nilsteampassnet / TeamPass

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 == "") {

Braces +5 added lines, -2 removed lines

@@ -95,8 +95,10 @@ 
       <li class="menu_150" style="padding:4px; text-align:left;"><i class="fa fa-bars fa-fw"></i>&nbsp;'.$LANG['admin_actions_title'].'
          <ul class="menu_250" style="text-align:left;">
             <li id="but_pickfiles_photo"><i class="fa fa-camera fa-fw"></i> &nbsp;'.$LANG['upload_new_avatar'].'</li>';
-            if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0) echo '
+            if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0) {
+                echo '
             <li id="but_change_password"><i class="fa fa-key fa-fw"></i> &nbsp;'.$LANG['index_change_pw'].'</li>';
+            }
             echo '
             <li id="but_change_psk"><i class="fa fa-lock fa-fw"></i> &nbsp;'.$LANG['menu_title_new_personal_saltkey'].'</li>
             <li id="but_reset_psk"><i class="fa fa-eraser fa-fw"></i> &nbsp;'.$LANG['personal_saltkey_lost'].'</li>
@@ -157,7 +159,7 @@ 
     <div id="filelist_photo" style="display:none;"></div>';
 
 // if DUOSecurity enabled then changing PWD is not allowed
-if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0)
+if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0) {
    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>
@@ -171,6 +173,7 @@ 
         <span class="button" id="button_change_pw">'.$LANG['index_change_pw_button'].'</span>&nbsp;
         <span id="password_change_wait" style="display:none;"><i class="fa fa-cog fa-spin"></i>&nbsp;'.$LANG['please_wait'].'</span>
     </div>';
+}
 
 //change the saltkey dialogbox
 echo '

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,

install/upgrade_db_1.08.php

Spacing +39 added lines, -39 removed lines

@@ -18,42 +18,42 @@ 
 global $k;
 //ENGLISH
 $english_vals = array(
-    array('at_modification',"Modification"),
-    array('at_creation',"Creation"),
-    array('at_delete',"Deletion"),
-    array('at_pw',"Password changed."),
-    array('at_category',"Group"),
-    array('at_personnel',"Personnal"),
-    array('at_description',"Description"),
-    array('at_url',"Url"),
-    array('at_login',"Login"),
-    array('at_label',"Label")
+    array('at_modification', "Modification"),
+    array('at_creation', "Creation"),
+    array('at_delete', "Deletion"),
+    array('at_pw', "Password changed."),
+    array('at_category', "Group"),
+    array('at_personnel', "Personnal"),
+    array('at_description', "Description"),
+    array('at_url', "Url"),
+    array('at_login', "Login"),
+    array('at_label', "Label")
 );
 //FRENCH
 $french_vals = array(
-    array('at_modification',"Modification"),
-    array('at_creation',"Création"),
-    array('at_delete',"Suppression"),
-    array('at_pw',"Mot de passe changé."),
-    array('at_category',"Group"),
-    array('at_personnel',"Personnel"),
-    array('at_description',"Description."),
-    array('at_url',"Url"),
-    array('at_login',"Login"),
-    array('at_label',"Label")
+    array('at_modification', "Modification"),
+    array('at_creation', "Création"),
+    array('at_delete', "Suppression"),
+    array('at_pw', "Mot de passe changé."),
+    array('at_category', "Group"),
+    array('at_personnel', "Personnel"),
+    array('at_description', "Description."),
+    array('at_url', "Url"),
+    array('at_login', "Login"),
+    array('at_label', "Label")
 );
 //SPANISH
 $spanish_vals = array(
-    array('at_modification',"Modificacion"),
-    array('at_creation',"Creacion"),
-    array('at_delete',"Borrado"),
-    array('at_pw',"Contraseéa cambiada."),
-    array('at_category',"Grupo"),
-    array('at_personnel',"Personal"),
-    array('at_description',"Descripcion."),
-    array('at_url',"Url"),
-    array('at_login',"Login"),
-    array('at_label',"Etiqueta")
+    array('at_modification', "Modificacion"),
+    array('at_creation', "Creacion"),
+    array('at_delete', "Borrado"),
+    array('at_pw', "Contraseéa cambiada."),
+    array('at_category', "Grupo"),
+    array('at_personnel', "Personal"),
+    array('at_description', "Descripcion."),
+    array('at_url', "Url"),
+    array('at_login', "Login"),
+    array('at_label', "Etiqueta")
 );
 
 changeDB();
@@ -79,9 +79,9 @@ 
                 mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data['action']."'");
                 $found = true;
             } else
-            if ($lang[1] == trim(substr($data['raison'],0,strpos($data['raison'],":"))) && !empty($data['raison'])) {
-                $data1= mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
-                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'],strpos($data['raison'],":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
+            if ($lang[1] == trim(substr($data['raison'], 0, strpos($data['raison'], ":"))) && !empty($data['raison'])) {
+                $data1 = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
+                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'], strpos($data['raison'], ":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
                 $found = true;
             }
         }
@@ -98,9 +98,9 @@ 
                 mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data['action']."'");
                 $found = true;
             } else
-            if ($lang[1] == trim(substr($data['raison'],0,strpos($data['raison'],":"))) && !empty($data['raison'])) {
-                $data1= mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
-                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'],strpos($data['raison'],":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
+            if ($lang[1] == trim(substr($data['raison'], 0, strpos($data['raison'], ":"))) && !empty($data['raison'])) {
+                $data1 = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
+                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'], strpos($data['raison'], ":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
                 $found = true;
             }
         }
@@ -117,9 +117,9 @@ 
                 mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data['action']."'");
                 $found = true;
             } else
-            if ($lang[1] == trim(substr($data['raison'],0,strpos($data['raison'],":"))) && !empty($data['raison'])) {
-                $data1= mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
-                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'],strpos($data['raison'],":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
+            if ($lang[1] == trim(substr($data['raison'], 0, strpos($data['raison'], ":"))) && !empty($data['raison'])) {
+                $data1 = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT action FROM ".$_SESSION['pre']."log_items WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$action."'"));
+                mysqli_query($dbTmp, "UPDATE ".$_SESSION['pre']."log_items SET raison = '".$lang[0]." ".substr($data['raison'], strpos($data['raison'], ":"))."' WHERE id_item=".$data['id_item']." AND date =".$data['date']." AND id_user =".$data['id_user']." AND raison ='".$data['raison']."' AND action ='".$data1[0]."'");
                 $found = true;
             }
         }

install/upgrade_run_final.php

Braces +6 added lines, -2 removed lines

@@ -101,8 +101,12 @@
         }
 
         // temp data
-        if (!isset($record['login'])) $record['login'] = "";
-        if (!isset($resNT['renewal_period'])) $resNT['renewal_period'] = "0";
+        if (!isset($record['login'])) {
+            $record['login'] = "";
+        }
+        if (!isset($resNT['renewal_period'])) {
+            $resNT['renewal_period'] = "0";
+        }
 
         // store data
         $res = mysqli_query($dbTmp,

install/install.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
     <body>
 <?php
 // define root path
-$abs_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/') . substr($_SERVER['PHP_SELF'], 0, strlen($_SERVER['PHP_SELF']) - 20);
-if( isset($_SERVER['HTTPS'] ) ) {
+$abs_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/').substr($_SERVER['PHP_SELF'], 0, strlen($_SERVER['PHP_SELF']) - 20);
+if (isset($_SERVER['HTTPS'])) {
     $protocol = 'https://';
 } else {
     $protocol = 'http://';

install/upgrade_run_encryption_pwd.php

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,7 @@ 
 
 $dbgDuo = fopen("upgrade.log", "a");
 $finish = false;
-$next = ($_POST['nb']+$_POST['start']);
+$next = ($_POST['nb'] + $_POST['start']);
 
 
 $dbTmp = mysqli_connect(
@@ -93,7 +93,7 @@ 
             $pw = decrypt($data['pw']);
             if (empty($pw)) {
                 // used protocol is #1
-                $pw = decryptOld($data['pw']);  // decrypt using protocol #1
+                $pw = decryptOld($data['pw']); // decrypt using protocol #1
             }
 
             // get key for this pw
@@ -131,7 +131,7 @@ 
     }
 
     // does tables KEYS exists
-    if(mysqli_num_rows(mysqli_query("SHOW TABLES LIKE '".$_SESSION['pre']."keys'")) == 1) {
+    if (mysqli_num_rows(mysqli_query("SHOW TABLES LIKE '".$_SESSION['pre']."keys'")) == 1) {
         $table_keys_exists = 1;
     } else {
         $table_keys_exists = 0;
@@ -162,7 +162,7 @@ 
                     fputs($dbgDuo, "\n/ step1 : ".$pw);
                     if (empty($pw)) {
                         // used protocol is #1
-                        $pw = decryptOld(trim($reason[1]));  // decrypt using protocol #1
+                        $pw = decryptOld(trim($reason[1])); // decrypt using protocol #1
                         fputs($dbgDuo, " / step2 : ".$pw);
                     }
 
@@ -185,7 +185,7 @@ 
 
                     // store new encryption
                     if (isUTF8($pw) && !empty($pw)) {
-                        $encrypt = cryption_phpCrypt($pw , SALT, "", "encrypt");
+                        $encrypt = cryption_phpCrypt($pw, SALT, "", "encrypt");
                         fputs($dbgDuo, " / Final : ".$encrypt['string']);
                         mysqli_query($dbTmp,
                             "UPDATE ".$_SESSION['pre']."log_items
@@ -217,8 +217,8 @@ 
 
         while ($record = mysqli_fetch_array($resData)) {
             $tmpData = substr(decrypt($record['data']), strlen($record['rndKey']));
-            if (isUTF8($tmpData ) && !empty($tmpData )) {
-                $encrypt = cryption_phpCrypt($tmpData , SALT, "", "encrypt");
+            if (isUTF8($tmpData) && !empty($tmpData)) {
+                $encrypt = cryption_phpCrypt($tmpData, SALT, "", "encrypt");
 
                 // store Password
                 $resData_tmp2 = mysqli_query($dbTmp,

install/upgrade_run_defuse_for_files.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     $_SESSION['port']
 );
 // are files encrypted? get the setting ongoing in teampass
-$set = mysqli_fetch_row(mysqli_query($dbTmp,"SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='enable_attachment_encryption'"));
+$set = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='enable_attachment_encryption'"));
 $enable_attachment_encryption = $set[0];
 
 // if no encryption then stop
@@ -51,11 +51,11 @@ 
 }
 
 // get path to upload
-$set = mysqli_fetch_row(mysqli_query($dbTmp,"SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='path_to_upload_folder'"));
+$set = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='path_to_upload_folder'"));
 $path_to_upload_folder = $set[0];
 
 // get previous saltkey
-$set = mysqli_fetch_row(mysqli_query($dbTmp,"SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='saltkey_ante_2127'"));
+$set = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT valeur FROM ".$_SESSION['pre']."misc WHERE type='admin' AND intitule='saltkey_ante_2127'"));
 $saltkey_ante_2127 = $set[0];