X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=d853f1ca8d9b9b1b56619e90b1827f27d2c1db99;hb=e2074329ede4aecf833db84c4faa594b97cd4ec5;hp=58283c56cb2362f9554a6b43c3dc7c5cea50d2d1;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 58283c56cb..d853f1ca8d 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/08/2005 *
- * ===============                              Last change: 01/01/2006 *
+ * Mailer v0.2.1-FINAL                                Start: 10/08/2005 *
+ * ===================                          Last change: 01/01/2006 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : gen_sql_patches.php                              *
@@ -17,7 +17,8 @@
  * 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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,13 +38,9 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
-
-// Check for version of sql_patches
-if (GET_EXT_VERSION('sql_patches') < '0.3.6') return false;
+if (!defined('__SECURITY')) {
+	die();
+} // END - if
 
 // Check if there is no scrambling string
 if (getConfig('pass_scramble') == '') {
@@ -51,11 +48,9 @@ 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",
-		array($scrambleString), __FILE__, __LINE__);
+	updateConfiguration('pass_scramble', $scrambleString);
 
-	// Also remember it in config
-	setConfigEntry('pass_scramble', $scrambleString);
+	// Remove dummy string
 	unset($scrambleString);
 } // END - if
 
@@ -63,14 +58,12 @@ if (getConfig('pass_scramble') == '') {
 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(generatePassword(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
 
@@ -78,33 +71,29 @@ if (getConfig('file_hash') == '') {
 	// Create filename from hashed random string
 	$fileHash = sha1(generatePassword(mt_rand(128, 256)));
 	$FQFN = sprintf("%sinc/.secret/.%s",
-		constant('PATH'),
+		getConfig('PATH'),
 		$fileHash
 	);
 
-	// Count of chars to be taken from back of the string
-	$nums = mt_rand(40, 45);
-
 	// Generate secret key from a randomized string
-	$secretKey = substr(sha1(generatePassword(mt_rand(128, 256))), -$nums);
+	$secretKey = sha1(generateHash(mt_rand(128, 256)));
 
 	// File hash was never created
 	writeToFile($FQFN, $secretKey);
 
 	// Is the file there?
 	if (isFileReadable($FQFN)) {
-		//* DEBUG: */ unlink($FQFN);
+		//* DEBUG: */ removeFile($FQFN);
 		//* DEBUG: */ $test = hexdec(getSession('u_hash')) / hexdec($secretKey);
 		//* DEBUG: */ $test = generateHash(str_replace('.', '', $test));
 		//* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".getSession('u_hash')."<br />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?
@@ -115,7 +104,6 @@ if (getConfig('file_hash') == '') {
 
 		// Also update configuration
 		setConfigEntry('secret_key', $secretKey);
-		setConfigEntry('file_hash' , $fileHash);
 
 		// Remove variables
 		unset($secretKey);
@@ -123,5 +111,5 @@ if (getConfig('file_hash') == '') {
 	} // END - if
 } // END - if
 
-//
-?>
\ No newline at end of file
+// [EOF]
+?>