X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=60353c90b5d498f9eff2e652ff5a85027dacca4d;hp=62ef9909e9e65266de14f52fd9e6728b130e6db9;hb=f3e4c2c048761589836fdbe6bd2e46599a1833a7;hpb=62b16291efe168636f5eda2c8644f6770382fb1e
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 62ef9909e9..60353c90b5 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Patcht das Passwort-System nach DB-Update *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: 856 $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: stelzi $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -46,11 +51,11 @@ if (getConfig('pass_scramble') == "") {
$scrambleString = genScrambleString(40);
// ... and store it there for future usage
- SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET pass_scramble='%s' WHERE config=0 LIMIT 1",
+ 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;
+ setConfigEntry('pass_scramble', $scrambleString);
unset($scrambleString);
} // END - if
@@ -61,18 +66,21 @@ if (getConfig('master_salt') == "") {
$masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
// ... and store it there for future usage
- SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET master_salt='%s' WHERE config=0 LIMIT 1",
+ 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;
+ setConfigEntry('master_salt', $masterSalt);
unset($masterSalt);
} // END - if
if (getConfig('file_hash') == "") {
// Create filename from hashed random string
- $file_hash = sha1(GEN_PASS(mt_rand(128, 256)));
- $file = PATH."inc/.secret/.".$file_hash;
+ $fileHash = sha1(GEN_PASS(mt_rand(128, 256)));
+ $FQFN = sprintf("%sinc/.secret/.%s",
+ constant('PATH'),
+ $fileHash
+ );
// Count of chars to be taken from back of the string
$nums = mt_rand(40, 45);
@@ -81,21 +89,23 @@ if (getConfig('file_hash') == "") {
$secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
// File hash was never created
- WRITE_FILE($file, $secretKey);
+ WRITE_FILE($FQFN, $secretKey);
// Is the file there?
- if (FILE_READABLE($file)) {
- //* DEBUG: */ unlink($file);
+ if (FILE_READABLE($FQFN)) {
+ //* DEBUG: */ unlink($FQFN);
//* DEBUG: */ $test = hexdec(get_session('u_hash')) / hexdec($secretKey);
//* DEBUG: */ $test = generateHash(str_replace('.', "", $test));
//* DEBUG: */ die("Secret-Key: ".$secretKey."
Cookie: ".get_session('u_hash')."
Test: ".$test);
- // Write $file_hash to database
- SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
- array($file_hash), __FILE__, __LINE__);
+ // Write $fileHash to database
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
+ array($fileHash), __FILE__, __LINE__);
// Generate FQFN for .htaccess file
- $FQFN = PATH."inc/.secret/.htaccess";
+ $FQFN = sprintf("%sinc/.secret/.htaccess",
+ constant('PATH')
+ );
// Is the .htaccess file there?
if (!FILE_READABLE($FQFN)) {
@@ -104,8 +114,12 @@ if (getConfig('file_hash') == "") {
} // END - if
// Also update configuration
- $_CONFIG['secret_key'] = $secretKey; unset($secretKey);
- $_CONFIG['file_hash'] = $file_hash; unset($file_hash);
+ setConfigEntry('secret_key', $secretKey);
+ setConfigEntry('file_hash' , $fileHash);
+
+ // Remove variables
+ unset($secretKey);
+ unset($fileHash);
} // END - if
} // END - if