evol : web sso connection

core/trunk/core/class/class_core_tools.php

@@ -1057,6 +1057,9 @@ class core_tools extends functions
     *
     */
     public function insert_page() {
+    	if (!isset($_SESSION['config']['app_id']) && $_SESSION['config']['app_id'] == '') {
+    		$_SESSION['config']['app_id'] = 'maarch_entreprise';
+    	}
         if(isset($_GET['amp;module']) && $_GET['amp;module'] <> "") {
             $_GET['module'] = $_GET['amp;module'];
             $_REQUEST['module'] = $_REQUEST['amp;module'];

core/trunk/core/class/class_security.php

@@ -96,17 +96,19 @@ class security extends dbquery
         // #TODO : Not usefull anymore, loginmode field is always in users table
         //Compatibility test, if loginmode column doesn't exists, Maarch can't crash
         if ($this->test_column($_SESSION['tablename']['users'], 'loginmode')) {
+            // #TODO : do evolution of the loginmethod in sql query
             if ($method == 'activex') {
                 $comp = " and STATUS <> 'DEL' and loginmode = 'activex'";
             } else if ($method == 'ldap') {
                 $comp =" and STATUS <> 'DEL'";
             } else {
                 $comp = " and password = '" . $pass . "' and STATUS <> 'DEL' "
-                      . "and loginmode = 'standard'";
+                      . "and (loginmode = 'standard' or loginmode  = 'sso')";
             }
         } else {
             $comp = " and password = '" . $pass . "' and STATUS <> 'DEL'";
         }
+        //echo $comp;exit;
         $user = $uc->get($s_login, $comp);
 
         if (isset($user)) {

core/trunk/index.php

@@ -22,6 +22,9 @@ $func = new functions();
 $core = new core_tools();
 $_SESSION['custom_override_id'] = $core->get_custom_id();
 
+/**** retrieve HTTP_REQUEST FROM SSO ****/
+$_SESSION['HTTP_REQUEST'] = $_REQUEST;
+
 if(isset($_SESSION['config']['defaultlang']) && !empty($_SESSION['config']['defaultlang']))
 {
 	include("portal".DIRECTORY_SEPARATOR.$_SESSION['config']['defaultlang'].'.php');