Completed
Push — development ( a93cfb...e3be50 )
by Nils
09:03
created
items.load.php 1 patch
Spacing   +15 added lines, -15 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
 
@@ -2359,8 +2359,8 @@  discard block
 block discarded – undo
2359 2359
         $("#delete-edit-file_"+file_id)
2360 2360
             .hide()
2361 2361
             .after(
2362
-                '<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>' +
2363
-                '&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>'
2362
+                '<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>' +
2363
+                '&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>'
2364 2364
             );
2365 2365
             $(".tip").tooltipster({multiple: true});
2366 2366
     }
@@ -2581,9 +2581,9 @@  discard block
 block discarded – undo
2581 2581
 
2582 2582
                 // Shall we show the root folder
2583 2583
                 if (data.html_json.can_create_root_folder === 1) {
2584
-                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2585
-                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2586
-                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
2584
+                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2585
+                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2586
+                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
2587 2587
                 }
2588 2588
 
2589 2589
                 //
@@ -4437,20 +4437,20 @@  discard block
 block discarded – undo
4437 4437
                     if (value.copy_to_clipboard_small_icons === "1") {
4438 4438
                         // Prepare Login
4439 4439
                         if (value.login !== "") {
4440
-                            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;';
4440
+                            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;';
4441 4441
                         }
4442 4442
 
4443 4443
                         // Prepare PWD
4444 4444
                         if (value.pw !== "") {
4445
-                            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;'
4445
+                            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;'
4446 4446
                         }
4447 4447
 
4448 4448
                         // Prepare favorite
4449 4449
                         if (value.enable_favourites === "1") {
4450 4450
                             if (value.is_favorite === 1) {
4451
-                                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>';
4451
+                                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>';
4452 4452
                             } else {
4453
-                                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>';
4453
+                                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>';
4454 4454
                             }
4455 4455
                         } else {
4456 4456
                             icon_favorite = '';
@@ -4464,7 +4464,7 @@  discard block
 block discarded – undo
4464 4464
                     // Append
4465 4465
                     $("#full_items_list").append(
4466 4466
                     '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
4467
-                    '<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;' +
4467
+                    '<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;' +
4468 4468
                         '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')">'+value.label +
4469 4469
                         value.desc +
4470 4470
                         '&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.
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.