Installer content encapsulated in inc/install-functions.php

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index d853f1ca8d9b9b1b56619e90b1827f27d2c1db99..3d2a48dfe5da78d94ac1e8c234abd54ab7b73739 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -43,7 +43,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 +55,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 +67,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 +83,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."<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);
+               updateConfiguration('file_hash', $fileHash);
 
                // Remove variables
                unset($secretKey);
@@ -111,5 +93,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]
 ?>