[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[580] trunk/includes/os

[<na...@us...>]

Revision: 580
          http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=580&view=rev
Author:   namiltd
Date:     2012-05-15 18:53:33 +0000 (Tue, 15 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/includes/os/class.AIX.inc.php
    trunk/includes/os/class.BSDCommon.inc.php
    trunk/includes/os/class.HPUX.inc.php
    trunk/includes/os/class.Linux.inc.php
    trunk/includes/os/class.SunOS.inc.php
    trunk/includes/os/class.WINNT.inc.php

Modified: trunk/includes/os/class.AIX.inc.php
===================================================================
--- trunk/includes/os/class.AIX.inc.php	2012-05-15 18:09:09 UTC (rev 579)
+++ trunk/includes/os/class.AIX.inc.php	2012-05-15 18:53:33 UTC (rev 580)
@@ -54,13 +54,13 @@
     {
         if (PSI_USE_VHOST === true)
         {
-            $this->sys->setIp(gethostbyname($this->_hostname()));
+            $this->sys->setIp(gethostbyname($this->sys->getHostname()));
         }
         else
         {
             if (!($result = getenv('SERVER_ADDR')))
             {
-                $this->sys->setIp(gethostbyname($this->_hostname()));
+                $this->sys->setIp(gethostbyname($this->sys->getHostname()));
             }
             else
             {
@@ -362,8 +362,8 @@
     {
         $this->_myaixdata();
         $this->_distro();
+        $this->_hostname();
         $this->_ip();
-        $this->_hostname();
         $this->_kernel();
         $this->_uptime();
         $this->_users();

Modified: trunk/includes/os/class.BSDCommon.inc.php
===================================================================
--- trunk/includes/os/class.BSDCommon.inc.php	2012-05-15 18:09:09 UTC (rev 579)
+++ trunk/includes/os/class.BSDCommon.inc.php	2012-05-15 18:53:33 UTC (rev 580)
@@ -215,10 +215,10 @@
     protected function ip()
     {
         if (PSI_USE_VHOST === true) {
-            $this->sys->setIp(gethostbyname($this->hostname()));
+            $this->sys->setIp(gethostbyname($this->sys->getHostname()));
         } else {
             if (!($result = getenv('SERVER_ADDR'))) {
-                $this->sys->setIp(gethostbyname($this->hostname()));
+                $this->sys->setIp(gethostbyname($this->sys->getHostname()));
             } else {
                 $this->sys->setIp($result);
             }

Modified: trunk/includes/os/class.HPUX.inc.php
===================================================================
--- trunk/includes/os/class.HPUX.inc.php	2012-05-15 18:09:09 UTC (rev 579)
+++ trunk/includes/os/class.HPUX.inc.php	2012-05-15 18:53:33 UTC (rev 580)
@@ -50,10 +50,10 @@
     private function _ip()
     {
         if (PSI_USE_VHOST === true) {
-            $this->sys->setIp(gethostbyname($this->_hostname()));
+            $this->sys->setIp(gethostbyname($this->sys->getHostname()));
         } else {
             if (!($result = getenv('SERVER_ADDR'))) {
-                $this->sys->setIp(gethostbyname($this->_hostname()));
+                $this->sys->setIp(gethostbyname($this->sys->getHostname()));
             } else {
                 $this->sys->setIp($result);
             }
@@ -386,8 +386,8 @@
     function build()
     {
         $this->_distro();
+        $this->_hostname();
         $this->_ip();
-        $this->_hostname();
         $this->_kernel();
         $this->_uptime();
         $this->_users();

Modified: trunk/includes/os/class.Linux.inc.php
===================================================================
--- trunk/includes/os/class.Linux.inc.php	2012-05-15 18:09:09 UTC (rev 579)
+++ trunk/includes/os/class.Linux.inc.php	2012-05-15 18:53:33 UTC (rev 580)
@@ -51,7 +51,6 @@
                 }
             }
         }
-        return $this->sys->getHostname();
     }
     /**
      * IP
@@ -61,10 +60,10 @@
     private function _ip()
     {
         if (PSI_USE_VHOST === true) {
-            $this->sys->setIp(gethostbyname($this->_hostname()));
+            $this->sys->setIp(gethostbyname($this->sys->getHostname()));
         } else {
             if (!($result = $_SERVER['SERVER_ADDR'])) {
-                $this->sys->setIp(gethostbyname($this->_hostname()));
+                $this->sys->setIp(gethostbyname($this->sys->getHostname()));
             } else {
                 $this->sys->setIp($result);
             }
@@ -575,8 +574,8 @@
     function build()
     {
         $this->_distro();
-        $this->_ip();
         $this->_hostname();
+        $this->_ip();
         $this->_kernel();
         $this->_uptime();
         $this->_users();

Modified: trunk/includes/os/class.SunOS.inc.php
===================================================================
--- trunk/includes/os/class.SunOS.inc.php	2012-05-15 18:09:09 UTC (rev 579)
+++ trunk/includes/os/class.SunOS.inc.php	2012-05-15 18:53:33 UTC (rev 580)
@@ -78,10 +78,10 @@
     private function _ip()
     {
         if (PSI_USE_VHOST === true) {
-            $this->sys->setIp(gethostbyname($this->_hostname()));
+            $this->sys->setIp(gethostbyname($this->sys->getHostname()));
         } else {
             if (!($result = getenv('SERVER_ADDR'))) {
-                $this->sys->setIp(gethostbyname($this->_hostname()));
+                $this->sys->setIp(gethostbyname($this->sys->getHostname()));
             } else {
                 $this->sys->setIp($result);
             }
@@ -265,8 +265,8 @@
      */
     function build()
     {
+        $this->_hostname();
         $this->_ip();
-        $this->_hostname();
         $this->_distro();
         $this->_kernel();
         $this->_uptime();

Modified: trunk/includes/os/class.WINNT.inc.php
===================================================================
--- trunk/includes/os/class.WINNT.inc.php	2012-05-15 18:09:09 UTC (rev 579)
+++ trunk/includes/os/class.WINNT.inc.php	2012-05-15 18:53:33 UTC (rev 580)
@@ -173,7 +173,7 @@
     private function _ip()
     {
         if (PSI_USE_VHOST === true) {
-            $this->sys->setIp(gethostbyname($this->_hostname()));
+            $this->sys->setIp(gethostbyname($this->sys->getHostname()));
         } else {
             $buffer = $this->_getWMI('Win32_ComputerSystem', array('Name'));
             $result = $buffer[0]['Name'];
@@ -458,8 +458,8 @@
      */
     function build()
     {
+        $this->_hostname();
         $this->_ip();
-        $this->_hostname();
         $this->_distro();
         $this->_users();
         $this->_uptime();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.