Added a comma after each msgnum exported. The parser was globbing them all together...

[citadel.git] / ctdlphp / ctdlsession.php

diff --git a/ctdlphp/ctdlsession.php b/ctdlphp/ctdlsession.php
index f2ac6f5237f052c468bd58766c7beb82ad993857..c9614c753ef57d2b24ee068d67e2d4eed051f4ca 100644 (file)
--- a/ctdlphp/ctdlsession.php
+++ b/ctdlphp/ctdlsession.php
@@ -1,5 +1,4 @@
 <?PHP
-
 // $Id$
 //
 // This gets called from within the header functions.  It establishes or
@@ -22,7 +21,7 @@ function establish_citadel_session() {
 
        session_start();
 
-       if ($_SESSION["ctdlsession"]) {
+       if (isset($_SESSION["ctdlsession"])) {
                $session = $_SESSION["ctdlsession"];
        }
        else {
@@ -35,59 +34,89 @@ function establish_citadel_session() {
        // session, and it's found in the /tmp directory.
 
        $sockname = "/tmp/" . $session . ".socket" ;
-
-       $clientsocket = fsockopen($sockname, 0, $errno, $errstr, 5);
+       $errno = 0; 
+       $errstr = "";
+       if (is_array(stat($sockname)))
+               $clientsocket = fsockopen(SOCKET_PREFIX.$sockname, 0, $errno, $errstr, 5);
+       else
+               $clientsocket = false;
+//// TODO: if we get connection refused...
+       echo "$socketname - $errno - $errstr";
+       
        if (!$clientsocket) {
                // It ain't there, dude.  Open up the proxy. (C version)
                //$cmd = "./sessionproxy " . $sockname ;
                //exec($cmd);
 
                // It ain't there, dude.  Open up the proxy.  (PHP version)
+               if (CITADEL_DEBUG_PROXY){
+                       $stdout = '>>/tmp/sessionproxyout.txt ';
+               }
+               else{
+                       $stdout = '>/dev/null ';
+               }
+
                $cmd = "./sessionproxy.php " . $sockname .
-                       " </dev/null >/dev/null 2>&1 " .
+                       " </dev/null ".$stdout."2>&1 " .
                        " 3>&1 4>&1 5>&1 6>&1 7>&1 8>&1 & " ;
                exec($cmd);
-               sleep(2);
-
-               // Ok, now try again.
-               $clientsocket = fsockopen($sockname, 0, $errno, $errstr, 5);
-
-               // Try to log the user back in and go back to the correct room.
-               if ($clientsocket) {
-
-                       ctdl_iden();    // Identify client
-
-                       if ($_SESSION["username"]) {
-                               login_existing_user(
-                                       $_SESSION["username"],
-                                       $_SESSION["password"]
-                               );
+               sleep(1);
+
+               // Keep attempting connections 10 times per second up to 100 times
+               $attempts = 0;
+               while (!$clientsocket) {
+                       usleep(100);
+                       if (is_array(stat($sockname)))
+                               $clientsocket = fsockopen(SOCKET_PREFIX.$sockname, 0, $errno, $errstr, 5);
+                       else 
+                               $clientsocket = false;
+                       $attempts += 1;
+                       if ($attempts > 100) {
+                               echo "ERROR: unable to start connection proxy. ";
+                               echo "Please contact your system administrator.<BR>\n";
+                               flush();
+                               exit(1);
                        }
+               }
 
-                       if ($_SESSION["room"]) {
-                               ctdl_goto($_SESSION["room"]);
-                       }
-                       else {
-                               ctdl_goto("_BASEROOM_");
-                       }
+               // At this point we have a good connection to Citadel.
+               $identity=array(
+                       "DevelNr" => '0',
+                       "ClientID" => '8',
+                       "VersionNumber" => '001',
+                       "ClientInfoString" => 'PHP web client|',
+                       "Remote Address" => $_SERVER['REMOTE_ADDR'] );
+
+               ctdl_iden($identity);   // Identify client
+               ctdl_MessageFormatsPrefered(array("text/html","text/plain"));
+               if (isset($_SESSION["username"])) {
+                       login_existing_user(
+                               $_SESSION["username"],
+                               $_SESSION["password"]
+                       );
                }
-       }
 
-       if ($clientsocket) {
-               if (!$_SESSION["serv_humannode"]) {
-                       ctdl_get_serv_info();
+               if (isset($_SESSION["room"])) {
+                       ctdl_goto($_SESSION["room"]);
+               }
+               else {
+                       ctdl_goto("_BASEROOM_");
                }
        }
-       else {
-               echo "ERROR: no Citadel socket!<BR>\n";
-               flush();
+
+       if (!isset($_SESSION["serv_humannode"])) {
+               $server_info = ctdl_get_serv_info();
+               // print_r($server_info);
+               $keys = array_keys($server_info);
+               foreach ($keys as $key)
+                       $_SESSION[$key] = $server_info[$key];
        }
 
        // If the user is trying to call up any page other than
        // login.php logout.php do_login.php,
        // and the session is not logged in, redirect to login.php
        //
-       if ($_SESSION["logged_in"] != 1) {
+       if (isset($_SESSION["logged_in"]) && ($_SESSION["logged_in"] != 1)) {
                $filename = basename(getenv('SCRIPT_NAME'));
                if (    (strcmp($filename, "login.php"))
                   &&   (strcmp($filename, "logout.php"))