Passed
Branch — development (e0e718)
by Nils
04:45
created
install/upgrade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
         } elseif (substr_count($val, '$pre = ') > 0) {
57 57
             $_SESSION['pre'] = getSettingValue($val);
58 58
         } elseif (substr_count($val, "define('SECUREPATH',") > 0) {
59
-            $_SESSION['sk_file'] = substr($val, 23, strpos($val, ');')-24)."/sk.php";
59
+            $_SESSION['sk_file'] = substr($val, 23, strpos($val, ');') - 24)."/sk.php";
60 60
         }
61 61
     }
62 62
 }
Please login to merge, or discard this patch.
sources/import.queries.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
             $config->setIgnoreHeaderLine("true");
138 138
             // extract data from CSV file
139 139
             $interpreter = new Interpreter();
140
-            $interpreter->addObserver(function (array $row) use (&$valuesToImport) {
140
+            $interpreter->addObserver(function(array $row) use (&$valuesToImport) {
141 141
                 $valuesToImport[] = array(
142 142
                     'Label'     => $row[0],
143 143
                     'Login'     => $row[1],
@@ -966,7 +966,7 @@  discard block
 block discarded – undo
966 966
         break;
967 967
 }
968 968
 
969
-spl_autoload_register(function ($class) {
969
+spl_autoload_register(function($class) {
970 970
     $prefix = 'League\\Csv\\';
971 971
     $base_dir = __DIR__.'/src/';
972 972
     $len = strlen($prefix);
Please login to merge, or discard this patch.
install/upgrade_ajax.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -427,7 +427,7 @@
 block discarded – undo
427 427
                     } elseif (substr_count($val, '$pre') > 0) {
428 428
                         $pre = getSettingValue($val);
429 429
                     } elseif (substr_count($val, "define('SECUREPATH',") > 0) {
430
-                        $superGlobal->put("sk_file", substr($val, 23, strpos($val, ');')-24)."/sk.php", "SESSION");
430
+                        $superGlobal->put("sk_file", substr($val, 23, strpos($val, ');') - 24)."/sk.php", "SESSION");
431 431
                     }
432 432
                 }
433 433
             }
Please login to merge, or discard this patch.
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.
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/items.queries.php 1 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.
install/install.queries.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -227,15 +227,15 @@
 block discarded – undo
227 227
                 }
228 228
                 $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = 'url_path'"));
229 229
                 if (intval($tmp) === 0) {
230
-                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('url_path', '". empty($session_url_path) ? $db['url_path'] : $session_url_path. "');");
230
+                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('url_path', '".empty($session_url_path) ? $db['url_path'] : $session_url_path."');");
231 231
                 } else {
232 232
                     mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '", empty($session_url_path) ? $db['url_path'] : $session_url_path, "' WHERE `key` = 'url_path';");
233 233
                 }
234 234
                 $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `_install` WHERE `key` = 'abspath'"));
235 235
                 if (intval($tmp) === 0) {
236
-                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('abspath', '". empty($session_abspath) ? $db['abspath'] : $session_abspath. "');");
236
+                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('abspath', '".empty($session_abspath) ? $db['abspath'] : $session_abspath."');");
237 237
                 } else {
238
-                    mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '". empty($session_abspath) ? $db['abspath'] : $session_abspath. "' WHERE `key` = 'abspath';");
238
+                    mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '".empty($session_abspath) ? $db['abspath'] : $session_abspath."' WHERE `key` = 'abspath';");
239 239
                 }
240 240
 
241 241
                 echo '[{"error" : "", "result" : "Connection is successful", "multiple" : ""}]';
Please login to merge, or discard this patch.
install/upgrade_run_2.1.27.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -759,7 +759,7 @@
 block discarded – undo
759 759
         utf8_encode(
760 760
             "<?php
761 761
 global \$SETTINGS;
762
-\$SETTINGS = array (" . $config_text . "
762
+\$SETTINGS = array (" . $config_text."
763 763
 );"
764 764
         )
765 765
     );
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
 
@@ -2375,8 +2375,8 @@  discard block
 block discarded – undo
2375 2375
         $("#delete-edit-file_"+file_id)
2376 2376
             .hide()
2377 2377
             .after(
2378
-                '<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>' +
2379
-                '&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>'
2378
+                '<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>' +
2379
+                '&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>'
2380 2380
             );
2381 2381
             $(".tip").tooltipster({multiple: true});
2382 2382
     }
@@ -2597,9 +2597,9 @@  discard block
 block discarded – undo
2597 2597
 
2598 2598
                 // Shall we show the root folder
2599 2599
                 if (data.html_json.can_create_root_folder === 1) {
2600
-                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2601
-                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2602
-                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2600
+                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2601
+                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2602
+                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2603 2603
                 }
2604 2604
 
2605 2605
                 //
@@ -4529,20 +4529,20 @@  discard block
 block discarded – undo
4529 4529
                     if (value.copy_to_clipboard_small_icons === 1) {
4530 4530
                         // Prepare Login
4531 4531
                         if (value.login !== "") {
4532
-                            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;';
4532
+                            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;';
4533 4533
                         }
4534 4534
 
4535 4535
                         // Prepare PWD
4536 4536
                         if (value.pw !== "") {
4537
-                            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;'
4537
+                            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;'
4538 4538
                         }
4539 4539
 
4540 4540
                         // Prepare favorite
4541 4541
                         if (value.enable_favourites === 1) {
4542 4542
                             if (value.is_favorite === 1) {
4543
-                                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>';
4543
+                                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>';
4544 4544
                             } else {
4545
-                                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>';
4545
+                                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>';
4546 4546
                             }
4547 4547
                         } else {
4548 4548
                             icon_favorite = '';
@@ -4556,7 +4556,7 @@  discard block
 block discarded – undo
4556 4556
                     // Append
4557 4557
                     $("#full_items_list").append(
4558 4558
                     '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
4559
-                    '<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;' +
4559
+                    '<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;' +
4560 4560
                         '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')">'+value.label +
4561 4561
                         value.desc +
4562 4562
                         '&nbsp;<span style="font-size:11px;font-style:italic;"><i class="fa fa-folder-o"></i>&nbsp;'+value.folder+'</span>' +
@@ -4614,20 +4614,20 @@  discard block
 block discarded – undo
4614 4614
                 if (value.copy_to_clipboard_small_icons === "1") {
4615 4615
                     // Prepare Login
4616 4616
                     if (value.login !== "") {
4617
-                        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;';
4617
+                        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;';
4618 4618
                     }
4619 4619
 
4620 4620
                     // Prepare PWD
4621 4621
                     if (value.pw !== "") {
4622
-                        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;'
4622
+                        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;'
4623 4623
                     }
4624 4624
 
4625 4625
                     // Prepare favorite
4626 4626
                     if (value.enable_favourites === "1") {
4627 4627
                         if (value.is_favorite === 1) {
4628
-                            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>';
4628
+                            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>';
4629 4629
                         } else {
4630
-                            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>';
4630
+                            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>';
4631 4631
                         }
4632 4632
                     } else {
4633 4633
                         icon_favorite = '';
@@ -4641,7 +4641,7 @@  discard block
 block discarded – undo
4641 4641
                 // Append
4642 4642
                 $("#full_items_list").append(
4643 4643
                 '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
4644
-                '<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;' +
4644
+                '<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;' +
4645 4645
                     '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')">'+value.label +
4646 4646
                     value.desc +
4647 4647
                     '&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.