Completed
Push — master ( 2c1eb1...6e4c54 )
by Justin
03:16
created
system/core/driver/filecache.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -30,13 +30,13 @@  discard block
 block discarded – undo
30 30
     }
31 31
 
32 32
     public function get($area, $key) {
33
-		if ($this->contains($area, $key)) {
34
-			$file_path = $this->getFilePath($area, $key);
35
-			//echo "area: " . $area . ", key: " . $key . ", File path: " . $file_path . "<br />\n";
33
+        if ($this->contains($area, $key)) {
34
+            $file_path = $this->getFilePath($area, $key);
35
+            //echo "area: " . $area . ", key: " . $key . ", File path: " . $file_path . "<br />\n";
36 36
 
37
-			$content = file_get_contents($file_path);
37
+            $content = file_get_contents($file_path);
38 38
 
39
-			//echo $content;
39
+            //echo $content;
40 40
 
41 41
             return unserialize($content);
42 42
         } else {
@@ -45,12 +45,12 @@  discard block
 block discarded – undo
45 45
     }
46 46
 
47 47
     public function contains ($area, $key) : bool {
48
-		return CACHING && file_exists($this->getFilePath($area, $key));
48
+        return CACHING && file_exists($this->getFilePath($area, $key));
49 49
     }
50 50
 
51 51
     protected function getFilePath (string $area, string $key) : string {
52
-    	return CACHE_PATH . md5($area) . "/" . md5($key) . ".php";
53
-	}
52
+        return CACHE_PATH . md5($area) . "/" . md5($key) . ".php";
53
+    }
54 54
 
55 55
     private function check_directory ($name) {
56 56
         if (!file_exists(CACHE_PATH . $name . "/")) {
@@ -74,23 +74,23 @@  discard block
 block discarded – undo
74 74
         if (empty($area)) {
75 75
             $this->rrmdir(CACHE_PATH, CACHE_PATH);
76 76
         } else {
77
-        	//area is not null
78
-
79
-			$area_path = CACHE_PATH . md5($area) . "/";
80
-
81
-			if (!empty($key)) {
82
-				$file_path = CACHE_PATH . md5($area) . "/" + md5($key) + ".php";
83
-
84
-				//check, if file exists
85
-				if (file_exists($file_path)) {
86
-					//remove file
87
-					unlink($file_path);
88
-				}
89
-			} else {
90
-				//clear full area
91
-				$this->rrmdir($area_path, CACHE_PATH);
92
-			}
93
-		}
77
+            //area is not null
78
+
79
+            $area_path = CACHE_PATH . md5($area) . "/";
80
+
81
+            if (!empty($key)) {
82
+                $file_path = CACHE_PATH . md5($area) . "/" + md5($key) + ".php";
83
+
84
+                //check, if file exists
85
+                if (file_exists($file_path)) {
86
+                    //remove file
87
+                    unlink($file_path);
88
+                }
89
+            } else {
90
+                //clear full area
91
+                $this->rrmdir($area_path, CACHE_PATH);
92
+            }
93
+        }
94 94
         // TODO: Implement clear() method.
95 95
     }
96 96
 
Please login to merge, or discard this patch.
system/core/classes/cache.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
         }
116 116
 
117 117
         if (!(self::$second_level_cache instanceof ICache)) {
118
-        	throw new Exception("second level cache is not instance of ICache.");
119
-		}
118
+            throw new Exception("second level cache is not instance of ICache.");
119
+        }
120 120
 
121 121
         return self::$second_level_cache;
122 122
     }
@@ -148,27 +148,27 @@  discard block
 block discarded – undo
148 148
         unset(self::$cache_instances[$name]);
149 149
     }
150 150
 
151
-	/**
152
-	 * put session
153
-	 *
154
-	 * @param $area cache area
155
-	 * @param $key cache key
156
-	 * @param $value cache entry value, can also be an object
157
-	 * @param $ttl time to live of cache entry in seconds (optional)
158
-	 */
159
-	public static function put(string $area, string $key, $value, $ttl = 180 * 60) {
160
-		self::getCache()->put($area, $key, $value, $ttl);
161
-	}
162
-
163
-	public static function get(string $area, string $key) {
164
-		return self::getCache()->get($area, $key);
165
-	}
166
-
167
-	public static function contains(string $area, string $key) : bool {
168
-		return self::getCache()->contains($area, $key);
169
-	}
170
-
171
-	public static function clear(string $area = "", string $key = "") {
172
-		self::getCache()->clear($area, $key);
173
-	}
151
+    /**
152
+     * put session
153
+     *
154
+     * @param $area cache area
155
+     * @param $key cache key
156
+     * @param $value cache entry value, can also be an object
157
+     * @param $ttl time to live of cache entry in seconds (optional)
158
+     */
159
+    public static function put(string $area, string $key, $value, $ttl = 180 * 60) {
160
+        self::getCache()->put($area, $key, $value, $ttl);
161
+    }
162
+
163
+    public static function get(string $area, string $key) {
164
+        return self::getCache()->get($area, $key);
165
+    }
166
+
167
+    public static function contains(string $area, string $key) : bool {
168
+        return self::getCache()->contains($area, $key);
169
+    }
170
+
171
+    public static function clear(string $area = "", string $key = "") {
172
+        self::getCache()->clear($area, $key);
173
+    }
174 174
 }
Please login to merge, or discard this patch.
system/core/classes/autoloadercache.php 1 patch
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -18,61 +18,61 @@
 block discarded – undo
18 18
 
19 19
 class AutoLoaderCache {
20 20
 
21
-	public static function init () {
22
-		//check, if directory autoloader in cache exists
23
-		if (!file_exists(CACHE_PATH . "autoloader")) {
24
-			mkdir(CACHE_PATH . "autoloader");
25
-		}
26
-		//check, if autoloader configuration exists
27
-		if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
28
-			//TODO: generate file automatically (self repair)
21
+    public static function init () {
22
+        //check, if directory autoloader in cache exists
23
+        if (!file_exists(CACHE_PATH . "autoloader")) {
24
+            mkdir(CACHE_PATH . "autoloader");
25
+        }
26
+        //check, if autoloader configuration exists
27
+        if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
28
+            //TODO: generate file automatically (self repair)
29 29
 
30
-			throw new ConfigurationException("autoloader configuration not found in store.");
31
-		}
32
-		if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) {
33
-			//create cache
34
-			self::createCache();
35
-		}
36
-	}
37
-	public static function load () {
38
-		if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
39
-			throw new ConfigurationException("autoloader configuration not found in store.");
40
-		}
41
-		if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) {
42
-			//cache file doesnt exists
43
-			self::createCache();
44
-		}
45
-		//load classes from cache to save I/O
46
-		require(CACHE_PATH . "autoloader/preloaded_classes.php");
47
-	}
48
-	private static function createCache () {
49
-		require(STORE_PATH . "autoloader/autoloader.php");
50
-		//create new cache file
51
-		$data = "";
30
+            throw new ConfigurationException("autoloader configuration not found in store.");
31
+        }
32
+        if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) {
33
+            //create cache
34
+            self::createCache();
35
+        }
36
+    }
37
+    public static function load () {
38
+        if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
39
+            throw new ConfigurationException("autoloader configuration not found in store.");
40
+        }
41
+        if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) {
42
+            //cache file doesnt exists
43
+            self::createCache();
44
+        }
45
+        //load classes from cache to save I/O
46
+        require(CACHE_PATH . "autoloader/preloaded_classes.php");
47
+    }
48
+    private static function createCache () {
49
+        require(STORE_PATH . "autoloader/autoloader.php");
50
+        //create new cache file
51
+        $data = "";
52 52
 
53
-		foreach ($autoloader_classes as $class_path) {
54
-			if (file_exists($class_path)) {
55
-				//get php code directly
56
-				$data .= file_get_contents($class_path);
57
-			} else if (file_exists(ROOT_PATH . $class_path)) {
58
-				//use ROOT_PATH prefix
59
-				$data .= file_get_contents(ROOT_PATH . $class_path);
60
-			} else {
61
-				echo "<!-- class " . $class_path . " couldnt be cached, file path doesnt exists. -->";
62
-			}
63
-		}
53
+        foreach ($autoloader_classes as $class_path) {
54
+            if (file_exists($class_path)) {
55
+                //get php code directly
56
+                $data .= file_get_contents($class_path);
57
+            } else if (file_exists(ROOT_PATH . $class_path)) {
58
+                //use ROOT_PATH prefix
59
+                $data .= file_get_contents(ROOT_PATH . $class_path);
60
+            } else {
61
+                echo "<!-- class " . $class_path . " couldnt be cached, file path doesnt exists. -->";
62
+            }
63
+        }
64 64
 
65
-		//remove unneccessary php tags
66
-		$data = str_replace("<?php", "", $data);
67
-		$data = str_replace("?>", "", $data);
68
-		$text = "<" . "?" . "php " . $data . " ?" . ">";
65
+        //remove unneccessary php tags
66
+        $data = str_replace("<?php", "", $data);
67
+        $data = str_replace("?>", "", $data);
68
+        $text = "<" . "?" . "php " . $data . " ?" . ">";
69 69
 		
70
-		//write data to file in uncrommpressed way
71
-		file_put_contents(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php", $text);
70
+        //write data to file in uncrommpressed way
71
+        file_put_contents(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php", $text);
72 72
 
73
-		//compress code, remove comments and unneccessary whitespaces with php_strip_whitespace()
74
-		file_put_contents(CACHE_PATH . "autoloader/preloaded_classes.php", php_strip_whitespace(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php"));
75
-	}
73
+        //compress code, remove comments and unneccessary whitespaces with php_strip_whitespace()
74
+        file_put_contents(CACHE_PATH . "autoloader/preloaded_classes.php", php_strip_whitespace(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php"));
75
+    }
76 76
 
77 77
 }
78 78
 
Please login to merge, or discard this patch.
system/core/classes/registry.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -28,59 +28,59 @@
 block discarded – undo
28 28
  */
29 29
 class Registry {
30 30
 
31
-	protected static $objects = array();
32
-	protected static $settings = array();
33
-	protected static $instance = null;
31
+    protected static $objects = array();
32
+    protected static $settings = array();
33
+    protected static $instance = null;
34 34
 
35
-	public function __construct () {
36
-		//
37
-	}
35
+    public function __construct () {
36
+        //
37
+    }
38 38
 
39
-	public static function &singleton () {
39
+    public static function &singleton () {
40 40
 
41
-		if (self::$instance == null) {
42
-			self::$instance = new Registry();
43
-		}
41
+        if (self::$instance == null) {
42
+            self::$instance = new Registry();
43
+        }
44 44
 
45
-		return self::$instance;
45
+        return self::$instance;
46 46
 
47
-	}
47
+    }
48 48
 
49
-	public function storeObject ($key, &$object) {
50
-		if (is_string($object)) {
51
-			$object = new $object();
52
-		}
49
+    public function storeObject ($key, &$object) {
50
+        if (is_string($object)) {
51
+            $object = new $object();
52
+        }
53 53
 
54
-		self::$objects[$key] = $object;
55
-	}
54
+        self::$objects[$key] = $object;
55
+    }
56 56
 
57
-	public function getObject ($key) {
58
-		if (!isset(self::$objects[$key])) {
59
-			throw new IllegalStateException("registry key '" . $key . "' doesnt exists.");
60
-		}
57
+    public function getObject ($key) {
58
+        if (!isset(self::$objects[$key])) {
59
+            throw new IllegalStateException("registry key '" . $key . "' doesnt exists.");
60
+        }
61 61
 
62
-		if (is_object(self::$objects[$key])) {
63
-			return self::$objects[$key];
64
-		} else {
65
-			throw new IllegalStateException("key '" . $key.  "' isnt an object.");
66
-		}
67
-	}
62
+        if (is_object(self::$objects[$key])) {
63
+            return self::$objects[$key];
64
+        } else {
65
+            throw new IllegalStateException("key '" . $key.  "' isnt an object.");
66
+        }
67
+    }
68 68
 
69
-	public function setSetting ($key, $value) {
70
-		self::$settings[$key] = $value;
71
-	}
69
+    public function setSetting ($key, $value) {
70
+        self::$settings[$key] = $value;
71
+    }
72 72
 
73
-	public function getSetting ($key) {
74
-		if (!isset(self::$settings[$key])) {
75
-			throw new IllegalStateException("Registry-Settings key '" . htmlentities($key) . "' doesnt exists.");
76
-		}
73
+    public function getSetting ($key) {
74
+        if (!isset(self::$settings[$key])) {
75
+            throw new IllegalStateException("Registry-Settings key '" . htmlentities($key) . "' doesnt exists.");
76
+        }
77 77
 
78
-		return self::$settings[$key];
79
-	}
78
+        return self::$settings[$key];
79
+    }
80 80
 
81
-	public function listSettings () {
82
-		return self::$settings;
83
-	}
81
+    public function listSettings () {
82
+        return self::$settings;
83
+    }
84 84
 
85 85
 }
86 86
 
Please login to merge, or discard this patch.
system/core/classes/database.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
                 self::$instances[$name]->connect($db_config_path);
75 75
             } else {
76 76
                 //Logger::error("Couldnt find database configuration file for database '" . $name . "'.");
77
-				echo "Couldnt find database configuration file for database '" . $name . "'.";
77
+                echo "Couldnt find database configuration file for database '" . $name . "'.";
78 78
             }
79 79
         }
80 80
     }
Please login to merge, or discard this patch.
system/core/validator/base.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,9 +27,9 @@
 block discarded – undo
27 27
 
28 28
 interface Validator_Base {
29 29
 
30
-	public function isValide ($value) : bool;
30
+    public function isValide ($value) : bool;
31 31
 
32
-	public function validate ($value);
32
+    public function validate ($value);
33 33
 
34 34
 }
35 35
 
Please login to merge, or discard this patch.
system/core/validator/string.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -28,26 +28,26 @@
 block discarded – undo
28 28
  */
29 29
 class Validator_String implements Validator_Base {
30 30
 
31
-	public function isValide($value) : bool {
32
-		$validated_str = $this->validate($value);
31
+    public function isValide($value) : bool {
32
+        $validated_str = $this->validate($value);
33 33
 
34
-		return strcmp($value, $validated_str) === 0;
35
-	}
34
+        return strcmp($value, $validated_str) === 0;
35
+    }
36 36
 
37
-	public function validate($value) : string {
38
-		//escape string
39
-		//$value = Database::getInstance()->escape($value);
37
+    public function validate($value) : string {
38
+        //escape string
39
+        //$value = Database::getInstance()->escape($value);
40 40
 
41
-		//remove html entities
42
-		$value = htmlspecialchars($value, ENT_QUOTES, "UTF-8");//htmlentities($value, null, "UTF-8");
41
+        //remove html entities
42
+        $value = htmlspecialchars($value, ENT_QUOTES, "UTF-8");//htmlentities($value, null, "UTF-8");
43 43
 
44
-		return $value;
45
-	}
44
+        return $value;
45
+    }
46 46
 
47
-	public static function get (string $value) : string {
48
-		$obj = new Validator_String();
49
-		return $obj->validate($value);
50
-	}
47
+    public static function get (string $value) : string {
48
+        $obj = new Validator_String();
49
+        return $obj->validate($value);
50
+    }
51 51
 
52 52
 }
53 53
 
Please login to merge, or discard this patch.
system/core/validator/filename.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,19 +27,19 @@
 block discarded – undo
27 27
 
28 28
 class Validator_Filename implements Validator_Base {
29 29
 
30
-	public function isValide ($value): bool {
31
-		return ctype_alnum($value);
32
-	}
33
-
34
-	public function validate ($value) : string {
35
-		//remove all characters except except a-z, A-Z and 0-9
36
-		return preg_replace("/[^a-zA-Z0-9]+/", "", $value);
37
-	}
38
-
39
-	public static function get (string $value) : string {
40
-		$obj = new Validator_Filename();
41
-		return $obj->validate($value);
42
-	}
30
+    public function isValide ($value): bool {
31
+        return ctype_alnum($value);
32
+    }
33
+
34
+    public function validate ($value) : string {
35
+        //remove all characters except except a-z, A-Z and 0-9
36
+        return preg_replace("/[^a-zA-Z0-9]+/", "", $value);
37
+    }
38
+
39
+    public static function get (string $value) : string {
40
+        $obj = new Validator_Filename();
41
+        return $obj->validate($value);
42
+    }
43 43
 }
44 44
 
45 45
 ?>
Please login to merge, or discard this patch.
system/core/validator/color.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -27,39 +27,39 @@
 block discarded – undo
27 27
 
28 28
 class Validator_Color implements Validator_Base {
29 29
 
30
-	//https://code.hyperspatial.com/all-code/php-code/verify-hex-color-string/
30
+    //https://code.hyperspatial.com/all-code/php-code/verify-hex-color-string/
31 31
 
32
-	public function isValide ($value): bool {
33
-		if(preg_match('/^#[a-f0-9]{6}$/i', $value)) { //hex color is valid
34
-			//Verified hex color
35
-			return true;
36
-		} else if(preg_match('/^[a-f0-9]{6}$/i', $value)) {
37
-			//Check for a hex color string without hash 'c1c2b4'
38
-			//hex color is valid
32
+    public function isValide ($value): bool {
33
+        if(preg_match('/^#[a-f0-9]{6}$/i', $value)) { //hex color is valid
34
+            //Verified hex color
35
+            return true;
36
+        } else if(preg_match('/^[a-f0-9]{6}$/i', $value)) {
37
+            //Check for a hex color string without hash 'c1c2b4'
38
+            //hex color is valid
39 39
 
40
-			//$fix_color = '#' . $value;
40
+            //$fix_color = '#' . $value;
41 41
 
42
-			return true;
43
-		}
42
+            return true;
43
+        }
44 44
 
45
-		return false;
46
-	}
45
+        return false;
46
+    }
47 47
 
48
-	public function validate ($value) {
49
-		if(preg_match('/^#[a-f0-9]{6}$/i', $value)) { //hex color is valid
50
-			//Verified hex color
51
-			return $value;
52
-		} else if(preg_match('/^[a-f0-9]{6}$/i', $value)) {
53
-			//Check for a hex color string without hash 'c1c2b4'
54
-			//hex color is valid
48
+    public function validate ($value) {
49
+        if(preg_match('/^#[a-f0-9]{6}$/i', $value)) { //hex color is valid
50
+            //Verified hex color
51
+            return $value;
52
+        } else if(preg_match('/^[a-f0-9]{6}$/i', $value)) {
53
+            //Check for a hex color string without hash 'c1c2b4'
54
+            //hex color is valid
55 55
 
56
-			$fix_color = '#' . $value;
56
+            $fix_color = '#' . $value;
57 57
 
58
-			return $fix_color;
59
-		}
58
+            return $fix_color;
59
+        }
60 60
 
61
-		throw new Exception("method isnt implemented yet.");
62
-	}
61
+        throw new Exception("method isnt implemented yet.");
62
+    }
63 63
 
64 64
 }
65 65
 
Please login to merge, or discard this patch.