X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fcache_functions.php;h=44df62bedea920e5cb094042077a2d09bdfc163a;hb=ec5bcdd7331073503aff5742884785b2fdd498e3;hp=e0c3fec20cd0b42090b05bc01ce33b78f94ffb07;hpb=80e2def8ef2125fd4d7d1312ee3993ab613f0846;p=mailer.git diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php index e0c3fec20c..44df62bede 100644 --- a/inc/libs/cache_functions.php +++ b/inc/libs/cache_functions.php @@ -32,11 +32,11 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) -{ +if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } + // Caching class class mxchange_cache { @@ -47,14 +47,19 @@ class mxchange_cache var $cache_inc = ""; var $cache_ctime = 0; var $cache_pointer = false; + var $cache_data = ""; + var $cache_version = ""; // Constructor function mxchange_cache($interval, $path, $tested) { + // Failed is the default + $this->ret = "failed"; + // Remember interval in class - $this->update_interval=$interval; + $this->update_interval = $interval; // Remeber path - $this->cache_path=$path; + $this->cache_path = $path; // Check if path exists if ((is_dir($path)) && (!$tested)) { @@ -70,22 +75,16 @@ class mxchange_cache UPDATE_CONFIG("cache_tested", 1); // All done! - return "done"; + $this->ret = "done"; } else { // Stop! Set a .htaccess file first - $this->ret="htaccess"; - return "htaccess"; + $this->ret = "htaccess"; } } } elseif ($tested) { // System already tested - $this->ret="done"; - return "done"; + $this->ret = "done"; } - - // Something goes wrong here! - $this->ret="failed"; - return "failed"; } function cache_file($file, $ignore_ctime=false) { @@ -103,7 +102,7 @@ class mxchange_cache $ctime = filectime($inc); } else { // No, it doesn't. Zero date/time - $ctime = "0"; + $ctime = 0; } // Remember change date/time in class @@ -153,10 +152,13 @@ class mxchange_cache if (($k == "ext_keep") && ($v == "Y")) { $cacheArray['active_extensions'][$data['ext_name']] = $v; } // END - if - } // END - if + } elseif (is_array($v)) { + // Serialize and BASE64-encode the array + $v = base64_encode(serialize($v)); + } // Write cache line to file - @fwrite($this->cache_pointer, "\$data['".$k."'][] = \"".$v."\";\n"); + @fwrite($this->cache_pointer, $this->add_raw_row($k, $v)); } } else { // Cannot create file @@ -186,27 +188,36 @@ class mxchange_cache } } - function cache_load() - { + function cache_load() { + // Is the cache file there? if (FILE_READABLE($this->cache_inc)) { // Prepare temporary array $data = array(); + $cache_version = null; // Load cache file - $cache = implode("", file($this->cache_inc)); + $this->cache_data = implode("", file($this->cache_inc)); // Execute cache file - eval($cache); + eval($this->cache_data); + if (is_array($data)) { + // Cache data + $this->cache_data = $data; + + // Cache version found? + if ((isset($cache_version)) && (is_array($cache_version))) { + // Remember it as well... + $this->cache_version = $cache_version; + } // END - if + // Return cache - return $data; + return $this->cache_data; } else { // Cache problem detected! $this->cache_destroy(); } - } - else - { + } else { // Cache file not found or not readable ADD_FATAL(__FILE__."(".__LINE__."): ".CACHE_CANNOT_LOAD_1.$this->cache_inc.CACHE_CANNOT_LOAD_2); } @@ -239,18 +250,15 @@ class mxchange_cache function cache_remove($search, $data, $array) { global $ARRAY; - if ((FILE_READABLE($this->cache_inc)) && (is_writeable($this->cache_inc))) - { + if ((FILE_READABLE($this->cache_inc)) && (is_writeable($this->cache_inc))) { // Load cache into dummy array $dummy = $this->cache_load(); // Search for key in array $key = array_search($data, $dummy[$search]); - if (!empty($key)) - { + if (!empty($key)) { // Key (hopefully) found? - foreach ($array as $a) - { + foreach ($array as $a) { // So we can remove all elements as requested unset($dummy[$a][$key]); } @@ -258,22 +266,17 @@ class mxchange_cache // Flush array to cache file $fp = fopen($this->cache_inc, 'w'); fwrite($fp, "\$ARRAY = \"".$ARRAY."\";\n"); - foreach ($dummy as $k => $v) - { - if (is_array($v)) - { + foreach ($dummy as $k => $v) { + if (is_array($v)) { // Multi line(s) found $LINE = ""; - foreach($v as $k2 => $v2) - { + foreach($v as $k2 => $v2) { // Put every array element in a row... - $LINE .= "\$data['".$k."'][] = \"".$v2."\";\n"; + $LINE .= $this->add_raw_row($k, $v2); } - } - else - { + } else { // Single line found - $LINE = "\$data['".$k."'] = \"".$v."\";\n"; + $LINE = $this->add_raw_row($k, $v); } // Write line(s) @@ -283,9 +286,7 @@ class mxchange_cache // Close cache file fclose($fp); } - } - else - { + } else { // Cannot write to cache! ADD_FATAL(__FILE__."(".__LINE__."): ".CACHE_PROBLEMS_DETECTED); } @@ -300,19 +301,15 @@ class mxchange_cache $dummy = $this->cache_load(); // Check if $dummy is valid (prevents some errors) - if ((is_array($dummy)) && (isset($dummy[$search])) && (is_array($dummy[$search]))) - { + if ((is_array($dummy)) && (isset($dummy[$search])) && (is_array($dummy[$search]))) { // Search for key in array $key_found = array_key_exists($search_key, $dummy[$search]); - if ($key_found == true) - { + if ($key_found == true) { $key = $search_key; // Key (hopefully) found? - foreach ($dummy as $a => $v) - { + foreach ($dummy as $a => $v) { // So we can update all entries - if ($a == $search) - { + if ($a == $search) { // Update now... $dummy[$a][$search_key] = $replace; } @@ -321,22 +318,17 @@ class mxchange_cache // Flush array to cache file $fp = fopen($this->cache_inc, 'w'); fwrite($fp, "\$dummy = \"".$ARRAY."\";\n"); - foreach ($dummy as $k => $v) - { - if (is_array($v)) - { + foreach ($dummy as $k => $v) { + if (is_array($v)) { // Multi line(s) found $LINE = ""; - foreach($v as $k2 => $v2) - { + foreach($v as $k2 => $v2) { // Put every array element in a row... - $LINE .= "\$data['".$k."'][] = \"".$v2."\";\n"; + $LINE .= $this->add_raw_row($k, $v2); } - } - else - { + } else { // Single line found - $LINE = "\$data['".$k."'] = \"".$v."\";\n"; + $LINE = $this->add_raw_row($k, $v); } // Write line(s) @@ -347,13 +339,58 @@ class mxchange_cache fclose($fp); } } - } - else - { + } else { // Cannot write to cache! ADD_FATAL(__FILE__."(".__LINE__."): ".CACHE_PROBLEMS_DETECTED); } } + + function store_extension_version ($ext_name) { + // Valid cache pointer? + if (is_resource($this->cache_pointer)) { + // Get extension version + $ext_ver = GET_EXT_VERSION($ext_name); + + // Write cache line to file + @fwrite($this->cache_pointer, "\$cache_version['".$ext_name."'] = \"".$ext_ver."\";\n"); + } else { + // Cannot create file + ADD_FATAL(__FILE__."(".__LINE__."): ".CACHE_PROBLEMS_DETECTED); + } + } + + function ext_version_matches ($ext_name) { + // Load cache (dummy) + $this->cache_load(); + + // Get extension version + $ext_ver = GET_EXT_VERSION($ext_name); + + //* DEBUG: */ echo __METHOD__.": ext_name={$ext_name},ext_ver={$ext_ver},cache_version={$this->cache_version}
\n"; + // Compare both + return ((isset($this->cache_version[$ext_name])) && ($this->cache_version[$ext_name] == $ext_ver)); + } + + function add_raw_row ($key, $value) { + // Init line + $line = ""; + + // String or non-string? ;-) + if (is_string($value)) { + // String... + $line = "\$data['".$key."'][] = \"".$value."\";\n"; + } else { + // Non-string + $line = "\$data['".$key."'][] = ".$value.";\n"; + } + + // Return line + return $line; + } + + function getStatus () { + return $this->ret; + } } // ?>