X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=57ec554ca29ef3b8ad3f40a7fe747987d406e7c4;hb=ba48cd57aabc0e3ee47b19756c4035be129d85de;hp=5cc162891c6a56c53b5d177244909077c14f81fd;hpb=4e025e412935b6b221a2d183ada05b7a22f4b9e7;p=mailer.git
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 5cc162891c..57ec554ca2 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -10,14 +10,14 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Patcht das Passwort-System nach DB-Update *
* -------------------------------------------------------------------- *
- * $Revision:: 856 $ *
+ * $Revision:: $ *
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
* 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 *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -37,48 +37,43 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
- require($INC);
+if (!defined('__SECURITY')) {
+ die();
}
// Check for version of sql_patches
-if (GET_EXT_VERSION("sql_patches") < "0.3.6") return false;
+if (getExtensionVersion('sql_patches') < '0.3.6') return false;
// Check if there is no scrambling string
-if (getConfig('pass_scramble') == "") {
+if (getConfig('pass_scramble') == '') {
// Generate 40 chars long scramble string
$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",
- array($scrambleString), __FILE__, __LINE__);
+ updateConfiguration('pass_scramble', $scrambleString);
- // Also remember it in config
- setConfigEntry('pass_scramble', $scrambleString);
+ // Remove dummy string
unset($scrambleString);
} // END - if
// Check if there is no master salt string
-if (getConfig('master_salt') == "") {
+if (getConfig('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(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
+ $masterSalt = scrambleString(sha1(generatePassword(mt_rand(128, 256))));
// ... and store it there for future usage
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET master_salt='%s' WHERE config=0 LIMIT 1",
- array($masterSalt), __FILE__, __LINE__);
+ updateConfiguration('master_salt', $masterSalt);
- // Also remember it in config
- setConfigEntry('master_salt', $masterSalt);
+ // Remove dummy string
unset($masterSalt);
} // END - if
-if (getConfig('file_hash') == "") {
+if (getConfig('file_hash') == '') {
// Create filename from hashed random string
- $fileHash = sha1(GEN_PASS(mt_rand(128, 256)));
+ $fileHash = sha1(generatePassword(mt_rand(128, 256)));
$FQFN = sprintf("%sinc/.secret/.%s",
- constant('PATH'),
+ getConfig('PATH'),
$fileHash
);
@@ -86,36 +81,34 @@ if (getConfig('file_hash') == "") {
$nums = mt_rand(40, 45);
// Generate secret key from a randomized string
- $secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
+ $secretKey = substr(sha1(generatePassword(mt_rand(128, 256))), -$nums);
// File hash was never created
- WRITE_FILE($FQFN, $secretKey);
+ writeToFile($FQFN, $secretKey);
// Is the file there?
- 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);
+ if (isFileReadable($FQFN)) {
+ //* DEBUG: */ removeFile($FQFN);
+ //* DEBUG: */ $test = hexdec(getSession('u_hash')) / hexdec($secretKey);
+ //* DEBUG: */ $test = generateHash(str_replace('.', '', $test));
+ //* DEBUG: */ die("Secret-Key: ".$secretKey."
Cookie: ".getSession('u_hash')."
Test: ".$test);
// Write $fileHash to database
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
- array($fileHash), __FILE__, __LINE__);
+ updateConfiguration('file_hash', $fileHash);
// Generate FQFN for .htaccess file
$FQFN = sprintf("%sinc/.secret/.htaccess",
- constant('PATH')
+ getConfig('PATH')
);
// Is the .htaccess file there?
- if (!FILE_READABLE($FQFN)) {
+ if (!isFileReadable($FQFN)) {
// Also create .htaccess file
- WRITE_FILE($FQFN, "Deny from all\n");
+ writeToFile($FQFN, "Deny from all\n");
} // END - if
// Also update configuration
setConfigEntry('secret_key', $secretKey);
- setConfigEntry('file_hash' , $fileHash);
// Remove variables
unset($secretKey);