Completed
Push — development ( 509694...8b0877 )
by Nils
11:40
created
sources/tree.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -125,16 +125,16 @@  discard block
 block discarded – undo
125 125
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
126 126
 
127 127
     // Prepare superGlobal variables
128
-    $session_forbiden_pfs =                         $superGlobal->get("forbiden_pfs", "SESSION");
129
-    $session_groupes_visibles =                     $superGlobal->get("groupes_visibles", "SESSION");
130
-    $session_list_restricted_folders_for_items =    $superGlobal->get("list_restricted_folders_for_items", "SESSION");
131
-    $session_user_id =                              $superGlobal->get("user_id", "SESSION");
132
-    $session_login =                                $superGlobal->get("login", "SESSION");
133
-    $session_no_access_folders =                    $superGlobal->get("no_access_folders", "SESSION");
134
-    $session_list_folders_limited =                 $superGlobal->get("list_folders_limited", "SESSION");
135
-    $session_read_only_folders =                    $superGlobal->get("read_only_folders", "SESSION");
136
-    $session_personal_folders =                    $superGlobal->get("personal_folders", "SESSION");
137
-    $session_personal_visible_groups =                    $superGlobal->get("personal_visible_groups", "SESSION");
128
+    $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION");
129
+    $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION");
130
+    $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION");
131
+    $session_user_id = $superGlobal->get("user_id", "SESSION");
132
+    $session_login = $superGlobal->get("login", "SESSION");
133
+    $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION");
134
+    $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION");
135
+    $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION");
136
+    $session_personal_folders = $superGlobal->get("personal_folders", "SESSION");
137
+    $session_personal_visible_groups = $superGlobal->get("personal_visible_groups", "SESSION");
138 138
 
139 139
     // Be sure that user can only see folders he/she is allowed to
140 140
     if (!in_array($nodeId, $session_forbiden_pfs)
@@ -296,15 +296,15 @@  discard block
 block discarded – undo
296 296
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
297 297
 
298 298
     // Prepare superGlobal variables
299
-    $session_forbiden_pfs =                         $superGlobal->get("forbiden_pfs", "SESSION");
300
-    $session_groupes_visibles =                     $superGlobal->get("groupes_visibles", "SESSION");
301
-    $session_list_restricted_folders_for_items =    $superGlobal->get("list_restricted_folders_for_items", "SESSION");
302
-    $session_user_id =                              $superGlobal->get("user_id", "SESSION");
303
-    $session_login =                                $superGlobal->get("login", "SESSION");
304
-    $session_user_read_only =                       $superGlobal->get("user_read_only", "SESSION");
305
-    $session_no_access_folders =                    $superGlobal->get("no_access_folders", "SESSION");
306
-    $session_list_folders_limited =                 $superGlobal->get("list_folders_limited", "SESSION");
307
-    $session_read_only_folders =                    $superGlobal->get("read_only_folders", "SESSION");
299
+    $session_forbiden_pfs = $superGlobal->get("forbiden_pfs", "SESSION");
300
+    $session_groupes_visibles = $superGlobal->get("groupes_visibles", "SESSION");
301
+    $session_list_restricted_folders_for_items = $superGlobal->get("list_restricted_folders_for_items", "SESSION");
302
+    $session_user_id = $superGlobal->get("user_id", "SESSION");
303
+    $session_login = $superGlobal->get("login", "SESSION");
304
+    $session_user_read_only = $superGlobal->get("user_read_only", "SESSION");
305
+    $session_no_access_folders = $superGlobal->get("no_access_folders", "SESSION");
306
+    $session_list_folders_limited = $superGlobal->get("list_folders_limited", "SESSION");
307
+    $session_read_only_folders = $superGlobal->get("read_only_folders", "SESSION");
308 308
 
309 309
     // Be sure that user can only see folders he/she is allowed to
310 310
     if (in_array($completTree[$nodeId]->id, $session_forbiden_pfs) === false
Please login to merge, or discard this patch.
items.load.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -498,28 +498,28 @@  discard block
 block discarded – undo
498 498
 
499 499
         // Prepare error message
500 500
         if (value.pw_status === "encryption_error") {
501
-            pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']);?>"></span>&nbsp;';
501
+            pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']); ?>"></span>&nbsp;';
502 502
         }
503 503
 
504 504
         // Prepare anyone can modify icon
505 505
         if (value.anyone_can_modify === "1") {
506
-            icon_all_can_modify = '<span class="fa fa-pencil fa-sm mi-grey-1 tip" title="<?php echo addslashes($LANG['item_menu_collab_enable']);?>"></span>&nbsp;&nbsp;';
506
+            icon_all_can_modify = '<span class="fa fa-pencil fa-sm mi-grey-1 tip" title="<?php echo addslashes($LANG['item_menu_collab_enable']); ?>"></span>&nbsp;&nbsp;';
507 507
         }
508 508
 
509 509
         // Prepare mini icons
510 510
         if (value.copy_to_clipboard_small_icons === "1") {
511 511
             // Login icon
512 512
             if (value.login !== "") {
513
-                icon_login = '<span class="fa fa-sm fa-user mi-black mini_login" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']);?>"></span>&nbsp;';
513
+                icon_login = '<span class="fa fa-sm fa-user mi-black mini_login" data-clipboard-text="'+value.login+'" title="<?php echo addslashes($LANG['item_menu_copy_login']); ?>"></span>&nbsp;';
514 514
             }
515 515
             // Pwd icon
516 516
             if (value.pw !== "") {
517
-                icon_pwd = '<span class="fa fa-sm fa-lock mi-black mini_pw" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']);?>" data-clipboard-id="'+value.item_id+'"></span>&nbsp;';
517
+                icon_pwd = '<span class="fa fa-sm fa-lock mi-black mini_pw" data-clipboard-text="'+value.pw+'" title="<?php echo addslashes($LANG['item_menu_copy_pw']); ?>" data-clipboard-id="'+value.item_id+'"></span>&nbsp;';
518 518
             }
519 519
 
520 520
             // Now check if pwd is empty. If it is then warn user
521 521
             if (value.pw === "") {
522
-                pwd_error = '&nbsp;<span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']);?>"></span>&nbsp;';
522
+                pwd_error = '&nbsp;<span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']); ?>"></span>&nbsp;';
523 523
             }
524 524
         }
525 525
 
@@ -2346,8 +2346,8 @@  discard block
 block discarded – undo
2346 2346
         $("#delete-edit-file_"+file_id)
2347 2347
             .hide()
2348 2348
             .after(
2349
-                '<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>' +
2350
-                '&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>'
2349
+                '<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>' +
2350
+                '&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>'
2351 2351
             );
2352 2352
             $(".tip").tooltipster({multiple: true});
2353 2353
     }
Please login to merge, or discard this patch.