Completed
Push — development ( 114d7b...e0e718 )
by Nils
09:25
created
sources/main.functions.php 3 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -505,6 +505,7 @@  discard block
 block discarded – undo
505 505
  *
506 506
  * trim a string depending on a specific string
507 507
  * @param string $element
508
+ * @param string $chaine
508 509
  * @return string
509 510
  */
510 511
 function trimElement($chaine, $element)
@@ -1562,6 +1563,9 @@  discard block
 block discarded – undo
1562 1563
  *
1563 1564
  * permits to handle the Teampass config file
1564 1565
  * $action accepts "rebuild" and "update"
1566
+ * @param string $action
1567
+ * @param string $field
1568
+ * @param integer $value
1565 1569
  */
1566 1570
 function handleConfigFile($action, $field = null, $value = null)
1567 1571
 {
@@ -2056,7 +2060,6 @@  discard block
 block discarded – undo
2056 2060
 
2057 2061
 /**
2058 2062
  * Permits to clean and sanitize text to be displayed
2059
- * @param  string $text text to clean
2060 2063
  * @param  string $type what clean to perform
2061 2064
  * @return string       text cleaned up
2062 2065
  */
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
         }
770 770
         // Get IDs of personal folders
771 771
         if (isset($SETTINGS['enable_pf_feature']) === true && $SETTINGS['enable_pf_feature'] === '1'
772
-            && isset($_SESSION['personal_folder']) === true &&  $_SESSION['personal_folder'] === '1'
772
+            && isset($_SESSION['personal_folder']) === true && $_SESSION['personal_folder'] === '1'
773 773
         ) {
774 774
             $persoFld = DB::queryfirstrow(
775 775
                 "SELECT id
@@ -1925,7 +1925,7 @@  discard block
 block discarded – undo
1925 1925
     $antiXss = new protect\AntiXSS\AntiXSS();
1926 1926
 
1927 1927
     // Protect against bad inputs
1928
-    if (is_array($source_file) ||is_array($target_file)) {
1928
+    if (is_array($source_file) || is_array($target_file)) {
1929 1929
         return 'error_cannot_be_array';
1930 1930
     }
1931 1931
 
@@ -2082,7 +2082,7 @@  discard block
 block discarded – undo
2082 2082
     $newArr = array();
2083 2083
 
2084 2084
     foreach ($arr as $key => $value) {
2085
-        $newArr[ $key ] = (is_array($value) ? array_map_r($func, $value) : ( is_array($func) ? call_user_func_array($func, $value) : $func( $value )));
2085
+        $newArr[$key] = (is_array($value) ? array_map_r($func, $value) : (is_array($func) ? call_user_func_array($func, $value) : $func($value)));
2086 2086
     }
2087 2087
 
2088 2088
     return $newArr;
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -18,15 +18,15 @@  discard block
 block discarded – undo
18 18
 
19 19
 // Load config if $SETTINGS not defined
20 20
 if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir'])) {
21
-  if (file_exists('../includes/config/tp.config.php')) {
22
-      require_once '../includes/config/tp.config.php';
23
-  } elseif (file_exists('./includes/config/tp.config.php')) {
24
-      require_once './includes/config/tp.config.php';
25
-  } elseif (file_exists('../../includes/config/tp.config.php')) {
26
-      require_once '../../includes/config/tp.config.php';
27
-  } else {
28
-      throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
29
-  }
21
+    if (file_exists('../includes/config/tp.config.php')) {
22
+        require_once '../includes/config/tp.config.php';
23
+    } elseif (file_exists('./includes/config/tp.config.php')) {
24
+        require_once './includes/config/tp.config.php';
25
+    } elseif (file_exists('../../includes/config/tp.config.php')) {
26
+        require_once '../../includes/config/tp.config.php';
27
+    } else {
28
+        throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
29
+    }
30 30
 }
31 31
 
32 32
 // load phpCrypt
@@ -1430,7 +1430,7 @@  discard block
 block discarded – undo
1430 1430
     // Can we use PHP7 random_int function?
1431 1431
     if (version_compare(phpversion(), '7.0', '>=')) {
1432 1432
         require_once $SETTINGS['cpassman_dir'].'/includes/libraries/PasswordGenerator/RandomGenerator/Php7RandomGenerator.php';
1433
-         $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
1433
+            $generator->setRandomGenerator(new PasswordGenerator\RandomGenerator\Php7RandomGenerator());
1434 1434
     }
1435 1435
 
1436 1436
     // init
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 2 patches
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.
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -2158,12 +2158,12 @@  discard block
 block discarded – undo
2158 2158
 
2159 2159
             // Check that user can access this folder
2160 2160
             if ((
2161
-                  in_array($post_source_folder_id, $_SESSION['groupes_visibles']) === false ||
2161
+                    in_array($post_source_folder_id, $_SESSION['groupes_visibles']) === false ||
2162 2162
                   in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) &&
2163 2163
                   (
2164
-                      $post_target_folder_id === '0' &&
2164
+                        $post_target_folder_id === '0' &&
2165 2165
                       isset($SETTINGS['can_create_root_folder']) === true && $SETTINGS['can_create_root_folder'] === '1'
2166
-                  )
2166
+                    )
2167 2167
             ) {
2168 2168
                 $returnValues = '[{"error" : "'.addslashes($LANG['error_not_allowed_to']).'"}]';
2169 2169
                 echo $returnValues;
@@ -3160,7 +3160,7 @@  discard block
 block discarded – undo
3160 3160
             if ((isset($_SESSION['user_settings']['session_psk']) === false || empty($_SESSION['user_settings']['session_psk']) === true)
3161 3161
                 && ($dataSource['personal_folder'] === '1' || $dataDestination['personal_folder'] === '1')
3162 3162
             ) {
3163
-                 echo '[{"error" : "ERR_PSK_REQUIRED"}]';
3163
+                    echo '[{"error" : "ERR_PSK_REQUIRED"}]';
3164 3164
                 break;
3165 3165
             }
3166 3166
 
@@ -4261,30 +4261,30 @@  discard block
 block discarded – undo
4261 4261
             $ret = sendEmail(
4262 4262
                 $LANG['email_request_access_subject'],
4263 4263
                 str_replace(
4264
-                  array(
4265
-                      '#tp_item_author#',
4266
-                      '#tp_user#',
4267
-                      '#tp_item#',
4268
-                      '#tp_reason#'
4269
-                  ),
4270
-                  array(
4271
-                      " ".addslashes($dataAuthor['login']),
4272
-                      addslashes($_SESSION['login']),
4273
-                      addslashes($dataItem['label']),
4274
-                      nl2br(addslashes($emailText))
4275
-                  ),
4276
-                  $LANG['email_request_access_mail']
4264
+                    array(
4265
+                        '#tp_item_author#',
4266
+                        '#tp_user#',
4267
+                        '#tp_item#',
4268
+                        '#tp_reason#'
4269
+                    ),
4270
+                    array(
4271
+                        " ".addslashes($dataAuthor['login']),
4272
+                        addslashes($_SESSION['login']),
4273
+                        addslashes($dataItem['label']),
4274
+                        nl2br(addslashes($emailText))
4275
+                    ),
4276
+                    $LANG['email_request_access_mail']
4277 4277
                 ),
4278 4278
                 $dataAuthor['email']
4279 4279
             );
4280 4280
 
4281 4281
             // Do log
4282 4282
             logItems(
4283
-              $item_id,
4284
-              $dataItem['label'],
4285
-              $_SESSION['user_id'],
4286
-              'at_access',
4287
-              $_SESSION['login']
4283
+                $item_id,
4284
+                $dataItem['label'],
4285
+                $_SESSION['user_id'],
4286
+                'at_access',
4287
+                $_SESSION['login']
4288 4288
             );
4289 4289
 
4290 4290
             // Return
Please login to merge, or discard this patch.
includes/libraries/Authentication/DuoSecurity/Duo.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
27 27
     private static function signVals($key, $vals, $prefix, $expire, $time = null)
28 28
     {
29 29
         $exp = ($time ? $time : time()) + $expire;
30
-        $val = $vals . '|' . $exp;
30
+        $val = $vals.'|'.$exp;
31 31
         $b64 = base64_encode($val);
32
-        $cookie = $prefix . '|' . $b64;
32
+        $cookie = $prefix.'|'.$b64;
33 33
 
34 34
         $sig = hash_hmac("sha1", $cookie, $key);
35
-        return $cookie . '|' . $sig;
35
+        return $cookie.'|'.$sig;
36 36
     }
37 37
 
38 38
     private static function parseVals($key, $val, $prefix, $ikey, $time = null)
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
         }
46 46
         list($u_prefix, $u_b64, $u_sig) = $parts;
47 47
 
48
-        $sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
48
+        $sig = hash_hmac("sha1", $u_prefix.'|'.$u_b64, $key);
49 49
         if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
50 50
             return null;
51 51
         }
@@ -88,12 +88,12 @@  discard block
 block discarded – undo
88 88
             return self::ERR_AKEY;
89 89
         }
90 90
 
91
-        $vals = $username . '|' . $ikey;
91
+        $vals = $username.'|'.$ikey;
92 92
 
93 93
         $duo_sig = self::signVals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
94 94
         $app_sig = self::signVals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
95 95
 
96
-        return $duo_sig . ':' . $app_sig;
96
+        return $duo_sig.':'.$app_sig;
97 97
     }
98 98
 
99 99
     public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time = null)
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 2 patches
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.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -206,8 +206,8 @@
 block discarded – undo
206 206
     "INT(12) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`increment_id`)"
207 207
 );
208 208
 if ($res === true) {
209
-  // Change name of field
210
-  mysqli_query($db_link, "ALTER TABLE `".$pre."misc` CHANGE `id` `increment_id` INT(12) NOT NULL AUTO_INCREMENT");
209
+    // Change name of field
210
+    mysqli_query($db_link, "ALTER TABLE `".$pre."misc` CHANGE `id` `increment_id` INT(12) NOT NULL AUTO_INCREMENT");
211 211
 } elseif ($res === false) {
212 212
     echo '[{"finish":"1", "msg":"", "error":"An error appears when adding increment_id user_ip to table misc! '.mysqli_error($db_link).'!"}]';
213 213
     mysqli_close($db_link);
Please login to merge, or discard this patch.
includes/libraries/PasswordGenerator/Generator/HumanPasswordGenerator.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -91,6 +91,10 @@
 block discarded – undo
91 91
         }
92 92
     }
93 93
 
94
+    /**
95
+     * @param integer $min
96
+     * @param integer $max
97
+     */
94 98
     private function generateWordListSubset($min, $max)
95 99
     {
96 100
         $wordList = $this->generateWordList();
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@
 block discarded – undo
153 153
             return $password;
154 154
         }
155 155
 
156
-        while(--$wordCount) {
156
+        while (--$wordCount) {
157 157
             $thisMin = $this->getLength() - strlen($password) - ($wordCount * $this->getMaxWordLength()) - (strlen($this->getWordSeparator()) * $wordCount);
158 158
             $thisMax = $this->getLength() - strlen($password) - ($wordCount * $this->getMinWordLength()) - (strlen($this->getWordSeparator()) * $wordCount);
159 159
 
Please login to merge, or discard this patch.
libraries/PasswordGenerator/Generator/PasswordGeneratorInterface.php 2 patches
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
      *
64 64
      * @param $option
65 65
      *
66
-     * @return mixed
66
+     * @return integer|null
67 67
      */
68 68
     public function getOptionValue($option);
69 69
 
@@ -77,9 +77,8 @@  discard block
 block discarded – undo
77 77
 
78 78
     /**
79 79
      * @param string $parameter
80
-     * @param mixed  $default
81 80
      *
82
-     * @return null|mixed
81
+     * @return string
83 82
      */
84 83
     public function getParameter($parameter);
85 84
 
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace PasswordGenerator\Generator;
4 4
 
5
-use PasswordGenerator\Exception\InvalidOptionException;
6 5
 use PasswordGenerator\Exception\InvalidOptionTypeException;
7 6
 use PasswordGenerator\Model\Option\Option;
8 7
 use PasswordGenerator\RandomGenerator\RandomGeneratorInterface;
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.