reading and checking for session variables rewritten

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 9a77b2d3cf7ad508c238a884fb18978cbedfe44d..1e402e0fa28c5366217d4d849b57599fdd23ec69 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -42,37 +42,37 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 if (GET_EXT_VERSION("sql_patches") < "0.3.6") return false;
 
 // Check if there is no scrambling string
-if (empty($CONFIG['pass_scramble']))
+if (empty($_CONFIG['pass_scramble']))
 {
         // Generate 40 chars long scramble string
         $scrambleString = genScrambleString(40);
 
         // ... and store it there for future usage
-        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET pass_scramble='%s' WHERE config='0' LIMIT 1",
+        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET pass_scramble='%s' WHERE config=0 LIMIT 1",
          array($scrambleString), __FILE__, __LINE__);
 
         // Also remember it in config
-        $CONFIG['pass_scramble'] = $scrambleString;
+        $_CONFIG['pass_scramble'] = $scrambleString;
         unset($scrambleString);
 }
 
 // Check if there is no master salt string
-if (empty($CONFIG['master_salt']))
+if (empty($_CONFIG['master_salt']))
 {
         // Generate the master salt which is the first chars minus 40 chars of this random hash
         // We do an extra scrambling here...
         $masterSalt = scrambleString(substr(generateHash(GEN_PASS(rand(128, 256))), 0, -40));
 
         // ... and store it there for future usage
-        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET master_salt='%s' WHERE config='0' LIMIT 1",
+        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET master_salt='%s' WHERE config=0 LIMIT 1",
          array($masterSalt), __FILE__, __LINE__);
 
         // Also remember it in config
-        $CONFIG['master_salt'] = $masterSalt;
+        $_CONFIG['master_salt'] = $masterSalt;
         unset($masterSalt);
 }
 
-if (empty($CONFIG['file_hash']))
+if (empty($_CONFIG['file_hash']))
 {
         // Create filename from hashed random string
         $file_hash = generateHash(GEN_PASS(rand(128, 256)));
@@ -96,12 +96,12 @@ if (empty($CONFIG['file_hash']))
                 @chmod($file, 0644);
 
                 //* DEBUG: */ unlink($file);
-                //* DEBUG: */ $test = hexdec($_COOKIE['u_hash']) / hexdec($secretKey);
+                //* DEBUG: */ $test = hexdec(get_session('u_hash')) / hexdec($secretKey);
                 //* DEBUG: */ $test = generateHash(str_replace('.', '', $test));
-                //* DEBUG: */ die("Secret-Key: ".$secretKey."<br>Cookie: ".$_COOKIE['u_hash']."<br>Test: ".$test);
+                //* DEBUG: */ die("Secret-Key: ".$secretKey."<br>Cookie: ".get_session('u_hash')."<br>Test: ".$test);
 
                 // Write $file_hash to database
-                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET file_hash='%s' WHERE config='0' LIMIT 1",
+                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET file_hash='%s' WHERE config=0 LIMIT 1",
                  array($file_hash), __FILE__, __LINE__);
 
                 // Also create .htaccess file
@@ -116,8 +116,8 @@ if (empty($CONFIG['file_hash']))
                 }
 
                 // Also update configuration
-                $CONFIG['secret_key'] = $secretKey; unset($secretKey);
-                $CONFIG['file_hash']  = $file_hash; unset($file_hash);
+                $_CONFIG['secret_key'] = $secretKey; unset($secretKey);
+                $_CONFIG['file_hash']  = $file_hash; unset($file_hash);
         }
 }