X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=b2b984b4e59cb36d146d06ce7fecc76eee3d6c38;hb=382df1e8685f2307b00724668e8cb66cb72500d8;hp=d8cf59fece8633bfa79fbcbb2a6b4c5cab924ef5;hpb=72288d31358f8061513f8d3d61a1f9e7feb44e50;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index d8cf59fece..b2b984b4e5 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                              *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -37,16 +36,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);
-}
-
-// 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') == '') {
+if (getPassScramble() == '') {
 	// Generate 40 chars long scramble string
 	$scrambleString = genScrambleString(40);
 
@@ -58,7 +53,7 @@ if (getConfig('pass_scramble') == '') {
 } // END - if
 
 // Check if there is no master salt string
-if (getConfig('master_salt') == '') {
+if (getMasterSalt() == '') {
 	// Generate the master salt which is the first chars minus 40 chars of this random hash
 	// We do an extra scrambling here...
 	$masterSalt = scrambleString(sha1(generatePassword(mt_rand(128, 256))));
@@ -70,52 +65,43 @@ if (getConfig('master_salt') == '') {
 	unset($masterSalt);
 } // END - if
 
-if (getConfig('file_hash') == '') {
+if ((getFileHash() == '') || (!isFileReadable(getPath() . getCachePath() . '.' . getFileHash() . '.cache'))) {
 	// Create filename from hashed random string
 	$fileHash = sha1(generatePassword(mt_rand(128, 256)));
-	$FQFN = sprintf("%sinc/.secret/.%s",
-		getConfig('PATH'),
+	$FQFN = sprintf('%s%s.%s.cache',
+		getPath(),
+		getCachePath(),
 		$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: */ 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 (!isFileReadable($FQFN)) {
-			// Also create .htaccess file
-			writeToFile($FQFN, "Deny from all\n");
-		} // END - if
-
 		// Also update configuration
 		setConfigEntry('secret_key', $secretKey);
 
+		// Force update
+		updateConfiguration('file_hash', $fileHash, '', '0', TRUE);
+
 		// Remove variables
 		unset($secretKey);
 		unset($fileHash);
 	} // END - if
 } // END - if
 
-//
-?>
\ No newline at end of file
+// @TODO Rewrite this to a filter
+if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isValidCacheInstance())) {
+	// Destroy some cache files
+	foreach (array('config', 'extension', 'filter', 'modules') as $cache) {
+		// Use rebuildCache()
+		rebuildCache($cache);
+	} // END - foreach
+} // END - if
+
+// [EOF]
+?>