lot of various code simplifications, including removing useless settings,

[platal.git] / include / xnet / session.inc.php

diff --git a/include/xnet/session.inc.php b/include/xnet/session.inc.php
index c0b6d26..8dedafd 100644 (file)
--- a/include/xnet/session.inc.php
+++ b/include/xnet/session.inc.php
@@ -70,11 +70,9 @@ class XnetSession
 
         if (Get::has('auth')) {
             return XnetSession::doAuthX();
-        } else {
-            global $page;
-
-            $page->doLogin();
         }
+
+        return false;
     }
 
     // }}}
@@ -105,11 +103,14 @@ class XnetSession
         $args = array();
         $path = Get::get('p');
         Get::kill('p');
+        Get::kill('PHPSESSID');
 
         foreach($_GET as $key => $val) {
             $args[] = urlencode($key).'='.urlencode($val);
         }
-        redirect($globals->baseurl . '/' . $path . '?' . join('&', $args));
+
+        redirect($globals->baseurl . '/' . $path
+                 . rtrim('?' . join('&', $args), '?'));
     }
 
     // }}}