X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=7491cd16ae41d36392a5ac6f40f7dc969aa47751;hb=433a86a6c27009ba3c48a17b5befcc671b45d9a5;hp=d853f1ca8d9b9b1b56619e90b1827f27d2c1db99;hpb=8cd3d68a23aa285f2fe149698a46cf8b4e3ac0ca;p=mailer.git
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index d853f1ca8d..7491cd16ae 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -14,8 +14,6 @@
* $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 - 2009 by Roland Haeder *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
@@ -43,7 +41,7 @@ if (!defined('__SECURITY')) {
} // END - if
// Check if there is no scrambling string
-if (getConfig('pass_scramble') == '') {
+if (getPassScramble() == '') {
// Generate 40 chars long scramble string
$scrambleString = genScrambleString(40);
@@ -55,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))));
@@ -67,11 +65,11 @@ if (getConfig('master_salt') == '') {
unset($masterSalt);
} // END - if
-if (getConfig('file_hash') == '') {
+if (getFileHash() == '') {
// Create filename from hashed random string
$fileHash = sha1(generatePassword(mt_rand(128, 256)));
- $FQFN = sprintf("%sinc/.secret/.%s",
- getConfig('PATH'),
+ $FQFN = sprintf("%sinc/cache/.%s.cache",
+ getPath(),
$fileHash
);
@@ -83,27 +81,9 @@ if (getConfig('file_hash') == '') {
// 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."
Cookie: ".getSession('u_hash')."
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);
+ updateConfiguration('file_hash', $fileHash);
// Remove variables
unset($secretKey);
@@ -111,5 +91,13 @@ if (getConfig('file_hash') == '') {
} // END - if
} // END - if
+// @TODO Rewrite this to a filter
+if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isCacheInstanceValid())) {
+ // Destroy some cache files
+ if ($GLOBALS['cache_instance']->loadCacheFile('config')) $GLOBALS['cache_instance']->removeCacheFile();
+ if ($GLOBALS['cache_instance']->loadCacheFile('extension')) $GLOBALS['cache_instance']->removeCacheFile();
+ if ($GLOBALS['cache_instance']->loadCacheFile('modules')) $GLOBALS['cache_instance']->removeCacheFile();
+} // END - if
+
// [EOF]
?>