X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=91dd06ea859147f5a3eb3917b459aaa033b7ba31;hp=c6d3a5373b3908b798a579dd547fab13696b13b9;hb=25b4a580b4c7e0d429eb8e436785d3c2ef304f8e;hpb=aba7afc0616db433dac750c3386dbb23b5d077ca

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index c6d3a5373b..91dd06ea85 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                              *
@@ -10,9 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Patcht das Passwort-System nach DB-Update        *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                           *
+ * 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 *
@@ -32,89 +38,79 @@
  ************************************************************************/
 
 // 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
-	$result = 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
-	$_CONFIG['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
-	$result = 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
-	$_CONFIG['master_salt'] = $masterSalt;
+	// Remove dummy string
 	unset($masterSalt);
 } // END - if
 
-if (getConfig('file_hash') == "") {
+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(generatePassword(mt_rand(128, 256)));
+	$FQFN = sprintf("%sinc/.secret/.%s",
+		getConfig('PATH'),
+		$fileHash
+	);
+
+	// Generate secret key from a randomized string
+	$secretKey = sha1(generateHash(mt_rand(128, 256)));
 
 	// File hash was never created
-	$fp = @fopen($file, 'w') or mxchange_die("Cannot write secret key file!");
-	if ($fp != false) {
-		// Could write to secret file! So let's generate the secret key...
-		// 1. Count of chars to be taken from back of the string
-		$nums = mt_rand(40, 45);
-		// 2. Generate secret key from a randomized string
-		$secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
-		// 3. Write the key to the file
-		fwrite($fp, $secretKey);
-		// 4. Close file
-		fclose($fp);
-
-		// Change access rights for more security
-		@chmod($file, 0644);
-
-		//* DEBUG: */ unlink($file);
-		//* DEBUG: */ $test = hexdec(get_session('u_hash')) / hexdec($secretKey);
-		//* DEBUG: */ $test = generateHash(str_replace('.', "", $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",
-			array($file_hash), __FILE__, __LINE__);
+	writeToFile($FQFN, $secretKey);
+
+	// Is the file there?
+	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."<br />Cookie: ".getSession('u_hash')."<br />Test: ".$test);
+
+		// Write $fileHash to database
+		updateConfiguration('file_hash', $fileHash);
+
+		// Generate FQFN for .htaccess file
+		$FQFN = sprintf("%sinc/.secret/.htaccess",
+			getConfig('PATH')
+		);
 
 		// Is the .htaccess file there?
-		if (!FILE_READABLE(PATH."inc/.secret/.htaccess")) {
+		if (!isFileReadable($FQFN)) {
 			// Also create .htaccess file
-			$fp = @fopen(PATH."inc/.secret/.htaccess", 'w') or mxchange_die("Cannot write to .htaccess file!");
-			if ($fp != false) {
-				// Add deny line to file
-				fwrite($fp, "Deny from all");
-
-				// Close the file
-				fclose($fp);
-			} // END - if
+			writeToFile($FQFN, "Deny from all\n");
 		} // END - if
 
 		// Also update configuration
-		$_CONFIG['secret_key'] = $secretKey; unset($secretKey);
-		$_CONFIG['file_hash']  = $file_hash; unset($file_hash);
+		setConfigEntry('secret_key', $secretKey);
+
+		// Remove variables
+		unset($secretKey);
+		unset($fileHash);
 	} // END - if
 } // END - if