JuKu / JuKuCMS

system/core/driver/memcacheimpl.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
         $this->memcache = new Memcache();
     }
 
-    public function connect ($host, $port) {
+    public function connect($host, $port) {
         $this->memcache->connect($host, $port);
     }
 
@@ -88,11 +88,11 @@ 
         }
     }
 
-    protected function getKey ($area, $key) {
+    protected function getKey($area, $key) {
         return md5($area) . md5($key);
     }
 
-    private function listAllKeys ($limit = 10000) {
+    private function listAllKeys($limit = 10000) {
         //list with keys
         $keys = array();
 

system/core/driver/filecache.php

Indentation +25 added lines, -25 removed lines

@@ -30,13 +30,13 @@ 
     }
 
     public function get($area, $key) {
-		if ($this->contains($area, $key)) {
-			$file_path = $this->getFilePath($area, $key);
-			//echo "area: " . $area . ", key: " . $key . ", File path: " . $file_path . "<br />\n";
+        if ($this->contains($area, $key)) {
+            $file_path = $this->getFilePath($area, $key);
+            //echo "area: " . $area . ", key: " . $key . ", File path: " . $file_path . "<br />\n";
 
-			$content = file_get_contents($file_path);
+            $content = file_get_contents($file_path);
 
-			//echo $content;
+            //echo $content;
 
             return unserialize($content);
         } else {
@@ -45,12 +45,12 @@ 
     }
 
     public function contains ($area, $key) : bool {
-		return CACHING && file_exists($this->getFilePath($area, $key));
+        return CACHING && file_exists($this->getFilePath($area, $key));
     }
 
     protected function getFilePath (string $area, string $key) : string {
-    	return CACHE_PATH . md5($area) . "/" . md5($key) . ".php";
-	}
+        return CACHE_PATH . md5($area) . "/" . md5($key) . ".php";
+    }
 
     private function check_directory ($name) {
         if (!file_exists(CACHE_PATH . $name . "/")) {
@@ -74,23 +74,23 @@ 
         if (empty($area)) {
             $this->rrmdir(CACHE_PATH, CACHE_PATH);
         } else {
-        	//area is not null
-
-			$area_path = CACHE_PATH . md5($area) . "/";
-
-			if (!empty($key)) {
-				$file_path = CACHE_PATH . md5($area) . "/" + md5($key) + ".php";
-
-				//check, if file exists
-				if (file_exists($file_path)) {
-					//remove file
-					unlink($file_path);
-				}
-			} else {
-				//clear full area
-				$this->rrmdir($area_path, CACHE_PATH);
-			}
-		}
+            //area is not null
+
+            $area_path = CACHE_PATH . md5($area) . "/";
+
+            if (!empty($key)) {
+                $file_path = CACHE_PATH . md5($area) . "/" + md5($key) + ".php";
+
+                //check, if file exists
+                if (file_exists($file_path)) {
+                    //remove file
+                    unlink($file_path);
+                }
+            } else {
+                //clear full area
+                $this->rrmdir($area_path, CACHE_PATH);
+            }
+        }
         // TODO: Implement clear() method.
     }
 

Spacing +8 added lines, -8 removed lines

@@ -44,15 +44,15 @@ 
         }
     }
 
-    public function contains ($area, $key) : bool {
+    public function contains($area, $key) : bool {
 		return CACHING && file_exists($this->getFilePath($area, $key));
     }
 
-    protected function getFilePath (string $area, string $key) : string {
+    protected function getFilePath(string $area, string $key) : string {
     	return CACHE_PATH . md5($area) . "/" . md5($key) . ".php";
 	}
 
-    private function check_directory ($name) {
+    private function check_directory($name) {
         if (!file_exists(CACHE_PATH . $name . "/")) {
             mkdir(CACHE_PATH . $name . "/");
         }
@@ -79,7 +79,7 @@ 
 			$area_path = CACHE_PATH . md5($area) . "/";
 
 			if (!empty($key)) {
-				$file_path = CACHE_PATH . md5($area) . "/" + md5($key) + ".php";
+				$file_path = CACHE_PATH . md5($area) . "/" +md5($key) + ".php";
 
 				//check, if file exists
 				if (file_exists($file_path)) {
@@ -94,15 +94,15 @@ 
         // TODO: Implement clear() method.
     }
 
-    protected function rrmdir ($dir, $cache_dir) {
+    protected function rrmdir($dir, $cache_dir) {
         if (is_dir($dir)) {
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (is_dir($dir."/".$object))
-                        $this->rrmdir($dir."/".$object, $cache_dir);
+                    if (is_dir($dir . "/" . $object))
+                        $this->rrmdir($dir . "/" . $object, $cache_dir);
                     else
-                        unlink($dir."/".$object);
+                        unlink($dir . "/" . $object);
                 }
             }
 

Braces +5 added lines, -4 removed lines

@@ -99,10 +99,11 @@
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (is_dir($dir."/".$object))
-                        $this->rrmdir($dir."/".$object, $cache_dir);
-                    else
-                        unlink($dir."/".$object);
+                    if (is_dir($dir."/".$object)) {
+                                            $this->rrmdir($dir."/".$object, $cache_dir);
+                    } else {
+                                            unlink($dir."/".$object);
+                    }
                 }
             }
 

system/core/driver/postgresqldriver.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
 class PostGreSQLDriver extends MySQLDriver {
 
-    public function connect ($config_path) {
+    public function connect($config_path) {
         if (file_exists($config_path)) {
             require($config_path);
         } else if (file_exists(CONFIG_PATH . $config_path)) {

system/core/driver/memcachedimpl.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
         }
     }
 
-    protected function getKey ($area, $key) {
+    protected function getKey($area, $key) {
         return md5($area) . md5($key);
     }
 

system/core/classes/packages.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 class Packages {
 
-    public static function listPackages (bool $installed_required = true) : array {
+    public static function listPackages(bool $installed_required = true) : array {
 
         if (!file_exists(ROOT_PATH . "store/package_list.php")) {
             return array();

system/core/classes/cache.php

Indentation +25 added lines, -25 removed lines

@@ -115,8 +115,8 @@ 
         }
 
         if (!(self::$second_level_cache instanceof ICache)) {
-        	throw new Exception("second level cache is not instance of ICache.");
-		}
+            throw new Exception("second level cache is not instance of ICache.");
+        }
 
         return self::$second_level_cache;
     }
@@ -148,27 +148,27 @@ 
         unset(self::$cache_instances[$name]);
     }
 
-	/**
-	 * put session
-	 *
-	 * @param $area cache area
-	 * @param $key cache key
-	 * @param $value cache entry value, can also be an object
-	 * @param $ttl time to live of cache entry in seconds (optional)
-	 */
-	public static function put(string $area, string $key, $value, $ttl = 180 * 60) {
-		self::getCache()->put($area, $key, $value, $ttl);
-	}
-
-	public static function get(string $area, string $key) {
-		return self::getCache()->get($area, $key);
-	}
-
-	public static function contains(string $area, string $key) : bool {
-		return self::getCache()->contains($area, $key);
-	}
-
-	public static function clear(string $area = "", string $key = "") {
-		self::getCache()->clear($area, $key);
-	}
+    /**
+     * put session
+     *
+     * @param $area cache area
+     * @param $key cache key
+     * @param $value cache entry value, can also be an object
+     * @param $ttl time to live of cache entry in seconds (optional)
+     */
+    public static function put(string $area, string $key, $value, $ttl = 180 * 60) {
+        self::getCache()->put($area, $key, $value, $ttl);
+    }
+
+    public static function get(string $area, string $key) {
+        return self::getCache()->get($area, $key);
+    }
+
+    public static function contains(string $area, string $key) : bool {
+        return self::getCache()->contains($area, $key);
+    }
+
+    public static function clear(string $area = "", string $key = "") {
+        self::getCache()->clear($area, $key);
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
      */
     protected static $cache_instances = array();
 
-    public static function init () {
+    public static function init() {
         require(CONFIG_PATH . "cache.php");
         
         if (!isset($config['first_lvl_cache']) || !isset($config['first_lvl_cache']['class_name'])) {
@@ -96,7 +96,7 @@ 
         //TODO: load other caches
     }
 
-    public static function &getCache ($name = "") : ICache {
+    public static function &getCache($name = "") : ICache {
         if (empty($name)) {
             return self::$instance;
         } else {
@@ -109,7 +109,7 @@ 
         }
     }
 
-    public static function &get2ndLvlCache () : ICache {
+    public static function &get2ndLvlCache() : ICache {
         if (self::$second_level_cache == null) {
             throw new Exception("second level cache is null.");
         }
@@ -121,11 +121,11 @@ 
         return self::$second_level_cache;
     }
 
-    public static function containsCache ($name) {
+    public static function containsCache($name) {
         return isset(self::$cache_instances[$name]);
     }
 
-    public static function putCache ($name, &$cache_instance) {
+    public static function putCache($name, &$cache_instance) {
         if ($name == null || $name == "") {
             throw new NullPointerException("cache name cannot be null.");
         }
@@ -144,7 +144,7 @@ 
         }
     }
 
-    public static function removeCache ($name) {
+    public static function removeCache($name) {
         unset(self::$cache_instances[$name]);
     }
 

system/core/classes/autoloadercache.php

Indentation +50 added lines, -50 removed lines

@@ -18,61 +18,61 @@
 
 class AutoLoaderCache {
 
-	public static function init () {
-		//check, if directory autoloader in cache exists
-		if (!file_exists(CACHE_PATH . "autoloader")) {
-			mkdir(CACHE_PATH . "autoloader");
-		}
-		//check, if autoloader configuration exists
-		if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
-			//TODO: generate file automatically (self repair)
+    public static function init () {
+        //check, if directory autoloader in cache exists
+        if (!file_exists(CACHE_PATH . "autoloader")) {
+            mkdir(CACHE_PATH . "autoloader");
+        }
+        //check, if autoloader configuration exists
+        if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
+            //TODO: generate file automatically (self repair)
 
-			throw new ConfigurationException("autoloader configuration not found in store.");
-		}
-		if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) {
-			//create cache
-			self::createCache();
-		}
-	}
-	public static function load () {
-		if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
-			throw new ConfigurationException("autoloader configuration not found in store.");
-		}
-		if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) {
-			//cache file doesnt exists
-			self::createCache();
-		}
-		//load classes from cache to save I/O
-		require(CACHE_PATH . "autoloader/preloaded_classes.php");
-	}
-	private static function createCache () {
-		require(STORE_PATH . "autoloader/autoloader.php");
-		//create new cache file
-		$data = "";
+            throw new ConfigurationException("autoloader configuration not found in store.");
+        }
+        if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) {
+            //create cache
+            self::createCache();
+        }
+    }
+    public static function load () {
+        if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
+            throw new ConfigurationException("autoloader configuration not found in store.");
+        }
+        if (!file_exists(CACHE_PATH . "autoloader/preloaded_classes.php")) {
+            //cache file doesnt exists
+            self::createCache();
+        }
+        //load classes from cache to save I/O
+        require(CACHE_PATH . "autoloader/preloaded_classes.php");
+    }
+    private static function createCache () {
+        require(STORE_PATH . "autoloader/autoloader.php");
+        //create new cache file
+        $data = "";
 
-		foreach ($autoloader_classes as $class_path) {
-			if (file_exists($class_path)) {
-				//get php code directly
-				$data .= file_get_contents($class_path);
-			} else if (file_exists(ROOT_PATH . $class_path)) {
-				//use ROOT_PATH prefix
-				$data .= file_get_contents(ROOT_PATH . $class_path);
-			} else {
-				echo "<!-- class " . $class_path . " couldnt be cached, file path doesnt exists. -->";
-			}
-		}
+        foreach ($autoloader_classes as $class_path) {
+            if (file_exists($class_path)) {
+                //get php code directly
+                $data .= file_get_contents($class_path);
+            } else if (file_exists(ROOT_PATH . $class_path)) {
+                //use ROOT_PATH prefix
+                $data .= file_get_contents(ROOT_PATH . $class_path);
+            } else {
+                echo "<!-- class " . $class_path . " couldnt be cached, file path doesnt exists. -->";
+            }
+        }
 
-		//remove unneccessary php tags
-		$data = str_replace("<?php", "", $data);
-		$data = str_replace("?>", "", $data);
-		$text = "<" . "?" . "php " . $data . " ?" . ">";
+        //remove unneccessary php tags
+        $data = str_replace("<?php", "", $data);
+        $data = str_replace("?>", "", $data);
+        $text = "<" . "?" . "php " . $data . " ?" . ">";
 		
-		//write data to file in uncrommpressed way
-		file_put_contents(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php", $text);
+        //write data to file in uncrommpressed way
+        file_put_contents(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php", $text);
 
-		//compress code, remove comments and unneccessary whitespaces with php_strip_whitespace()
-		file_put_contents(CACHE_PATH . "autoloader/preloaded_classes.php", php_strip_whitespace(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php"));
-	}
+        //compress code, remove comments and unneccessary whitespaces with php_strip_whitespace()
+        file_put_contents(CACHE_PATH . "autoloader/preloaded_classes.php", php_strip_whitespace(CACHE_PATH . "autoloader/preloaded_classes_uncompressed.php"));
+    }
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 
 class AutoLoaderCache {
 
-	public static function init () {
+	public static function init() {
 		//check, if directory autoloader in cache exists
 		if (!file_exists(CACHE_PATH . "autoloader")) {
 			mkdir(CACHE_PATH . "autoloader");
@@ -34,7 +34,7 @@ 
 			self::createCache();
 		}
 	}
-	public static function load () {
+	public static function load() {
 		if (!file_exists(STORE_PATH . "autoloader/autoloader.php")) {
 			throw new ConfigurationException("autoloader configuration not found in store.");
 		}
@@ -45,7 +45,7 @@ 
 		//load classes from cache to save I/O
 		require(CACHE_PATH . "autoloader/preloaded_classes.php");
 	}
-	private static function createCache () {
+	private static function createCache() {
 		require(STORE_PATH . "autoloader/autoloader.php");
 		//create new cache file
 		$data = "";

system/core/classes/registry.php

Indentation +40 added lines, -40 removed lines

@@ -28,59 +28,59 @@
  */
 class Registry {
 
-	protected static $objects = array();
-	protected static $settings = array();
-	protected static $instance = null;
+    protected static $objects = array();
+    protected static $settings = array();
+    protected static $instance = null;
 
-	public function __construct () {
-		//
-	}
+    public function __construct () {
+        //
+    }
 
-	public static function &singleton () {
+    public static function &singleton () {
 
-		if (self::$instance == null) {
-			self::$instance = new Registry();
-		}
+        if (self::$instance == null) {
+            self::$instance = new Registry();
+        }
 
-		return self::$instance;
+        return self::$instance;
 
-	}
+    }
 
-	public function storeObject ($key, &$object) {
-		if (is_string($object)) {
-			$object = new $object();
-		}
+    public function storeObject ($key, &$object) {
+        if (is_string($object)) {
+            $object = new $object();
+        }
 
-		self::$objects[$key] = $object;
-	}
+        self::$objects[$key] = $object;
+    }
 
-	public function getObject ($key) {
-		if (!isset(self::$objects[$key])) {
-			throw new IllegalStateException("registry key '" . $key . "' doesnt exists.");
-		}
+    public function getObject ($key) {
+        if (!isset(self::$objects[$key])) {
+            throw new IllegalStateException("registry key '" . $key . "' doesnt exists.");
+        }
 
-		if (is_object(self::$objects[$key])) {
-			return self::$objects[$key];
-		} else {
-			throw new IllegalStateException("key '" . $key.  "' isnt an object.");
-		}
-	}
+        if (is_object(self::$objects[$key])) {
+            return self::$objects[$key];
+        } else {
+            throw new IllegalStateException("key '" . $key.  "' isnt an object.");
+        }
+    }
 
-	public function setSetting ($key, $value) {
-		self::$settings[$key] = $value;
-	}
+    public function setSetting ($key, $value) {
+        self::$settings[$key] = $value;
+    }
 
-	public function getSetting ($key) {
-		if (!isset(self::$settings[$key])) {
-			throw new IllegalStateException("Registry-Settings key '" . htmlentities($key) . "' doesnt exists.");
-		}
+    public function getSetting ($key) {
+        if (!isset(self::$settings[$key])) {
+            throw new IllegalStateException("Registry-Settings key '" . htmlentities($key) . "' doesnt exists.");
+        }
 
-		return self::$settings[$key];
-	}
+        return self::$settings[$key];
+    }
 
-	public function listSettings () {
-		return self::$settings;
-	}
+    public function listSettings () {
+        return self::$settings;
+    }
 
 }
 

Spacing +8 added lines, -8 removed lines

@@ -32,11 +32,11 @@ 
 	protected static $settings = array();
 	protected static $instance = null;
 
-	public function __construct () {
+	public function __construct() {
 		//
 	}
 
-	public static function &singleton () {
+	public static function &singleton() {
 
 		if (self::$instance == null) {
 			self::$instance = new Registry();
@@ -46,7 +46,7 @@ 
 
 	}
 
-	public function storeObject ($key, &$object) {
+	public function storeObject($key, &$object) {
 		if (is_string($object)) {
 			$object = new $object();
 		}
@@ -54,7 +54,7 @@ 
 		self::$objects[$key] = $object;
 	}
 
-	public function getObject ($key) {
+	public function getObject($key) {
 		if (!isset(self::$objects[$key])) {
 			throw new IllegalStateException("registry key '" . $key . "' doesnt exists.");
 		}
@@ -62,15 +62,15 @@ 
 		if (is_object(self::$objects[$key])) {
 			return self::$objects[$key];
 		} else {
-			throw new IllegalStateException("key '" . $key.  "' isnt an object.");
+			throw new IllegalStateException("key '" . $key . "' isnt an object.");
 		}
 	}
 
-	public function setSetting ($key, $value) {
+	public function setSetting($key, $value) {
 		self::$settings[$key] = $value;
 	}
 
-	public function getSetting ($key) {
+	public function getSetting($key) {
 		if (!isset(self::$settings[$key])) {
 			throw new IllegalStateException("Registry-Settings key '" . htmlentities($key) . "' doesnt exists.");
 		}
@@ -78,7 +78,7 @@ 
 		return self::$settings[$key];
 	}
 
-	public function listSettings () {
+	public function listSettings() {
 		return self::$settings;
 	}
 

system/core/classes/icache.php

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
 
 interface ICache {
 
-    public function init ($config);
+    public function init($config);
 
     /**
      * put session
@@ -27,13 +27,13 @@ 
      * @param $value cache entry value, can also be an object
      * @param $ttl time to live of cache entry in seconds (optional)
      */
-    public function put ($area, $key, $value, $ttl = 180 * 60);
+    public function put($area, $key, $value, $ttl = 180 * 60);
 
-    public function get ($area, $key);
+    public function get($area, $key);
 
-    public function contains ($area, $key) : bool;
+    public function contains($area, $key) : bool;
 
-    public function clear ($area = "", $key = "");
+    public function clear($area = "", $key = "");
 
 }