[prev in list] [next in list] [prev in thread] [next in thread] 

List:       os-sim-commits
Subject:    [Os-sim-commits] os-sim/www/server server.php, 1.1,
From:       Dominique Karg <dkarg () users ! sourceforge ! net>
Date:       2007-02-27 18:54:27
Message-ID: E1HM7T4-0001dR-84 () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/os-sim/os-sim/www/server
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32467

Modified Files:
	server.php server_get_servers.php 
Log Message:
Show master server IP && port.


Index: server_get_servers.php
===================================================================
RCS file: /cvsroot/os-sim/os-sim/www/server/server_get_servers.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- server_get_servers.php	26 Feb 2007 20:48:54 -0000	1.1
+++ server_get_servers.php	27 Feb 2007 18:54:25 -0000	1.2
@@ -3,6 +3,32 @@
 require_once ('classes/Session.inc');
 require_once ('classes/Util.inc');
 
+function check_server($conn) {
+
+    require_once ('ossim_conf.inc');
+    $ossim_conf = $GLOBALS["CONF"];
+
+    /* get the port and IP address of the server */
+    $address = $ossim_conf->get_conf("server_address");
+    $port = $ossim_conf->get_conf("server_port");
+
+    /* create socket */
+    $socket = socket_create (AF_INET, SOCK_STREAM, 0);
+    if ($socket < 0) {
+        echo "socket_create() failed: reason: " . 
+            socket_strerror ($socket) . "\n";
+    }
+
+    /* connect */
+    $result = @socket_connect ($socket, $address, $port);
+    if (!$result) {
+        return false;
+    } 
+    return true;
+}
+
+
+
 function server_get_servers($conn) {
 
     $name = GET ('name');

Index: server.php
===================================================================
RCS file: /cvsroot/os-sim/os-sim/www/server/server.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- server.php	26 Feb 2007 20:48:54 -0000	1.1
+++ server.php	27 Feb 2007 18:54:25 -0000	1.2
@@ -16,6 +16,7 @@
 
 <?php
     require_once 'ossim_db.inc';
+    require_once 'ossim_conf.inc';
     require_once 'classes/Server.inc';
     require_once 'classes/Plugin.inc';
     require_once 'classes/Security.inc';
@@ -32,6 +33,28 @@
     if (empty($order))
          $order = "name";
 
+    $ossim_conf = $GLOBALS["CONF"];
+    $db = new ossim_db();
+    $conn = $db->connect();
+    
+    /* get the port and IP address of the server */
+    $address = $ossim_conf->get_conf("server_address");
+    $port = $ossim_conf->get_conf("server_port");
+
+    echo _("Master server at") . " <b>" . $address . ":" . $port . "</b> " . _("is") \
. " "; +    if(check_server($conn) == true){
+    echo "<font color=\"green\">";
+    echo _("UP");
+    echo "</font>";
+    // Server up
+    } else {
+    echo "<font color=\"red\">";
+    echo _("DOWN");
+    echo "</font>";
+    // Server down
+    }
+    echo ".";
+
 ?>
 
   <table align="center">
@@ -79,12 +102,6 @@
     </tr>
 
 <?php
-    require_once 'ossim_db.inc';
-    require_once 'classes/Server.inc';
-
-    $db = new ossim_db();
-    $conn = $db->connect();
-
     //first, get the servers connected; all this servers are "actived"
     $server_list = server_get_servers($conn);
     $server_list_aux = $server_list; //here are stored the connected servers
@@ -228,7 +245,7 @@
    } 
 ?>
     <tr>
-      <td colspan="10"><a href="newserverform.php"> <?php echo gettext("Insert new \
server"); ?> </a></td> +      <td colspan="12"><a href="newserverform.php"> <?php \
echo gettext("Insert new server"); ?> </a></td>  </tr>
 <!--    <tr>
       <td colspan="10"><a href="../conf/reload.php?what=servers"> <?php echo \
gettext("Reload"); ?> </a></td>


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Os-sim-commits mailing list
Os-sim-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/os-sim-commits


[prev in list] [next in list] [prev in thread] [next in thread]