JuKu / JuKuCMS

setup/db-repair.php

Indentation +20 added lines, -20 removed lines

@@ -29,8 +29,8 @@ 
 error_reporting(E_ALL);
 
 if (PHP_MAJOR_VERSION < 7) {
-	echo "CMS is required PHP 7.0.0 or greater! Please install PHP 7 (current version: " . PHP_VERSION . ").";
-	exit;
+    echo "CMS is required PHP 7.0.0 or greater! Please install PHP 7 (current version: " . PHP_VERSION . ").";
+    exit;
 }
 
 //define some constants
@@ -919,35 +919,35 @@ 
 
 //get main menuID
 if (!Settings::contains("main_menuID")) {
-	//create menu_names if absent
-	$main_menuID = Menu::createMenuName("Main Menu", "main_menu");
+    //create menu_names if absent
+    $main_menuID = Menu::createMenuName("Main Menu", "main_menu");
 
-	//set setting
-	Settings::create("main_menuID", $main_menuID, "Main MenuID", "id of main menu (in menu area)", "system", "general", "none", "none", 1);
+    //set setting
+    Settings::create("main_menuID", $main_menuID, "Main MenuID", "id of main menu (in menu area)", "system", "general", "none", "none", 1);
 } else {
-	$main_menuID = Settings::get("main_menuID");
+    $main_menuID = Settings::get("main_menuID");
 }
 
 //get admin area menuID
 if (!Settings::contains("admin_menuID")) {
-	//create menu_names if absent
-	$admin_menuID = Menu::createMenuName("Admin Menu", "admin_menu");
+    //create menu_names if absent
+    $admin_menuID = Menu::createMenuName("Admin Menu", "admin_menu");
 
-	//set setting
-	Settings::create("admin_menuID", $admin_menuID, "Admin MenuID", "id of admin menu (in admin area)", "system", "general", "none", "none", 2);
+    //set setting
+    Settings::create("admin_menuID", $admin_menuID, "Admin MenuID", "id of admin menu (in admin area)", "system", "general", "none", "none", 2);
 } else {
-	$admin_menuID = Settings::get("admin_menuID");
+    $admin_menuID = Settings::get("admin_menuID");
 }
 
 //get local menuID
 if (!Settings::contains("local_menuID")) {
-	//create menu_names if absent
-	$local_menuID = Menu::createMenuName("Default Local Menu", "local_menu");
+    //create menu_names if absent
+    $local_menuID = Menu::createMenuName("Default Local Menu", "local_menu");
 
-	//set setting
-	Settings::create("local_menuID", $local_menuID, "Default Local MenuID", "id of default local menu (in menu area)", "system", "general", "none", "none", 1);
+    //set setting
+    Settings::create("local_menuID", $local_menuID, "Default Local MenuID", "id of default local menu (in menu area)", "system", "general", "none", "none", 1);
 } else {
-	$local_menuID = Settings::get("local_menuID");
+    $local_menuID = Settings::get("local_menuID");
 }
 
 //create default folders, if absent
@@ -1069,11 +1069,11 @@ 
 echo "<br /><br />Finished DB Upgrade!";
 
 if (file_exists(ROOT_PATH . "setup/add-install.php")) {
-	echo "<br />Call add-install.php...<br />";
+    echo "<br />Call add-install.php...<br />";
 
-	require(ROOT_PATH . "setup/add-install.php");
+    require(ROOT_PATH . "setup/add-install.php");
 
-	echo "<br /><br />Finished additional Upgrade!";
+    echo "<br /><br />Finished additional Upgrade!";
 }
 
 ?>

system/core/driver/mysqldriver.php

Indentation +14 added lines, -14 removed lines

@@ -55,9 +55,9 @@ 
             $this->conn = new PDO("mysql:host=" . $this->host . ";port=" . $this->port . ";dbname=" . $this->database . "", $this->username, $this->password, $this->options);
 
             if (DEBUG_MODE) {
-				//$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-				//$this->conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
-			}
+                //$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                //$this->conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+            }
         } catch (PDOException $e) {
             echo "Couldnt connect to database!";
             echo $e->getTraceAsString();
@@ -103,15 +103,15 @@ 
             $res = $stmt->execute();
 
             if (!$res) {
-				if (DEBUG_MODE) {
-					echo "SQL Query: " + $sql;
-				}
+                if (DEBUG_MODE) {
+                    echo "SQL Query: " + $sql;
+                }
 
                 //TODO: throw exception instead
 
                 print_r($stmt->errorInfo());
 
-				ob_end_flush();
+                ob_end_flush();
                 exit;
             }
 
@@ -123,7 +123,7 @@ 
                 exit;
             }
 
-			print_r($e);
+            print_r($e);
 
             echo "<br /><br /><b>Query</b>: " . $sql . ", parameters: ";
             var_dump($params);
@@ -142,7 +142,7 @@ 
                 exit;
             }
 
-			print_r($e);
+            print_r($e);
 
             echo "<br /><br /><b>Query</b>: " . $sql . ", parameters: ";
             var_dump($params);
@@ -206,8 +206,8 @@ 
 
         $sql = str_replace("{DBPRAEFIX}", $this->praefix, $sql);
         $sql = str_replace("{praefix}", $this->praefix, $sql);
-		$sql = str_replace("{prefix}", $this->praefix, $sql);
-		$sql = str_replace("{PREFIX}", $this->praefix, $sql);
+        $sql = str_replace("{prefix}", $this->praefix, $sql);
+        $sql = str_replace("{PREFIX}", $this->praefix, $sql);
         return str_replace("{PRAEFIX}", $this->praefix, $sql);
     }
 
@@ -332,9 +332,9 @@ 
         }
     }
 
-	public function lastInsertId(): int {
-		return $this->conn->lastInsertId();
-	}
+    public function lastInsertId(): int {
+        return $this->conn->lastInsertId();
+    }
 
     public function listQueryHistory() : array {
         return self::$query_history;

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.
     }
 

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);
+    }
 }

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"));
+    }
 
 }
 

system/core/classes/security.php

Indentation +16 added lines, -16 removed lines

@@ -34,20 +34,20 @@ 
         @ini_set("expose_php", "off");
 
         //dont allow include($url) to avoid code injection
-		@ini_set("allow_url_include", "0");
+        @ini_set("allow_url_include", "0");
 
-		header("X-Content-Type-Options: nosniff");
+        header("X-Content-Type-Options: nosniff");
 
-		//enable internet explorer XSS protection, https://www.perpetual-beta.org/weblog/security-headers.html
-		header("X-XSS-Protection: 1; mode=block");
+        //enable internet explorer XSS protection, https://www.perpetual-beta.org/weblog/security-headers.html
+        header("X-XSS-Protection: 1; mode=block");
 
-		//https://developer.mozilla.org/de/docs/Web/HTTP/Headers/X-Frame-Options
-		$x_frame_options = Settings::get("x_frame_options", "SAMEORIGIN");
+        //https://developer.mozilla.org/de/docs/Web/HTTP/Headers/X-Frame-Options
+        $x_frame_options = Settings::get("x_frame_options", "SAMEORIGIN");
 
-		if (strcmp($x_frame_options, "none") !== 0) {
-			//set X-Frame-Options header to avoid clickjacking attacks
-			header("X-Frame-Options: " . $x_frame_options);
-		}
+        if (strcmp($x_frame_options, "none") !== 0) {
+            //set X-Frame-Options header to avoid clickjacking attacks
+            header("X-Frame-Options: " . $x_frame_options);
+        }
 
         /**
          * dont allow some XSS attacks or SQL Injections from host or server name
@@ -96,13 +96,13 @@ 
     }
 
     public static function checkCSRFToken ($value = null) {
-    	if (is_null($value)) {
-    		if (!isset($_REQUEST['csrf_token']) || empty($_REQUEST['csrf_token'])) {
-    			return false;
-			}
+        if (is_null($value)) {
+            if (!isset($_REQUEST['csrf_token']) || empty($_REQUEST['csrf_token'])) {
+                return false;
+            }
 
-    		$value = $_REQUEST['csrf_token'];
-		}
+            $value = $_REQUEST['csrf_token'];
+        }
 
         return self::$csrf_token === $value;
     }

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;
+    }
 
 }
 

system/core/classes/database.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
                 self::$instances[$name]->connect($db_config_path);
             } else {
                 //Logger::error("Couldnt find database configuration file for database '" . $name . "'.");
-				echo "Couldnt find database configuration file for database '" . $name . "'.";
+                echo "Couldnt find database configuration file for database '" . $name . "'.";
             }
         }
     }

system/core/classes/classloader.php

Indentation +15 added lines, -15 removed lines

@@ -107,12 +107,12 @@ 
         require(ROOT_PATH . "system/core/classes/" . strtolower($classname) . ".php");
         return null;
     } else if (file_exists(ROOT_PATH . "system/core/exception/" . strtolower($classname) . ".php")) {
-		require(ROOT_PATH . "system/core/exception/" . strtolower($classname) . ".php");
-		return null;
-	} else if (file_exists(ROOT_PATH . "system/core/driver/" . strtolower($classname) . ".php")) {
-		require(ROOT_PATH . "system/core/driver/" . strtolower($classname) . ".php");
-		return null;
-	}
+        require(ROOT_PATH . "system/core/exception/" . strtolower($classname) . ".php");
+        return null;
+    } else if (file_exists(ROOT_PATH . "system/core/driver/" . strtolower($classname) . ".php")) {
+        require(ROOT_PATH . "system/core/driver/" . strtolower($classname) . ".php");
+        return null;
+    }
 
     $array = explode("_", strtolower($classname));
 
@@ -135,16 +135,16 @@ 
         }
 
     } else if (sizeof($array) == 2) {
-		if ($array[0] == "validator") {
-			if (file_exists(ROOT_PATH . "system/core/validator/" . $array[1] . ".php")) {
-				require(ROOT_PATH . "system/core/validator/" . $array[1] . ".php");
-			} else {
-				echo "Could not load validator class " . $classname . "!";
-			}
-		} else {
-			echo "Could not load class " . $classname . ", unknown prefix '" . $array[0] . "'!";
+        if ($array[0] == "validator") {
+            if (file_exists(ROOT_PATH . "system/core/validator/" . $array[1] . ".php")) {
+                require(ROOT_PATH . "system/core/validator/" . $array[1] . ".php");
+            } else {
+                echo "Could not load validator class " . $classname . "!";
+            }
+        } else {
+            echo "Could not load class " . $classname . ", unknown prefix '" . $array[0] . "'!";
         }
-	} else if (sizeOf($array) == 1) {
+    } else if (sizeOf($array) == 1) {
 
         if (file_exists(ROOT_PATH . "system/classes/" . strtolower($classname) . ".php")) {
             include ROOT_PATH . "system/classes/" . strtolower($classname) . ".php";