More rewrites, and output-mode fixed (we should documentate this)

[mailer.git] / inc / loader / load_cache-revision.php

diff --git a/inc/loader/load_cache-revision.php b/inc/loader/load_cache-revision.php
index f9e9ec11003ed9b3ed4680f3e29465ac9bf913ba..08b60a7b1ade75863bbc4870a35358d1ed6e6ff2 100644 (file)
--- a/inc/loader/load_cache-revision.php
+++ b/inc/loader/load_cache-revision.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 *
@@ -38,27 +38,32 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+       die();
 }
 
 // Next cached table is the revision...
-if (($GLOBALS['cache_instance']->loadCacheFile('revision', true))) {
+if (($GLOBALS['cache_instance']->loadCacheFile('revision'))) {
        // Load revision from cache
        $GLOBALS['cache_array']['revision'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) {
+} elseif ((getOutputMode() != 1)) {
        // Create cache file here
-       $GLOBALS['cache_instance']->init('revision');
+       $GLOBALS['cache_instance']->init();
 
        // add the new RevInfos in and saves it to the cache
-       $GLOBALS['cache_instance']->addRow(getAkt_vers());
+       $GLOBALS['cache_instance']->addRow(getArrayFromActualVersion());
 
        // Close the cache
        $GLOBALS['cache_instance']->finalize();
 
-       // Include loader again
-       require(__FILE__);
+       // Generate FQFN for old revision file
+       $FQFN = sprintf("%s/.revision", getConfig('CACHE_PATH'));
+
+       // Is it there?
+       if (isFileReadable($FQFN)) {
+               // Then remove it
+               removeFile($FQFN);
+       } // END - if
 }
 
-//
+// [EOF]
 ?>