nilsteampassnet / TeamPass

kb.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     "SELECT id, login FROM ".prefix_table("users")." ORDER BY login ASC"
 );
 $counter = DB::count();
-if ($counter>0) {
+if ($counter > 0) {
     foreach ($rows as $reccord) {
         $tab_users[$reccord['login']] = array(
             'id'=>$reccord['id'],

items.offline.php

Spacing +13 added lines, -13 removed lines

@@ -116,35 +116,35 @@ 
         $("#offline_password").simplePassMeter({
             "requirements": {},
             "container": "#offline_pw_strength",
-            "defaultText" : "<?php echo $LANG['index_pw_level_txt'];?>",
+            "defaultText" : "<?php echo $LANG['index_pw_level_txt']; ?>",
             "ratings": [
                 {"minScore": 0,
                     "className": "meterFail",
-                    "text": "<?php echo $LANG['complex_level0'];?>"
+                    "text": "<?php echo $LANG['complex_level0']; ?>"
                 },
                 {"minScore": 25,
                     "className": "meterWarn",
-                    "text": "<?php echo $LANG['complex_level1'];?>"
+                    "text": "<?php echo $LANG['complex_level1']; ?>"
                 },
                 {"minScore": 50,
                     "className": "meterWarn",
-                    "text": "<?php echo $LANG['complex_level2'];?>"
+                    "text": "<?php echo $LANG['complex_level2']; ?>"
                 },
                 {"minScore": 60,
                     "className": "meterGood",
-                    "text": "<?php echo $LANG['complex_level3'];?>"
+                    "text": "<?php echo $LANG['complex_level3']; ?>"
                 },
                 {"minScore": 70,
                     "className": "meterGood",
-                    "text": "<?php echo $LANG['complex_level4'];?>"
+                    "text": "<?php echo $LANG['complex_level4']; ?>"
                 },
                 {"minScore": 80,
                     "className": "meterExcel",
-                    "text": "<?php echo $LANG['complex_level5'];?>"
+                    "text": "<?php echo $LANG['complex_level5']; ?>"
                 },
                 {"minScore": 90,
                     "className": "meterExcel",
-                    "text": "<?php echo $LANG['complex_level6'];?>"
+                    "text": "<?php echo $LANG['complex_level6']; ?>"
                 }
             ]
         });
@@ -162,7 +162,7 @@ 
      */
     function generateOfflineFile()
     {
-        $("#offline_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait'];?>').attr("class","").show();
+        $("#offline_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait']; ?>').attr("class","").show();
 
         //Get list of selected folders
         var ids = "";
@@ -172,19 +172,19 @@ 
         });
 
         if (ids == "") {
-            $("#offline_information").show().html("<?php echo $LANG['error_no_selected_folder'];?>").attr("class","ui-state-error");
+            $("#offline_information").show().html("<?php echo $LANG['error_no_selected_folder']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#offline_information").effect( "fade", "slow" );}, 1000);
             return;
         }
 
         if ($("#offline_password").val() == "") {
-            $("#offline_information").show().html("<?php echo $LANG['pdf_password_warning'];?>").attr("class","ui-state-error");
+            $("#offline_information").show().html("<?php echo $LANG['pdf_password_warning']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#offline_information").effect( "fade", "slow" );}, 1000);
             return;
         }
 
         if ($("#offline_pw_strength_value").val() < $("#min_offline_pw_strength_value").val()) {
-            $("#offline_information").addClass("ui-state-error ui-corner-all").show().html("<?php echo $LANG['error_complex_not_enought'];?>");
+            $("#offline_information").addClass("ui-state-error ui-corner-all").show().html("<?php echo $LANG['error_complex_not_enought']; ?>");
             setTimeout(function(){$("#offline_information").effect( "fade", "slow" );}, 1000);
             return;
         }
@@ -216,7 +216,7 @@ 
     {
         // prpare list of ids to treat during this run
         if (idsList != "") {
-            $("#offline_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait'];?> - ' + Math.round((parseInt(cpt)*100)/parseInt(number)) + "%");
+            $("#offline_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait']; ?> - ' + Math.round((parseInt(cpt)*100)/parseInt(number)) + "%");
 
             tab = idsList.split(';');
             idTree = tab[0];

admin.settings.load.php

Spacing +63 added lines, -63 removed lines

@@ -62,7 +62,7 @@ 
             $("#tbl_categories").append(
                 '<tr id="t_cat_'+data[0].id+'"><td colspan="2">'+
                 '<input type="text" id="catOrd_'+data[0].id+'" size="1" class="category_order" value="1" />&nbsp;&nbsp;'+
-                '<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category'];?>" onclick="fieldAdd('+
+                '<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category']; ?>" onclick="fieldAdd('+
                 data[0].id+')" style="cursor:pointer;">'+
                 '<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-plus fa-stack-1x fa-inverse"></i>'+
                 '</span>&nbsp;'+
@@ -70,10 +70,10 @@ 
                 '<label for="item_'+data[0].id+'_cat" id="item_'+data[0].id+'">'+
                 $("#new_category_label").val()+'</label>'+
                 '</td><td>'+
-                '<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders'];?>" onclick="catInFolders('+data[0].id+')" style="cursor:pointer;">'+
+                '<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders']; ?>" onclick="catInFolders('+data[0].id+')" style="cursor:pointer;">'+
                 '<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-edit fa-stack-1x fa-inverse"></i>'+
                 '</span>&nbsp;'+
-                '<?php echo $LANG['category_in_folders_title'];?>:'+
+                '<?php echo $LANG['category_in_folders_title']; ?>:'+
                 '<span style="font-family:italic; margin-left:10px;" id="catFolders_'+data[0].id+'"></span>'+
                 '<input type="hidden" id="catFoldersList_'+data[0].id+'" value="'+data[0].id+'" /></td><td></td>');
             // Add new cat
@@ -94,7 +94,7 @@ 
     var data = $("input[name=sel_item]:checked").attr("id").split('_');
     $("#post_id").val(data[1]);
     $("#post_type").val("renameItem");
-    $("#category_confirm_text").html("<?php echo $LANG['confirm_rename'];?>");
+    $("#category_confirm_text").html("<?php echo $LANG['confirm_rename']; ?>");
     $("#category_confirm").dialog("open");
 }
 
@@ -105,7 +105,7 @@ 
     var data = $("input[name=sel_item]:checked").attr("id").split('_');
     $("#post_id").val(data[1]);
     $("#post_type").val("deleteCategory");
-    $("#category_confirm_text").html("<?php echo $LANG['confirm_deletion'];?>");
+    $("#category_confirm_text").html("<?php echo $LANG['confirm_deletion']; ?>");
     $("#category_confirm").dialog("open");
 }
 
@@ -116,7 +116,7 @@ 
     var data = $("input[name=sel_item]:checked").attr("id").split('_');
     $("#post_id").val(data[1]);
     $("#post_type").val("moveItem");
-    $("#category_confirm_text").html("<?php echo $LANG['confirm_moveto'];?>");
+    $("#category_confirm_text").html("<?php echo $LANG['confirm_moveto']; ?>");
     $("#category_confirm").dialog("open");
 }
 
@@ -167,7 +167,7 @@ 
         "sources/categories.queries.php",
         {
             type    : "loadFieldsList",
-            title   : prepareExchangedData(sanitizeString($("#new_category_label").val()), "encode", "<?php echo $_SESSION['key'];?>")
+            title   : prepareExchangedData(sanitizeString($("#new_category_label").val()), "encode", "<?php echo $_SESSION['key']; ?>")
         },
         function(data) {
             var newList = '<table id="tbl_categories" style="">';
@@ -177,17 +177,17 @@ 
                 if (val[0] === "1") {
                     newList += '<tr id="t_cat_'+val[1]+'"><td colspan="2">'+
                     '<input type="text" id="catOrd_'+val[1]+'" size="1" class="category_order" value="'+val[3]+'" />&nbsp;'+
-                    '<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category'];?>" onclick="fieldAdd('+
+                    '<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category']; ?>" onclick="fieldAdd('+
                     val[1]+')" style="cursor:pointer;">'+
                     '<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-plus fa-stack-1x fa-inverse"></i>'+
                     '</span>&nbsp;'+
                     '<input type="radio" name="sel_item" id="item_'+val[1]+'_cat" />'+
                     '<label for="item_'+val[1]+'_cat" id="item_'+val[1]+'">'+val[2]+'</label>'+
                     '</td><td>'+
-                    '<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders'];?>" onclick="catInFolders('+val[1]+')" style="cursor:pointer;">'+
+                    '<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders']; ?>" onclick="catInFolders('+val[1]+')" style="cursor:pointer;">'+
                     '<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-edit fa-stack-1x fa-inverse"></i>'+
                     '</span>&nbsp;'+
-                    '<?php echo $LANG['category_in_folders_title'];?>:'+
+                    '<?php echo $LANG['category_in_folders_title']; ?>:'+
                     '<span style="font-family:italic; margin-left:10px;" id="catFolders_'+val[1]+'">'+val[4]+'</span>'+
                     '<input type="hidden" id="catFoldersList_'+val[1]+'" value="'+val[5]+'" /></td></tr>';
                 } else {
@@ -199,9 +199,9 @@ 
                     if (val[4] !== "") {
                         newList += '<span id="encryt_data_'+val[1]+'" style="margin-left:4px; cursor:pointer;">';
                         if (val[4] === "1") {
-                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
+                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
                         } else if (val[4] === "0") {
-                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
+                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
                         }
                         newList += '</span>'
                     }
@@ -234,7 +234,7 @@ 
     else if (action === "admin_action_change_salt_key") {
         option = aes_encrypt(sanitizeString($("#new_salt_key").val()));
     } else if (action === "admin_email_send_backlog") {
-        $("#email_testing_results").show().html("<?php echo addslashes($LANG['please_wait']);?>").attr("class","ui-corner-all ui-state-focus");
+        $("#email_testing_results").show().html("<?php echo addslashes($LANG['please_wait']); ?>").attr("class","ui-corner-all ui-state-focus");
     } else if (action === "admin_action_attachments_cryption") {
         option = $("input[name=attachments_cryption]:checked").val();
         if (option === "" || option === undefined) {
@@ -261,7 +261,7 @@ 
         if (option === "" || option.length === 0) return;
 
         // convert to json string
-        option = prepareExchangedData(JSON.stringify(option) , "encode", "<?php echo $_SESSION['key'];?>");
+        option = prepareExchangedData(JSON.stringify(option) , "encode", "<?php echo $_SESSION['key']; ?>");
     }
     //Lauchn ajax query
     $.post(
@@ -274,7 +274,7 @@ 
             $("#div_loading").hide();
             if (data != null) {
                 if (data[0].result == "db_backup") {
-                    $("#result_admin_action_db_backup").html("<span class='fa fa-file-code-o'></span>&nbsp;<a href='"+data[0].href+"'><?php echo $LANG['pdf_download'];?></a>").show();
+                    $("#result_admin_action_db_backup").html("<span class='fa fa-file-code-o'></span>&nbsp;<a href='"+data[0].href+"'><?php echo $LANG['pdf_download']; ?></a>").show();
                 } else if (data[0].result == "pf_done") {
                     $("#result_admin_action_check_pf").html("<span class='fa fa-check mi-green'></span>").show();
                 } else if (data[0].result == "db_restore") {
@@ -289,9 +289,9 @@ 
                 } else if (data[0].result == "db_optimize") {
                     $("#result_admin_action_db_optimize").html("<span class='fa fa-check mi-green'></span>").show();
                 } else if (data[0].result == "purge_old_files") {
-                    $("#result_admin_action_purge_old_files").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].nb_files_deleted+"&nbsp;<? echo $LANG['admin_action_purge_old_files_result'];?>").show();
+                    $("#result_admin_action_purge_old_files").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].nb_files_deleted+"&nbsp;<? echo $LANG['admin_action_purge_old_files_result']; ?>").show();
                 } else if (data[0].result == "db_clean_items") {
-                    $("#result_admin_action_db_clean_items").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].nb_items_deleted+"&nbsp;<?php echo $LANG['admin_action_db_clean_items_result'];?>").show();
+                    $("#result_admin_action_db_clean_items").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].nb_items_deleted+"&nbsp;<?php echo $LANG['admin_action_db_clean_items_result']; ?>").show();
                 } else if (data[0].result == "changed_salt_key") {
                     //deconnect user
                     $("#menu_action").val("deconnexion");
@@ -299,9 +299,9 @@ 
                     window.location.href = "logout.php"
                 } else if (data[0].result == "email_test_conf" || data[0].result == "admin_email_send_backlog") {
                     if (data[0].error != "") {
-                        $("#email_testing_results").html("<?php echo addslashes($LANG['admin_email_result_nok']);?>&nbsp;"+data[0].message).show().attr("class","ui-state-error ui-corner-all");
+                        $("#email_testing_results").html("<?php echo addslashes($LANG['admin_email_result_nok']); ?>&nbsp;"+data[0].message).show().attr("class","ui-state-error ui-corner-all");
                     } else {
-                        $("#email_testing_results").html("<?php echo addslashes(str_replace("#email#", $_SESSION['user_email'], $LANG['admin_email_result_ok']));?>").show().attr("class","ui-corner-all ui-state-focus");
+                        $("#email_testing_results").html("<?php echo addslashes(str_replace("#email#", $_SESSION['user_email'], $LANG['admin_email_result_ok'])); ?>").show().attr("class","ui-corner-all ui-state-focus");
                     }
                 } else if (data[0].result == "pw_prefix_correct") {
                     $("result_admin_action_pw_prefix_correct").html(data[0].ret).show();
@@ -326,7 +326,7 @@ 
                 } else if (data[0].result === "backup_decrypt_fails") {
                     $("#result_admin_script_backup").html(data[0].msg).show();
                 } else if (data[0].result === "backup_decrypt_success") {
-                    $("#result_admin_script_backup").html("<span class='fa fa-check mi-green'></span>&nbsp;<?php echo addslashes($LANG['file_is_now_ready']);?> - " + data[0].msg).show(1).delay(5000).fadeOut(500);
+                    $("#result_admin_script_backup").html("<span class='fa fa-check mi-green'></span>&nbsp;<?php echo addslashes($LANG['file_is_now_ready']); ?> - " + data[0].msg).show(1).delay(5000).fadeOut(500);
                 }
                 //--
             }
@@ -339,7 +339,7 @@ 
 *
 */
 function confirmChangingSk() {
-    if (confirm("<?php echo addslashes($LANG['confirm_database_reencryption']);?>")) {
+    if (confirm("<?php echo addslashes($LANG['confirm_database_reencryption']); ?>")) {
         changeMainSaltKey('starting', '');
     }
 }
@@ -360,14 +360,14 @@ 
     // start change
     if (start === "starting") {
         // inform
-        $("#changeMainSaltKey_message").html("<i class=\"fa fa-cog fa-spin fa\"></i>&nbsp;<?php echo $LANG['starting'];?>").show();
+        $("#changeMainSaltKey_message").html("<i class=\"fa fa-cog fa-spin fa\"></i>&nbsp;<?php echo $LANG['starting']; ?>").show();
 
         // launch query
         $.post(
             "sources/admin.queries.php",
             {
                 type     : "admin_action_change_salt_key___start",
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 if (data[0].error == "" && data[0].nextAction == "encrypt_items") {
@@ -379,7 +379,7 @@ 
                     //changeMainSaltKey(0, "files");
                 } else {
                     // error mngt
-                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-alert fa-spin fa\"></i>&nbsp;<?php echo $LANG['error_sent_back'];?> : "+data[0].error);
+                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-alert fa-spin fa\"></i>&nbsp;<?php echo $LANG['error_sent_back']; ?> : "+data[0].error);
                 }
             },
             "json"
@@ -388,7 +388,7 @@ 
     } else if (isFinite(start) && object !== "") {
         console.log("Step Encrypt - " +start+" ; "+nb+" ; "+$("#changeMainSaltKey_itemsCount").val());
 
-        $("#changeMainSaltKey_message").html("<i class=\"fa fa-cog fa-spin fa\"></i>&nbsp;<?php echo $LANG['treating_items'];?>...&nbsp;"+start+" > "+(parseInt(start)+parseInt(nb))+" (<?php echo $LANG['total_number_of_items'];?> : "+$("#changeMainSaltKey_itemsCount").val()+")");
+        $("#changeMainSaltKey_message").html("<i class=\"fa fa-cog fa-spin fa\"></i>&nbsp;<?php echo $LANG['treating_items']; ?>...&nbsp;"+start+" > "+(parseInt(start)+parseInt(nb))+" (<?php echo $LANG['total_number_of_items']; ?> : "+$("#changeMainSaltKey_itemsCount").val()+")");
 
         $.post(
             "sources/admin.queries.php",
@@ -398,7 +398,7 @@ 
                 start        : start,
                 length       : nb,
                 nbItems      : $("#changeMainSaltKey_itemsCount").val(),
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 console.log("Next action: "+data[0].nextAction);
@@ -412,11 +412,11 @@ 
                     }
                     changeMainSaltKey(data[0].nextStart, object);
                 } else if (data[0].nextAction === "finishing") {
-                    $("#changeMainSaltKey_message").html("<?php echo $LANG['finalizing'];?>...");
+                    $("#changeMainSaltKey_message").html("<?php echo $LANG['finalizing']; ?>...");
                     changeMainSaltKey("finishing");
                 } else {
                     // error mngt
-                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-alert fa-spin fa\"></i>&nbsp;<?php echo $LANG['error_sent_back'];?> : "+data[0].error);
+                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-alert fa-spin fa\"></i>&nbsp;<?php echo $LANG['error_sent_back']; ?> : "+data[0].error);
                 }
             },
             "json"
@@ -427,12 +427,12 @@ 
             "sources/admin.queries.php",
             {
                 type     : "admin_action_change_salt_key___end",
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 if (data[0].nextAction === "done") {
                     console.log("done");
-                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-info fa-lg\"></i>&nbsp;<?php echo $LANG['alert_message_done']." ".$LANG['number_of_items_treated'];?> : " + $("#changeMainSaltKey_itemsCountTotal").val() + '<p><?php echo $LANG['check_data_after_reencryption'];?><p><div style=\"margin-top:5px;\"><a href=\"#\" onclick=\"encryption_show_revert()\"><?php echo $LANG['revert'];?></a></div>');
+                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-info fa-lg\"></i>&nbsp;<?php echo $LANG['alert_message_done']." ".$LANG['number_of_items_treated']; ?> : " + $("#changeMainSaltKey_itemsCountTotal").val() + '<p><?php echo $LANG['check_data_after_reencryption']; ?><p><div style=\"margin-top:5px;\"><a href=\"#\" onclick=\"encryption_show_revert()\"><?php echo $LANG['revert']; ?></a></div>');
                 } else {
                     // error mngt
                 }
@@ -444,13 +444,13 @@ 
 }
 
 function encryption_show_revert() {
-    if (confirm('<?php echo $LANG['revert_the_database'];?>')) {
-        $("#changeMainSaltKey_message").append('<div style="margin-top:5px;"><i class="fa fa-cog fa-spin fa-lg"></i>&nbsp;<?php echo addslashes($LANG['please_wait']);?>...</div>')
+    if (confirm('<?php echo $LANG['revert_the_database']; ?>')) {
+        $("#changeMainSaltKey_message").append('<div style="margin-top:5px;"><i class="fa fa-cog fa-spin fa-lg"></i>&nbsp;<?php echo addslashes($LANG['please_wait']); ?>...</div>')
         $.post(
             "sources/admin.queries.php",
             {
                 type    : "admin_action_change_salt_key___restore_backup",
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 $("#changeMainSaltKey_message").html('').hide();
@@ -474,8 +474,8 @@ 
         "sources/admin.queries.php",
         {
             type    : "save_option_change",
-            data    : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key'];?>"),
-            key     : "<?php echo $_SESSION['key'];?>"
+            data    : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key']; ?>"),
+            key     : "<?php echo $_SESSION['key']; ?>"
         },
         function(data) {
             // force page reload in case of encryptClientServer
@@ -485,7 +485,7 @@ 
             }
             //decrypt data
             try {
-                data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+                data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
             } catch (e) {
                 // error
                 $("#message_box").html("An error appears. Answer from Server cannot be parsed!<br />Returned data:<br />"+data).show().fadeOut(4000);
@@ -524,8 +524,8 @@ 
         drag: true, // allow dragging the toggle between positions
         click: true, // allow clicking on the toggle
         text: {
-            on: '<?php echo $LANG['yes'];?>', // text for the ON position
-            off: '<?php echo $LANG['no'];?>' // and off
+            on: '<?php echo $LANG['yes']; ?>', // text for the ON position
+            off: '<?php echo $LANG['no']; ?>' // and off
         },
         on: true, // is the toggle ON on init
         animate: 250, // animation time (ms)
@@ -550,8 +550,8 @@ 
             "sources/admin.queries.php",
             {
                 type    : "save_option_change",
-                data     : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key'];?>"),
-                key     : "<?php echo $_SESSION['key'];?>"
+                data     : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key']; ?>"),
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 // force page reload in case of encryptClientServer
@@ -561,7 +561,7 @@ 
                 }
                 //decrypt data
                 try {
-                    data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+                    data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
                 } catch (e) {
                     // error
                     $("#message_box").html("An error appears. Answer from Server cannot be parsed!<br />Returned data:<br />"+data).show().fadeOut(4000);
@@ -605,7 +605,7 @@ 
             }
         },
         beforeLoad: function( event, ui ) {
-            ui.panel.html('<div id="loader_tab"><i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['loading'];?>...</div>')
+            ui.panel.html('<div id="loader_tab"><i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['loading']; ?>...</div>')
         },
         load: function( event, ui ) {
             $("#loader_tab").remove();
@@ -638,9 +638,9 @@ 
         autoOpen: false,
         width: 400,
         height: 120,
-        title: "<?php echo $LANG['confirm'];?>",
+        title: "<?php echo $LANG['confirm']; ?>",
         buttons: {
-            "<?php echo $LANG['confirm'];?>": function() {
+            "<?php echo $LANG['confirm']; ?>": function() {
                 $("#div_loading").show();
                 var $this = $(this);
                 // prepare data to send
@@ -675,7 +675,7 @@ 
                     "json"
                );
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $("#div_loading").hide();
                 $(this).dialog("close");
             }
@@ -688,9 +688,9 @@ 
         autoOpen: false,
         width: 500,
         height: 150,
-        title: "<?php echo $LANG['category_in_folders'];?>",
+        title: "<?php echo $LANG['category_in_folders']; ?>",
         buttons: {
-            "<?php echo $LANG['confirm'];?>": function() {
+            "<?php echo $LANG['confirm']; ?>": function() {
                 if ($("#new_field_title").val() != "" && $("#post_id").val() != "") {
                     $("#div_loading").show();
                     var $this = $(this);
@@ -712,7 +712,7 @@ 
                     );
                 }
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $("#div_loading").hide();
                 $(this).dialog("close");
             }
@@ -722,8 +722,8 @@ 
     $("#cat_folders_selection").multiselect({
         selectedList: 7,
         multiple:true,
-        checkAllText: "<?php echo $LANG['check_all_text'];?>",
-        uncheckAllText: "<?php echo $LANG['uncheck_all_text'];?>"
+        checkAllText: "<?php echo $LANG['check_all_text']; ?>",
+        uncheckAllText: "<?php echo $LANG['uncheck_all_text']; ?>"
     });
 
     $("#category_in_folder").dialog({
@@ -732,12 +732,12 @@ 
         autoOpen: false,
         width: 400,
         height: 350,
-        title: "<?php echo $LANG['category_in_folders'];?>",
+        title: "<?php echo $LANG['category_in_folders']; ?>",
         open: function() {
             $("#cat_folders_selection").multiselect('refresh');
         },
         buttons: {
-            "<?php echo $LANG['confirm'];?>": function() {
+            "<?php echo $LANG['confirm']; ?>": function() {
                 // get list of selected folders
                 var ids = "";
                 $("#cat_folders_selection :selected").each(function(i, selected) {
@@ -767,7 +767,7 @@ 
                     );
                 }
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $("#div_loading").hide();
                 $(this).dialog("close");
             }
@@ -780,12 +780,12 @@ 
         autoOpen: false,
         width:250,
         height:150,
-        title: "<?php echo $LANG['admin_action_db_restore_key'];?>",
+        title: "<?php echo $LANG['admin_action_db_restore_key']; ?>",
         buttons: {
-            "<?php echo $LANG['ok'];?>": function() {
+            "<?php echo $LANG['ok']; ?>": function() {
                 LaunchAdminActions("admin_action_db_restore", $("#restore_bck_fileObj").val()+"&"+$("#restore_bck_encryption_key").val());
             },
-            "<?php echo $LANG['cancel_button'];?>'": function() {
+            "<?php echo $LANG['cancel_button']; ?>'": function() {
                 $(this).dialog("close");
             }
         }
@@ -911,11 +911,11 @@ 
     $.post("sources/admin.queries.php",
         {
             type        : "is_backup_table_existing",
-            key         : "<?php echo $_SESSION['key'];?>"
+            key         : "<?php echo $_SESSION['key']; ?>"
         },
         function(data) {
             if (data === "1") {
-                $("#changeMainSaltKey_message").show().html('<?php echo addslashes($LANG['previous_backup_exists']);?>&nbsp;&nbsp;<b><a href="#" id="but_bck_restore"><?php echo $LANG['yes'];?></a></b><br /><?php echo $LANG['previous_backup_exists_delete'];?>&nbsp;&nbsp;<b><a href="#" id="but_bck_delete"><?php echo $LANG['yes'];?></a></b>');
+                $("#changeMainSaltKey_message").show().html('<?php echo addslashes($LANG['previous_backup_exists']); ?>&nbsp;&nbsp;<b><a href="#" id="but_bck_restore"><?php echo $LANG['yes']; ?></a></b><br /><?php echo $LANG['previous_backup_exists_delete']; ?>&nbsp;&nbsp;<b><a href="#" id="but_bck_delete"><?php echo $LANG['yes']; ?></a></b>');
 
                 // Restore the backup
                 $("#but_bck_restore").click(function(e) {
@@ -924,13 +924,13 @@ 
 
                 // Delete the backup
                 $("#but_bck_delete").click(function(e) {
-                    if (confirm("<?php echo $LANG['wipe_backup_data'];?>")) {
-                        $("#changeMainSaltKey_message").append('<div style="margin-top:5px;"><i class="fa fa-cog fa-spin fa-lg"></i>&nbsp;<?php echo addslashes($LANG['please_wait']);?>...</div>')
+                    if (confirm("<?php echo $LANG['wipe_backup_data']; ?>")) {
+                        $("#changeMainSaltKey_message").append('<div style="margin-top:5px;"><i class="fa fa-cog fa-spin fa-lg"></i>&nbsp;<?php echo addslashes($LANG['please_wait']); ?>...</div>')
                         $.post(
                             "sources/admin.queries.php",
                             {
                                 type    : "admin_action_change_salt_key___delete_backup",
-                                key     : "<?php echo $_SESSION['key'];?>"
+                                key     : "<?php echo $_SESSION['key']; ?>"
                             },
                             function(data) {
                                 $("#changeMainSaltKey_message").html('').hide();
@@ -995,9 +995,9 @@ 
             // show to user
             if (data[0].error === ""){
                 if (encrypted_data === "1") {
-                    $("#encryt_data_"+id).html('<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data'];?>" onclick="changeEncrypMode(\''+id+'\', \'0\')"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>');
+                    $("#encryt_data_"+id).html('<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data']; ?>" onclick="changeEncrypMode(\''+id+'\', \'0\')"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>');
                 } else {
-                    $("#encryt_data_"+id).html('<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data'];?>" onclick="changeEncrypMode(\''+id+'\', \'1\')"></i>');
+                    $("#encryt_data_"+id).html('<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data']; ?>" onclick="changeEncrypMode(\''+id+'\', \'1\')"></i>');
                 }
             }
             $("#div_loading").hide();

find.load.php

Spacing +35 added lines, -35 removed lines

@@ -21,7 +21,7 @@ 
 //<![CDATA[
 function aes_decrypt(text)
 {
-    return Aes.Ctr.decrypt(text, "<?php echo $_SESSION['key'];?>", 256);
+    return Aes.Ctr.decrypt(text, "<?php echo $_SESSION['key']; ?>", 256);
 }
 
 /*
@@ -38,10 +38,10 @@ 
         "sources/items.queries.php",
         {
             type    : "refresh_visible_folders",
-            key        : "<?php echo $_SESSION['key'];?>"
+            key        : "<?php echo $_SESSION['key']; ?>"
         },
         function(data) {
-            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
             $("#copy_in_folder").find('option').remove().end().append(data.selectFullVisibleFoldersOptions);
             $('#div_copy_item_to_folder').dialog('open');
         }
@@ -55,9 +55,9 @@ 
       autoOpen: false,
       width: 400,
       height: 200,
-      title: "<?php echo $LANG['item_menu_copy_elem'];?>",
+      title: "<?php echo $LANG['item_menu_copy_elem']; ?>",
       buttons: {
-          "<?php echo $LANG['ok'];?>": function() {
+          "<?php echo $LANG['ok']; ?>": function() {
               //Send query
                 $.post(
                     "sources/items.queries.php",
@@ -65,7 +65,7 @@ 
                         type    : "copy_item",
                         item_id : $('#id_selected_item').val(),
                         folder_id : $('#copy_in_folder').val(),
-                        key        : "<?php echo $_SESSION['key'];?>"
+                        key        : "<?php echo $_SESSION['key']; ?>"
                     },
                     function(data) {
                         //check if format error
@@ -74,7 +74,7 @@ 
                         }
                         //if OK
                         if (data[0].status == "ok") {
-                            $("#div_dialog_message_text").html("<?php echo $LANG['alert_message_done'];?>");
+                            $("#div_dialog_message_text").html("<?php echo $LANG['alert_message_done']; ?>");
                             $("#div_dialog_message").dialog('open');
                             $("#div_copy_item_to_folder").dialog('close');
                         }
@@ -82,7 +82,7 @@ 
                     "json"
                );
           },
-          "<?php echo $LANG['cancel_button'];?>": function() {
+          "<?php echo $LANG['cancel_button']; ?>": function() {
               $("#copy_item_to_folder_show_error").html("").hide();
               $(this).dialog('close');
           }
@@ -105,10 +105,10 @@ 
       autoOpen: false,
       width: 450,
       height: 220,
-      title: "<?php echo $LANG['see_item_title'];?>",
+      title: "<?php echo $LANG['see_item_title']; ?>",
       open:
         function(event, ui) {
-              $("#div_item_data_show_error").html("<?php echo $LANG['admin_info_loading'];?>").show();
+              $("#div_item_data_show_error").html("<?php echo $LANG['admin_info_loading']; ?>").show();
             $.post(
                 "sources/items.queries.php",
                 {
@@ -117,25 +117,25 @@ 
                     salt_key_required : $('#personalItem').val(),
                     salt_key_set : $('#personal_sk_set').val(),
                     page    : "find",
-                    key        : "<?php echo $_SESSION['key'];?>"
+                    key        : "<?php echo $_SESSION['key']; ?>"
                 },
                 function(data) {
                     //decrypt data
-                    data = prepareExchangedData(data, "decode", "<?php echo $_SESSION['key'];?>");
+                    data = prepareExchangedData(data, "decode", "<?php echo $_SESSION['key']; ?>");
                     var return_html = "";
                     if (data.show_detail_option != "0" || data.show_details == 0) {
                         //item expired
-                        return_html = "<?php echo $LANG['not_allowed_to_see_pw_is_expired'];?>";
+                        return_html = "<?php echo $LANG['not_allowed_to_see_pw_is_expired']; ?>";
                     } else if (data.show_details == "0") {
                         //Admin cannot see Item
-                        return_html = "<?php echo $LANG['not_allowed_to_see_pw'];?>";
+                        return_html = "<?php echo $LANG['not_allowed_to_see_pw']; ?>";
                     } else {
                         return_html = "<table>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['label'];?> :</td><td style='font-style:italic;display:inline;'>"+data.label+"</td></tr>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['description'];?> :</td><td style='font-style:italic;display:inline;'>"+data.description+"</td></tr>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['pw'];?> :</td><td style='font-style:italic;display:inline;'>"+unsanitizeString(data.pw)+"</td></tr>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['index_login'];?> :</td><td style='font-style:italic;display:inline;'>"+data.login+"</td></tr>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['url'];?> :</td><td style='font-style:italic;display:inline;'>"+data.url+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['label']; ?> :</td><td style='font-style:italic;display:inline;'>"+data.label+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['description']; ?> :</td><td style='font-style:italic;display:inline;'>"+data.description+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['pw']; ?> :</td><td style='font-style:italic;display:inline;'>"+unsanitizeString(data.pw)+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['index_login']; ?> :</td><td style='font-style:italic;display:inline;'>"+data.login+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['url']; ?> :</td><td style='font-style:italic;display:inline;'>"+data.url+"</td></tr>"+
                         "</table>";
                     }
                     $("#div_item_data_show_error").html("").hide();
@@ -150,7 +150,7 @@ 
         }
         ,
       buttons: {
-          "<?php echo $LANG['ok'];?>": function() {
+          "<?php echo $LANG['ok']; ?>": function() {
               $(this).dialog('close');
           }
       }
@@ -166,7 +166,7 @@ 
         "sAjaxSource": "sources/find.queries.php",
         "bJQueryUI": true,
         "oLanguage": {
-            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
         },
         "fnInitComplete": function() {
             $("#find_page input").focus();
@@ -194,7 +194,7 @@ 
         autoOpen: false,
         width: 500,
         height: 400,
-        title: "<?php echo $LANG['mass_operation'];?>",
+        title: "<?php echo $LANG['mass_operation']; ?>",
         open: function() {
             var html = sel_items = sel_items_txt = item_id = '';
 
@@ -213,7 +213,7 @@ 
 
             // prepare display
             if ($("#div_mass_op").data('action') === "move") {
-                html = '<?php echo $LANG['you_decided_to_move_items'];?>: ' +
+                html = '<?php echo $LANG['you_decided_to_move_items']; ?>: ' +
                 '<div><ul>' + sel_items_txt + '</ul></div>';
                 var folder_options = '';
 
@@ -222,7 +222,7 @@ 
                     "sources/folders.queries.php",
                     {
                         type    : "get_list_of_folders",
-                        key     : "<?php echo $_SESSION['key'];?>"
+                        key     : "<?php echo $_SESSION['key']; ?>"
                     },
                     function(data) {
                         $("#div_loading").hide();
@@ -235,7 +235,7 @@ 
                         }
 
                         // destination folder
-                         html += '<div style=""><?php echo $LANG['import_keepass_to_folder'];?>:&nbsp;&nbsp;' +
+                         html += '<div style=""><?php echo $LANG['import_keepass_to_folder']; ?>:&nbsp;&nbsp;' +
                          '<select id="mass_move_destination_folder_id">' + data[0].list_folders + '</select>' +
                          '</div>';
 
@@ -245,19 +245,19 @@ 
                     "json"
                 );
             } else if ($("#div_mass_op").data('action') === "delete") {
-                html = '<?php echo $LANG['you_decided_to_delete_items'];?>: ' +
+                html = '<?php echo $LANG['you_decided_to_delete_items']; ?>: ' +
                 '<div><ul>' + sel_items_txt + '</ul></div>' +
-                '<div style="padding:10px;" class="ui-corner-all ui-state-error"><span class="fa fa-warning fa-lg"></span>&nbsp;<?php echo $LANG['confirm_deletion'];?></div>';
+                '<div style="padding:10px;" class="ui-corner-all ui-state-error"><span class="fa fa-warning fa-lg"></span>&nbsp;<?php echo $LANG['confirm_deletion']; ?></div>';
                 
                 $("#div_mass_html").html(html);
             }
 
         },
         buttons: {
-            "<?php echo $LANG['ok'];?>": function() {
+            "<?php echo $LANG['ok']; ?>": function() {
                 $("#div_mass_op_msg")
                     .addClass("ui-state-highlight")
-                    .html('<span class="fa fa-cog fa-spin fa-lg"></span>&nbsp;<?php echo $LANG['please_wait'];?>')
+                    .html('<span class="fa fa-cog fa-spin fa-lg"></span>&nbsp;<?php echo $LANG['please_wait']; ?>')
                     .show();
 
                 var sel_items = '';
@@ -270,7 +270,7 @@ 
                 if (sel_items === "") {
                     $("#div_mass_op_msg")
                         .addClass("ui-state-error")
-                        .html('<span class="fa fa-warning fa-lg"></span>&nbsp;<?php echo $LANG['must_select_items'];?>')
+                        .html('<span class="fa fa-warning fa-lg"></span>&nbsp;<?php echo $LANG['must_select_items']; ?>')
                         .show().delay(2000).fadeOut(1000);
                     return false;
                 }
@@ -285,7 +285,7 @@ 
                             type        : "mass_move_items",
                             item_ids    : sel_items,
                             folder_id   : $("#mass_move_destination_folder_id").val(),
-                            key         : "<?php echo $_SESSION['key'];?>"
+                            key         : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             //check if format error
@@ -297,7 +297,7 @@ 
                                 //reload search 
                                 oTable.api().ajax.reload();
 
-                                $("#main_info_box_text").html("<?php echo $LANG['alert_message_done'];?>");
+                                $("#main_info_box_text").html("<?php echo $LANG['alert_message_done']; ?>");
                                     $("#main_info_box").show().position({
                                         my: "center",
                                         at: "center top+75",
@@ -320,7 +320,7 @@ 
                         {
                             type        : "mass_delete_items",
                             item_ids    : sel_items,
-                            key         : "<?php echo $_SESSION['key'];?>"
+                            key         : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             //check if format error
@@ -332,7 +332,7 @@ 
                                 //reload search 
                                 oTable.api().ajax.reload();
 
-                                $("#main_info_box_text").html("<?php echo $LANG['alert_message_done'];?>");
+                                $("#main_info_box_text").html("<?php echo $LANG['alert_message_done']; ?>");
                                     $("#main_info_box").show().position({
                                         my: "center",
                                         at: "center top+75",
@@ -348,7 +348,7 @@ 
                     );
                 }
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $(this).dialog('close');
             }
         }

views.load.php

Spacing +6 added lines, -6 removed lines

@@ -167,7 +167,7 @@ 
 $(function() {
     $("#tabs").tabs({
         beforeLoad: function( event, ui ) {
-            ui.panel.html('<div id="loader_tab"><i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['loading'];?>...</div>')
+            ui.panel.html('<div id="loader_tab"><i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['loading']; ?>...</div>')
         },
         load: function( event, ui ) {
             $("#loader_tab").remove();
@@ -193,7 +193,7 @@ 
         autoOpen: false,
         width: 400,
         height: 150,
-        title: "<?php echo $LANG['please_confirm'];?>",
+        title: "<?php echo $LANG['please_confirm']; ?>",
         open : function() {
             // check if one is ticked
             var list_i = "";
@@ -213,13 +213,13 @@ 
 
             // confirm?
             if ($("#tab2_action").val() == "restoration") {
-                $("#tab2_dialog_html").html("<?php echo $LANG['views_confirm_restoration'];?>");
+                $("#tab2_dialog_html").html("<?php echo $LANG['views_confirm_restoration']; ?>");
             } else if ($("#tab2_action").val() == "deletion") {
-                $("#tab2_dialog_html").html("<?php echo $LANG['views_confirm_items_deletion'];?>");
+                $("#tab2_dialog_html").html("<?php echo $LANG['views_confirm_items_deletion']; ?>");
             }
         },
         buttons: {
-            "<?php echo $LANG['confirm'];?>": function() {
+            "<?php echo $LANG['confirm']; ?>": function() {
                 LoadingPage();
                 var list_i = "";
                 $(".cb_deleted_item:checked").each(function() {
@@ -262,7 +262,7 @@ 
                     );
                 }
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $(this).dialog("close");
             }
         }

profile.php

Indentation +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 
 // if DUOSecurity enabled then changing PWD is not allowed
 if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0)
-   echo '
+    echo '
     <div id="div_change_password" style="display:none; padding:5px;" class="ui-widget ui-state-default">
         <div style="text-align:center;margin:5px;padding:3px;" id="change_pwd_complexPw" class="ui-widget ui-state-active ui-corner-all"></div>
         <label for="new_pw" class="form_label">'.$LANG['index_new_pw'].' :</label>

Spacing +37 added lines, -37 removed lines

@@ -114,7 +114,7 @@ 
 if (isset($_SESSION['last_pw_change']) && !empty($_SESSION['last_pw_change'])) {
     echo '
     <div style="margin-bottom:6px;">
-        <i class="fa fa-calendar fa-fw fa-lg"></i>&nbsp;'. $LANG['index_last_pw_change'].' ', isset($_SESSION['settings']['date_format']) ? date($_SESSION['settings']['date_format'], $_SESSION['last_pw_change']) : (isset($_SESSION['last_pw_change']) ? date("d/m/Y", $_SESSION['last_pw_change']) : "-"). '. ', $_SESSION['numDaysBeforePwExpiration'] == "infinite" ? '' : $LANG['index_pw_expiration'].' '.$_SESSION['numDaysBeforePwExpiration'].' '.$LANG['days'].'
+        <i class="fa fa-calendar fa-fw fa-lg"></i>&nbsp;'. $LANG['index_last_pw_change'].' ', isset($_SESSION['settings']['date_format']) ? date($_SESSION['settings']['date_format'], $_SESSION['last_pw_change']) : (isset($_SESSION['last_pw_change']) ? date("d/m/Y", $_SESSION['last_pw_change']) : "-").'. ', $_SESSION['numDaysBeforePwExpiration'] == "infinite" ? '' : $LANG['index_pw_expiration'].' '.$_SESSION['numDaysBeforePwExpiration'].' '.$LANG['days'].'
     </div>';
 }
 echo '
@@ -217,7 +217,7 @@ 
     $(".tip").tooltipster({multiple: true});
     // password
     $("#but_change_password").click(function() {
-        $("#change_pwd_complexPw").html("<?php echo $LANG['complex_asked'];?> : <?php echo $_SESSION['settings']['pwComplexity'][$_SESSION['user_pw_complexity']][1];?>");
+        $("#change_pwd_complexPw").html("<?php echo $LANG['complex_asked']; ?> : <?php echo $_SESSION['settings']['pwComplexity'][$_SESSION['user_pw_complexity']][1]; ?>");
         $("#change_pwd_error").hide();
       $("#div_change_psk, #div_reset_psk").hide();
 
@@ -232,35 +232,35 @@ 
         $("#new_pw").simplePassMeter({
             "requirements": {},
             "container": "#pw_strength",
-            "defaultText" : "<?php echo $LANG['index_pw_level_txt'];?>",
+            "defaultText" : "<?php echo $LANG['index_pw_level_txt']; ?>",
             "ratings": [
                 {"minScore": 0,
                     "className": "meterFail",
-                    "text": "<?php echo $LANG['complex_level0'];?>"
+                    "text": "<?php echo $LANG['complex_level0']; ?>"
                 },
                 {"minScore": 25,
                     "className": "meterWarn",
-                    "text": "<?php echo $LANG['complex_level1'];?>"
+                    "text": "<?php echo $LANG['complex_level1']; ?>"
                 },
                 {"minScore": 50,
                     "className": "meterWarn",
-                    "text": "<?php echo $LANG['complex_level2'];?>"
+                    "text": "<?php echo $LANG['complex_level2']; ?>"
                 },
                 {"minScore": 60,
                     "className": "meterGood",
-                    "text": "<?php echo $LANG['complex_level3'];?>"
+                    "text": "<?php echo $LANG['complex_level3']; ?>"
                 },
                 {"minScore": 70,
                     "className": "meterGood",
-                    "text": "<?php echo $LANG['complex_level4'];?>"
+                    "text": "<?php echo $LANG['complex_level4']; ?>"
                 },
                 {"minScore": 80,
                     "className": "meterExcel",
-                    "text": "<?php echo $LANG['complex_level5'];?>"
+                    "text": "<?php echo $LANG['complex_level5']; ?>"
                 },
                 {"minScore": 90,
                     "className": "meterExcel",
-                    "text": "<?php echo $LANG['complex_level6'];?>"
+                    "text": "<?php echo $LANG['complex_level6']; ?>"
                 }
             ]
         });
@@ -284,32 +284,32 @@ 
                         type                : "change_pw",
                         change_pw_origine   : "user_change",
                         complexity          : $("#pw_strength_value").val(),
-                        data                : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key'];?>")
+                        data                : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key']; ?>")
                     },
                     function(data) {
                         if (data[0].error == "already_used") {
                             $("#new_pw, #new_pw2").val("");
-                            $("#change_pwd_error").addClass("ui-state-error ui-corner-all").show().html("<span><?php echo $LANG['pw_used'];?></span>");
+                            $("#change_pwd_error").addClass("ui-state-error ui-corner-all").show().html("<span><?php echo $LANG['pw_used']; ?></span>");
                         } else if (data[0].error == "complexity_level_not_reached") {
                             $("#new_pw, #new_pw2").val("");
-                            $("#change_pwd_error").addClass("ui-state-error ui-corner-all").show().html("<span><?php echo $LANG['error_complex_not_enought'];?></span>");
+                            $("#change_pwd_error").addClass("ui-state-error ui-corner-all").show().html("<span><?php echo $LANG['error_complex_not_enought']; ?></span>");
                         } else {
                             $("#div_change_password").hide();
                             $("#dialog_user_profil").dialog("option", "height", 450);
                             $("#new_pw, #new_pw2").val("");
                         }
                         $("#password_change_wait").hide();
-                        $("#profile_info_box").html("<?php echo $LANG['alert_message_done'];?>").show();
+                        $("#profile_info_box").html("<?php echo $LANG['alert_message_done']; ?>").show();
                         setTimeout(function(){$("#profile_info_box").effect( "fade", "slow" );}, 1000);
                     },
                     "json"
                 );
             } else {
-                $("#change_pwd_error").addClass("ui-state-error ui-corner-all").show().html("<?php echo $LANG['error_complex_not_enought'];?>");
+                $("#change_pwd_error").addClass("ui-state-error ui-corner-all").show().html("<?php echo $LANG['error_complex_not_enought']; ?>");
                 setTimeout(function(){$("#change_pwd_error").effect( "fade", "slow" );}, 1000);
             }
         } else {
-            $("#change_pwd_error").addClass("ui-state-error ui-corner-all").show().html("<?php echo $LANG['index_pw_error_identical'];?>");
+            $("#change_pwd_error").addClass("ui-state-error ui-corner-all").show().html("<?php echo $LANG['index_pw_error_identical']; ?>");
             setTimeout(function(){$("#change_pwd_error").effect( "fade", "slow" );}, 1000);
         }
     });
@@ -362,8 +362,8 @@ 
                 var tmp = Math.random().toString(36).substring(7);
 
                 up.settings.multipart_params = {
-                    "PHPSESSID":"<?php echo $_SESSION['user_id'];?>",
-                    "newFileName":"user<?php echo $_SESSION['user_id'];?>"+tmp,
+                    "PHPSESSID":"<?php echo $_SESSION['user_id']; ?>",
+                    "newFileName":"user<?php echo $_SESSION['user_id']; ?>"+tmp,
                     "type_upload":"upload_profile_photo",
                     "user_token": $("#profile_user_token").val()
                 };
@@ -373,7 +373,7 @@ 
 
     // Show runtime status
     uploader_photo.bind("Init", function(up, params) {
-        $("#plupload_runtime2").html("<?php echo $LANG['runtime_upload'];?> " + params.runtime).removeClass('ui-state-error');
+        $("#plupload_runtime2").html("<?php echo $LANG['runtime_upload']; ?> " + params.runtime).removeClass('ui-state-error');
         $("#upload_enabled2").val("1");
     });
 
@@ -421,7 +421,7 @@ 
     });
     $(".editable_select").editable("sources/users.queries.php", {
         indicator : "<img src=\'includes/images/loading.gif\' />",
-        data   : " {'full':'<?php echo $LANG['full'];?>','sequential':'<?php echo $LANG['sequential'];?>', 'selected':'<?php echo $_SESSION['user_settings']['treeloadstrategy'];?>'}",
+        data   : " {'full':'<?php echo $LANG['full']; ?>','sequential':'<?php echo $LANG['sequential']; ?>', 'selected':'<?php echo $_SESSION['user_settings']['treeloadstrategy']; ?>'}",
         type   : 'select',
         select : true,
         onblur : "cancel",
@@ -431,7 +431,7 @@ 
     });
     $(".editable_language").editable("sources/users.queries.php", {
         indicator : "<img src=\'includes/images/loading.gif\' />",
-        data   : '<?php print json_encode($arraFlags);?>',
+        data   : '<?php print json_encode($arraFlags); ?>',
         type   : 'select',
         select : true,
         onblur : "cancel",
@@ -441,7 +441,7 @@ 
     });
     $(".editable_timezone").editable("sources/users.queries.php", {
         indicator : "<img src=\'includes/images/loading.gif\' />",
-        data : '<?php print json_encode($arrayTimezones);?>',
+        data : '<?php print json_encode($arrayTimezones); ?>',
         type   : 'select',
         select : true,
         onblur : "cancel",
@@ -451,7 +451,7 @@ 
     });
     $(".editable_yesno").editable("sources/users.queries.php", {
         indicator : "<img src=\'includes/images/loading.gif\' />",
-        data : '{"O":"<?php echo $LANG['no'];?>","1":"<?php echo $LANG['yes'];?>"}',
+        data : '{"O":"<?php echo $LANG['no']; ?>","1":"<?php echo $LANG['yes']; ?>"}',
         type   : 'select',
         select : true,
         onblur : "cancel",
@@ -472,7 +472,7 @@ 
 
       // prepare fields
       $("#new_personal_saltkey").val("");
-      $("#old_personal_saltkey").val("<?php echo addslashes(str_replace("&quot;", '"', @$_SESSION['my_sk']));?>");
+      $("#old_personal_saltkey").val("<?php echo addslashes(str_replace("&quot;", '"', @$_SESSION['my_sk'])); ?>");
 
       $("#div_change_psk").show();
       $("#dialog_user_profil").dialog("option", "height", 600);
@@ -484,7 +484,7 @@ 
 
         if ($("#new_personal_saltkey").val() === "" || $("#new_personal_saltkey").val() === "") {
             $("#psk_change_wait").hide();
-            $("#div_change_psk").before('<div id="tmp_msg" class="ui-widget ui-state-error ui-corner-all" style="margin-bottom:3px; padding:3px;"><?php echo addslashes($LANG['home_personal_saltkey_label']);?></div>');
+            $("#div_change_psk").before('<div id="tmp_msg" class="ui-widget ui-state-error ui-corner-all" style="margin-bottom:3px; padding:3px;"><?php echo addslashes($LANG['home_personal_saltkey_label']); ?></div>');
 
             setTimeout(function(){$("#tmp_msg").effect( "fade", "slow" );$("#tmp_msg").remove();}, 1000);
             return false;
@@ -499,11 +499,11 @@ 
             "sources/main.queries.php",
             {
                 type            : "change_personal_saltkey",
-                data_to_share   : prepareExchangedData(data_to_share, "encode", "<?php echo $_SESSION['key'];?>"),
-                key             : "<?php echo $_SESSION['key'];?>"
+                data_to_share   : prepareExchangedData(data_to_share, "encode", "<?php echo $_SESSION['key']; ?>"),
+                key             : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
-                data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+                data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
                 if (data.error == "no") {
                     changePersonalSaltKey(data_to_share, data.list, data.nb_total);
                 } else {
@@ -538,12 +538,12 @@ 
          "sources/main.queries.php",
          {
             type    : "reset_personal_saltkey",
-            data_to_share   : prepareExchangedData(data_to_share, "encode", "<?php echo $_SESSION['key'];?>"),
-            key             : "<?php echo $_SESSION['key'];?>"
+            data_to_share   : prepareExchangedData(data_to_share, "encode", "<?php echo $_SESSION['key']; ?>"),
+            key             : "<?php echo $_SESSION['key']; ?>"
          },
          function(data) {
             $("#psk_reset_wait").hide();
-            $("#button_reset_psk").after('<div id="reset_temp"><?php echo $LANG['alert_message_done'];?></div>');
+            $("#button_reset_psk").after('<div id="reset_temp"><?php echo $LANG['alert_message_done']; ?></div>');
             setTimeout(function(){$("#div_reset_psk").effect( "fade", "slow" ); $("#reset_temp").remove();}, 1500);
          }
       );
@@ -571,14 +571,14 @@ 
          var regex = new RegExp("^[a-zA-Z0-9.,/#&$@()%*]+$");
          var key = event.key;
          if (!regex.test(key)) {
-            $("#field_warning").html("<?php echo addslashes($LANG['character_not_allowed']);?>").stop(true,true).show().fadeOut(1000);
+            $("#field_warning").html("<?php echo addslashes($LANG['character_not_allowed']); ?>").stop(true,true).show().fadeOut(1000);
             event.preventDefault();
             return false;
          }
          break;
       }
    }).bind("paste",function(e){
-      $("#field_warning").html("<?php echo addslashes($LANG['error_not_allowed_to']);?>").stop(true,true).show().fadeOut(1000);
+      $("#field_warning").html("<?php echo addslashes($LANG['error_not_allowed_to']); ?>").stop(true,true).show().fadeOut(1000);
       e.preventDefault();
    });
 });
@@ -603,7 +603,7 @@ 
       "sources/main.queries.php",
         {
            type    : "store_personal_saltkey",
-           data    : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key'];?>"),
+           data    : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key']; ?>"),
            debug   : true
         },
         function(data){
@@ -617,13 +617,13 @@ 
                     "sources/utils.queries.php",
                     {
                         type            : "reencrypt_personal_pwd",
-                        data_to_share   : prepareExchangedData(credentials, "encode", "<?php echo $_SESSION['key'];?>"),
+                        data_to_share   : prepareExchangedData(credentials, "encode", "<?php echo $_SESSION['key']; ?>"),
                         currentId       : currentID,
-                        key             : "<?php echo $_SESSION['key'];?>"
+                        key             : "<?php echo $_SESSION['key']; ?>"
                     },
                     function(data){
                         if (currentID == "") {
-                            $("#psk_change_wait_info").html("<?php echo $LANG['alert_message_done'];?>");
+                            $("#psk_change_wait_info").html("<?php echo $LANG['alert_message_done']; ?>");
                             location.reload();
                         } else {
                             if (data[0].error == "") {

error.php

Spacing +3 added lines, -3 removed lines

@@ -67,13 +67,13 @@
         <div class="ui-state-error ui-corner-all error" >'.$LANG['error_not_exists'].'</div>';
     } elseif (@$_SESSION['error']['code'] == ERR_SESS_EXPIRED) {
         echo '
-        <div class="ui-state-error ui-corner-all error" style="text-align:center;" >'.$LANG['index_session_expired'].'<br /><br /><a href="index.php" />'.$LANG['home'] .'</a></div>';
+        <div class="ui-state-error ui-corner-all error" style="text-align:center;" >'.$LANG['index_session_expired'].'<br /><br /><a href="index.php" />'.$LANG['home'].'</a></div>';
     } elseif (@$_SESSION['error']['code'] == ERR_NO_MCRYPT) {
         echo '
-        <div class="ui-state-error ui-corner-all error" style="text-align:center;" >'.$LANG['error_mcrypt_not_loaded'].'<br /><br /><a href="index.php" />'.$LANG['home'] .'</a></div>';
+        <div class="ui-state-error ui-corner-all error" style="text-align:center;" >'.$LANG['error_mcrypt_not_loaded'].'<br /><br /><a href="index.php" />'.$LANG['home'].'</a></div>';
     } elseif (@$_SESSION['error']['code'] == ERR_VALID_SESSION) {
         echo '
-        <div class="ui-state-error ui-corner-all error" style="text-align:center;" >'.$LANG['error_not_authorized'].'<br /><br /><a href="index.php" />'.$LANG['home'] .'</a></div>';
+        <div class="ui-state-error ui-corner-all error" style="text-align:center;" >'.$LANG['error_not_authorized'].'<br /><br /><a href="index.php" />'.$LANG['home'].'</a></div>';
     }
 }
 

ssh.php

Spacing +12 added lines, -12 removed lines

@@ -23,7 +23,7 @@ 
 ) {
     die('Hacking attempt...');
 }
-$_SESSION['settings']['enable_server_password_change']  = 1;
+$_SESSION['settings']['enable_server_password_change'] = 1;
 /* do checks */
 require_once $_SESSION['settings']['cpassman_dir'].'/includes/config/include.php';
 require_once $_SESSION['settings']['cpassman_dir'].'/sources/checks.php';
@@ -136,7 +136,7 @@ 
             type    : "server_auto_update_password_frequency",
             id      : $('#selected_items').val(),
             freq    : $('#ssh_freq').val(),
-            key     : "<?php echo $_SESSION['key'];?>"
+            key     : "<?php echo $_SESSION['key']; ?>"
         },
         function(data) {
             if (data[0].error != "") {
@@ -147,7 +147,7 @@ 
                     .addClass( "ui-state-error" );
             } else {
                 $("#cronned_task_error")
-                    .html("<?php echo $LANG['alert_message_done'];?>")
+                    .html("<?php echo $LANG['alert_message_done']; ?>")
                     .show()
                     .removeClass( "ui-state-error" )
                     .addClass( "ui-state-focus" );
@@ -161,37 +161,37 @@ 
 {
     // check if new password is set
     if($("#ausp_pwd").val() == "") {
-        $("#dialog_auto_update_server_pwd_info").html('<i class="fa fa-warning"></i>&nbsp;<?php echo $LANG['error_new_pwd_missing'];?>').show();
+        $("#dialog_auto_update_server_pwd_info").html('<i class="fa fa-warning"></i>&nbsp;<?php echo $LANG['error_new_pwd_missing']; ?>').show();
         return false;
     }
     // check if new password is set
     if($("#ausp_ssh_root").val() == "" || $("#ausp_ssh_pwd").val() == "") {
-        $("#dialog_auto_update_server_pwd_info").html('<i class="fa fa-warning"></i>&nbsp;<?php echo $LANG['error_ssh_credentials_missing'];?>').show();
+        $("#dialog_auto_update_server_pwd_info").html('<i class="fa fa-warning"></i>&nbsp;<?php echo $LANG['error_ssh_credentials_missing']; ?>').show();
         return false;
     }
     // show progress
-    $("#dialog_auto_update_server_pwd_status").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait'];?>&nbsp;...&nbsp;').attr("class","").show();
+    $("#dialog_auto_update_server_pwd_status").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait']; ?>&nbsp;...&nbsp;').attr("class","").show();
     $("#dialog_auto_update_server_pwd_info").html("").hide();
     //prepare data
         var data = '{"currentId":"'+$('#selected_items').val() + '", '+
         '"new_pwd":"'+$('#ausp_pwd').val()+'", '+
         '"ssh_root":"'+$('#ausp_ssh_root').val()+'", '+
         '"ssh_pwd":"'+$('#ausp_ssh_pwd').val()+'", '+
-        '"user_id":"<?php echo $_SESSION['user_id'];?>"}';
+        '"user_id":"<?php echo $_SESSION['user_id']; ?>"}';
 
     $.post(
         "sources/utils.queries.php",
         {
             type        : "server_auto_update_password",
-            data        : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key'];?>"),
-            key         : "<?php echo $_SESSION['key'];?>"
+            data        : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key']; ?>"),
+            key         : "<?php echo $_SESSION['key']; ?>"
         },
         function(data) {
-            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
             //check if format error
             if (data.error != "") {
                 $("#dialog_auto_update_server_pwd_info").html("Error: "+data.error).show();
-                $("#dialog_auto_update_server_pwd_status").html("<?php echo $LANG['auto_update_server_password_info'];?>");
+                $("#dialog_auto_update_server_pwd_status").html("<?php echo $LANG['auto_update_server_password_info']; ?>");
             } else {
                 // tbc
                 $("#dialog_auto_update_server_pwd_status").html("done "+data.text);
@@ -225,7 +225,7 @@ 
             numerals   : true
         },
         function(data) {
-            data = prepareExchangedData(data, "decode", "<?php echo $_SESSION['key'];?>");
+            data = prepareExchangedData(data, "decode", "<?php echo $_SESSION['key']; ?>");
             if (data.error == "true") {
                 $("#dialog_auto_update_server_pwd_info").html(data.error_msg).show();
             } else {

install/upgrade_run_encryption_suggestions.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 
 $dbgDuo = fopen("upgrade.log", "w");
 $finish = false;
-$next = ($_POST['nb']+$_POST['start']);
+$next = ($_POST['nb'] + $_POST['start']);
 
 $dbTmp = mysqli_connect(
     $_SESSION['server'],
@@ -68,7 +68,7 @@ 
         decrypt($record['pw']),
         strlen($record['pw_iv'])
     );
-    if (isUTF8($tmpData ) && !empty($tmpData)) {
+    if (isUTF8($tmpData) && !empty($tmpData)) {
         $encrypt = cryption_phpCrypt(
             $tmpData,
             SALT,