<?php
/************************************************************************
- * MXChange v0.2.1 Start: 10/22/2009 *
- * =============== Last change: 10/22/2009 *
+ * Mailer v0.2.1-FINAL Start: 10/22/2009 *
+ * =================== Last change: 10/22/2009 *
* *
* -------------------------------------------------------------------- *
* File : cachesystem.class.php *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
fwrite($this->pointer, "<?php\n");
} else {
// Cannot create file
- addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
}
}
$GLOBALS['cache_array']['extension'][$k][$data['ext_name']] = $v;
}
if (($k == 'ext_keep') && ($v == 'Y')) {
- $GLOBALS['cache_array']['active_extensions'][$data['ext_name']] = $v;
+ $GLOBALS['cache_array']['always_active'][$data['ext_name']] = $v;
} // END - if
- } elseif (is_array($v)) {
- // Serialize and BASE64-encode the array
- $v = base64_encode(serialize($v));
} elseif ($this->name == 'config') {
// Configuration
$GLOBALS['cache_array']['config'][$data['config']][$k] = $v;
$GLOBALS['cache_array']['refsystem'][$k][$data['id']] = $v;
} elseif ($this->name == 'revision') {
// Revision data
- $GLOBALS['cache_array']['revision'][$k] = $v;
+ $GLOBALS['cache_array']['revision'][$k][0] = $v;
} elseif ($this->name == 'themes') {
// Themes
if ($k == 'theme_path') {
} else {
$GLOBALS['cache_array']['themes'][$k][$data['theme_path']] = $v;
}
+ } elseif ($this->name == 'imprint') {
+ // Imprint
+ $GLOBALS['cache_array']['imprint'][$k][$data['imprint_id']] = $v;
+ } elseif (is_array($v)) {
+ // Serialize and BASE64-encode the array
+ $v = base64_encode(serialize($v));
} else {
// Finialize the cache and close it
$this->finalize();
} // END - foreach
} else {
// Cannot create file
- addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
}
}
// Remove pointer and status
unset($this->status[$this->name]);
$this->pointer = false;
- //* DEBUG: */ outputHtml(__METHOD__."(<font color=\"#0000aa\">".__LINE__."</font>): {$this->name} - FINALIZED!<br />");
+ //* DEBUG: */ outputHtml(__METHOD__ . '(<font color="#0000aa">' . __LINE__."</font>): {$this->name} - FINALIZED!<br />");
} // END - if
}
// Is the cache file there?
if ($this->isCacheReadable()) {
// Load cache file
- require($this->fqfn);
+ include($this->fqfn);
// Is there an array?
if (isset($this->data[$this->name])) {
} else {
// Cache file not found or not readable
debug_report_bug($this->name);
- addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".sprintf(getMessage('CACHE_CANNOT_LOAD'), $this->fqfn));
+ addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMaskedMessage('CACHE_CANNOT_LOAD', $this->fqfn));
// Try to remove it
$this->removeCacheFile();
$this->rebuilt[$this->name] = true;
} else {
// Not removed!
- addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".sprintf(getMessage('CACHE_CANNOT_UNLINK'), $this->fqfn));
+ addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMaskedMessage('CACHE_CANNOT_UNLINK', $this->fqfn));
}
} // END - if
}
}
} else {
// Cannot write to cache!
- addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
}
}
} // END - foreach
} else {
// Cannot write array!
- addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
}
}
} // END - if
} else {
// Cannot write to cache!
- addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
}
}
// Get extension version
$ext_ver = getExtensionVersion($ext_name);
- // Write cache line to file
- fwrite($this->pointer, $this->rewriteEntry($ext_name, $ext_ver, 'version', true));
-
// Add the extension version to object (DO NOT REMOVE IT! Endless loop...)
$this->version[$this->name][$ext_name] = $ext_ver;
+
+ // Write cache line to file
+ fwrite($this->pointer, $this->rewriteEntry($ext_name, $ext_ver, 'version', true));
} // END - if
- //* DEBUG: */ outputHtml(__METHOD__."(<font color=\"#0000aa\">".__LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />");
+ //* DEBUG: */ outputHtml(__METHOD__ . '(<font color="#0000aa">' . __LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />");
} else {
// Cannot create file
- addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
}
}
// Checks wether versions from cache and extension matches
function extensionVersionMatches ($ext_name) {
- // Default is not matching
- $matches = false;
-
- // Compare only if installed
- if (isExtensionInstalled($ext_name)) {
- // Get extension version
- $ext_ver = getExtensionVersion($ext_name);
-
- // Debug messages
- if (isset($this->version[$this->name][$ext_name])) {
- // Does it match?
- $matches = ((isset($this->version[$this->name][$ext_name])) && ($this->version[$this->name][$ext_name] == $ext_ver));
- } elseif ($this->isCacheReadable()) {
- // No cache version found!
- logDebugMessage(__METHOD__, __LINE__, "Cache {$this->name} has missing version entry for extension {$ext_name}! Purging cache...");
-
- // Remove the cache file
- $this->removeCacheFile(true);
+ // Check cache
+ if (!isset($GLOBALS[__METHOD__][$ext_name])) {
+ // Compare only if installed
+ if (isExtensionInstalled($ext_name)) {
+ // Get extension version
+ $ext_ver = getExtensionVersion($ext_name);
+
+ // Debug messages
+ if (isset($this->version[$this->name][$ext_name])) {
+ // Does it match?
+ $GLOBALS[__METHOD__][$ext_name] = ((isset($this->version[$this->name][$ext_name])) && ($this->version[$this->name][$ext_name] == $ext_ver));
+ } elseif ($this->isCacheReadable()) {
+ // No cache version found!
+ logDebugMessage(__METHOD__, __LINE__, "Cache {$this->name} has missing version entry for extension {$ext_name}! Purging cache...");
+
+ // Remove the cache file
+ $this->removeCacheFile(true);
+ }
+ } else {
+ // Not installed, does always match
+ $GLOBALS[__METHOD__][$ext_name] = true;
}
} else {
- // Not installed, does always match
- $matches = true;
+ // Cache entry found, log debug message
+ //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'ext_name=' . $ext_name . ', matches=' . intval($GLOBALS[__METHOD__][$ext_name]));
}
// Compare both
- return $matches;
+ return $GLOBALS[__METHOD__][$ext_name];
}
// Rewrit the entry so it can be stored in cache file
// False
$line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = false;\n";
}
+ } elseif (isset($value[0])) {
+ // These lines needs fixing
+ debug_report_bug('Invalid entry with [0] found. key=' . $key);
} else {
// Non-string
$line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = " . $value . ";\n";
projects / mailer.git / blobdiff