X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fcachesystem.class.php;h=729197a03dd48d8d7d6e542c6d67010acc53e6b3;hb=63f159414369b5ea19a8ca75d8cd8033c45d8341;hp=aaaebe605205fd0b843abcb2761c5b5f5a1e5333;hpb=f4d7dc336fde4cebc47701026a94d193f77854a1;p=mailer.git

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index aaaebe6052..729197a03d 100644
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -119,13 +119,13 @@ class CacheSystem {
 
 			// Create file
 			if ($this->isCacheReadable()) changeMode($this->fqfn, 0666);
-			$this->pointer = fopen($this->fqfn, 'w') or debug_report_bug(__METHOD__, __LINE__, 'Cannot write to cache ' . $this->fqfn . ' !');
+			$this->pointer = fopen($this->fqfn, 'w') or reportBug(__METHOD__, __LINE__, 'Cannot write to cache ' . $this->fqfn . ' !');
 
 			// Add open PHP tag
 			$this->writeLine('<?php');
 		} else {
 			// Cannot create file
-			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
+			reportBug(__METHOD__, __LINE__, 'Problems with cache directory detected, getStatusCode()=' . $this->getStatusCode());
 		}
 	}
 
@@ -138,10 +138,10 @@ class CacheSystem {
 		// Is the pointer a valid resource?
 		if (is_resource($this->pointer)) {
 			// Write the line
-			fwrite($this->pointer, $line . "\n");
+			fwrite($this->pointer, $line . chr(10));
 		} else {
 			// Something bad happened
-			debug_report_bug(__METHOD__, __LINE__, 'Pointer type is ' . gettype($this->pointer) . ', expected is resource.');
+			reportBug(__METHOD__, __LINE__, 'Pointer type is ' . gettype($this->pointer) . ', expected is resource.');
 		}
 	}
 
@@ -187,12 +187,12 @@ class CacheSystem {
 					}
 				} elseif ($this->name == 'admin_acls') {
 					// Access control lines
-					$GLOBALS['cache_array']['admin_acls'][$k][$data['admin_id']][] = $v;
+					array_push($GLOBALS['cache_array']['admin_acls'][$k][$data['admin_id']], $v);
 				} elseif ($this->name == 'refdepths') {
-					// Referal levels
+					// Referral levels
 					$GLOBALS['cache_array']['refdepths'][$k][$data['id']] = $v;
 				} elseif ($this->name == 'refsystem') {
-					// Referal system
+					// Referral system
 					$GLOBALS['cache_array']['refsystem'][$k][$data['id']] = $v;
 				} elseif ($this->name == 'revision') {
 					// Revision data
@@ -207,6 +207,12 @@ class CacheSystem {
 				} elseif ($this->name == 'imprint') {
 					// Imprint
 					$GLOBALS['cache_array']['imprint'][$k][$data['imprint_id']] = $v;
+				} elseif ($this->name == 'points_data') {
+					// Table 'points_data'
+					$GLOBALS['cache_array']['points_data'][$k][$data['id']] = $v;
+				} elseif ($this->name == 'earning') {
+					// Table 'earning'
+					$GLOBALS['cache_array']['earning'][$k][$data['earning_id']] = $v;
 				} elseif (is_array($v)) {
 					// Serialize and BASE64-encode the array
 					$v = base64_encode(serialize($v));
@@ -218,7 +224,7 @@ class CacheSystem {
 					$this->removeCacheFile(true);
 
 					// Unsupported/unhandled cache detected
-					debug_report_bug(__METHOD__, __LINE__, 'Unsupported cache ' . $this->name . ' detected.');
+					reportBug(__METHOD__, __LINE__, 'Unsupported cache ' . $this->name . ' detected.');
 				}
 
 				// Write cache line to file
@@ -226,7 +232,7 @@ class CacheSystem {
 			} // END - foreach
 		} else {
 			// Cannot create file
-			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
+			reportBug(__METHOD__, __LINE__, 'Problem with cache detected, no resource! pointer[]=' . gettype($this->pointer));
 		}
 	}
 
@@ -251,7 +257,7 @@ class CacheSystem {
 			// Remove pointer and status
 			unset($this->status[$this->name]);
 			$this->pointer = false;
-			//* DEBUG: */ debugOutput(__METHOD__ . '(<font color="#0000aa">' . __LINE__.'</font>): '.$this->name.' - FINALIZED!');
+			//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'name=' . $this->name . ' - FINALIZED!');
 		} // END - if
 	}
 
@@ -290,8 +296,7 @@ class CacheSystem {
 			} // END - if
 		} else {
 			// Cache file not found or not readable
-			debug_report_bug(__METHOD__, __LINE__, $this->name);
-			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMaskedMessage('CACHE_CANNOT_LOAD', $this->fqfn));
+			reportBug(__METHOD__, __LINE__, '{%message,CACHE_CANNOT_LOAD=' . $this->name . '%}');
 
 			// Try to remove it
 			$this->removeCacheFile();
@@ -333,7 +338,7 @@ class CacheSystem {
 			} // END - if
 
 			// Remove cache file from system
-			//* DEBUG: */ debug_report_bug(__METHOD__, __LINE__, 'About to remove ' . basename($this->fqfn) . '!');
+			//* DEBUG: */ reportBug(__METHOD__, __LINE__, 'About to remove ' . basename($this->fqfn) . '!');
 			removeFile($this->fqfn);
 
 			// Reset read status
@@ -347,7 +352,7 @@ class CacheSystem {
 				$this->rebuilt[$this->name] = true;
 			} else {
 				// Not removed!
-				addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMaskedMessage('CACHE_CANNOT_UNLINK', $this->fqfn));
+				reportBug(__METHOD__, __LINE__, '{%message,CACHE_CANNOT_UNLINK=' . $this->name . '%}');
 			}
 		} // END - if
 	}
@@ -375,10 +380,10 @@ class CacheSystem {
 
 				// Close cache file
 				$this->finalize();
-			}
+			} // END - if
 		} else {
 			// Cannot write to cache!
-			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
+			reportBug(__METHOD__, __LINE__, 'Problem with cache detected: Unexpected status ' . $this->status[$this->name]);
 		}
 	}
 
@@ -402,7 +407,7 @@ class CacheSystem {
 			} // END - foreach
 		} else {
 			// Cannot write array!
-			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
+			reportBug(__METHOD__, __LINE__, 'Problem with cache detected: pointer is not resource! pointer[]=' . gettype($this->pointer));
 		}
 	}
 
@@ -439,7 +444,7 @@ class CacheSystem {
 			} // END - if
 		} else {
 			// Cannot write to cache!
-			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
+			reportBug(__METHOD__, __LINE__, 'Problem with cache detected: Unexpected status ' . $this->status[$this->name]);
 		}
 	}
 
@@ -458,14 +463,14 @@ class CacheSystem {
 				// Write cache line to file
 				$this->writeLine($this->rewriteEntry($ext_name, $ext_ver, 'version', true));
 			} // END - if
-			//* DEBUG: */ debugOutput(__METHOD__ . '(<font color="#0000aa">' . __LINE__ . '</font>): '.$this->name.' - '.$ext_name.'='.$ext_ver);
+			//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'name=' . $this->name . ',ext_name=' . $ext_name . ',ext_ver=' . $ext_ver);
 		} else {
 			// Cannot create file
-			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
+			reportBug(__METHOD__, __LINE__, 'Problem with cache detected: pointer is not resource! pointer[]=' . gettype($this->pointer));
 		}
 	}
 
-	// Checks wether versions from cache and extension matches
+	// Checks whether versions from cache and extension matches
 	function extensionVersionMatches ($ext_name) {
 		// Check cache
 		if (!isset($GLOBALS[__METHOD__][$ext_name])) {
@@ -521,7 +526,7 @@ class CacheSystem {
 			$line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = '" . escapeQuotes($value) . "';";
 		} elseif (is_null($value)) {
 			// Null
-			$line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = null;';
+			$line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = NULL;';
 		} elseif (is_bool($value)) {
 			// Boolean value
 			if ($value === true) {
@@ -533,7 +538,7 @@ class CacheSystem {
 			}
 		} elseif (isset($value[0])) {
 			// These lines needs fixing
-			debug_report_bug(__METHOD__, __LINE__, 'Invalid entry with [0] found. key=' . $key);
+			reportBug(__METHOD__, __LINE__, 'Invalid entry with [0] found. key=' . $key);
 		} else {
 			// Non-string
 			$line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = ' . $value . ';';
@@ -553,7 +558,7 @@ class CacheSystem {
 		$this->statusCode = $status;
 	}
 
-	// Checks wether the current cache file is readable
+	// Checks whether the current cache file is readable
 	function isCacheReadable () {
 		// Array entry found?
 		if (!isset($this->readable[$this->name])) {
@@ -568,7 +573,7 @@ class CacheSystem {
 	// Cloning not allowed
 	function __clone () {
 		// Please do not clone this class
-		debug_report_bug(__METHOD__, __LINE__, 'Cloning of this class is not allowed.');
+		reportBug(__METHOD__, __LINE__, 'Cloning of this class is not allowed.');
 	}
 } // END - class