[Phpgroupware-cvs] phpgroupware/login.php, 1.76.2.4.2.18

[nomail]

Update of /phpgroupware
Modified Files:
        Branch: Version-0_9_16-branch
          login.php

date: 2004/09/08 09:15:47;  author: skwashd;  state: Exp;  lines: +12 -4

Log Message:
cookies should be ignored if disabled
=====================================================================
Index: phpgroupware/login.php
diff -u phpgroupware/login.php:1.76.2.4.2.17 
phpgroupware/login.php:1.76.2.4.2.18
--- phpgroupware/login.php:1.76.2.4.2.17        Fri Jan 23 00:28:59 2004
+++ phpgroupware/login.php      Wed Sep  8 09:15:47 2004
@@ -31,7 +31,10 @@
                exit;
        }
 
-       $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set'];
+       $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT 
+                                                       . 
'/phpgwapi/templates/' 
+                                                       . 
$GLOBALS['phpgw_info']['login_template_set'];
+                                                       
        $tmpl = CreateObject('phpgwapi.Template', 
$GLOBALS['phpgw_info']['server']['template_dir']);
 
        // This is used for system downtime, to prevent new logins.
@@ -213,8 +216,7 @@
                unset($sslattributes);
        }
 
-       if (isset($_POST['passwd_type']) || $_POST['submit_x'] || 
$_POST['submit_y'] || $submit)
-//              isset($_POST['passwd']) && $_POST['passwd']) // enable 
konqueror to login via Return
+       if (isset($_POST['passwd_type']) || $_POST['submit'] || 
$_POST['submit_x'] || $_POST['submit_y'])
        {
                if (getenv(REQUEST_METHOD) != 'POST' && 
$_SERVER['REQUEST_METHOD'] != 'POST'
                        && !isset($_SERVER['PHP_AUTH_USER']) && 
!isset($_SERVER['SSL_CLIENT_S_DN']))
@@ -290,6 +292,12 @@
                }
        }
 
+       if( (address@hidden'phpgw_info']['server']['usecookies']) && 
@is_array($_COOKIE) )
+       {
+               unset($_COOKIE['last_loginid']);
+               unset($_COOKIE['last_domain']);
+       }
+       
        $last_loginid = $_COOKIE['last_loginid'];
        if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
        {