| 32,7 → 32,7 |
|---|
| public function __construct($blockname = false) |
| { |
| parent::__construct($blockname); |
| $this->setCPURegExp1("/^cpu(.*)\, (.*) MHz/"); |
| $this->setCPURegExp1("/^cpu(.*)\, (.*) MHz/\n/^CPU: (.*) \((.*)-MHz (.*)\)/"); // multiple regexp separated by \n |
| $this->setCPURegExp2("/^(.*) at scsibus.*: <(.*)> .*/"); |
| $this->setSCSIRegExp2("/^(da[0-9]+): (.*)MB /"); |
| $this->setPCIRegExp1("/(.*): <(.*)>(.*) (pci|legacypci)[0-9]+$/"); |
| 40,19 → 40,6 |
|---|
| } |
| |
| /** |
| * UpTime |
| * time the system is running |
| * |
| * @return void |
| */ |
| private function _uptime() |
| { |
| $a = $this->grabkey('kern.boottime'); |
| preg_match("/sec = ([0-9]+)/", $a, $buf); |
| $this->sys->setUptime(time() - $buf[1]); |
| } |
| |
| /** |
| * get network information |
| * |
| * @return void |
| 140,7 → 127,7 |
|---|
| * |
| * @see BSDCommon::build() |
| * |
| * @return Void |
| * @return void |
| */ |
| public function build() |
| { |
| 147,7 → 134,6 |
|---|
| parent::build(); |
| if (!$this->blockname || $this->blockname==='vitals') { |
| $this->_distroicon(); |
| $this->_uptime(); |
| $this->_processes(); |
| } |
| if (!$this->blockname || $this->blockname==='network') { |