SQLs fixed

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 4853da16b7023890ae3083769503b693e3bd3377..24bd20b76f0851532d4f571faa5e6a2883d9f707 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -70,8 +68,9 @@ if (getMasterSalt() == '') {
 if (getFileHash() == '') {
        // Create filename from hashed random string
        $fileHash = sha1(generatePassword(mt_rand(128, 256)));
-       $FQFN = sprintf("%sinc/.secret/.%s",
+       $FQFN = sprintf("%s%s.%s.cache",
                getPath(),
+               getCachePath(),
                $fileHash
        );
 
@@ -83,27 +82,9 @@ if (getFileHash() == '') {
 
        // 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",
-                       getPath()
-               );
-
-               // 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 +92,13 @@ if (getFileHash() == '') {
        } // 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]
 ?>