Merge branch 'development'

nilsteampassnet · Jan 28, 2016 · 88ede56 · 88ede56
2 parents d11a1d2 + ebe6233
commit 88ede56
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/admin.settings.php b/admin.settings.php
@@ -292,7 +292,7 @@ function updateSettings ($setting, $val, $type = '')
         updateSettings('item_extra_fields', $_POST['item_extra_fields_input']);
     }
     // Update LDAP mode
-    if (isset($_POST['ldap_mode']) && @$_SESSION['settings']['ldap_mode'] != $_POST['ldap_mode_input']) {
+    if (isset($_POST['ldap_mode_input']) && @$_SESSION['settings']['ldap_mode'] != $_POST['ldap_mode_input']) {
         updateSettings('ldap_mode', $_POST['ldap_mode_input']);
     }
     // Update LDAP type

diff --git a/install/install.js b/install/install.js
@@ -136,20 +136,25 @@ function CheckPage()
                     multiple:   multiple
                 },
                 complete : function(data, statut){
-                    data = $.parseJSON(data.responseText);
-                    if (data[0].error == "") {
-                        $("#res"+step+"_check"+data[0].index).html("<img src=\"images/tick.png\">");
-                        if (data[0].result != undefined && data[0].result != "" ) {
-                            $("#step_result").html(data[0].result);
-                        }
+                    if (data.responseText == "") {
+                        // stop error occured, PHP5.5 installed?
+                        $("#step_result").html("[ERROR] Answer from server is empty. This may occur if PHP version is not at least 5.5. Please check this this fit your server configuration!");
                     } else {
-                    	// ignore setting error if regarding setting permissions (step 6, index 2)
-                    	if (step+data[0].index != "62") {
-                    		$("#step_res").val("false");
-                    	}
-                        $("#res"+step+"_check"+data[0].index).html("<img src=\"images/exclamation-red.png\">&nbsp;<i>"+data[0].error+"</i>");
-                        if (data[0].result != undefined && data[0].result != "" ) {
-                            $("#step_result").html(data[0].result);
+                        data = $.parseJSON(data.responseText);
+                        if (data[0].error == "") {
+                            $("#res"+step+"_check"+data[0].index).html("<img src=\"images/tick.png\">");
+                            if (data[0].result != undefined && data[0].result != "" ) {
+                                $("#step_result").html(data[0].result);
+                            }
+                        } else {
+                        	// ignore setting error if regarding setting permissions (step 6, index 2)
+                        	if (step+data[0].index != "62") {
+                        		$("#step_res").val("false");
+                        	}
+                            $("#res"+step+"_check"+data[0].index).html("<img src=\"images/exclamation-red.png\">&nbsp;<i>"+data[0].error+"</i>");
+                            if (data[0].result != undefined && data[0].result != "" ) {
+                                $("#step_result").html(data[0].result);
+                            }
                         }
                     }
                 }

diff --git a/sources/identify.php b/sources/identify.php
@@ -675,7 +675,6 @@ function identifyUser($sentData)
                 $_SESSION['list_restricted_folders_for_items'] = array();
                 $_SESSION['nb_folders'] = 1;
                 $_SESSION['nb_roles'] = 0;
-                $_SESSION['fonction_id'] = 0;
             }
             // Get some more elements
             $_SESSION['screenHeight'] = $dataReceived['screenHeight'];

diff --git a/sources/tree.php b/sources/tree.php
@@ -103,8 +103,8 @@
 function buildNodeTree($nodeId)
 {
     global $ret_json, $listFoldersLimitedKeys, $listRestrictedFoldersForItemsKeys, $tree, $LANG;
-
-        
+    
+
     // Be sure that user can only see folders he/she is allowed to
     if (
         !in_array($nodeId, $_SESSION['forbiden_pfs'])