[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6839] property: allow old style separator for domain
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [6839] property: allow old style separator for domains at login for normal username ( not email) |
Date: |
Tue, 25 Jan 2011 08:02:53 +0000 |
Revision: 6839
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6839
Author: sigurdne
Date: 2011-01-25 08:02:53 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
property: allow old style separator for domains at login for normal username
(not email)
Modified Paths:
--------------
trunk/login.php
trunk/phpgwapi/inc/sso/include_login.inc.php
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2011-01-25 07:37:07 UTC (rev 6838)
+++ trunk/login.php 2011-01-25 08:02:53 UTC (rev 6839)
@@ -11,10 +11,10 @@
* @version $Id$
*/
- if(isset($_REQUEST['skip_remote']) && $_REQUEST['skip_remote'])
- {
- $GLOBALS['phpgw_remote_user_fallback'] = 'sql';
- }
+ if(isset($_REQUEST['skip_remote']) && $_REQUEST['skip_remote'])
+ {
+ $GLOBALS['phpgw_remote_user_fallback'] = 'sql';
+ }
if(isset($_GET['logout']) && $_GET['logout']) // In case a user logged
in via SSO - actively logs out
{
Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php 2011-01-25 07:37:07 UTC
(rev 6838)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php 2011-01-25 08:02:53 UTC
(rev 6839)
@@ -31,7 +31,22 @@
exit;
}
+
/**
+ * check for emailaddress as username
+ */
+ require_once dirname(realpath(__FILE__)) .
'/../class.EmailAddressValidator.inc.php';
+
+ $validator = new phpgwapi_EmailAddressValidator();
+ if ( isset($_POST['login']) && $_POST['login'] != '')
+ {
+ if(!$validator->check_email_address($_POST['login']))
+ {
+ $_POST['login'] = str_replace('@', '#',
$_POST['login']);
+ }
+ }
+
+ /**
* Include phpgroupware header
*/
require_once $header;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6839] property: allow old style separator for domains at login for normal username ( not email),
Sigurd Nes <=