Passed
Push — development ( 72acab...588a17 )
by Nils
04:47
created
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.
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.
api/functions.php 1 patch
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.
sources/identify.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -495,9 +495,9 @@
 block discarded – undo
495 495
 
496 496
                                 if ($entries['count'] > 0) {
497 497
                                     // Now check if group fits
498
-                                    for ($i=0; $i<$entries['count']; $i++) {
499
-                                      $parsr=ldap_explode_dn($entries[$i]['dn'], 0);
500
-                                      if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
498
+                                    for ($i = 0; $i < $entries['count']; $i++) {
499
+                                      $parsr = ldap_explode_dn($entries[$i]['dn'], 0);
500
+                                      if (str_replace(array('CN=', 'cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
501 501
                                         $GroupRestrictionEnabled = true;
502 502
                                         break;
503 503
                                       }
Please login to merge, or discard this patch.
sources/core.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -492,7 +492,7 @@
 block discarded – undo
492 492
             $_SESSION['validite_pw'] = true;
493 493
         } else {
494 494
             $_SESSION['numDaysBeforePwExpiration'] = $SETTINGS['pw_life_duration'] - round(
495
-                (mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y')) - $_SESSION['last_pw_change']) / (24 * 60 * 60)
495
+                (mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y')) - $_SESSION['last_pw_change']) / (24 * 60 * 60)
496 496
             );
497 497
             if ($_SESSION['numDaysBeforePwExpiration'] <= 0) {
498 498
                 $_SESSION['validite_pw'] = false;
Please login to merge, or discard this patch.
items.load.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -457,28 +457,28 @@  discard block
 block discarded – undo
457 457
 
458 458
         // Prepare error message
459 459
         if (value.pw_status === "encryption_error") {
460
-            pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']);?>"></span>&nbsp;';
460
+            pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']); ?>"></span>&nbsp;';
461 461
         }
462 462
 
463 463
         // Prepare anyone can modify icon
464 464
         if (value.anyone_can_modify === "1") {
465
-            icon_all_can_modify = '<span class="fa fa-pencil fa-sm mi-grey-1 pointer tip" title="<?php echo addslashes($LANG['item_menu_collab_enable']);?>" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')"></span>&nbsp;&nbsp;';
465
+            icon_all_can_modify = '<span class="fa fa-pencil fa-sm mi-grey-1 pointer tip" title="<?php echo addslashes($LANG['item_menu_collab_enable']); ?>" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')"></span>&nbsp;&nbsp;';
466 466
         }
467 467
 
468 468
         // Prepare mini icons
469 469
         if (value.copy_to_clipboard_small_icons === "1" && value.display_item === 1) {
470 470
             // Login icon
471 471
             if (value.login !== "") {
472
-                icon_login = '<span class="fa fa-sm fa-user mi-black mini_login" data-clipboard-text="'+sanitizeString(value.login)+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>" id="minilogin_'+value.item_id+'"></span>&nbsp;';
472
+                icon_login = '<span class="fa fa-sm fa-user mi-black mini_login" data-clipboard-text="'+sanitizeString(value.login)+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>" id="minilogin_'+value.item_id+'"></span>&nbsp;';
473 473
             }
474 474
             // Pwd icon
475 475
             if (value.pw !== "") {
476
-                icon_pwd = '<span class="fa fa-sm fa-lock mi-black mini_pw" data-clipboard-text="'+sanitizeString(value.pw)+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>" data-clipboard-id="'+value.item_id+'" id="minipwd_'+value.item_id+'"></span>&nbsp;';
476
+                icon_pwd = '<span class="fa fa-sm fa-lock mi-black mini_pw" data-clipboard-text="'+sanitizeString(value.pw)+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>" data-clipboard-id="'+value.item_id+'" id="minipwd_'+value.item_id+'"></span>&nbsp;';
477 477
             }
478 478
 
479 479
             // Now check if pwd is empty. If it is then warn user
480 480
             if (value.pw === "") {
481
-                pwd_error = '&nbsp;<span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']);?>"></span>&nbsp;';
481
+                pwd_error = '&nbsp;<span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']); ?>"></span>&nbsp;';
482 482
             }
483 483
         }
484 484
 
@@ -2409,8 +2409,8 @@  discard block
 block discarded – undo
2409 2409
         $("#delete-edit-file_"+file_id)
2410 2410
             .hide()
2411 2411
             .after(
2412
-                '<span class="delete_me">&nbsp;<span id="confirm-delete-edit-file_'+file_id+'" class="fa fa-thumbs-up tip" style="cursor:pointer;" onclick="delete_attached_file('+file_id+', 1)" title="<?php echo addslashes($LANG['confirm']);?>"></span>' +
2413
-                '&nbsp;<span id="cancel-delete-edit-file_'+file_id+'" class="fa fa-thumbs-down tip" style="cursor:pointer;" onclick="cancel_delete_attached_file('+file_id+')" title="<?php echo addslashes($LANG['cancel']);?>"></span>&nbsp;</span>'
2412
+                '<span class="delete_me">&nbsp;<span id="confirm-delete-edit-file_'+file_id+'" class="fa fa-thumbs-up tip" style="cursor:pointer;" onclick="delete_attached_file('+file_id+', 1)" title="<?php echo addslashes($LANG['confirm']); ?>"></span>' +
2413
+                '&nbsp;<span id="cancel-delete-edit-file_'+file_id+'" class="fa fa-thumbs-down tip" style="cursor:pointer;" onclick="cancel_delete_attached_file('+file_id+')" title="<?php echo addslashes($LANG['cancel']); ?>"></span>&nbsp;</span>'
2414 2414
             );
2415 2415
             $(".tip").tooltipster({multiple: true});
2416 2416
     }
@@ -2631,9 +2631,9 @@  discard block
 block discarded – undo
2631 2631
 
2632 2632
                 // Shall we show the root folder
2633 2633
                 if (data.html_json.can_create_root_folder === 1) {
2634
-                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2635
-                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2636
-                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2634
+                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2635
+                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2636
+                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2637 2637
                 }
2638 2638
 
2639 2639
                 //
@@ -4674,20 +4674,20 @@  discard block
 block discarded – undo
4674 4674
                     if (value.copy_to_clipboard_small_icons === '1') {
4675 4675
                         // Prepare Login
4676 4676
                         if (value.login !== "") {
4677
-                            value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>"></span>&nbsp;';
4677
+                            value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>"></span>&nbsp;';
4678 4678
                         }
4679 4679
 
4680 4680
                         // Prepare PWD
4681 4681
                         if (value.pw !== "") {
4682
-                            value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>"></span>&nbsp;'
4682
+                            value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>"></span>&nbsp;'
4683 4683
                         }
4684 4684
 
4685 4685
                         // Prepare favorite
4686 4686
                         if (value.enable_favourites === '1') {
4687 4687
                             if (value.is_favorite === '1') {
4688
-                                icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']);?>"></span>';
4688
+                                icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']); ?>"></span>';
4689 4689
                             } else {
4690
-                                icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']);?>"></span>';
4690
+                                icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']); ?>"></span>';
4691 4691
                             }
4692 4692
                         } else {
4693 4693
                             icon_favorite = '';
@@ -4701,7 +4701,7 @@  discard block
 block discarded – undo
4701 4701
                     // Append
4702 4702
                     $("#full_items_list").append(
4703 4703
                     '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
4704
-                    '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']);?>"></span>&nbsp;' +
4704
+                    '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']); ?>"></span>&nbsp;' +
4705 4705
                         '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')"><b>'+value.label + '</b>' +
4706 4706
                         '&nbsp;<span style="font-size:11px;font-style:italic; background-color:#f2e9e5;">&nbsp;<i class="fa fa-folder-o"></i>&nbsp;'+value.folder+'&nbsp;</span>&nbsp;'+value.desc+'' +
4707 4707
                         '</span><span style="float:right;margin:2px 10px 0px 0px;">' +
@@ -4758,20 +4758,20 @@  discard block
 block discarded – undo
4758 4758
                 if (value.copy_to_clipboard_small_icons === "1") {
4759 4759
                     // Prepare Login
4760 4760
                     if (value.login !== "") {
4761
-                        value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>"></span>&nbsp;';
4761
+                        value.login = '<span class="fa fa-user fa-lg mi-black mini_login tip" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>"></span>&nbsp;';
4762 4762
                     }
4763 4763
 
4764 4764
                     // Prepare PWD
4765 4765
                     if (value.pw !== "") {
4766
-                        value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>"></span>&nbsp;'
4766
+                        value.pw = '<span class="fa fa-lock fa-lg mi-black mini_pw tip" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>"></span>&nbsp;'
4767 4767
                     }
4768 4768
 
4769 4769
                     // Prepare favorite
4770 4770
                     if (value.enable_favourites === "1") {
4771 4771
                         if (value.is_favorite === 1) {
4772
-                            icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']);?>"></span>';
4772
+                            icon_favorite = '<span class="fa fa-star fa-lg mi-yellow tip" onclick="ActionOnQuickIcon('+value.item_id+',0)" class="tip" title="<?php echo addslashes($LANG['item_menu_del_from_fav']); ?>"></span>';
4773 4773
                         } else {
4774
-                            icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']);?>"></span>';
4774
+                            icon_favorite = '<span class="fa fa-star-o fa-lg tip" onclick="ActionOnQuickIcon('+value.item_id+',1)" class="tip" title="<?php echo addslashes($LANG['item_menu_add_to_fav']); ?>"></span>';
4775 4775
                         }
4776 4776
                     } else {
4777 4777
                         icon_favorite = '';
@@ -4785,7 +4785,7 @@  discard block
 block discarded – undo
4785 4785
                 // Append
4786 4786
                 $("#full_items_list").append(
4787 4787
                 '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
4788
-                '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']);?>"></span>&nbsp;' +
4788
+                '<span class="fa fa-key mi-yellow tip" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \''+value.open_edit+'\', \''+value.reload+'\', \''+value.tree_id+'\')" title="<?php echo addslashes($LANG['click_to_edit']); ?>"></span>&nbsp;' +
4789 4789
                     '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')">'+value.label +
4790 4790
                     value.desc +
4791 4791
                     '&nbsp;<span style="font-size:11px;font-style:italic;"><i class="fa fa-folder-o"></i>&nbsp;'+value.folder+'</span>' +
Please login to merge, or discard this patch.
sources/items.queries.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -896,7 +896,7 @@  discard block
 block discarded – undo
896 896
                     /*FOLDER */
897 897
                     if ($data['id_tree'] != $dataReceived['categorie']) {
898 898
                         // Get name of folders
899
-                        $dataTmp = DB::query("SELECT title FROM ".prefix_table("nested_tree")." WHERE id IN %li", array($data['id_tree'],$dataReceived['categorie']));
899
+                        $dataTmp = DB::query("SELECT title FROM ".prefix_table("nested_tree")." WHERE id IN %li", array($data['id_tree'], $dataReceived['categorie']));
900 900
 
901 901
                         logItems($dataReceived['id'], $label, $_SESSION['user_id'], 'at_modification', $_SESSION['login'], 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']);
902 902
                         // ask for page reloading
@@ -1974,7 +1974,7 @@  discard block
 block discarded – undo
1974 1974
                         if (empty($path) === true) {
1975 1975
                             $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
1976 1976
                         } else {
1977
-                            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
1977
+                            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
1978 1978
                         }
1979 1979
                     }
1980 1980
                     // Build text to show user
@@ -4474,7 +4474,7 @@  discard block
 block discarded – undo
4474 4474
         if (empty($path) === true) {
4475 4475
             $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
4476 4476
         } else {
4477
-            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
4477
+            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
4478 4478
         }
4479 4479
     }
4480 4480
     // Build text to show user
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
-require dirname(__FILE__) .'/../includes/config/settings.php';
16
-require_once dirname(__FILE__) .'/../includes/config/tp.config.php';
15
+require 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.
sources/admin.queries.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
                         array(
108 108
                             'http' => array(
109 109
                                 'ignore_errors' => true,
110
-                                'proxy' =>  $SETTINGS['proxy_ip'] . ':' . $SETTINGS['proxy_port']
110
+                                'proxy' =>  $SETTINGS['proxy_ip'].':'.$SETTINGS['proxy_port']
111 111
                             )
112 112
                         )
113 113
                     );
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 
666 666
 
667 667
         // generate new saltkey
668
-        $old_sk_filename = SECUREPATH."/teampass-seckey.txt".'.'.date("Y_m_d", mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y'))).'.'.time();
668
+        $old_sk_filename = SECUREPATH."/teampass-seckey.txt".'.'.date("Y_m_d", mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))).'.'.time();
669 669
         copy(
670 670
             SECUREPATH."/teampass-seckey.txt",
671 671
             $old_sk_filename
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
             $objects = explode(",", $post_object);
770 770
 
771 771
             // Allowed values for $_POST['object'] : "items,logs,files,categories"
772
-            if (in_array($objects[0], array("items","logs","files","categories")) === false) {
772
+            if (in_array($objects[0], array("items", "logs", "files", "categories")) === false) {
773 773
                 echo '[{"nextAction":"" , "error":"Input `'.$objects[0].'` is not allowed" , "nbOfItems":""}]';
774 774
                 break;
775 775
             }
@@ -1259,7 +1259,7 @@  discard block
 block discarded – undo
1259 1259
             foreach ($rows as $record) {
1260 1260
                 if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
1261 1261
                     $addFile = 0;
1262
-                    if ($post_option== "decrypt" && $record['status'] === 'encrypted') {
1262
+                    if ($post_option == "decrypt" && $record['status'] === 'encrypted') {
1263 1263
                         $addFile = 1;
1264 1264
                     } elseif ($post_option == "encrypt" && $record['status'] === 'clear') {
1265 1265
                         $addFile = 1;
@@ -1551,7 +1551,7 @@  discard block
 block discarded – undo
1551 1551
                     $tmp_skfile,
1552 1552
                     $tmp_skfile.'.'.date(
1553 1553
                         "Y_m_d",
1554
-                        mktime(0, 0, 0, (int)date('m'), (int)date('d'), (int)date('y'))
1554
+                        mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))
1555 1555
                     )
1556 1556
                 )) {
1557 1557
                     echo '[{"result" : "" , "error" : "Could NOT perform a copy of file: '.$tmp_skfile.'"}]';
@@ -2067,16 +2067,16 @@  discard block
 block discarded – undo
2067 2067
                         );
2068 2068
 
2069 2069
                         $debug_ldap .= 'Search filter (group): '.$filter_group."<br/>".
2070
-                          'Results : '.str_replace("\n","<br>", print_r(ldap_get_entries($ldapconn, $result_group), true))."<br/>";
2070
+                          'Results : '.str_replace("\n", "<br>", print_r(ldap_get_entries($ldapconn, $result_group), true))."<br/>";
2071 2071
 
2072 2072
                         if ($result_group) {
2073 2073
                             $entries = ldap_get_entries($ldapconn, $result_group);
2074 2074
 
2075 2075
                             if ($entries['count'] > 0) {
2076 2076
                                 // Now check if group fits
2077
-                                for ($i=0; $i<$entries['count']; $i++) {
2078
-                                  $parsr=ldap_explode_dn($entries[$i]['dn'], 0);
2079
-                                  if (str_replace(array('CN=','cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
2077
+                                for ($i = 0; $i < $entries['count']; $i++) {
2078
+                                  $parsr = ldap_explode_dn($entries[$i]['dn'], 0);
2079
+                                  if (str_replace(array('CN=', 'cn='), '', $parsr[0]) === $SETTINGS['ldap_usergroup']) {
2080 2080
                                     $GroupRestrictionEnabled = true;
2081 2081
                                     break;
2082 2082
                                   }
@@ -2089,7 +2089,7 @@  discard block
 block discarded – undo
2089 2089
                     }
2090 2090
 
2091 2091
                     $debug_ldap .= 'Search filter : '.$filter."<br/>".
2092
-                            'Results : '.str_replace("\n","<br>", print_r(ldap_get_entries($ldapconn, $result), true))."<br/>";
2092
+                            'Results : '.str_replace("\n", "<br>", print_r(ldap_get_entries($ldapconn, $result), true))."<br/>";
2093 2093
 
2094 2094
                     if (ldap_count_entries($ldapconn, $result)) {
2095 2095
                         // try auth
Please login to merge, or discard this patch.