[Fmsystem-commits] [6840] Merge 6838:6839 from trunk

[Sigurd Nes]

Revision: 6840
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6840
Author:   sigurdne
Date:     2011-01-25 08:03:38 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
Merge 6838:6839 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/login.php
    branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839

Modified: branches/Version-1_0-branch/login.php
===================================================================
--- branches/Version-1_0-branch/login.php       2011-01-25 08:02:53 UTC (rev 
6839)
+++ branches/Version-1_0-branch/login.php       2011-01-25 08:03:38 UTC (rev 
6840)
@@ -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: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php  
2011-01-25 08:02:53 UTC (rev 6839)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php  
2011-01-25 08:03:38 UTC (rev 6840)
@@ -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;