[Fmsystem-commits] [6837] API: change user/domain separator from @ to #

[Sigurd Nes]

Revision: 6837
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6837
Author:   sigurdne
Date:     2011-01-24 20:07:18 +0000 (Mon, 24 Jan 2011)
Log Message:
-----------
API: change user/domain separator from @ to #

Modified Paths:
--------------
    trunk/admin/inc/class.boaccess_history.inc.php
    trunk/admin/inc/class.bocurrentsessions.inc.php
    trunk/login.php
    trunk/phpgwapi/inc/class.sessions.inc.php
    trunk/phpgwapi/inc/functions.inc.php
    trunk/phpgwapi/inc/sso/include_login.inc.php

Modified: trunk/admin/inc/class.boaccess_history.inc.php
===================================================================
--- trunk/admin/inc/class.boaccess_history.inc.php      2011-01-24 10:05:25 UTC 
(rev 6836)
+++ trunk/admin/inc/class.boaccess_history.inc.php      2011-01-24 20:07:18 UTC 
(rev 6837)
@@ -54,9 +54,9 @@
                                        $record['lo'] = '';             // dont 
show a 0 for not loged out
                                }
 
-                               if (ereg('@',$record['loginid']))
+                               if (preg_match('/#/',$record['loginid']))
                                {
-                                       $t = split('@',$record['loginid']);
+                                       $t = explode('#',$record['loginid']);
                                        $record['loginid'] = $t[0];
                                }
 

Modified: trunk/admin/inc/class.bocurrentsessions.inc.php
===================================================================
--- trunk/admin/inc/class.bocurrentsessions.inc.php     2011-01-24 10:05:25 UTC 
(rev 6836)
+++ trunk/admin/inc/class.bocurrentsessions.inc.php     2011-01-24 20:07:18 UTC 
(rev 6837)
@@ -44,7 +44,7 @@
                        $values = 
$GLOBALS['phpgw']->session->list_sessions($start, $sort, $order);
                        foreach ( $values as &$value )
                        {
-                               if ( preg_match('/^(.*)@(.*)$/', $value['lid'], 
$m) )
+                               if ( preg_match('/^(.*)#(.*)$/', $value['lid'], 
$m) )
                                {
                                        $value['lid'] = $m[1];
                                }

Modified: trunk/login.php
===================================================================
--- trunk/login.php     2011-01-24 10:05:25 UTC (rev 6836)
+++ trunk/login.php     2011-01-24 20:07:18 UTC (rev 6837)
@@ -172,9 +172,9 @@
                }
 
                $logindomain = phpgw::get_var('logindomain', 'string', 'POST');
-               if ( strstr($login,'@') === false && $logindomain )
+               if ( strstr($login,'#') === false && $logindomain )
                {
-                       $login .= "@{$logindomain}";
+                       $login .= "#{$logindomain}";
                }
 
                $receipt = array();

Modified: trunk/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php   2011-01-24 10:05:25 UTC (rev 
6836)
+++ trunk/phpgwapi/inc/class.sessions.inc.php   2011-01-24 20:07:18 UTC (rev 
6837)
@@ -352,7 +352,7 @@
                        $GLOBALS['phpgw']->interserver = 
createObject('phpgwapi.interserver');
                        $this->_login  = $login;
                        $this->_passwd = $passwd;
-                       $login_array = explode('@', $login);
+                       $login_array = explode('#', $login);
                        $this->_account_lid = $login_array[0];
                        $now = time();
 
@@ -1125,7 +1125,7 @@
 
                        $this->_session_flags = $session['session_flags'];
 
-                       $lid_data = explode('@', $session['session_lid']);
+                       $lid_data = explode('#', $session['session_lid']);
                        $this->_account_lid = $lid_data[0];
 
                        if ( isset($lid_data[1]) )
@@ -1359,7 +1359,7 @@
                        {
                                $filename = $file->getFilename();
                                // only try php session files
-                               if ( !preg_match('/^sess_([a-f0-9]+)$/', 
$filename) )
+                               if ( !preg_match('/^sess_([a-z0-9]+)$/', 
$filename) )
                                {
                                        continue;
                                }
@@ -1457,7 +1457,7 @@
                        }
                        $login  = $this->_db->db_addslashes($login);
                        $sql    = 'SELECT COUNT(*) AS cnt FROM phpgw_access_log'
-                                       . " WHERE account_id = 0 AND 
(loginid='{$login}' OR loginid LIKE 'address@hidden')"
+                                       . " WHERE account_id = 0 AND 
(loginid='{$login}' OR loginid LIKE '$login#%')"
                                                . " AND li > {$block_time}";
                        $this->_db->query($sql, __LINE__, __FILE__);
 
@@ -1558,7 +1558,7 @@
                        $this->_data['domain']      = $this->_account_domain;
                        $this->_data['sessionid']   = $this->_sessionid;
                        $this->_data['session_ip']  = $this->_get_user_ip();
-                       $this->_data['session_lid'] = 
$this->_account_lid.'@'.$this->_account_domain;
+                       $this->_data['session_lid'] = 
$this->_account_lid.'#'.$this->_account_domain;
                        $this->_data['account_id']  = $this->_account_id;
                        $this->_data['account_lid'] = $this->_account_lid;
                        $this->_data['userid']      = $this->_account_lid;
@@ -1580,7 +1580,7 @@
                protected function _set_login($login)
                {
                        $m = array();
-                       if ( preg_match('/(.*)@(.*)/', $login, $m) )
+                       if ( preg_match('/(.*)#(.*)/', $login, $m) )
                        {
                                $this->_account_lid = $m[1];
                                $this->_account_domain = $m[2];

Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php        2011-01-24 10:05:25 UTC (rev 
6836)
+++ trunk/phpgwapi/inc/functions.inc.php        2011-01-24 20:07:18 UTC (rev 
6837)
@@ -397,11 +397,11 @@
        if (isset($_POST['login']))     // on login
        {
                $GLOBALS['login'] = $_POST['login'];
-               if (strstr($GLOBALS['login'],'@') === False)
+               if (strstr($GLOBALS['login'],'#') === False)
                {
-                       $GLOBALS['login'] .= '@' . 
phpgw::get_var('logindomain', 'string', 'POST', 
$GLOBALS['phpgw_info']['server']['default_domain']);
+                       $GLOBALS['login'] .= '#' . 
phpgw::get_var('logindomain', 'string', 'POST', 
$GLOBALS['phpgw_info']['server']['default_domain']);
                }
-               list(,$GLOBALS['phpgw_info']['user']['domain']) = 
explode('@',$GLOBALS['login']);
+               list(,$GLOBALS['phpgw_info']['user']['domain']) = 
explode('#',$GLOBALS['login']);
        }
        else if (phpgw::get_var('domain', 'string', 'REQUEST', false))
        {
@@ -630,7 +630,7 @@
                {
                        if ( isset($_POST['login']) && $_POST['login'] != '')
                        {
-                               list($login) = explode("@",$_POST['login']);
+                               list($login) = explode("#",$_POST['login']);
                                print_debug('LID',$login,'app');
                                $login_id = 
$GLOBALS['phpgw']->accounts->name2id($login);
                                print_debug('User ID',$login_id,'app');

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2011-01-24 10:05:25 UTC 
(rev 6836)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2011-01-24 20:07:18 UTC 
(rev 6837)
@@ -340,7 +340,7 @@
 
                                if ($_COOKIE['last_domain'] != $default_domain 
&& !empty($_COOKIE['last_domain']) && 
!$GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
                                {
-                                       $last_loginid .= '@' . 
$_COOKIE['last_domain'];
+                                       $last_loginid .= '#' . 
$_COOKIE['last_domain'];
                                }
                        }