- Login failtures added to admin/member menu

[mailer.git] / inc / libs / cache_functions.php

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index 1394c129b3e4ddd1c81da5cb87086fc49ab5be9e..f3496a5ccb4f152aed76f2fac9e2d2c510583ad8 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -47,6 +47,8 @@ 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) {
@@ -156,7 +158,7 @@ class mxchange_cache
                                } // END - if
 
                                // 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,35 @@ 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();
 
                        // 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)) {
+                                       // 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 +249,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 +265,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 +285,7 @@ class mxchange_cache
                                // Close cache file
                                fclose($fp);
                        }
-               }
-               else
-               {
+               } else {
                        // Cannot write to cache!
                        ADD_FATAL(__FILE__."(".__LINE__."): ".CACHE_PROBLEMS_DETECTED);
                }
@@ -300,19 +300,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 +317,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 +338,54 @@ 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_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}<br />\n";
+               // Compare both
+               return ($ext_ver == $this->cache_version);
+       }
+
+       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;
+       }
 }
 //
 ?>