Fix: Changed name of to

Author: ArtemAnoshin

cleantalk/cleantalk.php

@@ -8,8 +8,8 @@
 		return;
 	}
 
-    global $salt;
-    $apbct_checkjs_val = apbct_checkjs_hash($apikey, $salt);
+    global $apbct_salt;
+    $apbct_checkjs_val = apbct_checkjs_hash($apikey, $apbct_salt);
 	global $apbct_checkjs_val;
 	global $antispam_activity_status;
 	if ($spam_firewall == 1) {

cleantalk/inc/admin.php

@@ -70,7 +70,7 @@ function install( $files, $api_key, $cms, $exclusions ){
 function install_config( $modified_files, $api_key, $cms, $exclusions ){
 
     $path_to_config = CLEANTALK_ROOT . 'config.php';
-    $salt = str_pad(rand(0, getrandmax()), 6, '0').str_pad(rand(0, getrandmax()), 6, '0');
+    $apbct_salt = str_pad(rand(0, getrandmax()), 6, '0').str_pad(rand(0, getrandmax()), 6, '0');
     // Attention. Backwards order because inserting it step by step
 
     $pass = 'NO PASS';
@@ -119,8 +119,8 @@ function install_config( $modified_files, $api_key, $cms, $exclusions ){
         );
     }
 
-    File::inject__variable( $path_to_config, 'salt', $salt );
-    File::inject__variable( $path_to_config, 'security', hash( 'sha256', '0(o_O)0' . $salt ) );
+    File::inject__variable( $path_to_config, 'salt', $apbct_salt );
+    File::inject__variable( $path_to_config, 'security', hash( 'sha256', '0(o_O)0' . $apbct_salt ) );
     File::inject__variable( $path_to_config, 'modified_files', $modified_files, true );
     if( $exclusions )
         File::inject__variable( $path_to_config, 'exclusions', $exclusions, true );
@@ -243,12 +243,12 @@ function apbct__plugin_update_message() {
  * Print Block with CSCart Js Snippet
  */
 function apbct__cscart_js_snippet() {
-    global $apikey, $salt, $detected_cms;
+    global $apikey, $apbct_salt, $detected_cms;
 
     // Only for CsCart
     if ($detected_cms != 'cscart') return;
 
-    $apbct_checkjs_hash = apbct_checkjs_hash($apikey, $salt);
+    $apbct_checkjs_hash = apbct_checkjs_hash($apikey, $apbct_salt);
     ?>
 
     <div class="highlight">

cleantalk/inc/functions.php

@@ -446,10 +446,10 @@ function apbct_obfuscate_param($value = null)
 	 * return null|0|1;
 	 */
 	 function apbct_js_test(){
-		 global $apikey, $salt, $detected_cms;
+		 global $apikey, $apbct_salt, $detected_cms;
 		 if(isset($_COOKIE['apbct_checkjs'])){
 			if(
-                $_COOKIE['apbct_checkjs'] == apbct_checkjs_hash($apikey, $salt) ||
+                $_COOKIE['apbct_checkjs'] == apbct_checkjs_hash($apikey, $apbct_salt) ||
                 ($detected_cms === 'cscart' && $_COOKIE['apbct_checkjs'] == md5($apikey))
             )
 				return 1;

cleantalk/lib/Cleantalk/ApbctUni/SFW.php

@@ -79,10 +79,10 @@ public function logs__update($ip, $result) {
 		if($ip === NULL || $result === NULL)
 			return;
 
-		global $salt;
+		global $apbct_salt;
 
 		$time = time();
-		$log_path = CLEANTALK_ROOT . 'data/sfw_logs/'. hash('sha256', $ip . $salt) .'.log';
+		$log_path = CLEANTALK_ROOT . 'data/sfw_logs/'. hash('sha256', $ip . $apbct_salt) .'.log';
 
 		if( file_exists( $log_path ) ){
 

cleantalk/lib/Cleantalk/Updater/Updater.php

@@ -308,4 +308,15 @@ private function rollback(){
 		}else
 			return false;
 	}
+
+    /**
+     * Update 2.5.3
+     */
+    function update_to_2_5_3()
+    {
+        global $apikey, $apbct_salt;
+
+        File::clean__variable(CLEANTALK_CONFIG_FILE, 'apbct_salt');
+        File::inject__variable(CLEANTALK_CONFIG_FILE, 'apbct_salt', apbct_checkjs_hash($apikey, $apbct_salt));
+    }
 }