Completed
Push — development ( 114d7b...e0e718 )
by Nils
09:25
created
sources/tree.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -130,16 +130,16 @@  discard block
 block discarded – undo
130 130
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
131 131
 
132 132
     // Prepare superGlobal variables
133
-    $session_forbiden_pfs =                         $superGlobal->get("forbiden_pfs", "SESSION");
134
-    $session_groupes_visibles =                     $superGlobal->get("groupes_visibles", "SESSION");
135
-    $session_list_restricted_folders_for_items =    $superGlobal->get("list_restricted_folders_for_items", "SESSION");
136
-    $session_user_id =                              $superGlobal->get("user_id", "SESSION");
137
-    $session_login =                                $superGlobal->get("login", "SESSION");
138
-    $session_no_access_folders =                    $superGlobal->get("no_access_folders", "SESSION");
139
-    $session_list_folders_limited =                 $superGlobal->get("list_folders_limited", "SESSION");
140
-    $session_read_only_folders =                    $superGlobal->get("read_only_folders", "SESSION");
141
-    $session_personal_folders =                    $superGlobal->get("personal_folders", "SESSION");
142
-    $session_personal_visible_groups =                    $superGlobal->get("personal_visible_groups", "SESSION");
133
+    $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION");
134
+    $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION");
135
+    $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION");
136
+    $session_user_id = $superGlobal->get("user_id", "SESSION");
137
+    $session_login = $superGlobal->get("login", "SESSION");
138
+    $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION");
139
+    $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION");
140
+    $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION");
141
+    $session_personal_folders = $superGlobal->get("personal_folders", "SESSION");
142
+    $session_personal_visible_groups = $superGlobal->get("personal_visible_groups", "SESSION");
143 143
 
144 144
     // Be sure that user can only see folders he/she is allowed to
145 145
     if (in_array($nodeId, $session_forbiden_pfs) === false
@@ -304,15 +304,15 @@  discard block
 block discarded – undo
304 304
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
305 305
 
306 306
     // Prepare superGlobal variables
307
-    $session_forbiden_pfs =                         $superGlobal->get("forbiden_pfs", "SESSION");
308
-    $session_groupes_visibles =                     $superGlobal->get("groupes_visibles", "SESSION");
309
-    $session_list_restricted_folders_for_items =    $superGlobal->get("list_restricted_folders_for_items", "SESSION");
310
-    $session_user_id =                              $superGlobal->get("user_id", "SESSION");
311
-    $session_login =                                $superGlobal->get("login", "SESSION");
312
-    $session_user_read_only =                       $superGlobal->get("user_read_only", "SESSION");
313
-    $session_no_access_folders =                    $superGlobal->get("no_access_folders", "SESSION");
314
-    $session_list_folders_limited =                 $superGlobal->get("list_folders_limited", "SESSION");
315
-    $session_read_only_folders =                    $superGlobal->get("read_only_folders", "SESSION");
307
+    $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION");
308
+    $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION");
309
+    $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION");
310
+    $session_user_id = $superGlobal->get("user_id", "SESSION");
311
+    $session_login = $superGlobal->get("login", "SESSION");
312
+    $session_user_read_only = $superGlobal->get("user_read_only", "SESSION");
313
+    $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION");
314
+    $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION");
315
+    $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION");
316 316
 
317 317
     // Be sure that user can only see folders he/she is allowed to
318 318
     if (in_array($completTree[$nodeId]->id, $session_forbiden_pfs) === false
Please login to merge, or discard this patch.
includes/libraries/LDAP/adLDAP/adLDAP.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -620,9 +620,9 @@
 block discarded – undo
620 620
         // Connect to the AD/LDAP server as the username/password
621 621
         $domainController = $this->randomController();
622 622
         if ($this->useSSL) {
623
-            $this->ldapConnection = ldap_connect("ldaps://".$domainController .":". $this->adPort);
623
+            $this->ldapConnection = ldap_connect("ldaps://".$domainController.":".$this->adPort);
624 624
         } else {
625
-            $this->ldapConnection = ldap_connect("ldap://".$domainController .":". $this->adPort);
625
+            $this->ldapConnection = ldap_connect("ldap://".$domainController.":".$this->adPort);
626 626
         }
627 627
 
628 628
         // Set some ldap options for talking to AD
Please login to merge, or discard this patch.
sources/find.queries.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -341,8 +341,8 @@
 block discarded – undo
341 341
         if ($getItemInList === true) {
342 342
             $sOutputConst .= $sOutputItem;
343 343
         } else {
344
-            $iFilteredTotal --;
345
-            $iTotal --;
344
+            $iFilteredTotal--;
345
+            $iTotal--;
346 346
         }
347 347
     }
348 348
     if (!empty($sOutputConst)) {
Please login to merge, or discard this patch.
sources/identify.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@
 block discarded – undo
331 331
 		}
332 332
 		$passwordClear = $_SERVER['PHP_AUTH_PW'];
333 333
 		$pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']);
334
-	}else{
334
+	} else{
335 335
 		$passwordClear = htmlspecialchars_decode($dataReceived['pw']);
336 336
 		$pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw']));
337 337
 		$username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login']));
Please login to merge, or discard this patch.
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -321,26 +321,26 @@  discard block
 block discarded – undo
321 321
     $dataReceived = prepareExchangedData($sentData, "decode");
322 322
 
323 323
     // prepare variables
324
-	if (isset($SETTINGS['enable_http_request_login']) === true
324
+    if (isset($SETTINGS['enable_http_request_login']) === true
325 325
         && $SETTINGS['enable_http_request_login'] === '1'
326 326
         && isset($_SERVER['PHP_AUTH_USER']) === true
327 327
         && !(isset($SETTINGS['maintenance_mode']) === true
328 328
         && $SETTINGS['maintenance_mode'] === '1')
329 329
     ) {
330 330
         if (strpos($_SERVER['PHP_AUTH_USER'], '@') !== false) {
331
-			$username = explode("@", $_SERVER['PHP_AUTH_USER'])[0];
332
-		} elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) {
333
-			$username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1];
334
-		} else {
335
-			$username = $_SERVER['PHP_AUTH_USER'];
336
-		}
337
-		$passwordClear = $_SERVER['PHP_AUTH_PW'];
338
-		$pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']);
339
-	}else{
340
-		$passwordClear = htmlspecialchars_decode($dataReceived['pw']);
341
-		$pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw']));
342
-		$username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login']));
343
-	}
331
+            $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0];
332
+        } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) {
333
+            $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1];
334
+        } else {
335
+            $username = $_SERVER['PHP_AUTH_USER'];
336
+        }
337
+        $passwordClear = $_SERVER['PHP_AUTH_PW'];
338
+        $pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']);
339
+    }else{
340
+        $passwordClear = htmlspecialchars_decode($dataReceived['pw']);
341
+        $pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw']));
342
+        $username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login']));
343
+    }
344 344
     $logError = "";
345 345
     $userPasswordVerified = false;
346 346
 
@@ -438,10 +438,10 @@  discard block
 block discarded – undo
438 438
                 if (($SETTINGS['ldap_bind_dn'] === "" && $SETTINGS['ldap_bind_passwd'] === "") || $ldapbind === true) {
439 439
                     $filter = "(&(".$SETTINGS['ldap_user_attribute']."=".$username.")(objectClass=".$SETTINGS['ldap_object_class']."))";
440 440
                     $result = ldap_search(
441
-                      $ldapconn,
442
-                      $SETTINGS['ldap_search_base'],
443
-                      $filter,
444
-                      array('dn', 'mail', 'givenname', 'sn')
441
+                        $ldapconn,
442
+                        $SETTINGS['ldap_search_base'],
443
+                        $filter,
444
+                        array('dn', 'mail', 'givenname', 'sn')
445 445
                     );
446 446
                     if ($debugLdap == 1) {
447 447
                         fputs(
@@ -488,11 +488,11 @@  discard block
 block discarded – undo
488 488
                                 if ($entries['count'] > 0) {
489 489
                                     // Now check if group fits
490 490
                                     for ($i=0; $i<$entries['count']; $i++) {
491
-                                      $parsr=ldap_explode_dn($entries[$i]['dn'], 0);
492
-                                      if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
491
+                                        $parsr=ldap_explode_dn($entries[$i]['dn'], 0);
492
+                                        if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
493 493
                                         $GroupRestrictionEnabled = true;
494 494
                                         break;
495
-                                      }
495
+                                        }
496 496
                                     }
497 497
 
498 498
                                 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 		}
337 337
 		$passwordClear = $_SERVER['PHP_AUTH_PW'];
338 338
 		$pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']);
339
-	}else{
339
+	} else {
340 340
 		$passwordClear = htmlspecialchars_decode($dataReceived['pw']);
341 341
 		$pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw']));
342 342
 		$username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login']));
@@ -487,9 +487,9 @@  discard block
 block discarded – undo
487 487
 
488 488
                                 if ($entries['count'] > 0) {
489 489
                                     // Now check if group fits
490
-                                    for ($i=0; $i<$entries['count']; $i++) {
491
-                                      $parsr=ldap_explode_dn($entries[$i]['dn'], 0);
492
-                                      if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
490
+                                    for ($i = 0; $i < $entries['count']; $i++) {
491
+                                      $parsr = ldap_explode_dn($entries[$i]['dn'], 0);
492
+                                      if (str_replace(array('CN=', 'cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
493 493
                                         $GroupRestrictionEnabled = true;
494 494
                                         break;
495 495
                                       }
Please login to merge, or discard this patch.
admin.settings.load.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -205,9 +205,9 @@  discard block
 block discarded – undo
205 205
                     if (val[4] !== "") {
206 206
                         newList += '<span id="encryt_data_'+val[1]+'" style="margin-left:4px; cursor:pointer;">';
207 207
                         if (val[4] === "1") {
208
-                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
208
+                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
209 209
                         } else if (val[4] === "0") {
210
-                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
210
+                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
211 211
                         }
212 212
                         newList += '</span>'
213 213
                     }
@@ -215,9 +215,9 @@  discard block
 block discarded – undo
215 215
                     if (val[6] !== "") {
216 216
                         newList += '<span style="margin-left:4px;">';
217 217
                         if (val[6] === "text") {
218
-                            newList += '<i class="fa fa-paragraph tip" title="<?php echo $LANG['data_is_text'];?>"></i>';
218
+                            newList += '<i class="fa fa-paragraph tip" title="<?php echo $LANG['data_is_text']; ?>"></i>';
219 219
                         } else if (val[6] === "masked") {
220
-                            newList += '<i class="fa fa-eye-slash tip" title="<?php echo $LANG['data_is_masked'];?>"></i>';
220
+                            newList += '<i class="fa fa-eye-slash tip" title="<?php echo $LANG['data_is_masked']; ?>"></i>';
221 221
                         }
222 222
                         newList += '</span>'
223 223
                     }
@@ -1028,8 +1028,8 @@  discard block
 block discarded – undo
1028 1028
         function(data) {
1029 1029
             data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
1030 1030
 
1031
-            var html_admin_by = '<option value="">-- <?php echo addslashes($LANG['select']);?> --</option>',
1032
-                html_roles = '<option value="">-- <?php echo addslashes($LANG['select']);?> --</option>',
1031
+            var html_admin_by = '<option value="">-- <?php echo addslashes($LANG['select']); ?> --</option>',
1032
+                html_roles = '<option value="">-- <?php echo addslashes($LANG['select']); ?> --</option>',
1033 1033
                 selected_admin_by = 0,
1034 1034
                 selected_role = 0;
1035 1035
 
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
1040 1040
                 if (data[i].selected_role === 1) {
1041 1041
                     selected_role = data[i].id;
1042 1042
                 }
1043
-                html_admin_by += '<option value="'+data[i].id+'"><?php echo addslashes($LANG['managers_of']." ");?>'+data[i].title+'</option>';
1043
+                html_admin_by += '<option value="'+data[i].id+'"><?php echo addslashes($LANG['managers_of']." "); ?>'+data[i].title+'</option>';
1044 1044
                 html_roles += '<option value="'+data[i].id+'">'+data[i].title+'</option>';
1045 1045
             }
1046 1046
             $("#ldap_new_user_is_administrated_by").append(html_admin_by);
Please login to merge, or discard this patch.
index.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -700,20 +700,20 @@
 block discarded – undo
700 700
             && $SETTINGS['maintenance_mode'] === '1')
701 701
         ) {
702 702
             if (strpos($_SERVER['PHP_AUTH_USER'], '@') !== false) {
703
-				$username = explode("@", $_SERVER['PHP_AUTH_USER'])[0];
704
-			} elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) {
705
-				$username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1];
706
-			} else {
707
-				$username = $_SERVER['PHP_AUTH_USER'];
708
-			}
709
-			echo '
703
+                $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0];
704
+            } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) {
705
+                $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1];
706
+            } else {
707
+                $username = $_SERVER['PHP_AUTH_USER'];
708
+            }
709
+            echo '
710 710
         				<div style="margin-bottom:3px;">
711 711
         			        <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label>
712 712
         		            <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username , '" readonly />
713 713
         		            <span id="login_check_wait" style="display:none; float:right;"><i class="fa fa-cog fa-spin fa-1x"></i></span>
714 714
                         </div>';
715
-		} else {
716
-        	echo '
715
+        } else {
716
+            echo '
717 717
                     	    <div style="margin-bottom:3px;">
718 718
                     	        <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label>
719 719
                                 <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="', empty($post_login) === false ? $post_login : '', '" />
Please login to merge, or discard this patch.
Spacing   +30 added lines, -33 removed lines patch added patch discarded remove patch
@@ -91,34 +91,34 @@  discard block
 block discarded – undo
91 91
 require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
92 92
 
93 93
 // Prepare POST variables
94
-$post_language =        filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
95
-$post_sig_response =    filter_input(INPUT_POST, 'sig_response', FILTER_SANITIZE_STRING);
96
-$post_duo_login =       filter_input(INPUT_POST, 'duo_login', FILTER_SANITIZE_STRING);
97
-$post_duo_data =        filter_input(INPUT_POST, 'duo_data', FILTER_SANITIZE_STRING);
98
-$post_login =           filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING);
99
-$post_pw =              filter_input(INPUT_POST, 'pw', FILTER_SANITIZE_STRING);
94
+$post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
95
+$post_sig_response = filter_input(INPUT_POST, 'sig_response', FILTER_SANITIZE_STRING);
96
+$post_duo_login = filter_input(INPUT_POST, 'duo_login', FILTER_SANITIZE_STRING);
97
+$post_duo_data = filter_input(INPUT_POST, 'duo_data', FILTER_SANITIZE_STRING);
98
+$post_login = filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING);
99
+$post_pw = filter_input(INPUT_POST, 'pw', FILTER_SANITIZE_STRING);
100 100
 
101 101
 // Prepare superGlobal variables
102
-$session_user_language =        $superGlobal->get("user_language", "SESSION");
103
-$session_user_id =              $superGlobal->get("user_id", "SESSION");
104
-$session_user_flag =            $superGlobal->get("user_language_flag", "SESSION");
105
-$session_user_admin =           $superGlobal->get("user_admin", "SESSION");
102
+$session_user_language = $superGlobal->get("user_language", "SESSION");
103
+$session_user_id = $superGlobal->get("user_id", "SESSION");
104
+$session_user_flag = $superGlobal->get("user_language_flag", "SESSION");
105
+$session_user_admin = $superGlobal->get("user_admin", "SESSION");
106 106
 $session_user_human_resources = $superGlobal->get("user_can_manage_all_users", "SESSION");
107
-$session_user_avatar_thumb =    $superGlobal->get("user_avatar_thumb", "SESSION");
108
-$session_name =                 $superGlobal->get("name", "SESSION");
109
-$session_lastname =             $superGlobal->get("lastname", "SESSION");
110
-$session_user_manager =         $superGlobal->get("user_manager", "SESSION");
111
-$session_user_read_only =       $superGlobal->get("user_read_only", "SESSION");
112
-$session_is_admin =             $superGlobal->get("is_admin", "SESSION");
113
-$session_login =                $superGlobal->get("login", "SESSION");
114
-$session_validite_pw =          $superGlobal->get("validite_pw", "SESSION");
115
-$session_nb_folders =           $superGlobal->get("nb_folders", "SESSION");
116
-$session_nb_roles =             $superGlobal->get("nb_roles", "SESSION");
117
-$session_autoriser =            $superGlobal->get("autoriser", "SESSION");
118
-$session_hide_maintenance =     $superGlobal->get("hide_maintenance", "SESSION");
119
-$session_initial_url =          $superGlobal->get("initial_url", "SESSION");
120
-$server_request_uri =           $superGlobal->get("REQUEST_URI", "SERVER");
121
-$session_nb_users_online =      $superGlobal->get("nb_users_online", "SESSION");
107
+$session_user_avatar_thumb = $superGlobal->get("user_avatar_thumb", "SESSION");
108
+$session_name = $superGlobal->get("name", "SESSION");
109
+$session_lastname = $superGlobal->get("lastname", "SESSION");
110
+$session_user_manager = $superGlobal->get("user_manager", "SESSION");
111
+$session_user_read_only = $superGlobal->get("user_read_only", "SESSION");
112
+$session_is_admin = $superGlobal->get("is_admin", "SESSION");
113
+$session_login = $superGlobal->get("login", "SESSION");
114
+$session_validite_pw = $superGlobal->get("validite_pw", "SESSION");
115
+$session_nb_folders = $superGlobal->get("nb_folders", "SESSION");
116
+$session_nb_roles = $superGlobal->get("nb_roles", "SESSION");
117
+$session_autoriser = $superGlobal->get("autoriser", "SESSION");
118
+$session_hide_maintenance = $superGlobal->get("hide_maintenance", "SESSION");
119
+$session_initial_url = $superGlobal->get("initial_url", "SESSION");
120
+$server_request_uri = $superGlobal->get("REQUEST_URI", "SERVER");
121
+$session_nb_users_online = $superGlobal->get("nb_users_online", "SESSION");
122 122
 
123 123
 
124 124
 /* DEFINE WHAT LANGUAGE TO USE */
@@ -239,10 +239,7 @@  discard block
 block discarded – undo
239 239
         <div style="float:right; margin:-10px 5px 0 0; color:#FFF;">'
240 240
             .$LANG['index_welcome'].'&nbsp;<b>'.$session_name.'&nbsp;'.$session_lastname
241 241
             .'&nbsp;['.$session_login.']</b>&nbsp;-&nbsp;'
242
-            , $session_user_admin === '1' ? $LANG['god'] :
243
-                ($session_user_manager === '1' ? $LANG['gestionnaire'] :
244
-                    ($session_user_read_only === '1' ? $LANG['read_only_account'] :
245
-                        ($session_user_human_resources === '1' ? $LANG['human_resources'] :$LANG['user'])
242
+            , $session_user_admin === '1' ? $LANG['god'] : ($session_user_manager === '1' ? $LANG['gestionnaire'] : ($session_user_read_only === '1' ? $LANG['read_only_account'] : ($session_user_human_resources === '1' ? $LANG['human_resources'] : $LANG['user'])
246 243
                     )
247 244
                 ), '&nbsp;'.strtolower($LANG['index_login']).'</div>';
248 245
 
@@ -709,7 +706,7 @@  discard block
 block discarded – undo
709 706
 			echo '
710 707
         				<div style="margin-bottom:3px;">
711 708
         			        <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label>
712
-        		            <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username , '" readonly />
709
+        		            <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username, '" readonly />
713 710
         		            <span id="login_check_wait" style="display:none; float:right;"><i class="fa fa-cog fa-spin fa-1x"></i></span>
714 711
                         </div>';
715 712
 		} else {
@@ -733,7 +730,7 @@  discard block
 block discarded – undo
733 730
                         </div>';
734 731
         }
735 732
 
736
-        if (!(isset($SETTINGS['enable_http_request_login']) === true && $SETTINGS['enable_http_request_login'] === '1' && isset($_SERVER['PHP_AUTH_USER']) === true   && !(isset($SETTINGS['maintenance_mode']) === true && $SETTINGS['maintenance_mode'] === '1')) ) {
733
+        if (!(isset($SETTINGS['enable_http_request_login']) === true && $SETTINGS['enable_http_request_login'] === '1' && isset($_SERVER['PHP_AUTH_USER']) === true && !(isset($SETTINGS['maintenance_mode']) === true && $SETTINGS['maintenance_mode'] === '1'))) {
737 734
             echo '
738 735
                         <div id="connect_pw" style="margin-bottom:3px;">
739 736
                             <label for="pw" class="form_label" id="user_pwd">'.$LANG['index_password'].'</label>
@@ -788,7 +785,7 @@  discard block
 block discarded – undo
788 785
 <script>
789 786
 var seconds = 1;
790 787
 function updateLogonButton(timeToGo){
791
-    document.getElementById("but_identify_user").value = "' . $LANG['duration_login_attempt'] . ' " + timeToGo;
788
+    document.getElementById("but_identify_user").value = "' . $LANG['duration_login_attempt'].' " + timeToGo;
792 789
 }
793 790
 $( window ).on( "load", function() {
794 791
     updateLogonButton(seconds);
@@ -845,7 +842,7 @@  discard block
 block discarded – undo
845 842
             <a href="https://www.reddit.com/r/TeamPass/" target="_blank" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['admin_help']).'"><i class="fa fa-reddit-alien"></i></a>
846 843
             &nbsp;
847 844
             ', ($session_user_id !== null && empty($session_user_id) === false) ? '
848
-            <a href="#" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['bugs_page']).'" onclick="generateBugReport()"><i class="fa fa-bug"></i></a>' : '' ,'
845
+            <a href="#" style="color:#F0F0F0;" class="tip" title="'.addslashes($LANG['bugs_page']).'" onclick="generateBugReport()"><i class="fa fa-bug"></i></a>' : '', '
849 846
         </div>
850 847
         <div style="float:left;width:32%;text-align:center;">
851 848
             ', ($session_user_id !== null && empty($session_user_id) === false) ? '<i class="fa fa-users"></i>&nbsp;'.$session_nb_users_online.'&nbsp;'.$LANG['users_online'].'&nbsp;|&nbsp;<i class="fa fa-hourglass-end"></i>&nbsp;'.$LANG['index_expiration_in'].'&nbsp;<div style="display:inline;" id="countdown"></div>' : '', '
Please login to merge, or discard this patch.
api/functions.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
                             $json[$inc]['nlevel'] = mb_convert_encoding($folder->nlevel, mb_detect_encoding($folder->nlevel), 'UTF-8');
634 634
                             $json[$inc]['personal'] = mb_convert_encoding($folder->personal_folder, mb_detect_encoding($folder->personal_folder), 'UTF-8');
635 635
 
636
-                            $inc ++;
636
+                            $inc++;
637 637
                         }
638 638
                     }
639 639
                 }
@@ -2099,7 +2099,7 @@  discard block
 block discarded – undo
2099 2099
                         $tree = new Tree\NestedTree\NestedTree(prefix_table("nested_tree"), 'id', 'parent_id', 'title');
2100 2100
                         $tree->rebuild();
2101 2101
 
2102
-                        echo json_encode(array('new_id' => $newID , 'err' => ''));
2102
+                        echo json_encode(array('new_id' => $newID, 'err' => ''));
2103 2103
                     } elseif ($GLOBALS['request'][1] === "edit") {
2104 2104
                         // Is this folder a personal one?
2105 2105
                         $fldData = DB::queryFirstRow(
@@ -2166,7 +2166,7 @@  discard block
 block discarded – undo
2166 2166
                             $item_definition['item_id']
2167 2167
                         );
2168 2168
 
2169
-                        echo json_encode(array('new_id' => '' , 'err' => ''));
2169
+                        echo json_encode(array('new_id' => '', 'err' => ''));
2170 2170
                     }
2171 2171
                 } else {
2172 2172
                     rest_error('AUTH_NOT_GRANTED');
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1635,7 +1635,7 @@
 block discarded – undo
1635 1635
                         rest_error('AUTH_NO_URL');
1636 1636
                     }
1637 1637
                 } else {
1638
-                  rest_error('AUTH_NO_IDENTIFIER');
1638
+                    rest_error('AUTH_NO_IDENTIFIER');
1639 1639
                 }
1640 1640
             } else {
1641 1641
                 rest_error('AUTH_NO_IDENTIFIER');
Please login to merge, or discard this patch.
sources/folders.queries.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -978,9 +978,9 @@  discard block
 block discarded – undo
978 978
 
979 979
             // Get all allowed folders
980 980
             $array_all_visible_folders = array_merge(
981
-              $_SESSION['groupes_visibles'],
982
-              $_SESSION['read_only_folders'],
983
-              $_SESSION['personal_visible_groups']
981
+                $_SESSION['groupes_visibles'],
982
+                $_SESSION['read_only_folders'],
983
+                $_SESSION['personal_visible_groups']
984 984
             );
985 985
 
986 986
             // get list of all folders
@@ -993,7 +993,7 @@  discard block
 block discarded – undo
993 993
                 // Can user access this subfolder?
994 994
 
995 995
                 if (in_array($node->id, $array_all_visible_folders) === false) {
996
-                  continue;
996
+                    continue;
997 997
                 }
998 998
 
999 999
                 // get info about current node
Please login to merge, or discard this patch.
backups/script.backup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,15 +12,15 @@
 block discarded – undo
12 12
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13 13
  */
14 14
 
15
-include dirname(__FILE__) .'/../includes/config/settings.php';
16
-require_once dirname(__FILE__) .'/../includes/config/tp.config.php';
15
+include dirname(__FILE__).'/../includes/config/settings.php';
16
+require_once dirname(__FILE__).'/../includes/config/tp.config.php';
17 17
 header("Content-type: text/html; charset=utf-8");
18 18
 
19 19
 $_SESSION['CPM'] = 1;
20 20
 
21 21
 // connect to DB
22
-require_once $SETTINGS['cpassman_dir'] .'/sources/SplClassLoader.php';
23
-require_once $SETTINGS['cpassman_dir'] .'/includes/libraries/Database/Meekrodb/db.class.php';
22
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
23
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
24 24
 
25 25
 // Load libraries
26 26
 require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
Please login to merge, or discard this patch.