Changeset a68d42f968bde01a20d55ffc7c9cd33656fbb900

Timestamp:

05/06/09 10:43:45 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

a0fbd8081aad14716555b28cab27c19b76973eea

Parents:

15110c771604f44d1b149a66b2d4f09f00fb585c

git-committer:

Neutron Soutmun <neo.neutron@…> (05/06/09 10:43:45)

Message:

Handle the virtual server for squid helper

2009-05-06 Neutron Soutmun <neo.neutron@…>

• weblogin/squid_helper.php: Handle the virtual server for squid helper.

Files:

• ChangeLog (modified) (1 diff)
• weblogin/squid_helper.php (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2009-05-06  Neutron Soutmun <neo.neutron@gmail.com>
+
+        * weblogin/squid_helper.php: Handle the virtual server for squid helper.
+
 2009-05-04  Neutron Soutmun <neo.neutron@gmail.com>
 

weblogin/squid_helper.php

@@ -33 +33 @@
 include_once 'config.php';
 require_once 'rahu_xmlrpc.class.php';
+require_once 'networkchk.php';
 
 define(CACHE_TIME, 120);
@@ -46 +47 @@
   $srcip = rawurldecode($arg);
 
+  $config = get_config_by_network(trim($srcip), $config_list);
+  $vserver_id = $config["VSERVER_ID"];
+
   // Check cache
-  if (!empty($user_list[$srcip]['username']) && 
-    (time() - $user_list[$srcip]['timestamp']) < CACHE_TIME) {
-    fwrite(STDOUT, "OK user=". $user_list[$srcip]['username']  ."\n");
+  if (!empty($user_list[$vserver_id][$srcip]['username']) && 
+    (time() - $user_list[$vserver_id][$srcip]['timestamp']) < CACHE_TIME) {
+    fwrite(STDOUT, "OK user=". $user_list[$vserver_id][$srcip]['username']  ."\n");
     continue;
   }
@@ -57 +61 @@
   $xmlrpc->port = $config["RAHUNAS_PORT"];
   try {
-    $retinfo = $xmlrpc->do_getsessioninfo($srcip);
+    $retinfo = $xmlrpc->do_getsessioninfo($vserver_id, $srcip);
     if (is_array($retinfo) && !empty($retinfo['session_id'])) {
-      $user_list[$srcip]['username'] = $retinfo['username'];      
-      $user_list[$srcip]['timestamp'] = time();      
+      $user_list[$vserver_id][$srcip]['username'] = $retinfo['username'];      
+      $user_list[$vserver_id][$srcip]['timestamp'] = time();      
       fwrite(STDOUT, "OK user=". $retinfo['username']  ."\n");
     } else {