phpsysinfo-subversion — subversion commit list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(11) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(40) |
| 2009 |
Jan
(60) |
Feb
(15) |
Mar
(36) |
Apr
(19) |
May
(28) |
Jun
(71) |
Jul
(15) |
Aug
(3) |
Sep
(22) |
Oct
(5) |
Nov
(1) |
Dec
|
| 2010 |
Jan
(18) |
Feb
(5) |
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(2) |
Oct
(4) |
Nov
(16) |
Dec
(9) |
| 2011 |
Jan
(9) |
Feb
(8) |
Mar
(1) |
Apr
(3) |
May
(2) |
Jun
|
Jul
(4) |
Aug
(15) |
Sep
(2) |
Oct
|
Nov
(7) |
Dec
(3) |
| 2012 |
Jan
(5) |
Feb
(10) |
Mar
(11) |
Apr
(16) |
May
(10) |
Jun
(7) |
Jul
(33) |
Aug
(43) |
Sep
(32) |
Oct
|
Nov
(6) |
Dec
(6) |
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
1
(2) |
2
|
3
|
|
4
|
5
|
6
|
7
|
8
|
9
|
10
|
|
11
|
12
|
13
|
14
|
15
|
16
|
17
|
|
18
|
19
|
20
|
21
|
22
(3) |
23
(1) |
24
|
|
25
(3) |
26
(1) |
27
|
28
|
29
|
30
(1) |
31
|
|
From: <namiltd@us...> - 2012-03-30 19:50:48
|
Revision: 555
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=555&view=rev
Author: namiltd
Date: 2012-03-30 19:50:42 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/ChangeLog
trunk/includes/class.CommonFunctions.inc.php
trunk/includes/os/class.BSDCommon.inc.php
trunk/includes/os/class.Linux.inc.php
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2012-03-26 06:04:22 UTC (rev 554)
+++ trunk/ChangeLog 2012-03-30 19:50:42 UTC (rev 555)
@@ -9,6 +9,7 @@
- [UPD] Language files (pl, cz)
- [Fix] Fix SMART Plugin crash on some systems
+ - [FIX] Fix SCSI, USB and IDE devices detection on FreeBSD
phpSysInfo 3.0.16
Modified: trunk/includes/class.CommonFunctions.inc.php
===================================================================
--- trunk/includes/class.CommonFunctions.inc.php 2012-03-26 06:04:22 UTC (rev 554)
+++ trunk/includes/class.CommonFunctions.inc.php 2012-03-30 19:50:42 UTC (rev 555)
@@ -224,7 +224,7 @@
*/
public static function checkForExtensions($arrExt = array())
{
- $arrReq = array('simplexml', 'pcre', 'xml', 'mbstring');
+ $arrReq = array('simplexml', 'pcre', 'xml', 'mbstring', 'dom');
$extensions = array_merge($arrExt, $arrReq);
$text = "";
$error = false;
Modified: trunk/includes/os/class.BSDCommon.inc.php
===================================================================
--- trunk/includes/os/class.BSDCommon.inc.php 2012-03-26 06:04:22 UTC (rev 554)
+++ trunk/includes/os/class.BSDCommon.inc.php 2012-03-30 19:50:42 UTC (rev 555)
@@ -309,13 +309,13 @@
foreach ($this->readdmesg() as $line) {
if (preg_match("/".$this->_SCSIRegExp1."/", $line, $ar_buf)) {
$dev = new HWDevice();
- $dev->setName($ar_buf[1]);
+ $dev->setName($ar_buf[1].": ".$ar_buf[2]);
$this->sys->setScsiDevices($dev);
} elseif (preg_match("/".$this->_SCSIRegExp2."/", $line, $ar_buf)) {
/* duplication security */
$notwas = true;
foreach ($this->sys->getScsiDevices() as $finddev) {
- if ($notwas && ($finddev->getName() == $ar_buf[1])){
+ if ($notwas && (($finddev->getName() == $ar_buf[1])||(strstr($finddev->getName(), ' ', true) == $ar_buf[1].":"))){
$finddev->setCapacity($ar_buf[2] * 2048 * 1.049);
$notwas = false;
break;
@@ -368,13 +368,33 @@
foreach ($this->readdmesg() as $line) {
if (preg_match('/^(ad[0-9]+): (.*)MB <(.*)> (.*) (.*)/', $line, $ar_buf)) {
$dev = new HWDevice();
- $dev->setName($ar_buf[1]);
+ $dev->setName($ar_buf[1].": ".$ar_buf[3]);
$dev->setCapacity($ar_buf[2] * 1024);
$this->sys->setIdeDevices($dev);
} elseif (preg_match('/^(acd[0-9]+): (.*) <(.*)> (.*)/', $line, $ar_buf)) {
$dev = new HWDevice();
- $dev->setName($ar_buf[1]);
+ $dev->setName($ar_buf[1].": ".$ar_buf[3]);
$this->sys->setIdeDevices($dev);
+ } elseif (preg_match('/^(ada[0-9]+): <(.*)> (.*) (.*)/', $line, $ar_buf)) {
+ $dev = new HWDevice();
+ $dev->setName($ar_buf[1].": ".$ar_buf[2]);
+ $this->sys->setIdeDevices($dev);
+ } elseif (preg_match('/^(ada[0-9]+): (.*)MB (.*)/', $line, $ar_buf)) {
+ /* duplication security */
+ $notwas = true;
+ foreach ($this->sys->getIdeDevices() as $finddev) {
+ if ($notwas && (($finddev->getName() == $ar_buf[1])||(strstr($finddev->getName(), ' ', true) == $ar_buf[1].":"))){
+ $finddev->setCapacity($ar_buf[2] * 1024);
+ $notwas = false;
+ break;
+ }
+ }
+ if ($notwas) {
+ $dev = new HWDevice();
+ $dev->setName($ar_buf[1]);
+ $dev->setCapacity($ar_buf[2] * 1024);
+ $this->sys->setIdeDevices($dev);
+ }
}
}
}
@@ -423,8 +443,25 @@
}
}
}
-
+
/**
+ * USB devices
+ * get the ide device information out of dmesg
+ *
+ * @return void
+ */
+ protected function usb()
+ {
+ foreach ($this->readdmesg() as $line) {
+ if (preg_match('/^(ugen[0-9\.]+): <(.*)> (.*) (.*)/', $line, $ar_buf)) {
+ $dev = new HWDevice();
+ $dev->setName($ar_buf[1].": ".$ar_buf[2]);
+ $this->sys->setUSBDevices($dev);
+ }
+ }
+ }
+
+ /**
* filesystem information
*
* @return void
@@ -471,6 +508,7 @@
$this->hostname();
$this->ip();
$this->scsi();
+ $this->usb();
}
}
?>
Modified: trunk/includes/os/class.Linux.inc.php
===================================================================
--- trunk/includes/os/class.Linux.inc.php 2012-03-26 06:04:22 UTC (rev 554)
+++ trunk/includes/os/class.Linux.inc.php 2012-03-30 19:50:42 UTC (rev 555)
@@ -447,14 +447,10 @@
$bufe2 = preg_split("/\n/", $bufr2, -1, PREG_SPLIT_NO_EMPTY);
foreach ($bufe2 as $buf2) {
if (preg_match('/\s+encap:Ethernet\s+HWaddr\s([^\s]*)/i', $buf2, $ar_buf2))
-// $dev->setInfo('MAC '.preg_replace('/:/', '-', $ar_buf2[1]));
$dev->setInfo(preg_replace('/:/', '-', $ar_buf2[1]));
else if (preg_match('/^\s+inet\saddr:([^\s]*)/i', $buf2, $ar_buf2))
-// $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').'IP '.$ar_buf2[1]);
$dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
-// else if (preg_match('/^\s+inet6\saddr:(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2))
else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2))
-// $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').'IPv6 '.$ar_buf2[1]);
$dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <namiltd@us...> - 2012-03-26 06:04:28
|
Revision: 554
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=554&view=rev
Author: namiltd
Date: 2012-03-26 06:04:22 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Property Changed:
----------------
trunk/tools/MakeRelease.sh
trunk/tools/check.sh
Property changes on: trunk/tools/MakeRelease.sh
___________________________________________________________________
Added: svn:executable
+ *
Property changes on: trunk/tools/check.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <namiltd@us...> - 2012-03-25 09:07:36
|
Revision: 553
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=553&view=rev
Author: namiltd
Date: 2012-03-25 09:07:31 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2012-03-25 08:27:55 UTC (rev 552)
+++ trunk/ChangeLog 2012-03-25 09:07:31 UTC (rev 553)
@@ -8,6 +8,8 @@
- [UPD] Updated jQuery plugin to 1.7.2
- [UPD] Language files (pl, cz)
+ - [Fix] Fix SMART Plugin crash on some systems
+
phpSysInfo 3.0.16
- [ADD] Mageia to detected distros
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <namiltd@us...> - 2012-03-25 08:28:01
|
Revision: 552
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=552&view=rev
Author: namiltd
Date: 2012-03-25 08:27:55 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/SMART/class.SMART.inc.php
Modified: trunk/plugins/SMART/class.SMART.inc.php
===================================================================
--- trunk/plugins/SMART/class.SMART.inc.php 2012-03-25 08:03:58 UTC (rev 551)
+++ trunk/plugins/SMART/class.SMART.inc.php 2012-03-25 08:27:55 UTC (rev 552)
@@ -101,15 +101,30 @@
return;
}
foreach ($this->_filecontent as $disk=>$result) {
- preg_match('/Vendor Specific SMART Attributes with Thresholds\:\n(.*)\n((.|\n)*)\n\nSMART Error Log Version\:/', $result, $vendorInfos);
+ // set the start and end offset in the result string at the beginning and end respectively
+ // just in case we don't find the two strings, so that it still works as expected.
+ $startIndex = 0;
+ $endIndex = 0;
+ $vendorInfos = "";
+
+ // locate the beginning string offset for the attributes
+ if ( preg_match('/(Vendor Specific SMART Attributes with Thresholds)/', $result, $matches, PREG_OFFSET_CAPTURE) )
+ $startIndex = $matches[0][1];
+
+ // locate the end string offset for the attributes, this is usually right before string "SMART Error Log Version" (hopefully every output has it!)
+ if ( preg_match('/(SMART Error Log Version)/', $result, $matches, PREG_OFFSET_CAPTURE) )
+ $endIndex = $matches[0][1];
+
+ if (($startIndex)&&($endIndex)&&($endIndex>$startIndex))
+ $vendorInfos = preg_split("/\n/", substr ( $result, $startIndex, $endIndex - $startIndex ));
+
if (!empty($vendorInfos)) {
$labels = preg_split('/[\s]+/', $vendorInfos[1]);
foreach ($labels as $k=>$v) {
$labels[$k] = str_replace('#', '', strtolower($v));
}
- $lines = preg_split('/\n/', $vendorInfos[2]);
$i = 0; // Line number
- foreach ($lines as $line) {
+ foreach ($vendorInfos as $line) {
$line = preg_replace('/^[\s]+/', '', $line);
$values = preg_split('/[\s]+/', $line);
if (count($values) > count($labels)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jacky672@us...> - 2012-03-25 08:04:05
|
Revision: 551
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=551&view=rev
Author: jacky672
Date: 2012-03-25 08:03:58 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
fix the undefined constant
Modified Paths:
--------------
trunk/includes/os/class.Linux.inc.php
Modified: trunk/includes/os/class.Linux.inc.php
===================================================================
--- trunk/includes/os/class.Linux.inc.php 2012-03-23 13:51:32 UTC (rev 550)
+++ trunk/includes/os/class.Linux.inc.php 2012-03-25 08:03:58 UTC (rev 551)
@@ -78,7 +78,7 @@
{
if (CommonFunctions::executeProgram('uname', '-r', $strBuf, PSI_DEBUG)) {
$result = trim($strBuf);
- if (CommonFunctions::executeProgram('uname', '-v', $strBuf, PSI_)) {
+ if (CommonFunctions::executeProgram('uname', '-v', $strBuf, PSI_DEBUG)) {
if (preg_match('/SMP/', $strBuf)) {
$result .= ' (SMP)';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <namiltd@us...> - 2012-03-23 13:51:41
|
Revision: 550
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=550&view=rev
Author: namiltd
Date: 2012-03-23 13:51:32 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/includes/os/class.Linux.inc.php
Modified: trunk/includes/os/class.Linux.inc.php
===================================================================
--- trunk/includes/os/class.Linux.inc.php 2012-03-22 11:36:03 UTC (rev 549)
+++ trunk/includes/os/class.Linux.inc.php 2012-03-23 13:51:32 UTC (rev 550)
@@ -78,7 +78,7 @@
{
if (CommonFunctions::executeProgram('uname', '-r', $strBuf, PSI_DEBUG)) {
$result = trim($strBuf);
- if (CommonFunctions::executeProgram('uname', '-v', $strBuf, PSI_DEBUG)) {
+ if (CommonFunctions::executeProgram('uname', '-v', $strBuf, PSI_)) {
if (preg_match('/SMP/', $strBuf)) {
$result .= ' (SMP)';
}
@@ -511,7 +511,7 @@
*/
private function _filesystems()
{
- $arrResult = Parser::df("-P");
+ $arrResult = Parser::df("-P 2>/dev/null");
foreach ($arrResult as $dev) {
$this->sys->setDiskDevices($dev);
}
@@ -527,8 +527,8 @@
if (!$list) {
return;
}
- // We have the '2> /dev/null' because Ubuntu gives an error on this command which causes the distro to be unknown
- if (CommonFunctions::executeProgram('lsb_release', '-a 2> /dev/null', $distro_info, PSI_DEBUG)) {
+ // We have the '2>/dev/null' because Ubuntu gives an error on this command which causes the distro to be unknown
+ if (CommonFunctions::executeProgram('lsb_release', '-a 2>/dev/null', $distro_info, PSI_DEBUG)) {
$distro_tmp = preg_split("/\n/", $distro_info, -1, PREG_SPLIT_NO_EMPTY);
foreach ($distro_tmp as $info) {
$info_tmp = preg_split('/:/', $info, 2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <namiltd@us...> - 2012-03-22 11:36:14
|
Revision: 549
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=549&view=rev
Author: namiltd
Date: 2012-03-22 11:36:03 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/ChangeLog
trunk/config.php.new
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2012-03-22 11:31:34 UTC (rev 548)
+++ trunk/ChangeLog 2012-03-22 11:36:03 UTC (rev 549)
@@ -3,7 +3,7 @@
phpSysInfo 3.0.17
- [ADD] Chakra to detected distros
- - [ADD] Network interfaces infos option PSI_HIDE_NETWORK_INFOS (experimental)
+ - [ADD] Network interfaces infos option PSI_SHOW_NETWORK_INFOS (experimental)
- [UPD] Updated jQuery plugin to 1.7.2
- [UPD] Language files (pl, cz)
Modified: trunk/config.php.new
===================================================================
--- trunk/config.php.new 2012-03-22 11:31:34 UTC (rev 548)
+++ trunk/config.php.new 2012-03-22 11:36:03 UTC (rev 549)
@@ -246,7 +246,13 @@
*/
define('PSI_HIDE_NETWORK_INTERFACE', '');
+/**
+ * Show network interfaces infos (experimental)
+ * Example : define('PSI_SHOW_NETWORK_INFOS', true);
+ */
+define('PSI_SHOW_NETWORK_INFOS', false);
+
// ********************************
// UPS PARAMETERS
// ********************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <namiltd@us...> - 2012-03-22 11:31:40
|
Revision: 548
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=548&view=rev
Author: namiltd
Date: 2012-03-22 11:31:34 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/ChangeLog
trunk/tools/MakeRelease.sh
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2012-03-22 09:44:38 UTC (rev 547)
+++ trunk/ChangeLog 2012-03-22 11:31:34 UTC (rev 548)
@@ -3,6 +3,7 @@
phpSysInfo 3.0.17
- [ADD] Chakra to detected distros
+ - [ADD] Network interfaces infos option PSI_HIDE_NETWORK_INFOS (experimental)
- [UPD] Updated jQuery plugin to 1.7.2
- [UPD] Language files (pl, cz)
Modified: trunk/tools/MakeRelease.sh
===================================================================
--- trunk/tools/MakeRelease.sh 2012-03-22 09:44:38 UTC (rev 547)
+++ trunk/tools/MakeRelease.sh 2012-03-22 11:31:34 UTC (rev 548)
@@ -17,6 +17,7 @@
# remove the svn directories
find . -type d -name .svn -exec rm -fr {} \;
+#or find . -iname ".svn" -print0 | xargs -0 rm -r
#remove some dirs
rm -rf tools sample
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <namiltd@us...> - 2012-03-22 09:44:49
|
Revision: 547
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=547&view=rev
Author: namiltd
Date: 2012-03-22 09:44:38 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/includes/os/class.Linux.inc.php
trunk/includes/os/class.WINNT.inc.php
trunk/includes/to/device/class.NetDevice.inc.php
trunk/includes/xml/class.XML.inc.php
trunk/js/phpSysInfo/phpsysinfo.js
trunk/templates/html/index_dynamic.html
Modified: trunk/includes/os/class.Linux.inc.php
===================================================================
--- trunk/includes/os/class.Linux.inc.php 2012-03-21 21:28:03 UTC (rev 546)
+++ trunk/includes/os/class.Linux.inc.php 2012-03-22 09:44:38 UTC (rev 547)
@@ -443,6 +443,21 @@
$dev->setTxBytes($stats[8]);
$dev->setErrors($stats[2] + $stats[10]);
$dev->setDrops($stats[3] + $stats[11]);
+ if ((PSI_SHOW_NETWORK_INFOS) && (CommonFunctions::executeProgram('ifconfig', trim($dev_name).' 2>/dev/null', $bufr2, PSI_DEBUG))) {
+ $bufe2 = preg_split("/\n/", $bufr2, -1, PREG_SPLIT_NO_EMPTY);
+ foreach ($bufe2 as $buf2) {
+ if (preg_match('/\s+encap:Ethernet\s+HWaddr\s([^\s]*)/i', $buf2, $ar_buf2))
+// $dev->setInfo('MAC '.preg_replace('/:/', '-', $ar_buf2[1]));
+ $dev->setInfo(preg_replace('/:/', '-', $ar_buf2[1]));
+ else if (preg_match('/^\s+inet\saddr:([^\s]*)/i', $buf2, $ar_buf2))
+// $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').'IP '.$ar_buf2[1]);
+ $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+// else if (preg_match('/^\s+inet6\saddr:(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2))
+ else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2))
+// $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').'IPv6 '.$ar_buf2[1]);
+ $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+ }
+ }
$this->sys->setNetDevices($dev);
}
}
Modified: trunk/includes/os/class.WINNT.inc.php
===================================================================
--- trunk/includes/os/class.WINNT.inc.php 2012-03-21 21:28:03 UTC (rev 546)
+++ trunk/includes/os/class.WINNT.inc.php 2012-03-22 09:44:38 UTC (rev 547)
@@ -105,10 +105,12 @@
foreach ($arrProp as $propItem) {
eval("\$value = \$objItem->".$propItem->Name.";");
if ( empty($strValue)) {
- $arrInstance[$propItem->Name] = trim($value);
+ if (is_string($value)) $arrInstance[$propItem->Name] = trim($value);
+ else $arrInstance[$propItem->Name] = $value;
} else {
if (in_array($propItem->Name, $strValue)) {
- $arrInstance[$propItem->Name] = trim($value);
+ if (is_string($value)) $arrInstance[$propItem->Name] = trim($value);
+ else $arrInstance[$propItem->Name] = $value;
}
}
}
@@ -335,9 +337,30 @@
*/
private function _network()
{
- foreach ($this->_getWMI('Win32_PerfRawData_Tcpip_NetworkInterface') as $device) {
- $dev = new NetDevice();
- $dev->setName($device['Name']);
+ $allDevices = $this->_getWMI('Win32_PerfRawData_Tcpip_NetworkInterface', array('Name', 'BytesSentPersec', 'BytesTotalPersec', 'BytesReceivedPersec', 'PacketsReceivedErrors', 'PacketsReceivedDiscarded'));
+ if (PSI_SHOW_NETWORK_INFOS)
+ $allNetworkAdapterConfigurations = $this->_getWMI('Win32_NetworkAdapterConfiguration', array('Description', 'MACAddress', 'IPAddress'));
+
+ foreach ($allDevices as $device) {
+ $dev = new NetDevice();
+ $name=$device['Name'];
+
+ $cname=preg_replace('/[^A-Za-z0-9]/', '_', $name); //convert to canonical
+ if (preg_match('/\s-\s([^-]*)$/', $name, $ar_name))
+ $name=substr($name,0,strlen($name)-strlen($ar_name[0]));
+ $dev->setName($name);
+
+ if (PSI_SHOW_NETWORK_INFOS) foreach ($allNetworkAdapterConfigurations as $NetworkAdapterConfiguration) {
+ if ( preg_replace('/[^A-Za-z0-9]/', '_', $NetworkAdapterConfiguration['Description']) == $cname ) {
+ $dev->setInfo(preg_replace('/:/', '-', $NetworkAdapterConfiguration['MACAddress']));
+ foreach( $NetworkAdapterConfiguration['IPAddress'] as $ipaddres)
+ if (($ipaddres!="0.0.0.0")&&(!preg_match('/^fe80::/i',$ipaddres)))
+ $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ipaddres);
+
+ break;
+ }
+ }
+
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wmisdk/wmi/win32_perfrawdata_tcpip_networkinterface.asp
// there is a possible bug in the wmi interfaceabout uint32 and uint64: http://www.ureader.com/message/1244948.aspx, so that
// magative numbers would occour, try to calculate the nagative value from total - positive number
@@ -354,6 +377,7 @@
$dev->setRxBytes($rxbytes);
$dev->setErrors($device['PacketsReceivedErrors']);
$dev->setDrops($device['PacketsReceivedDiscarded']);
+
$this->sys->setNetDevices($dev);
}
}
Modified: trunk/includes/to/device/class.NetDevice.inc.php
===================================================================
--- trunk/includes/to/device/class.NetDevice.inc.php 2012-03-21 21:28:03 UTC (rev 546)
+++ trunk/includes/to/device/class.NetDevice.inc.php 2012-03-22 09:44:38 UTC (rev 547)
@@ -61,6 +61,13 @@
private $_drops = 0;
/**
+ * string with info
+ *
+ * @var String
+ */
+ private $_info = null;
+
+ /**
* Returns $_drops.
*
* @see NetDevice::$_drops
@@ -189,5 +196,31 @@
{
$this->_txBytes = $txBytes;
}
+
+ /**
+ * Returns $_info.
+ *
+ * @see NetDevice::$_info
+ *
+ * @return String
+ */
+ public function getInfo()
+ {
+ return $this->_info;
+ }
+
+ /**
+ * Sets $_info.
+ *
+ * @param String $info info string
+ *
+ * @see NetDevice::$_info
+ *
+ * @return Void
+ */
+ public function setInfo($info)
+ {
+ $this->_info = $info;
+ }
}
?>
Modified: trunk/includes/xml/class.XML.inc.php
===================================================================
--- trunk/includes/xml/class.XML.inc.php 2012-03-21 21:28:03 UTC (rev 546)
+++ trunk/includes/xml/class.XML.inc.php 2012-03-22 09:44:38 UTC (rev 547)
@@ -149,6 +149,8 @@
$device->addAttribute('TxBytes', $dev->getTxBytes());
$device->addAttribute('Err', $dev->getErrors());
$device->addAttribute('Drops', $dev->getDrops());
+ if ((PSI_SHOW_NETWORK_INFOS) && ($dev->getInfo()))
+ $device->addAttribute('Info', $dev->getInfo());
}
}
}
Modified: trunk/js/phpSysInfo/phpsysinfo.js
===================================================================
--- trunk/js/phpSysInfo/phpsysinfo.js 2012-03-21 21:28:03 UTC (rev 546)
+++ trunk/js/phpSysInfo/phpsysinfo.js 2012-03-22 09:44:38 UTC (rev 547)
@@ -727,16 +727,68 @@
* @param {jQuery} xml phpSysInfo-XML
*/
function refreshNetwork(xml) {
- var name = "", rx = 0, tx = 0, er = 0, dr = 0;
- $("#tbody_network").empty();
+ var tree = [], closed = [], html0= "", html1= "" ,html = "", isinfo = false;
+ $("#network").empty();
+
+ html0 += "<h2>" + genlang(21, false) + "</h2>\n";
+
+ html1 += " <thead>\n";
+ html1 += " <tr>\n";
+ html1 += " <th>" + genlang(22, true) + "</th>\n";
+ html1 += " <th class=\"right\" style=\"width:50px;\">" + genlang(23, true) + "</th>\n";
+ html1 += " <th class=\"right\" style=\"width:50px;\">" + genlang(24, true) + "</th>\n";
+ html1 += " <th class=\"right\" style=\"width:50px;\">" + genlang(25, true) + "</th>\n";
+ html1 += " </tr>\n";
+ html1 += " </thead>\n";
+
$("Network NetDevice", xml).each(function getDevice(id) {
+ var name = "", rx = 0, tx = 0, er = 0, dr = 0, info = "", networkindex = 0;
name = $(this).attr("Name");
rx = parseInt($(this).attr("RxBytes"), 10);
tx = parseInt($(this).attr("TxBytes"), 10);
er = parseInt($(this).attr("Err"), 10);
dr = parseInt($(this).attr("Drops"), 10);
- $("#tbody_network").append("<tr><td>" + name + "</td><td class=\"right\">" + formatBytes(rx, xml) + "</td><td class=\"right\">" + formatBytes(tx, xml) + "</td><td class=\"right\">" + er.toString() + "/" + dr.toString() + "</td></tr>");
+ html +="<tr><td>" + name + "</td><td class=\"right\">" + formatBytes(rx, xml) + "</td><td class=\"right\">" + formatBytes(tx, xml) + "</td><td class=\"right\">" + er.toString() + "/" + dr.toString() + "</td></tr>";
+
+ networkindex = tree.push(0);
+
+ info = $(this).attr("Info");
+ if ( (info !== undefined) && (info != "") ) {
+ var i =0, infos = info.split(";");
+ isinfo = true;
+ for(i = 0; i < infos.length; i++){
+ html +="<tr><td>" + infos[i] + "</td><td></td><td></td><td></td></tr>";
+ tree.push(networkindex);
+ closed.push(networkindex);
+ }
+ }
});
+ html += "</tbody>\n";
+ html += "</table>\n";
+ if (isinfo) {
+ html0 += "<table id=\"NetworkTree\" class=\"tablemain\" style=\"border-spacing:0;\">\n";
+ html1 += " <tbody class=\"tree\">\n";
+ } else {
+ html0 += "<table id=\"NetworkTree\" class=\"stripeMe\" style=\"border-spacing:0;\">\n";
+ html1 += " <tbody class=\"tbody_network\">\n";
+ }
+ $("#network").append(html0+html1+html);
+
+ if (isinfo) $("#NetworkTree").jqTreeTable(tree, {
+ openImg: "./gfx/treeTable/tv-collapsable.gif",
+ shutImg: "./gfx/treeTable/tv-expandable.gif",
+ leafImg: "./gfx/treeTable/tv-item.gif",
+ lastOpenImg: "./gfx/treeTable/tv-collapsable-last.gif",
+ lastShutImg: "./gfx/treeTable/tv-expandable-last.gif",
+ lastLeafImg: "./gfx/treeTable/tv-item-last.gif",
+ vertLineImg: "./gfx/treeTable/vertline.gif",
+ blankImg: "./gfx/treeTable/blank.gif",
+ collapse: closed,
+ column: 0,
+ striped: true,
+ highlight: false,
+ state: false
+ });
}
/**
Modified: trunk/templates/html/index_dynamic.html
===================================================================
--- trunk/templates/html/index_dynamic.html 2012-03-21 21:28:03 UTC (rev 546)
+++ trunk/templates/html/index_dynamic.html 2012-03-22 09:44:38 UTC (rev 547)
@@ -126,19 +126,6 @@
<div id="filesystem">
</div>
<div id="network">
- <h2><span id="lang_021">Network Usage</span></h2>
- <table class="stripeMe" id="networkTable" style="border-spacing:0;">
- <thead>
- <tr>
- <th><span id="lang_022">Interface</span></th>
- <th class="right" style="width:60px;"><span id="lang_023">Recieved</span></th>
- <th class="right" style="width:60px;"><span id="lang_024">Transfered</span></th>
- <th class="right" style="width:60px;"><span id="lang_025">Error/Drops</span></th>
- </tr>
- </thead>
- <tbody id="tbody_network">
- </tbody>
- </table>
</div>
<div id="voltage" style="display: none;">
<h2><span id="lang_052">Voltage</span></h2>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iysaak@us...> - 2012-03-01 15:51:55
|
Revision: 545
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=545&view=rev
Author: iysaak
Date: 2012-03-01 15:51:46 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
1st python script to transform language files
Added Paths:
-----------
branches/ysaak-v4/tools/lang/
branches/ysaak-v4/tools/lang/xml2php.py
Added: branches/ysaak-v4/tools/lang/xml2php.py
===================================================================
(Binary files differ)
Property changes on: branches/ysaak-v4/tools/lang/xml2php.py
___________________________________________________________________
Added: svn:mime-type
+ application/x-python
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iysaak@us...> - 2012-03-01 15:46:14
|
Revision: 544
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=544&view=rev
Author: iysaak
Date: 2012-03-01 15:46:03 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
ysaak: create branche for new front-end version
Added Paths:
-----------
branches/ysaak-v4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|