X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=57ec554ca29ef3b8ad3f40a7fe747987d406e7c4;hb=b9edcfb00bb14c7b53b107ff5b1290841340b434;hp=e2b45f2eab75893a31c0360bc290e53ec3ae87a9;hpb=5071030af40e69ca4284642f44758964e18f5be8;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index e2b45f2eab..57ec554ca2 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -17,7 +17,7 @@
  * 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,13 +37,12 @@
  ************************************************************************/
 
 // 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') == '') {
@@ -51,11 +50,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 +60,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,8 +73,8 @@ if (getConfig('file_hash') == '') {
 	// Create filename from hashed random string
 	$fileHash = sha1(generatePassword(mt_rand(128, 256)));
 	$FQFN = sprintf("%sinc/.secret/.%s",
-	constant('PATH'),
-	$fileHash
+		getConfig('PATH'),
+		$fileHash
 	);
 
 	// Count of chars to be taken from back of the string
@@ -99,12 +94,11 @@ if (getConfig('file_hash') == '') {
 		//* 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 +109,6 @@ if (getConfig('file_hash') == '') {
 
 		// Also update configuration
 		setConfigEntry('secret_key', $secretKey);
-		setConfigEntry('file_hash' , $fileHash);
 
 		// Remove variables
 		unset($secretKey);