Completed
Push — development ( f36d1a...3b52a6 )
by Nils
08:19
created
items.import.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -309,7 +309,7 @@
 block discarded – undo
309 309
                 BeforeUpload: function (up, file) {
310 310
                     $("#import_status_ajax_loader").show();
311 311
                     up.settings.multipart_params = {
312
-                        "PHPSESSID":"<?php echo $_SESSION['user_id'];?>",
312
+                        "PHPSESSID":"<?php echo $_SESSION['user_id']; ?>",
313 313
                         "type_upload":"import_items_from_keypass",
314 314
                         "user_token": $("#import_user_token").val()
315 315
                     };
Please login to merge, or discard this patch.
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.
install/upgrade_run_final.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -711,7 +711,7 @@
 block discarded – undo
711 711
         utf8_encode(
712 712
             "<?php
713 713
 global \$SETTINGS;
714
-\$SETTINGS = array (" . $config_text . "
714
+\$SETTINGS = array (" . $config_text."
715 715
     );"
716 716
         )
717 717
     );
Please login to merge, or discard this patch.
sources/admin.queries.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
             $objects = explode(",", $post_object);
765 765
 
766 766
             // Allowed values for $_POST['object'] : "items,logs,files,categories"
767
-            if (in_array($objects[0], array("items","logs","files","categories")) === false) {
767
+            if (in_array($objects[0], array("items", "logs", "files", "categories")) === false) {
768 768
                 echo '[{"nextAction":"" , "error":"Input `'.$objects[0].'` is not allowed" , "nbOfItems":""}]';
769 769
                 break;
770 770
             }
@@ -1329,7 +1329,7 @@  discard block
 block discarded – undo
1329 1329
             foreach ($rows as $record) {
1330 1330
                 if (is_file($SETTINGS['path_to_upload_folder'].'/'.$record['file'])) {
1331 1331
                     $addFile = 0;
1332
-                    if ($post_option== "decrypt" && $record['status'] === 'encrypted') {
1332
+                    if ($post_option == "decrypt" && $record['status'] === 'encrypted') {
1333 1333
                         $addFile = 1;
1334 1334
                     } elseif ($post_option == "encrypt" && $record['status'] === 'clear') {
1335 1335
                         $addFile = 1;
Please login to merge, or discard this patch.
api/functions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -632,7 +632,7 @@
 block discarded – undo
632 632
                             $json[$inc]['nlevel'] = mb_convert_encoding($folder->nlevel, mb_detect_encoding($folder->nlevel), 'UTF-8');
633 633
                             $json[$inc]['personal'] = mb_convert_encoding($folder->personal_folder, mb_detect_encoding($folder->personal_folder), 'UTF-8');
634 634
 
635
-                            $inc ++;
635
+                            $inc++;
636 636
                         }
637 637
                     }
638 638
                 }
Please login to merge, or discard this patch.
sources/items.queries.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3125,7 +3125,7 @@
 block discarded – undo
3125 3125
             if ((isset($_SESSION['user_settings']['session_psk']) === false || empty($_SESSION['user_settings']['session_psk']) === true)
3126 3126
                 && ($dataSource['personal_folder'] === '1' || $dataDestination['personal_folder'] === '1')
3127 3127
             ) {
3128
-                 echo '[{"error" : "ERR_PSK_REQUIRED"}]';
3128
+                    echo '[{"error" : "ERR_PSK_REQUIRED"}]';
3129 3129
                 break;
3130 3130
             }
3131 3131
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -886,7 +886,7 @@
 block discarded – undo
886 886
                     /*FOLDER */
887 887
                     if ($data['id_tree'] != $dataReceived['categorie']) {
888 888
                         // Get name of folders
889
-                        $dataTmp = DB::query("SELECT title FROM ".prefix_table("nested_tree")." WHERE id IN %li", array($data['id_tree'],$dataReceived['categorie']));
889
+                        $dataTmp = DB::query("SELECT title FROM ".prefix_table("nested_tree")." WHERE id IN %li", array($data['id_tree'], $dataReceived['categorie']));
890 890
 
891 891
                         logItems($dataReceived['id'], $label, $_SESSION['user_id'], 'at_modification', $_SESSION['login'], 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']);
892 892
                         // ask for page reloading
Please login to merge, or discard this patch.
includes/language/estonian.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14 14
  */
15 15
 global $LANG;
16
-$LANG = array (
16
+$LANG = array(
17 17
     'newly_created_user_is_administrated_by' => 'Newly created user is administrated by',
18 18
     'error_security_level_not_reached' => 'Expected level of security not reached!',
19 19
     'error_psk_should_be_changed' => 'Due to policy change, you may need change your personal saltkey.',
Please login to merge, or discard this patch.
includes/language/french.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14 14
  */
15 15
 global $LANG;
16
-$LANG = array (
16
+$LANG = array(
17 17
     'newly_created_user_is_administrated_by' => 'Les nouveaux utilisateurs sont administrés par',
18 18
     'error_security_level_not_reached' => 'Niveau de sécurité non atteint !',
19 19
     'error_psk_should_be_changed' => 'Il vous est demandé de changer votre clé de salage personnelle.',
Please login to merge, or discard this patch.
includes/language/portuguese_br.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14 14
  */
15 15
 global $LANG;
16
-$LANG = array (
16
+$LANG = array(
17 17
     'newly_created_user_is_administrated_by' => 'Newly created user is administrated by',
18 18
     'error_security_level_not_reached' => 'Expected level of security not reached!',
19 19
     'error_psk_should_be_changed' => 'Due to policy change, you may need change your personal saltkey.',
Please login to merge, or discard this patch.