nilsteampassnet / TeamPass

items.load.php

Spacing +20 added lines, -20 removed lines

@@ -457,28 +457,28 @@ 
 
         // Prepare error message
         if (value.pw_status === "encryption_error") {
-            pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']);?>"></span>&nbsp;';
+            pwd_error = '<span class="fa fa-warning fa-sm mi-red tip" title="<?php echo addslashes($LANG['pw_encryption_error']); ?>"></span>&nbsp;';
         }
 
         // Prepare anyone can modify icon
         if (value.anyone_can_modify === "1") {
-            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;';
+            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;';
         }
 
         // Prepare mini icons
         if (value.copy_to_clipboard_small_icons === "1" && value.display_item === 1) {
             // Login icon
             if (value.login !== "") {
-                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;';
+                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;';
             }
             // Pwd icon
             if (value.pw !== "") {
-                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;';
+                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;';
             }
 
             // Now check if pwd is empty. If it is then warn user
             if (value.pw === "") {
-                pwd_error = '&nbsp;<span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']);?>"></span>&nbsp;';
+                pwd_error = '&nbsp;<span class="fa fa-exclamation-circle fa-sm mi-yellow tip" title="<?php echo addslashes($LANG['password_is_empty']); ?>"></span>&nbsp;';
             }
         }
 
@@ -2409,8 +2409,8 @@ 
         $("#delete-edit-file_"+file_id)
             .hide()
             .after(
-                '<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>' +
-                '&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>'
+                '<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>' +
+                '&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>'
             );
             $(".tip").tooltipster({multiple: true});
     }
@@ -2631,9 +2631,9 @@ 
 
                 // Shall we show the root folder
                 if (data.html_json.can_create_root_folder === 1) {
-                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
-                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
-                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']);?></option>';
+                    html_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
+                    html_full_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
+                    html_active_visible = '<option value="0"><?php echo addslashes($LANG['root']); ?></option>';
                 }
 
                 //
@@ -4674,20 +4674,20 @@ 
                     if (value.copy_to_clipboard_small_icons === '1') {
                         // Prepare Login
                         if (value.login !== "") {
-                            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;';
+                            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;';
                         }
 
                         // Prepare PWD
                         if (value.pw !== "") {
-                            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;'
+                            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;'
                         }
 
                         // Prepare favorite
                         if (value.enable_favourites === '1') {
                             if (value.is_favorite === '1') {
-                                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>';
+                                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>';
                             } else {
-                                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>';
+                                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>';
                             }
                         } else {
                             icon_favorite = '';
@@ -4701,7 +4701,7 @@ 
                     // Append
                     $("#full_items_list").append(
                     '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
-                    '<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;' +
+                    '<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;' +
                         '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')"><b>'+value.label + '</b>' +
                         '&nbsp;<span style="font-size:11px;font-style:italic; background-color:#f2e9e5;">&nbsp;<i class="fa fa-folder-o"></i>&nbsp;'+value.folder+'&nbsp;</span>&nbsp;'+value.desc+'' +
                         '</span><span style="float:right;margin:2px 10px 0px 0px;">' +
@@ -4758,20 +4758,20 @@ 
                 if (value.copy_to_clipboard_small_icons === "1") {
                     // Prepare Login
                     if (value.login !== "") {
-                        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;';
+                        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;';
                     }
 
                     // Prepare PWD
                     if (value.pw !== "") {
-                        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;'
+                        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;'
                     }
 
                     // Prepare favorite
                     if (value.enable_favourites === "1") {
                         if (value.is_favorite === 1) {
-                            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>';
+                            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>';
                         } else {
-                            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>';
+                            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>';
                         }
                     } else {
                         icon_favorite = '';
@@ -4785,7 +4785,7 @@ 
                 // Append
                 $("#full_items_list").append(
                 '<li class="item trunc_line" id="'+value.item_id+'"><a id="fileclass'+value.item_id+'" class="file_search">' +
-                '<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;' +
+                '<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;' +
                     '<span class="truncate" onclick="AfficherDetailsItem(\''+value.item_id+'\',\''+value.sk+'\',\''+value.expired+'\', \''+value.restricted+'\', \''+value.display+'\', \'\', \''+value.reload+'\', \''+value.tree_id+'\')">'+value.label +
                     value.desc +
                     '&nbsp;<span style="font-size:11px;font-style:italic;"><i class="fa fa-folder-o"></i>&nbsp;'+value.folder+'</span>' +

sources/items.queries.php

Indentation +22 added lines, -22 removed lines

@@ -2191,12 +2191,12 @@ 
 
             // Check that user can access this folder
             if ((
-                  in_array($post_source_folder_id, $_SESSION['groupes_visibles']) === false ||
+                    in_array($post_source_folder_id, $_SESSION['groupes_visibles']) === false ||
                   in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) &&
                   (
-                      $post_target_folder_id === '0' &&
+                        $post_target_folder_id === '0' &&
                       isset($SETTINGS['can_create_root_folder']) === true && $SETTINGS['can_create_root_folder'] === '1'
-                  )
+                    )
             ) {
                 $returnValues = '[{"error" : "'.addslashes($LANG['error_not_allowed_to']).'"}]';
                 echo $returnValues;
@@ -3201,7 +3201,7 @@ 
             if ((isset($_SESSION['user_settings']['session_psk']) === false || empty($_SESSION['user_settings']['session_psk']) === true)
                 && ($dataSource['personal_folder'] === '1' || $dataDestination['personal_folder'] === '1')
             ) {
-                 echo '[{"error" : "ERR_PSK_REQUIRED"}]';
+                    echo '[{"error" : "ERR_PSK_REQUIRED"}]';
                 break;
             }
 
@@ -4340,19 +4340,19 @@ 
             $ret = sendEmail(
                 $LANG['email_request_access_subject'],
                 str_replace(
-                  array(
-                      '#tp_item_author#',
-                      '#tp_user#',
-                      '#tp_item#',
-                      '#tp_reason#'
-                  ),
-                  array(
-                      " ".addslashes($dataAuthor['login']),
-                      addslashes($_SESSION['login']),
-                      $path,
-                      nl2br(addslashes($emailText))
-                  ),
-                  $LANG['email_request_access_mail']
+                    array(
+                        '#tp_item_author#',
+                        '#tp_user#',
+                        '#tp_item#',
+                        '#tp_reason#'
+                    ),
+                    array(
+                        " ".addslashes($dataAuthor['login']),
+                        addslashes($_SESSION['login']),
+                        $path,
+                        nl2br(addslashes($emailText))
+                    ),
+                    $LANG['email_request_access_mail']
                 ),
                 $dataAuthor['email'],
                 $LANG,
@@ -4361,11 +4361,11 @@ 
 
             // Do log
             logItems(
-              $item_id,
-              $dataItem['label'],
-              $_SESSION['user_id'],
-              'at_access',
-              $_SESSION['login']
+                $item_id,
+                $dataItem['label'],
+                $_SESSION['user_id'],
+                'at_access',
+                $_SESSION['login']
             );
 
             // Return

Spacing +3 added lines, -3 removed lines

@@ -896,7 +896,7 @@ 
                     /*FOLDER */
                     if ($data['id_tree'] != $dataReceived['categorie']) {
                         // Get name of folders
-                        $dataTmp = DB::query("SELECT title FROM ".prefix_table("nested_tree")." WHERE id IN %li", array($data['id_tree'],$dataReceived['categorie']));
+                        $dataTmp = DB::query("SELECT title FROM ".prefix_table("nested_tree")." WHERE id IN %li", array($data['id_tree'], $dataReceived['categorie']));
 
                         logItems($dataReceived['id'], $label, $_SESSION['user_id'], 'at_modification', $_SESSION['login'], 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']);
                         // ask for page reloading
@@ -1974,7 +1974,7 @@ 
                         if (empty($path) === true) {
                             $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
                         } else {
-                            $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                            $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                         }
                     }
                     // Build text to show user
@@ -4474,7 +4474,7 @@ 
         if (empty($path) === true) {
             $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
         } else {
-            $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+            $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
         }
     }
     // Build text to show user

backups/script.backup.php

Spacing +4 added lines, -4 removed lines

@@ -12,15 +12,15 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-require dirname(__FILE__) .'/../includes/config/settings.php';
-require_once dirname(__FILE__) .'/../includes/config/tp.config.php';
+require dirname(__FILE__).'/../includes/config/settings.php';
+require_once dirname(__FILE__).'/../includes/config/tp.config.php';
 header("Content-type: text/html; charset=utf-8");
 
 $_SESSION['CPM'] = 1;
 
 // connect to DB
-require_once $SETTINGS['cpassman_dir'] .'/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] .'/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 
 // Load libraries
 require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';

sources/export.queries.php

Switch Indentation +171 added lines, -171 removed lines

@@ -452,23 +452,23 @@ 
             break;
 
     //CASE export in HTML format
-    case "export_to_html_format":
-        // step 1:
-        // - prepare export file
-        // - get full list of objects id to export
-        include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
-        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
-        $idsList = array();
-        $objNumber = 0;
-
-        foreach (explode(';', $post_ids) as $id) {
-            if (in_array($id, $_SESSION['forbiden_pfs']) === false
-                && in_array($id, $_SESSION['groupes_visibles']) === true
-                && (in_array($id, $_SESSION['no_access_folders']) === false)
-            ) {
-                // count elements to display
-                $result = DB::query(
-                    "SELECT i.id AS id, i.label AS label, i.restricted_to AS restricted_to, i.perso AS perso
+        case "export_to_html_format":
+            // step 1:
+            // - prepare export file
+            // - get full list of objects id to export
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
+            $idsList = array();
+            $objNumber = 0;
+
+            foreach (explode(';', $post_ids) as $id) {
+                if (in_array($id, $_SESSION['forbiden_pfs']) === false
+                    && in_array($id, $_SESSION['groupes_visibles']) === true
+                    && (in_array($id, $_SESSION['no_access_folders']) === false)
+                ) {
+                    // count elements to display
+                    $result = DB::query(
+                        "SELECT i.id AS id, i.label AS label, i.restricted_to AS restricted_to, i.perso AS perso
                     FROM ".prefix_table("items")." as i
                     INNER JOIN ".prefix_table("nested_tree")." as n ON (i.id_tree = n.id)
                     INNER JOIN ".prefix_table("log_items")." as l ON (i.id = l.id_item)
@@ -476,41 +476,41 @@ 
                     AND i.id_tree= %i
                     AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
                     ORDER BY i.label ASC, l.date DESC",
-                    "0",
-                    $id,
-                    "at_creation",
-                    "at_modification",
-                    "at_pw :%"
-                );
-                foreach ($result as $record) {
-                    $restricted_users_array = explode(';', $record['restricted_to']);
-                    if (((in_array($id, $_SESSION['personal_visible_groups']) === true
-                        && !($record['perso'] == 1 && $_SESSION['user_id'] == $record['restricted_to'])
-                        && empty($record['restricted_to']) === false)
-                        ||
-                        (empty($record['restricted_to']) === false 
-                        && in_array($_SESSION['user_id'], $restricted_users_array) === false)
-                        ||
-                        (in_array($id, $_SESSION['groupes_visibles']))
-                        ) && (
-                        in_array($record['id'], $idsList) === false
-                        )
-                    ) {
-                        array_push($idsList, $record['id']);
-                        $objNumber++;
+                        "0",
+                        $id,
+                        "at_creation",
+                        "at_modification",
+                        "at_pw :%"
+                    );
+                    foreach ($result as $record) {
+                        $restricted_users_array = explode(';', $record['restricted_to']);
+                        if (((in_array($id, $_SESSION['personal_visible_groups']) === true
+                            && !($record['perso'] == 1 && $_SESSION['user_id'] == $record['restricted_to'])
+                            && empty($record['restricted_to']) === false)
+                            ||
+                            (empty($record['restricted_to']) === false 
+                            && in_array($_SESSION['user_id'], $restricted_users_array) === false)
+                            ||
+                            (in_array($id, $_SESSION['groupes_visibles']))
+                            ) && (
+                            in_array($record['id'], $idsList) === false
+                            )
+                        ) {
+                            array_push($idsList, $record['id']);
+                            $objNumber++;
+                        }
                     }
                 }
             }
-        }
 
-            // prepare export file
-            //save the file
-            $html_file = '/teampass_export_'.time().'_'.generateKey().'.html';
-            //print_r($full_listing);
-            $outstream = fopen($SETTINGS['path_to_files_folder'].$html_file, "w");
-            fwrite(
-                $outstream,
-                '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+                // prepare export file
+                //save the file
+                $html_file = '/teampass_export_'.time().'_'.generateKey().'.html';
+                //print_r($full_listing);
+                $outstream = fopen($SETTINGS['path_to_files_folder'].$html_file, "w");
+                fwrite(
+                    $outstream,
+                    '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
     <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <title>TeamPass Off-line mode</title>
@@ -550,38 +550,38 @@ 
             <th style="width:20%;">'.$LANG['url'].'</th>
         </tr></thead>
         <tbody id="itemsTable_tbody">'
-            );
-
-        fclose($outstream);
+                );
 
-        // send back and continue
-        echo '[{"loop":"true", "number":"'.$objNumber.'", "file":"'.$SETTINGS['path_to_files_folder'].$html_file.'" , "file_link":"'.$SETTINGS['url_to_files_folder'].$html_file.'"}]';
-        break;
+            fclose($outstream);
 
-    //CASE export in HTML format - Iteration loop
-    case "export_to_html_format_loop":
-        // do checks ... if fails, return an error
-        if (null === $post_idTree || null === $post_idsList) {
-            echo '[{"error":"true"}]';
+            // send back and continue
+            echo '[{"loop":"true", "number":"'.$objNumber.'", "file":"'.$SETTINGS['path_to_files_folder'].$html_file.'" , "file_link":"'.$SETTINGS['url_to_files_folder'].$html_file.'"}]';
             break;
-        }
 
-        // exclude this folder if not allowed
-        if (in_array($post_idTree, $_SESSION['forbiden_pfs']) === true
-            || in_array($post_idTree, $_SESSION['groupes_visibles']) === false
-            || (in_array($post_idTree, $_SESSION['no_access_folders']) === true)
-        ) {
-            echo '[{"loop":"true", "number":"'.$post_number.'", "cpt":"'.$post_cpt.'", "file":"'.$post_file.'", "idsList":"'.$post_idsList.'" , "file_link":"'.$post_file_link.'"}]';
-            break;
-        }
+        //CASE export in HTML format - Iteration loop
+        case "export_to_html_format_loop":
+            // do checks ... if fails, return an error
+            if (null === $post_idTree || null === $post_idsList) {
+                echo '[{"error":"true"}]';
+                break;
+            }
 
-        $full_listing = array();
-        $items_id_list = array();
-        include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
-        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
+            // exclude this folder if not allowed
+            if (in_array($post_idTree, $_SESSION['forbiden_pfs']) === true
+                || in_array($post_idTree, $_SESSION['groupes_visibles']) === false
+                || (in_array($post_idTree, $_SESSION['no_access_folders']) === true)
+            ) {
+                echo '[{"loop":"true", "number":"'.$post_number.'", "cpt":"'.$post_cpt.'", "file":"'.$post_file.'", "idsList":"'.$post_idsList.'" , "file_link":"'.$post_file_link.'"}]';
+                break;
+            }
+
+            $full_listing = array();
+            $items_id_list = array();
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Encryption/GibberishAES/GibberishAES.php';
 
-        $rows = DB::query(
-            "SELECT i.id as id, i.url as url, i.perso as perso, i.label as label, i.description as description, i.pw as pw, i.login as login, i.id_tree as id_tree,
+            $rows = DB::query(
+                "SELECT i.id as id, i.url as url, i.perso as perso, i.label as label, i.description as description, i.pw as pw, i.login as login, i.id_tree as id_tree,
                 l.date as date, i.pw_iv as pw_iv,
                 n.renewal_period as renewal_period
             FROM ".prefix_table("items")." as i
@@ -591,108 +591,108 @@ 
             AND i.id_tree= %i
             AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
             ORDER BY i.label ASC, l.date DESC",
-            "0",
-            $post_idTree,
-            "at_creation",
-            "at_modification",
-            "at_pw :%"
-        );
-
-        foreach ($rows as $record) {
-            //exclude all results except the first one returned by query
-            if (empty($id_managed) || $id_managed != $record['id']) {
-                // decrypt PW
-                if (empty($post_salt_key) === false && null !== $post_salt_key) {
-                    $pw = cryption(
-                        $record['pw'],
-                        mysqli_escape_string($link, stripslashes($post_salt_key)),
-                        "decrypt"
+                "0",
+                $post_idTree,
+                "at_creation",
+                "at_modification",
+                "at_pw :%"
+            );
+
+            foreach ($rows as $record) {
+                //exclude all results except the first one returned by query
+                if (empty($id_managed) || $id_managed != $record['id']) {
+                    // decrypt PW
+                    if (empty($post_salt_key) === false && null !== $post_salt_key) {
+                        $pw = cryption(
+                            $record['pw'],
+                            mysqli_escape_string($link, stripslashes($post_salt_key)),
+                            "decrypt"
+                        );
+                    } else {
+                        $pw = cryption(
+                            $record['pw'],
+                            "",
+                            "decrypt"
+                        );
+                    }
+                    array_push(
+                        $full_listing, array(
+                            'id_tree' => $record['id_tree'],
+                            'id' => $record['id'],
+                            'label' => $record['label'],
+                            'description' => addslashes(str_replace(array(";", "<br />"), array("|", "\n\r"), mysqli_escape_string($link, stripslashes(utf8_decode($record['description']))))),
+                            'pw' => $pw['string'],
+                            'login' => $record['login'],
+                            'url' => $record['url'],
+                            'perso' => $record['perso']
+                        )
                     );
-                } else {
-                    $pw = cryption(
-                        $record['pw'],
-                        "",
-                        "decrypt"
+                    $i++;
+                    array_push($items_id_list, $record['id']);
+
+                    // log
+                    logItems(
+                        $record['id'],
+                        $record['l SeekableIteratorabel'],
+                        $_SESSION['user_id'],
+                        'at_export',
+                        $_SESSION['login'],
+                        'html'
                     );
                 }
-                array_push(
-                    $full_listing, array(
-                        'id_tree' => $record['id_tree'],
-                        'id' => $record['id'],
-                        'label' => $record['label'],
-                        'description' => addslashes(str_replace(array(";", "<br />"), array("|", "\n\r"), mysqli_escape_string($link, stripslashes(utf8_decode($record['description']))))),
-                        'pw' => $pw['string'],
-                        'login' => $record['login'],
-                        'url' => $record['url'],
-                        'perso' => $record['perso']
-                    )
-                );
-                $i++;
-                array_push($items_id_list, $record['id']);
-
-                // log
-                logItems(
-                    $record['id'],
-                    $record['l SeekableIteratorabel'],
-                    $_SESSION['user_id'],
-                    'at_export',
-                    $_SESSION['login'],
-                    'html'
-                );
+                $id_managed = $record['id'];
             }
-            $id_managed = $record['id'];
-        }
 
-        //save in export file
-        $outstream = fopen($post_file.'.txt', "a");
+            //save in export file
+            $outstream = fopen($post_file.'.txt', "a");
 
-        $lineType = "line1";
-        $idTree = "";
-        foreach ($full_listing as $elem) {
-            if ($lineType == "line0") {
-                $lineType = "line1";
-            } else {
-                $lineType = "line0";
-            }
-            if (empty($elem['description'])) {
-                $desc = '&nbsp;';
-            } else {
-                $desc = addslashes($elem['description']);
-            }
-            if (empty($elem['login'])) {
-                $login = '&nbsp;';
-            } else {
-                $login = addslashes($elem['login']);
-            }
-            if (empty($elem['url'])) {
-                $url = '&nbsp;';
-            } else {
-                $url = addslashes($elem['url']);
-            }
+            $lineType = "line1";
+            $idTree = "";
+            foreach ($full_listing as $elem) {
+                if ($lineType == "line0") {
+                    $lineType = "line1";
+                } else {
+                    $lineType = "line0";
+                }
+                if (empty($elem['description'])) {
+                    $desc = '&nbsp;';
+                } else {
+                    $desc = addslashes($elem['description']);
+                }
+                if (empty($elem['login'])) {
+                    $login = '&nbsp;';
+                } else {
+                    $login = addslashes($elem['login']);
+                }
+                if (empty($elem['url'])) {
+                    $url = '&nbsp;';
+                } else {
+                    $url = addslashes($elem['url']);
+                }
 
-            // Prepare tree
-            if ($idTree != $elem['id_tree']) {
-                $arbo = $tree->getPath($elem['id_tree'], true);
-                foreach ($arbo as $folder) {
-                    $arboHtml_tmp = htmlspecialchars(stripslashes($folder->title), ENT_QUOTES);
-                    if (empty($arboHtml)) {
-                        $arboHtml = $arboHtml_tmp;
-                    } else {
-                        $arboHtml .= ' » '.$arboHtml_tmp;
+                // Prepare tree
+                if ($idTree != $elem['id_tree']) {
+                    $arbo = $tree->getPath($elem['id_tree'], true);
+                    foreach ($arbo as $folder) {
+                        $arboHtml_tmp = htmlspecialchars(stripslashes($folder->title), ENT_QUOTES);
+                        if (empty($arboHtml)) {
+                            $arboHtml = $arboHtml_tmp;
+                        } else {
+                            $arboHtml .= ' » '.$arboHtml_tmp;
+                        }
                     }
+                    fputs(
+                        $outstream,
+                        '
+        <tr class="path"><td colspan="5">'.$arboHtml.'</td></tr>'
+                    );
+                    $idTree = $elem['id_tree'];
                 }
+
+                $encPw = GibberishAES::enc($elem['pw'], $post_pdf_password);
                 fputs(
                     $outstream,
                     '
-        <tr class="path"><td colspan="5">'.$arboHtml.'</td></tr>'
-                );
-                $idTree = $elem['id_tree'];
-            }
-
-            $encPw = GibberishAES::enc($elem['pw'], $post_pdf_password);
-            fputs(
-                $outstream,
-                '
         <tr class="'.$lineType.'">
             <td>'.addslashes($elem['label']).'</td>
             <td align="center"><span class="span_pw" id="span_'.$elem['id'].'"><a href="#" onclick="decryptme('.$elem['id'].', \''.$encPw.'\');return false;">Decrypt </a></span><input type="hidden" id="hide_'.$elem['id'].'" value="'.$encPw.'" /></td>
@@ -700,16 +700,16 @@ 
             <td align="center">'.$login.'</td>
             <td align="center">'.$url.'</td>
             </tr>'
-            );
-        }
+                );
+            }
 
-        fclose($outstream);
+            fclose($outstream);
 
-        // send back and continue
-        echo '[{"loop":"true", "number":"'.$post_number.'", "cpt":"'.$post_cpt.'", "file":"'.$post_file.'", "idsList":"'.$post_idsList.'" , "file_link":"'.$post_file_link.'"}]';
-        break;
+            // send back and continue
+            echo '[{"loop":"true", "number":"'.$post_number.'", "cpt":"'.$post_cpt.'", "file":"'.$post_file.'", "idsList":"'.$post_idsList.'" , "file_link":"'.$post_file_link.'"}]';
+            break;
 
-            //CASE export in HTML format - Iteration loop
+                //CASE export in HTML format - Iteration loop
         case "export_to_html_format_finalize":
             // Load includes
             include $SETTINGS['cpassman_dir'].'/includes/config/include.php';

includes/language/german.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 global $LANG;
-$LANG = array (
+$LANG = array(
     'provide_yubico_identifiers' => 'Please provide your Yubico identifiers',
     'admin_yubico_authentication_setting' => 'Enable Yubico authentication',
     'yubico_user_id' => 'Client ID',

includes/language/french.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 global $LANG;
-$LANG = array (
+$LANG = array(
     'provide_yubico_identifiers' => 'Merci de fournir vos identifiants Yubico',
     'admin_yubico_authentication_setting' => 'Activer la double identification avec Yubico',
     'yubico_user_id' => 'ID client',

includes/language/czech.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 global $LANG;
-$LANG = array (
+$LANG = array(
     'provide_yubico_identifiers' => 'Please provide your Yubico identifiers',
     'admin_yubico_authentication_setting' => 'Enable Yubico authentication',
     'yubico_user_id' => 'Client ID',

includes/language/catalan.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 global $LANG;
-$LANG = array (
+$LANG = array(
     'provide_yubico_identifiers' => 'Please provide your Yubico identifiers',
     'admin_yubico_authentication_setting' => 'Enable Yubico authentication',
     'yubico_user_id' => 'Client ID',

includes/language/spanish.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 global $LANG;
-$LANG = array (
+$LANG = array(
     'provide_yubico_identifiers' => 'Please provide your Yubico identifiers',
     'admin_yubico_authentication_setting' => 'Enable Yubico authentication',
     'yubico_user_id' => 'Client ID',