nilsteampassnet / TeamPass

includes/libraries/Encryption/Encryption/RuntimeTests.php

Spacing +16 added lines, -16 removed lines

@@ -46,10 +46,10 @@ 
             Core::ensureFunctionExists('openssl_get_cipher_methods');
             if (\in_array(Core::CIPHER_METHOD, \openssl_get_cipher_methods()) === false) {
                 throw new Ex\EnvironmentIsBrokenException(
-                    'Cipher method not supported. This is normally caused by an outdated ' .
-                    'version of OpenSSL (and/or OpenSSL compiled for FIPS compliance). ' .
-                    'Please upgrade to a newer version of OpenSSL that supports ' .
-                    Core::CIPHER_METHOD . ' to use this library.'
+                    'Cipher method not supported. This is normally caused by an outdated '.
+                    'version of OpenSSL (and/or OpenSSL compiled for FIPS compliance). '.
+                    'Please upgrade to a newer version of OpenSSL that supports '.
+                    Core::CIPHER_METHOD.' to use this library.'
                 );
             }
 
@@ -101,7 +101,7 @@ 
 
         // Modifying the ciphertext: Appending a string.
         try {
-            Crypto::decrypt($ciphertext . 'a', $key, true);
+            Crypto::decrypt($ciphertext.'a', $key, true);
             throw new Ex\EnvironmentIsBrokenException();
         } catch (Ex\WrongKeyOrModifiedCiphertextException $e) { /* expected */
         }
@@ -159,8 +159,8 @@ 
         $info   = Encoding::hexToBin('f0f1f2f3f4f5f6f7f8f9');
         $length = 42;
         $okm    = Encoding::hexToBin(
-            '3cb25f25faacd57a90434f64d0362f2a' .
-            '2d2d0a90cf1a5a4c5db02d56ecc4c5bf' .
+            '3cb25f25faacd57a90434f64d0362f2a'.
+            '2d2d0a90cf1a5a4c5db02d56ecc4c5bf'.
             '34007208d5b887185865'
         );
         $computed_okm = Core::HKDF('sha256', $ikm, $length, $info, $salt);
@@ -172,8 +172,8 @@ 
         $ikm    = \str_repeat("\x0c", 22);
         $length = 42;
         $okm    = Encoding::hexToBin(
-            '2c91117204d745f3500d636a62f64f0a' .
-            'b3bae548aa53d423b0d1f27ebba6f5e5' .
+            '2c91117204d745f3500d636a62f64f0a'.
+            'b3bae548aa53d423b0d1f27ebba6f5e5'.
             '673a081d70cce7acfc48'
         );
         $computed_okm = Core::HKDF('sha1', $ikm, $length, '', null);
@@ -207,20 +207,20 @@ 
     {
         // AES CTR mode test vector from NIST SP 800-38A
         $key = Encoding::hexToBin(
-            '603deb1015ca71be2b73aef0857d7781' .
+            '603deb1015ca71be2b73aef0857d7781'.
             '1f352c073b6108d72d9810a30914dff4'
         );
         $iv        = Encoding::hexToBin('f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff');
         $plaintext = Encoding::hexToBin(
-            '6bc1bee22e409f96e93d7e117393172a' .
-            'ae2d8a571e03ac9c9eb76fac45af8e51' .
-            '30c81c46a35ce411e5fbc1191a0a52ef' .
+            '6bc1bee22e409f96e93d7e117393172a'.
+            'ae2d8a571e03ac9c9eb76fac45af8e51'.
+            '30c81c46a35ce411e5fbc1191a0a52ef'.
             'f69f2445df4f9b17ad2b417be66c3710'
         );
         $ciphertext = Encoding::hexToBin(
-            '601ec313775789a5b7a7f504bbf3d228' .
-            'f443e3ca4d62b59aca84e990cacaf5c5' .
-            '2b0930daa23de94ce87017ba2d84988d' .
+            '601ec313775789a5b7a7f504bbf3d228'.
+            'f443e3ca4d62b59aca84e990cacaf5c5'.
+            '2b0930daa23de94ce87017ba2d84988d'.
             'dfc9c58db67aada613c2dd08457941a6'
         );
 

includes/libraries/Encryption/Encryption/Encoding.php

Spacing +5 added lines, -5 removed lines

@@ -124,16 +124,16 @@ 
         // being a prefix of another type's header, leading to ambiguity.
         if (Core::ourStrlen($header) !== self::SERIALIZE_HEADER_BYTES) {
             throw new Ex\EnvironmentIsBrokenException(
-                'Header must be ' . self::SERIALIZE_HEADER_BYTES . ' bytes.'
+                'Header must be '.self::SERIALIZE_HEADER_BYTES.' bytes.'
             );
         }
 
         return Encoding::binToHex(
-            $header .
-            $bytes .
+            $header.
+            $bytes.
             \hash(
                 self::CHECKSUM_HASH_ALGO,
-                $header . $bytes,
+                $header.$bytes,
                 true
             )
         );
@@ -197,7 +197,7 @@ 
         $checksum_b = \hash(self::CHECKSUM_HASH_ALGO, $checked_bytes, true);
 
         /* Check if the checksum matches. */
-        if (! Core::hashEquals($checksum_a, $checksum_b)) {
+        if (!Core::hashEquals($checksum_a, $checksum_b)) {
             throw new Ex\BadFormatException(
                 "Data is corrupted, the checksum doesn't match"
             );

includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
              * here in order to make the API simpler, avoiding the need to
              * document that this method might throw an Ex\BadFormatException. */
             throw new Ex\WrongKeyOrModifiedCiphertextException(
-                "The decrypted key was found to be in an invalid format. " .
+                "The decrypted key was found to be in an invalid format. ".
                 "This very likely indicates it was modified by an attacker."
             );
         }

includes/libraries/LDAP/adLDAP/collections/adLDAPCollection.php

Indentation +33 added lines, -33 removed lines

@@ -38,24 +38,24 @@ 
 abstract class adLDAPCollection
 {
     /**
-    * The current adLDAP connection via dependency injection
-    * 
-    * @var adLDAP
-    */
+     * The current adLDAP connection via dependency injection
+     * 
+     * @var adLDAP
+     */
     protected $adldap;
     
     /**
-    * The current object being modifed / called
-    * 
-    * @var mixed
-    */
+     * The current object being modifed / called
+     * 
+     * @var mixed
+     */
     protected $currentObject;
     
     /**
-    * The raw info array from Active Directory
-    * 
-    * @var array
-    */
+     * The raw info array from Active Directory
+     * 
+     * @var array
+     */
     protected $info;
     
     public function __construct($info, adLDAP $adldap) {
@@ -64,10 +64,10 @@ 
     }
     
     /**
-    * Set the raw info array from Active Directory
-    * 
-    * @param array $info
-    */
+     * Set the raw info array from Active Directory
+     * 
+     * @param array $info
+     */
     public function setInfo(array $info) {
         if ($this->info && sizeof($info) >= 1) {
             unset($this->info);
@@ -76,11 +76,11 @@ 
     }
     
     /**
-    * Magic get method to retrieve data from the raw array in a formatted way
-    * 
-    * @param string $attribute
-    * @return mixed
-    */
+     * Magic get method to retrieve data from the raw array in a formatted way
+     * 
+     * @param string $attribute
+     * @return mixed
+     */
     public function __get($attribute) {
         if (isset($this->info[0]) && is_array($this->info[0])) {
             foreach ($this->info[0] as $keyAttr => $valueAttr) {
@@ -106,20 +106,20 @@ 
     }    
     
     /**
-    * Magic set method to update an attribute
-    * 
-    * @param string $attribute
-    * @param string $value
-    * @return bool
-    */
+     * Magic set method to update an attribute
+     * 
+     * @param string $attribute
+     * @param string $value
+     * @return bool
+     */
     abstract public function __set($attribute, $value);
     
     /** 
-    * Magic isset method to check for the existence of an attribute 
-    * 
-    * @param string $attribute 
-    * @return bool 
-    */ 
+     * Magic isset method to check for the existence of an attribute 
+     * 
+     * @param string $attribute 
+     * @return bool 
+     */ 
     public function __isset($attribute) {
         if (isset($this->info[0]) && is_array($this->info[0])) { 
             foreach ($this->info[0] as $keyAttr => $valueAttr) { 
@@ -129,6 +129,6 @@ 
             } 
         } 
         return false; 
-     } 
+        } 
 }
 ?>

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
                     else {
                         $array = array();
                         foreach ($this->info[0][strtolower($attribute)] as $key => $value) {
-                            if ((string)$key != 'count') {
+                            if ((string) $key != 'count') {
                                 $array[$key] = $value;
                             } 
                         }  

Braces +2 added lines, -4 removed lines

@@ -87,8 +87,7 @@ 
                 if (strtolower($keyAttr) == strtolower($attribute)) {
                     if ($this->info[0][strtolower($attribute)]['count'] == 1) {
                         return $this->info[0][strtolower($attribute)][0];   
-                    }
-                    else {
+                    } else {
                         $array = array();
                         foreach ($this->info[0][strtolower($attribute)] as $key => $value) {
                             if ((string)$key != 'count') {
@@ -99,8 +98,7 @@ 
                     }
                 }   
             }
-        }
-        else {
+        } else {
             return NULL;   
         }
     }    

items.export.php

Spacing +4 added lines, -4 removed lines

@@ -165,7 +165,7 @@ 
 
     function exportItemsToFile()
     {
-        $("#export_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait'];?>&nbsp;...&nbsp;<span id="export_progress">0%</span>').attr("class","").show();
+        $("#export_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait']; ?>&nbsp;...&nbsp;<span id="export_progress">0%</span>').attr("class","").show();
 
         //Get list of selected folders
         var ids = "";
@@ -175,20 +175,20 @@ 
         });
 
         if (ids == "") {
-            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['error_no_selected_folder'];?>").attr("class","ui-state-error");
+            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['error_no_selected_folder']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#export_information").effect( "fade", "slow" );}, 1000);
             return;
         }
 
         if ($("input[name='export_format']:checked").length == 0) {
-            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['error_export_format_not_selected'];?>").attr("class","ui-state-error");
+            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['error_export_format_not_selected']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#export_information").effect( "fade", "slow" );}, 1000);
             return;
         }
 
         // Get PDF encryption password and make sure it is set
         if (($("#export_pdf_password").val() == "") && ($("input[name='export_format']:checked").val() == "pdf")) {
-            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['pdf_password_warning'];?>").attr("class","ui-state-error");
+            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['pdf_password_warning']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#export_information").effect( "fade", "slow" );}, 1000);
             return;
         }

suggestion.load.php

Spacing +43 added lines, -43 removed lines

@@ -31,7 +31,7 @@ 
             {
                 type    : "open_kb",
                 id      : id,
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 data = $.parseJSON(data);
@@ -71,7 +71,7 @@ 
             {
                 type    : "duplicate_suggestion",
                 id      : $("#suggestion_id").val(),
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 if (data[0].status == "no") {
@@ -101,12 +101,12 @@ 
             {
                 type        : "get_complexity_level",
                 folder_id   : $("#suggestion_folder").val(),
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 if (data[0].status == "ok") {
                     $("#complexity_required").val(data[0].complexity);
-                    $("#complexity_required_text").html("[<?php echo $LANG['complex_asked'];?>&nbsp;&nbsp;<span style=\"color:#D04806; font-weight:bold;\">"+data[0].complexity_text+"</span>]");
+                    $("#complexity_required_text").html("[<?php echo $LANG['complex_asked']; ?>&nbsp;&nbsp;<span style=\"color:#D04806; font-weight:bold;\">"+data[0].complexity_text+"</span>]");
                 }
                 $("#pw_wait").hide();
             },
@@ -138,7 +138,7 @@ 
                     "sAjaxSource": "sources/datatable/datatable.suggestion.php",
                     "bJQueryUI": true,
                     "oLanguage": {
-                        "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+                        "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
                     },
                     "columns": [
                         {"width": "7%", className: "dt-body-left"},
@@ -164,7 +164,7 @@ 
                         "sAjaxSource": "sources/datatable/datatable.suggestion.php",
                         "bJQueryUI": true,
                         "oLanguage": {
-                            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+                            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
                         },
                         "columns": [
                             {"width": "7%", className: "dt-body-left"},
@@ -186,7 +186,7 @@ 
                         "sAjaxSource": "sources/datatable/datatable.items_change.php",
                         "bJQueryUI": true,
                         "oLanguage": {
-                            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+                            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
                         },
                         "columns": [
                             {"width": "5%", className: "dt-body-left"},
@@ -211,15 +211,15 @@ 
             autoOpen: false,
             width: 300,
             height: 150,
-            title: "<?php echo $LANG['suggestion_delete_confirm'];?>",
+            title: "<?php echo $LANG['suggestion_delete_confirm']; ?>",
             buttons: {
-                "<?php echo $LANG['del_button'];?>": function() {
+                "<?php echo $LANG['del_button']; ?>": function() {
                     $.post(
                         "sources/suggestion.queries.php",
                         {
                             type    : "delete_suggestion",
                             id      : $("#suggestion_id").val(),
-                            key     : "<?php echo $_SESSION['key'];?>"
+                            key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             $("#div_suggestion_delete").dialog("close");
@@ -228,7 +228,7 @@ 
                         }
                     )
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             }
@@ -241,19 +241,19 @@ 
             autoOpen: false,
             width: 400,
             height: 240,
-            title: "<?php echo $LANG['suggestion_validate_confirm'];?>",
+            title: "<?php echo $LANG['suggestion_validate_confirm']; ?>",
             open: function( event, ui ) {
                 $("#suggestion_edit_wait").hide();
             },
             buttons: {
-                "<?php echo $LANG['confirm'];?>": function() {
+                "<?php echo $LANG['confirm']; ?>": function() {
                     $("#suggestion_edit_wait").show();
                     $.post(
                         "sources/suggestion.queries.php",
                         {
                             type    : "validate_suggestion",
                             id      : $("#suggestion_id").val(),
-                            key     : "<?php echo $_SESSION['key'];?>"
+                            key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             if (data[0].status == "done") {
@@ -261,13 +261,13 @@ 
                                 oTable.fnDraw();
                                 $("#div_suggestion_validate").dialog("close");
                             } else if (data[0].status = "error_when_creating") {
-                                $("#suggestion_error").show().html("<?php echo $LANG['suggestion_error_cannot_add'];?>").addClass("ui-state-error");
+                                $("#suggestion_error").show().html("<?php echo $LANG['suggestion_error_cannot_add']; ?>").addClass("ui-state-error");
                             }
                         },
                         "json"
                     )
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             }
@@ -280,9 +280,9 @@ 
             autoOpen: false,
             width: 450,
             height: 550,
-            title: "<?php echo $LANG['suggestion_add'];?>",
+            title: "<?php echo $LANG['suggestion_add']; ?>",
             buttons: {
-                "<?php echo $LANG['save_button'];?>": function() {
+                "<?php echo $LANG['save_button']; ?>": function() {
                     $("#suggestion_error").hide();
                     if ($("#suggestion_label").val() == "") {
                         $("#suggestion_label").addClass("ui-state-error");
@@ -291,7 +291,7 @@ 
                     } else if ($("#suggestion_folder").val() == "") {
                         $("#suggestion_folder").addClass("ui-state-error");
                     } else if (parseInt($("#password_complexity").val()) < parseInt($("#complexity_required").val())) {
-                        $("#suggestion_error").show().html("<?php echo $LANG['error_complex_not_enought'];?>").addClass("ui-state-error");
+                        $("#suggestion_error").show().html("<?php echo $LANG['error_complex_not_enought']; ?>").addClass("ui-state-error");
                     } else {
                         $("#add_suggestion_wait").show();
                         var data = '{"label":"'+sanitizeString($("#suggestion_label").val())+
@@ -303,8 +303,8 @@ 
                         $.post("sources/suggestion.queries.php",
                             {
                                 type     : "add_new",
-                                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) {
                                 if (data[0].status == "done") {
@@ -312,7 +312,7 @@ 
                                     oTable.fnDraw();
                                     $("#suggestion_form").dialog("close");
                                 } else if (data[0].status = "duplicate_suggestion") {
-                                    $("#suggestion_error").show().html("<?php echo $LANG['suggestion_error_duplicate'];?>").addClass("ui-state-error");
+                                    $("#suggestion_error").show().html("<?php echo $LANG['suggestion_error_duplicate']; ?>").addClass("ui-state-error");
                                 }
                                 $("#add_suggestion_wait").hide();
                             },
@@ -320,7 +320,7 @@ 
                         );
                     }
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             },
@@ -343,10 +343,10 @@ 
             autoOpen: false,
             width: 700,
             height: 400,
-            title: "<?php echo $LANG['suggestion_delete_confirm'];?>",
+            title: "<?php echo $LANG['suggestion_delete_confirm']; ?>",
             buttons: {
-                "<?php echo $LANG['approve'];?>": function() {
-                    $("#suggestion_view_wait").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."...";?>").show();
+                "<?php echo $LANG['approve']; ?>": function() {
+                    $("#suggestion_view_wait").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."..."; ?>").show();
 
                     // select fields to update
                     var fields_to_update = "";
@@ -362,7 +362,7 @@ 
                             type    : "approve_item_change",
                             id      : $("#suggestion_id").val(),
                             data    : fields_to_update,
-                            key     : "<?php echo $_SESSION['key'];?>"
+                            key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             if (data[0].error === "") {
@@ -382,18 +382,18 @@ 
                         "json"
                     )
                 },
-                "<?php echo $LANG['reject'];?>": function() {
-                    $("#suggestion_view_wait").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."...";?>").show();
+                "<?php echo $LANG['reject']; ?>": function() {
+                    $("#suggestion_view_wait").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."..."; ?>").show();
                     $.post(
                         "sources/suggestion.queries.php",
                         {
                             type    : "reject_item_change",
                             id      : $("#suggestion_id").val(),
-                            key     : "<?php echo $_SESSION['key'];?>"
+                            key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
 
-                            $("#suggestion_view_wait").html("<?php echo $LANG['alert_message_done'];?>");
+                            $("#suggestion_view_wait").html("<?php echo $LANG['alert_message_done']; ?>");
                             oTable = $("#t_change").dataTable();
                             oTable.fnDraw();
                             setTimeout(
@@ -405,24 +405,24 @@ 
                         }
                     )
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             },
             open: function (event, ui) {
-                $("#div_suggestion_html").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."...";?>");
+                $("#div_suggestion_html").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."..."; ?>");
 
                 // load change
                 $.post("sources/suggestion.queries.php",
                     {
                         type     : "get_item_change_detail",
                         id       : $("#suggestion_id").val(),
-                        key      : "<?php echo $_SESSION['key'];?>"
+                        key      : "<?php echo $_SESSION['key']; ?>"
                     },
                     function(data) {
                         //decrypt data
                         try {
-                            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+                            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
                         } catch (e) {
                             // error
                             return;
@@ -451,35 +451,35 @@ 
         $("#suggestion_pwd").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']; ?>"
                 }
             ]
         });

kb.load.php

Spacing +13 added lines, -13 removed lines

@@ -27,7 +27,7 @@ 
             {
             type    : "open_kb",
             id      : id,
-            key     : "<?php echo $_SESSION['key'];?>"
+            key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 data = $.parseJSON(data);
@@ -66,7 +66,7 @@ 
             "sAjaxSource": "sources/datatable/datatable.kb.php",
             "bJQueryUI": true,
             "oLanguage": {
-                "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+                "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
             }
         });
 
@@ -77,15 +77,15 @@ 
             autoOpen: false,
             width: 300,
             height: 150,
-            title: "<?php echo $LANG['item_menu_del_elem'];?>",
+            title: "<?php echo $LANG['item_menu_del_elem']; ?>",
             buttons: {
-                "<?php echo $LANG['del_button'];?>": function() {
+                "<?php echo $LANG['del_button']; ?>": function() {
                     $.post(
                 		"sources/kb.queries.php",
                         {
                         type    : "delete_kb",
                         id      : $("#kb_id").val(),
-                        key     : "<?php echo $_SESSION['key'];?>"
+                        key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             $("#div_kb_delete").dialog("close");
@@ -94,7 +94,7 @@ 
                         }
                    )
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             }
@@ -107,9 +107,9 @@ 
             autoOpen: false,
             width: 900,
             height: 600,
-            title: "<?php echo $LANG['kb_form'];?>",
+            title: "<?php echo $LANG['kb_form']; ?>",
             buttons: {
-                "<?php echo $LANG['save_button'];?>": function() {
+                "<?php echo $LANG['save_button']; ?>": function() {
                     if ($("#kb_label").val() == "") {
                         $("#kb_label").addClass("ui-state-error");
                     } else if ($("#kb_category").val() == "") {
@@ -130,8 +130,8 @@ 
                          $.post("sources/kb.queries.php",
                               {
                                   type     : "kb_in_db",
-                                  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) {
                                 if (data[0].status == "done") {
@@ -144,7 +144,7 @@ 
                        );
                     }
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             },
@@ -153,9 +153,9 @@ 
                 $("#kb_associated_to").multiselect();
                 var instance = CKEDITOR.instances["kb_description"];
                 if (instance) {
-                    CKEDITOR.replace("kb_description",{toolbar:"Full", height: 250,language: "<?php echo $_SESSION['user_language_code'];?>"});
+                    CKEDITOR.replace("kb_description",{toolbar:"Full", height: 250,language: "<?php echo $_SESSION['user_language_code']; ?>"});
                 } else {
-                    $("#kb_description").ckeditor({toolbar:"Full", height: 250,language: "<?php echo $_SESSION['user_language_code'];?>"});
+                    $("#kb_description").ckeditor({toolbar:"Full", height: 250,language: "<?php echo $_SESSION['user_language_code']; ?>"});
                 }
             },
             close: function(event,ui) {

roles.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     !isset($_SESSION['CPM']) || $_SESSION['CPM'] != 1 ||
     !isset($_SESSION['user_id']) || empty($_SESSION['user_id']) ||
     !isset($_SESSION['key']) || empty($_SESSION['key'])
-){
+) {
     die('Hacking attempt...');
 }
 

admin.settings.php

Indentation +2 added lines, -2 removed lines

@@ -196,7 +196,7 @@ 
                 <td>
                       <i class="fa fa-chevron-right mi-grey-1" style="margin-right: .3em;">&nbsp;</i>
                       <label>' .
-                          $LANG['settings_enable_sts'] . '
+                            $LANG['settings_enable_sts'] . '
                           &nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_enable_sts_tip']), ENT_QUOTES).'"></i>
                       </label>
                 </td>
@@ -1153,7 +1153,7 @@ 
                 </tr>';
 
 // AD Port
- echo '
+    echo '
                 <tr>
                     <td><label for="ldap_port">'.$LANG['settings_ldap_port'].'&nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_ldap_port_tip']), ENT_QUOTES).'"></i></label></td>
                     <td><input type="text" size="50" id="ldap_port" name="ldap_port" class="text ui-widget-content" title="389" value="', isset($_SESSION['settings']['ldap_port']) ? $_SESSION['settings']['ldap_port'] : '389', '" onchange="updateSetting($(this).attr(\'id\'));" /></td>

Spacing +30 added lines, -33 removed lines

@@ -196,7 +196,7 @@ 
                 <td>
                       <i class="fa fa-chevron-right mi-grey-1" style="margin-right: .3em;">&nbsp;</i>
                       <label>' .
-                          $LANG['settings_enable_sts'] . '
+                          $LANG['settings_enable_sts'].'
                           &nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_enable_sts_tip']), ENT_QUOTES).'"></i>
                       </label>
                 </td>
@@ -289,14 +289,14 @@ 
                     </td>
                     <td>
                         <select id="date_format" name="date_format" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));">
-                            <option value="d/m/Y"', !isset($_SESSION['settings']['date_format']) || $_SESSION['settings']['date_format'] == "d/m/Y" ? ' selected="selected"':"", '>d/m/Y</option>
-                            <option value="m/d/Y"', $_SESSION['settings']['date_format'] == "m/d/Y" ? ' selected="selected"':"", '>m/d/Y</option>
-                            <option value="d-M-Y"', $_SESSION['settings']['date_format'] == "d-M-Y" ? ' selected="selected"':"", '>d-M-Y</option>
-                            <option value="d/m/y"', $_SESSION['settings']['date_format'] == "d/m/y" ? ' selected="selected"':"", '>d/m/y</option>
-                            <option value="m/d/y"', $_SESSION['settings']['date_format'] == "m/d/y" ? ' selected="selected"':"", '>m/d/y</option>
-                            <option value="d-M-y"', $_SESSION['settings']['date_format'] == "d-M-y" ? ' selected="selected"':"", '>d-M-y</option>
-                            <option value="d-m-y"', $_SESSION['settings']['date_format'] == "d-m-y" ? ' selected="selected"':"", '>d-m-y</option>
-                            <option value="Y-m-d"', $_SESSION['settings']['date_format'] == "Y-m-d" ? ' selected="selected"':"", '>Y-m-d</option>
+                            <option value="d/m/Y"', !isset($_SESSION['settings']['date_format']) || $_SESSION['settings']['date_format'] == "d/m/Y" ? ' selected="selected"' : "", '>d/m/Y</option>
+                            <option value="m/d/Y"', $_SESSION['settings']['date_format'] == "m/d/Y" ? ' selected="selected"' : "", '>m/d/Y</option>
+                            <option value="d-M-Y"', $_SESSION['settings']['date_format'] == "d-M-Y" ? ' selected="selected"' : "", '>d-M-Y</option>
+                            <option value="d/m/y"', $_SESSION['settings']['date_format'] == "d/m/y" ? ' selected="selected"' : "", '>d/m/y</option>
+                            <option value="m/d/y"', $_SESSION['settings']['date_format'] == "m/d/y" ? ' selected="selected"' : "", '>m/d/y</option>
+                            <option value="d-M-y"', $_SESSION['settings']['date_format'] == "d-M-y" ? ' selected="selected"' : "", '>d-M-y</option>
+                            <option value="d-m-y"', $_SESSION['settings']['date_format'] == "d-m-y" ? ' selected="selected"' : "", '>d-m-y</option>
+                            <option value="Y-m-d"', $_SESSION['settings']['date_format'] == "Y-m-d" ? ' selected="selected"' : "", '>Y-m-d</option>
                         </select>
                     </td>
                 </tr>';
@@ -309,10 +309,10 @@ 
                     </td>
                     <td>
                         <select id="time_format" name="time_format" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));">
-                            <option value="H:i:s"', !isset($_SESSION['settings']['time_format']) || $_SESSION['settings']['time_format'] == "H:i:s" ? ' selected="selected"':"", '>H:i:s</option>
-                            <option value="h:m:s a"', $_SESSION['settings']['time_format'] == "h:i:s a" ? ' selected="selected"':"", '>h:i:s a</option>
-                            <option value="g:i:s a"', $_SESSION['settings']['time_format'] == "g:i:s a" ? ' selected="selected"':"", '>g:i:s a</option>
-                            <option value="G:i:s"', $_SESSION['settings']['time_format'] == "G:i:s" ? ' selected="selected"':"", '>G:i:s</option>
+                            <option value="H:i:s"', !isset($_SESSION['settings']['time_format']) || $_SESSION['settings']['time_format'] == "H:i:s" ? ' selected="selected"' : "", '>H:i:s</option>
+                            <option value="h:m:s a"', $_SESSION['settings']['time_format'] == "h:i:s a" ? ' selected="selected"' : "", '>h:i:s a</option>
+                            <option value="g:i:s a"', $_SESSION['settings']['time_format'] == "g:i:s a" ? ' selected="selected"' : "", '>g:i:s a</option>
+                            <option value="G:i:s"', $_SESSION['settings']['time_format'] == "G:i:s" ? ' selected="selected"' : "", '>G:i:s</option>
                         </select>
                     </td>
                 </tr>';
@@ -862,7 +862,7 @@ 
                 </td></tr>';
 // Enable Item modification by anyone by default
 echo '
-                <tr id="tr_option_anyone_can_modify_bydefault"', isset($_SESSION['settings']['anyone_can_modify']) && $_SESSION['settings']['anyone_can_modify'] == 1 ? '':' style="display:none;"', '><td>
+                <tr id="tr_option_anyone_can_modify_bydefault"', isset($_SESSION['settings']['anyone_can_modify']) && $_SESSION['settings']['anyone_can_modify'] == 1 ? '' : ' style="display:none;"', '><td>
                     <i class="fa fa-chevron-right mi-grey-1" style="margin-right: .3em;">&nbsp;</i>
                     <label>'.htmlentities(strip_tags($LANG['settings_anyone_can_modify_bydefault'])).'</label>
                     </td><td>
@@ -878,7 +878,7 @@ 
                 </td></tr>';
 // enable restricted_to_roles
 echo '
-                <tr id="tr_option_restricted_to_roles" style="display:', isset($_SESSION['settings']['restricted_to']) && $_SESSION['settings']['restricted_to'] == 1 ? 'inline':'none', ';"><td>
+                <tr id="tr_option_restricted_to_roles" style="display:', isset($_SESSION['settings']['restricted_to']) && $_SESSION['settings']['restricted_to'] == 1 ? 'inline' : 'none', ';"><td>
                     <i class="fa fa-chevron-right mi-grey-1" style="margin-right: .3em;">&nbsp;</i>
                     <label>'.$LANG['restricted_to_roles'].'</label>
                     </td><td>
@@ -1067,7 +1067,7 @@ 
 }
 // LDAP inputs
 echo '
-            <div id="div_ldap_configuration" ', (isset($_SESSION['settings']['ldap_mode']) && $_SESSION['settings']['ldap_mode'] == 1) ? '':' style="display:none;"' , '>
+            <div id="div_ldap_configuration" ', (isset($_SESSION['settings']['ldap_mode']) && $_SESSION['settings']['ldap_mode'] == 1) ? '' : ' style="display:none;"', '>
                 <div style="font-weight:bold;font-size:14px;margin:15px 0px 8px 0px;">'.$LANG['admin_ldap_configuration'].'</div>
                 <table id="ldap_config_values">';
 // Type
@@ -1086,14 +1086,14 @@ 
                     </tr>';
 // Domain
 echo '
-                    <tr style="display:', (isset($ldap_type)) ? '' : 'none' , '" class="tr-windows tr-ldap tr-posix tr-posix-search">
+                    <tr style="display:', (isset($ldap_type)) ? '' : 'none', '" class="tr-windows tr-ldap tr-posix tr-posix-search">
                         <td><label for="ldap_suffix">'.$LANG['settings_ldap_domain'].'</label></td>
                         <td><input type="text" size="50" id="ldap_suffix" name="ldap_suffix" class="text ui-widget-content" title="@dc=example,dc=com" value="', isset($_SESSION['settings']['ldap_suffix']) ? $_SESSION['settings']['ldap_suffix'] : '', '" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                     </tr>';
 
 // Domain DN
 echo '
-                    <tr style="display:', (isset($ldap_type) && $ldap_type != 'posix-search') ? '' : 'none' , '" class="tr-windows tr-posix tr-ldap">
+                    <tr style="display:', (isset($ldap_type) && $ldap_type != 'posix-search') ? '' : 'none', '" class="tr-windows tr-posix tr-ldap">
                         <td><label for="ldap_domain_dn">'.$LANG['settings_ldap_domain_dn'].'</label></td>
                         <td><input type="text" size="50" id="ldap_domain_dn" name="ldap_domain_dn" class="text ui-widget-content" title="dc=example,dc=com" value="', isset($_SESSION['settings']['ldap_domain_dn']) ? $_SESSION['settings']['ldap_domain_dn'] : '', '" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                     </tr>';
@@ -1108,39 +1108,39 @@ 
 // LDAP username attribute
         // LDAP Object Class
         echo '
-                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none' , '" class="tr-posix-search tr-ldap">
+                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none', '" class="tr-posix-search tr-ldap">
                     <td><label for="ldap_object_class">'.$LANG['settings_ldap_object_class'].'&nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_ldap_object_class_tip']), ENT_QUOTES).'"></i></label></td>
                     <td><input type="text" size="50" id="ldap_object_class" name="ldap_object_class" class="text ui-widget-content" title="Person" value="',
                     isset($_SESSION['settings']['ldap_object_class']) ? $_SESSION['settings']['ldap_object_class'] : 'posixAccount', '" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                 </tr>';
         echo '
-                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none' , '" class="tr-posix-search tr-ldap">
+                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none', '" class="tr-posix-search tr-ldap">
                     <td><label for="ldap_user_attribute">'.$LANG['settings_ldap_user_attribute'].'&nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_ldap_user_attribute_tip']), ENT_QUOTES).'"></i></label></td>
                     <td><input type="text" size="50" id="ldap_user_attribute" name="ldap_user_attribute" class="text ui-widget-content" title="uid" value="',
                         isset($_SESSION['settings']['ldap_user_attribute']) ? $_SESSION['settings']['ldap_user_attribute'] : 'uid', '" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                 </tr>';
                 // LDAP
                 echo '
-                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none' , '" class="tr-posix-search tr-ldap">
+                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none', '" class="tr-posix-search tr-ldap">
                     <td><label for="ldap_usergroup">'.$LANG['settings_ldap_usergroup'].'&nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_ldap_usergroup_tip']), ENT_QUOTES).'"></i></label></td>
                     <td><input type="text" size="50" id="ldap_usergroup" name="ldap_usergroup" class="text ui-widget-content" title="uid" value="',
                         isset($_SESSION['settings']['ldap_usergroup']) ? $_SESSION['settings']['ldap_usergroup'] : '', '" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                 </tr>';
                 // LDAP BIND DN for search
                 echo '
-                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none' , '" class="tr-posix-search tr-ldap">
+                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none', '" class="tr-posix-search tr-ldap">
                     <td><label for="ldap_bind_dn">'.$LANG['settings_ldap_bind_dn'].'&nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_ldap_bind_dn_tip']), ENT_QUOTES).'"></i></label></td>
                     <td><input type="text" size="50" id="ldap_bind_dn" name="ldap_bind_dn" class="text ui-widget-content" title="uid=teampass,ou=people,dc=mydomain,dc=local" value="', isset($_SESSION['settings']['ldap_bind_dn']) ? $_SESSION['settings']['ldap_bind_dn'] : '', '" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                 </tr>';
                 // LDAP BIND PASSWD for search
                 echo '
-                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none' , '" class="tr-posix-search tr-ldap">
+                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none', '" class="tr-posix-search tr-ldap">
                     <td><label for="ldap_bind_passwd">'.$LANG['settings_ldap_bind_passwd'].'&nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_ldap_bind_passwd_tip']), ENT_QUOTES).'"></i></label></td>
                     <td><input type="text" size="50" id="ldap_bind_passwd" name="ldap_bind_passwd" class="text ui-widget-content" title="123password456" value="', isset($_SESSION['settings']['ldap_bind_passwd']) ? $_SESSION['settings']['ldap_bind_passwd'] : '', '" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                 </tr>';
                 // LDAP BASE for search
                 echo '
-                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none' , '" class="tr-posix-search tr-ldap">
+                <tr style="display:', (isset($ldap_type) && $ldap_type === 'posix-search') ? '' : 'none', '" class="tr-posix-search tr-ldap">
                     <td><label for="ldap_search_base">'.$LANG['settings_ldap_search_base'].'&nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_ldap_search_base_tip']), ENT_QUOTES).'"></i></label></td>
                     <td><input type="text" size="50" id="ldap_search_base" name="ldap_search_base" class="text ui-widget-content" title="ou=people,dc=octopoos,dc=local" value="', isset($_SESSION['settings']['ldap_search_base']) ? $_SESSION['settings']['ldap_search_base'] : '', '" onchange="updateSetting($(this).attr(\'id\'));" /></td>
                 </tr>';
@@ -1440,9 +1440,9 @@ 
                         </td>
                         <td>
                             <select id="email_security" name="email_security" class="text ui-widget-content" onchange="updateSetting($(this).attr(\'id\'));">
-                            <option value="none"', !isset($_SESSION['settings']['email_security']) || $_SESSION['settings']['email_security'] == "none" ? ' selected="selected"':"", '>None</option>
-                            <option value="ssl"', isset($_SESSION['settings']['email_security']) && $_SESSION['settings']['email_security'] == "ssl" ? ' selected="selected"':"", '>SSL</option>
-                            <option value="tls"', isset($_SESSION['settings']['email_security']) && $_SESSION['settings']['email_security'] == "tls" ? ' selected="selected"':"", '>TLS</option>
+                            <option value="none"', !isset($_SESSION['settings']['email_security']) || $_SESSION['settings']['email_security'] == "none" ? ' selected="selected"' : "", '>None</option>
+                            <option value="ssl"', isset($_SESSION['settings']['email_security']) && $_SESSION['settings']['email_security'] == "ssl" ? ' selected="selected"' : "", '>SSL</option>
+                            <option value="tls"', isset($_SESSION['settings']['email_security']) && $_SESSION['settings']['email_security'] == "tls" ? ' selected="selected"' : "", '>TLS</option>
                         </select>
                         </td>
                     </tr>';
@@ -1594,8 +1594,7 @@ 
                     '</label>
                     </td><td>
                     <input type="text" size="5" id="upload_imageresize_width" name="upload_imageresize_width" value="',
-                        isset($_SESSION['settings']['upload_imageresize_width']) ? $_SESSION['settings']['upload_imageresize_width'] :
-                        '800', '" class="text ui-widget-content upl_img_opt" onchange="updateSetting($(this).attr(\'id\'));" />
+                        isset($_SESSION['settings']['upload_imageresize_width']) ? $_SESSION['settings']['upload_imageresize_width'] : '800', '" class="text ui-widget-content upl_img_opt" onchange="updateSetting($(this).attr(\'id\'));" />
                     </td>
                 </tr>
                 <tr><td>
@@ -1604,8 +1603,7 @@ 
                     '</label>
                     </td><td>
                     <input type="text" size="5" id="upload_imageresize_height" name="upload_imageresize_height" value="',
-                        isset($_SESSION['settings']['upload_imageresize_height']) ? $_SESSION['settings']['upload_imageresize_height'] :
-                        '600', '" class="text ui-widget-content upl_img_opt" onchange="updateSetting($(this).attr(\'id\'));" />
+                        isset($_SESSION['settings']['upload_imageresize_height']) ? $_SESSION['settings']['upload_imageresize_height'] : '600', '" class="text ui-widget-content upl_img_opt" onchange="updateSetting($(this).attr(\'id\'));" />
                     </td>
                 </tr>
                 <tr><td>
@@ -1614,8 +1612,7 @@ 
                     '</label>
                     </td><td>
                     <input type="text" size="5" id="upload_imageresize_quality" name="upload_imageresize_quality" value="',
-                        isset($_SESSION['settings']['upload_imageresize_quality']) ? $_SESSION['settings']['upload_imageresize_quality'] :
-                        '90', '" class="text ui-widget-content upl_img_opt" onchange="updateSetting($(this).attr(\'id\'));" />
+                        isset($_SESSION['settings']['upload_imageresize_quality']) ? $_SESSION['settings']['upload_imageresize_quality'] : '90', '" class="text ui-widget-content upl_img_opt" onchange="updateSetting($(this).attr(\'id\'));" />
                 </td></tr>';
 echo '
                 <tr><td colspan="3"><hr /></td></tr>';