JuKu / JuKuCMS

system/core/classes/classloader.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * initialize classloader (called only once / request)
      */
-    public static function init () {
+    public static function init() {
 
         //register autoloader
         spl_autoload_register('cms_autoloader');
@@ -45,7 +45,7 @@ 
 
     }
 
-    public static function rebuildCache () {
+    public static function rebuildCache() {
 
         require_once(ROOT_PATH . "system/core/classes/packages.php");
 
@@ -94,12 +94,12 @@ 
     /**
      * add classloader for specific namespace prefix
      */
-    public static function addLoader (string $prefix, callable $func) {
+    public static function addLoader(string $prefix, callable $func) {
     	$prefix = strtolower($prefix);
     	self::$namespace_autoloader[$prefix] = $func;
 	}
 
-	public static function removeLoader (string $prefix) {
+	public static function removeLoader(string $prefix) {
 		$prefix = strtolower($prefix);
     	unset(self::$namespace_autoloader[$prefix]);
 	}
@@ -109,7 +109,7 @@ 
 /**
  * autoload function
  */
-function cms_autoloader ($classname) {
+function cms_autoloader($classname) {
 
     ClassLoader::$loadedClasses++;
 

Indentation +77 added lines, -77 removed lines

@@ -95,14 +95,14 @@ 
      * add classloader for specific namespace prefix
      */
     public static function addLoader (string $prefix, callable $func) {
-    	$prefix = strtolower($prefix);
-    	self::$namespace_autoloader[$prefix] = $func;
-	}
+        $prefix = strtolower($prefix);
+        self::$namespace_autoloader[$prefix] = $func;
+    }
 
-	public static function removeLoader (string $prefix) {
-		$prefix = strtolower($prefix);
-    	unset(self::$namespace_autoloader[$prefix]);
-	}
+    public static function removeLoader (string $prefix) {
+        $prefix = strtolower($prefix);
+        unset(self::$namespace_autoloader[$prefix]);
+    }
 
 }
 
@@ -122,66 +122,66 @@ 
         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;
-	}
-
-	//check, if class belongs to dwoo template engine
+        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;
+    }
+
+    //check, if class belongs to dwoo template engine
     if (PHPUtils::startsWith($classname, "Dwoo")) {
         if (class_exists("DwooAutoloader", true)) {
             DwooAutoloader::loadClass($classname);
             return;
         } else {
-			echo "Could not load Dwoo template engine class " . $classname . "!";
+            echo "Could not load Dwoo template engine class " . $classname . "!";
         }
     }
 
     //check, if we have to use namespace classloading
-	if (PHPUtils::containsStr($classname, "\\")) {
-    	//we have to use namespace classloading
-		if (PHPUtils::startsWith($classname, "\\")) {
-			//use normal class loading
-			$classname = substr($classname, 1);
-		} else {
-			$array = explode("\\", strtolower($classname));
-
-			if ($array[0] === "plugin") {
-				$array1 = array();
-
-				for ($i = 2; $i < count($array); $i++) {
-					$array1[] = $array[$i];
-				}
-
-				$file_name = implode("/", $array1);
-
-				//load plugin class
-				$path = PLUGIN_PATH . $array[1] . "/classes/" . $file_name . ".php";
-
-				if (file_exists($path)) {
-					require($path);
-				} else {
-					$expected_str = (DEBUG_MODE ? " (expected path: " . $path . ")" : "");
-					echo "Could not load plugin-class with namespace " . $classname . $expected_str . "!";
-				}
-			} else {
-				//check, if there is a classloader for this prefix
-				if (isset(ClassLoader::$namespace_autoloader[$array[0]])) {
-					//get function
-					$func = ClassLoader::$namespace_autoloader[$array[0]];
-
-					//call func
-					$func($classname);
-				} else {
-					throw new IllegalStateException("Cannot load namespace class '" . $classname . "' with unknown prefix '" . $array[0] . "'!");
-				}
-			}
-
-			return;
-		}
-	}
+    if (PHPUtils::containsStr($classname, "\\")) {
+        //we have to use namespace classloading
+        if (PHPUtils::startsWith($classname, "\\")) {
+            //use normal class loading
+            $classname = substr($classname, 1);
+        } else {
+            $array = explode("\\", strtolower($classname));
+
+            if ($array[0] === "plugin") {
+                $array1 = array();
+
+                for ($i = 2; $i < count($array); $i++) {
+                    $array1[] = $array[$i];
+                }
+
+                $file_name = implode("/", $array1);
+
+                //load plugin class
+                $path = PLUGIN_PATH . $array[1] . "/classes/" . $file_name . ".php";
+
+                if (file_exists($path)) {
+                    require($path);
+                } else {
+                    $expected_str = (DEBUG_MODE ? " (expected path: " . $path . ")" : "");
+                    echo "Could not load plugin-class with namespace " . $classname . $expected_str . "!";
+                }
+            } else {
+                //check, if there is a classloader for this prefix
+                if (isset(ClassLoader::$namespace_autoloader[$array[0]])) {
+                    //get function
+                    $func = ClassLoader::$namespace_autoloader[$array[0]];
+
+                    //call func
+                    $func($classname);
+                } else {
+                    throw new IllegalStateException("Cannot load namespace class '" . $classname . "' with unknown prefix '" . $array[0] . "'!");
+                }
+            }
+
+            return;
+        }
+    }
 
     $array = explode("_", strtolower($classname));
 
@@ -204,32 +204,32 @@ 
         }
 
     } 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 if ($array[0] == "datatype") {
-			if (file_exists(ROOT_PATH . "system/core/datatype/" . $array[1] . ".php")) {
-				require(ROOT_PATH . "system/core/datatype/" . $array[1] . ".php");
-			} else {
-				echo "Could not load datatype class " . $classname . "!";
-			}
-		} else if (strpos($classname, "Plugin")) {
-			//dwoo tries several times to load a class - with and without namespace, so we hide this error message
-		} 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 if ($array[0] == "datatype") {
+            if (file_exists(ROOT_PATH . "system/core/datatype/" . $array[1] . ".php")) {
+                require(ROOT_PATH . "system/core/datatype/" . $array[1] . ".php");
+            } else {
+                echo "Could not load datatype class " . $classname . "!";
+            }
+        } else if (strpos($classname, "Plugin")) {
+            //dwoo tries several times to load a class - with and without namespace, so we hide this error message
+        } 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";
         } else if (file_exists(ROOT_PATH . "system/libs/smarty/sysplugins/" . strtolower($classname) . "php")) {
             require ROOT_PATH . "system/libs/smarty/sysplugins/" . strtolower($classname) . ".php";
         } else if (strpos($classname, "Plugin") !== FALSE) {
-			//dwoo tries several times to load a class - with and without namespace, so we hide this error message
-		} else {
+            //dwoo tries several times to load a class - with and without namespace, so we hide this error message
+        } else {
             echo "Could not load class '" . $classname . "'' (array size 1)!";
         }
 

plugins/calender/classes/event.php

Indentation +49 added lines, -49 removed lines

@@ -29,71 +29,71 @@
 
 class Event {
 
-	protected $row = null;
+    protected $row = null;
 
-	public function __construct(array $row) {
-		$this->row = $row;
-	}
+    public function __construct(array $row) {
+        $this->row = $row;
+    }
 
-	public function getID () : int {
-		return $this->row['id'];
-	}
+    public function getID () : int {
+        return $this->row['id'];
+    }
 
-	public function getCalenderID () : int {
-		return $this->row['calenderID'];
-	}
+    public function getCalenderID () : int {
+        return $this->row['calenderID'];
+    }
 
-	public function getTitle () : string {
-		return utf8_encode($this->row['title']);
-	}
+    public function getTitle () : string {
+        return utf8_encode($this->row['title']);
+    }
 
-	public function getDescription () : string {
-		return utf8_encode($this->row['description']);
-	}
+    public function getDescription () : string {
+        return utf8_encode($this->row['description']);
+    }
 
-	public function getPriceInfo () : string {
-		return (isset($this->row['price_info']) ? $this->row['price_info'] : "");
-	}
+    public function getPriceInfo () : string {
+        return (isset($this->row['price_info']) ? $this->row['price_info'] : "");
+    }
 
-	public function hasImage () : bool {
-		return $this->row['image'] !== "none";
-	}
+    public function hasImage () : bool {
+        return $this->row['image'] !== "none";
+    }
 
-	public function getImage () : string {
-		return $this->row['image'];
-	}
+    public function getImage () : string {
+        return $this->row['image'];
+    }
 
-	public function isAllDay () : bool {
-		return $this->row['all_day'] == 1;
-	}
+    public function isAllDay () : bool {
+        return $this->row['all_day'] == 1;
+    }
 
-	public function getFromTimestamp () : string {
-		return $this->row['from_date'];
-	}
+    public function getFromTimestamp () : string {
+        return $this->row['from_date'];
+    }
 
-	public function getToTimestamp () : string {
-		return $this->row['to_date'];
-	}
+    public function getToTimestamp () : string {
+        return $this->row['to_date'];
+    }
 
-	public function getLocation () : string {
-		return utf8_encode($this->row['location']);
-	}
+    public function getLocation () : string {
+        return utf8_encode($this->row['location']);
+    }
 
-	public function hasColor () : bool {
-		return $this->row['color'] !== "none";
-	}
+    public function hasColor () : bool {
+        return $this->row['color'] !== "none";
+    }
 
-	public function getColor () : string {
-		return $this->row['color'];
-	}
+    public function getColor () : string {
+        return $this->row['color'];
+    }
 
-	public function isActivated () : bool {
-		return $this->row['activated'] == 1;
-	}
+    public function isActivated () : bool {
+        return $this->row['activated'] == 1;
+    }
 
-	public static function castEvent (Event $event) : Event {
-		return $event;
-	}
+    public static function castEvent (Event $event) : Event {
+        return $event;
+    }
 
 }
 

Spacing +15 added lines, -15 removed lines

@@ -35,63 +35,63 @@
 		$this->row = $row;
 	}
 
-	public function getID () : int {
+	public function getID() : int {
 		return $this->row['id'];
 	}
 
-	public function getCalenderID () : int {
+	public function getCalenderID() : int {
 		return $this->row['calenderID'];
 	}
 
-	public function getTitle () : string {
+	public function getTitle() : string {
 		return utf8_encode($this->row['title']);
 	}
 
-	public function getDescription () : string {
+	public function getDescription() : string {
 		return utf8_encode($this->row['description']);
 	}
 
-	public function getPriceInfo () : string {
+	public function getPriceInfo() : string {
 		return (isset($this->row['price_info']) ? $this->row['price_info'] : "");
 	}
 
-	public function hasImage () : bool {
+	public function hasImage() : bool {
 		return $this->row['image'] !== "none";
 	}
 
-	public function getImage () : string {
+	public function getImage() : string {
 		return $this->row['image'];
 	}
 
-	public function isAllDay () : bool {
+	public function isAllDay() : bool {
 		return $this->row['all_day'] == 1;
 	}
 
-	public function getFromTimestamp () : string {
+	public function getFromTimestamp() : string {
 		return $this->row['from_date'];
 	}
 
-	public function getToTimestamp () : string {
+	public function getToTimestamp() : string {
 		return $this->row['to_date'];
 	}
 
-	public function getLocation () : string {
+	public function getLocation() : string {
 		return utf8_encode($this->row['location']);
 	}
 
-	public function hasColor () : bool {
+	public function hasColor() : bool {
 		return $this->row['color'] !== "none";
 	}
 
-	public function getColor () : string {
+	public function getColor() : string {
 		return $this->row['color'];
 	}
 
-	public function isActivated () : bool {
+	public function isActivated() : bool {
 		return $this->row['activated'] == 1;
 	}
 
-	public static function castEvent (Event $event) : Event {
+	public static function castEvent(Event $event) : Event {
 		return $event;
 	}
 

config/ldap.example.php

Spacing +4 added lines, -4 removed lines

@@ -16,16 +16,16 @@
 	'ssl' => false,
 
 	'auth' => true,
-	'user' => "uname",//ldap rdn or dn,
+	'user' => "uname", //ldap rdn or dn,
 	'password' => "admin",
 
 	// domain, for purposes of constructing $user
-	'ldap_usr_dom' => "",//e.q. @college.school.edu --> user "user1" => user1@college.school.edu
+	'ldap_usr_dom' => "", //e.q. @college.school.edu --> user "user1" => user1@college.school.edu
 
 	// active directory DN (base location of ldap search)
-	'dn' => "",//$dn = "OU=Departments,DC=college,DC=school,DC=edu";
+	'dn' => "", //$dn = "OU=Departments,DC=college,DC=school,DC=edu";
 
-	'readonly' => true,//only readonly access
+	'readonly' => true, //only readonly access
 
 	//https://www.forumsys.com/tutorials/integration-how-to/ldap/api-identity-management-ldap-server/
 

Indentation +22 added lines, -22 removed lines

@@ -7,38 +7,38 @@
  */
 
 $ldap_config = array(
-	'enabled' => false,
+    'enabled' => false,
 
-	// active directory server
-	'host' => "localhost",
-	'port' => 389,
+    // active directory server
+    'host' => "localhost",
+    'port' => 389,
 
-	'use_uri' => true,
-	'user_prefix' => "uid=",
+    'use_uri' => true,
+    'user_prefix' => "uid=",
 
-	'ssl' => false,
+    'ssl' => false,
 
-	'auth' => true,
-	'user' => "uname",//ldap rdn or dn,
-	'password' => "admin",
+    'auth' => true,
+    'user' => "uname",//ldap rdn or dn,
+    'password' => "admin",
 
-	// domain, for purposes of constructing $user
-	'ldap_usr_dom' => "",//e.q. @college.school.edu --> user "user1" => user1@college.school.edu
+    // domain, for purposes of constructing $user
+    'ldap_usr_dom' => "",//e.q. @college.school.edu --> user "user1" => user1@college.school.edu
 
-	// active directory DN (base location of ldap search)
-	'dn' => "",//$dn = "OU=Departments,DC=college,DC=school,DC=edu";
+    // active directory DN (base location of ldap search)
+    'dn' => "",//$dn = "OU=Departments,DC=college,DC=school,DC=edu";
 
-	'readonly' => true,//only readonly access
+    'readonly' => true,//only readonly access
 
-	//https://www.forumsys.com/tutorials/integration-how-to/ldap/api-identity-management-ldap-server/
+    //https://www.forumsys.com/tutorials/integration-how-to/ldap/api-identity-management-ldap-server/
 
-	//https://www.forumsys.com/tutorials/integration-how-to/ldap/online-ldap-test-server/
+    //https://www.forumsys.com/tutorials/integration-how-to/ldap/online-ldap-test-server/
 
-	//ldap params
-	'params' => array(
-		LDAP_OPT_PROTOCOL_VERSION => 3,
-		LDAP_OPT_REFERRALS => 0
-	),
+    //ldap params
+    'params' => array(
+        LDAP_OPT_PROTOCOL_VERSION => 3,
+        LDAP_OPT_REFERRALS => 0
+    ),
 );
 
 ?>

system/packages/com.jukusoft.cms.user/classes/iauthentificator.php

Indentation +9 added lines, -9 removed lines

@@ -27,15 +27,15 @@
 
 interface IAuthentificator {
 
-	/**
-	 * check password of user and import user, if neccessary
-	 *
-	 * @param $username string name of user
-	 * @param $password string password of user
-	 *
-	 * @return userID or -1, if credentials are wrong
-	 */
-	public function checkPasswordAndImport (string $username, string $password) :  int;
+    /**
+     * check password of user and import user, if neccessary
+     *
+     * @param $username string name of user
+     * @param $password string password of user
+     *
+     * @return userID or -1, if credentials are wrong
+     */
+    public function checkPasswordAndImport (string $username, string $password) :  int;
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 *
 	 * @return userID or -1, if credentials are wrong
 	 */
-	public function checkPasswordAndImport (string $username, string $password) :  int;
+	public function checkPasswordAndImport(string $username, string $password) :  int;
 
 }
 

system/packages/com.jukusoft.cms.user/classes/localauthentificator.php

Indentation +44 added lines, -44 removed lines

@@ -27,58 +27,58 @@
 
 class LocalAuthentificator implements IAuthentificator {
 
-	public function __construct() {
-		//
-	}
+    public function __construct() {
+        //
+    }
 
-	/**
-	 * check password of user and import user, if neccessary
-	 *
-	 * @param $username string name of user
-	 * @param $password string password of user
-	 *
-	 * @return userID or -1, if credentials are wrong
-	 */
-	public function checkPasswordAndImport(string $username, string $password) : int {
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `username` = :username AND `activated` = '1'; ", array(
-			'username' => &$username
-		));
+    /**
+     * check password of user and import user, if neccessary
+     *
+     * @param $username string name of user
+     * @param $password string password of user
+     *
+     * @return userID or -1, if credentials are wrong
+     */
+    public function checkPasswordAndImport(string $username, string $password) : int {
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `username` = :username AND `activated` = '1'; ", array(
+            'username' => &$username
+        ));
 
-		if (!$row) {
-			//user doesnt exists
-			return -1;
-		}
+        if (!$row) {
+            //user doesnt exists
+            return -1;
+        }
 
-		//get salt
-		$salt = $row['salt'];
+        //get salt
+        $salt = $row['salt'];
 
-		//add salt to password
-		$password .= $salt;
+        //add salt to password
+        $password .= $salt;
 
-		//verify password
-		if (password_verify($password, $row['password'])) {
-			//correct password
+        //verify password
+        if (password_verify($password, $row['password'])) {
+            //correct password
 
-			//check, if a newer password algorithmus is available --> rehash required
-			if (password_needs_rehash($row['password'], PASSWORD_DEFAULT)) {
-				//rehash password
-				$new_hash = self::hashPassword($password, $salt);
+            //check, if a newer password algorithmus is available --> rehash required
+            if (password_needs_rehash($row['password'], PASSWORD_DEFAULT)) {
+                //rehash password
+                $new_hash = self::hashPassword($password, $salt);
 
-				//update password in database
-				Database::getInstance()->execute("UPDATE `{praefix}user` SET `password` = :password WHERE `userID` = :userID; ", array(
-					'password' => $new_hash,
-					'userID' => array(
-						'type' => PDO::PARAM_INT,
-						'value' => $row['userID']
-					)
-				));
-			}
+                //update password in database
+                Database::getInstance()->execute("UPDATE `{praefix}user` SET `password` = :password WHERE `userID` = :userID; ", array(
+                    'password' => $new_hash,
+                    'userID' => array(
+                        'type' => PDO::PARAM_INT,
+                        'value' => $row['userID']
+                    )
+                ));
+            }
 
-			return $row['userID'];
-		} else {
-			return -1;
-		}
-	}
+            return $row['userID'];
+        } else {
+            return -1;
+        }
+    }
 
 }
 

system/packages/com.jukusoft.cms.plugin/extensions/settingsinstaller.php

Indentation +33 added lines, -33 removed lines

@@ -27,49 +27,49 @@
 
 class SettingsInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['set-settings'])) {
-			$prefs = new Preferences("plugin_" . $plugin->getName() . "_uninstall");
+    public function install(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['set-settings'])) {
+            $prefs = new Preferences("plugin_" . $plugin->getName() . "_uninstall");
 
-			foreach ($install_json['set-settings'] as $key=>$value) {
-				if (Settings::contains($key)) {
-					//backup old value
-					$old_value = Settings::get($key);
-					$prefs->put($key, $old_value);
-				} else {
-					$prefs->put($key, null);
-				}
+            foreach ($install_json['set-settings'] as $key=>$value) {
+                if (Settings::contains($key)) {
+                    //backup old value
+                    $old_value = Settings::get($key);
+                    $prefs->put($key, $old_value);
+                } else {
+                    $prefs->put($key, null);
+                }
 
-				//set new value
-				Settings::set($key, $value);
-			}
+                //set new value
+                Settings::set($key, $value);
+            }
 
-			$prefs->save();
-		}
+            $prefs->save();
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		//restore old values
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        //restore old values
 
-		$prefs = new Preferences("plugin_" . $plugin->getName() . "_uninstall");
+        $prefs = new Preferences("plugin_" . $plugin->getName() . "_uninstall");
 
-		foreach ($prefs->listAll() as $key=>$value) {
-			if ($value != null) {
-				Settings::set($key, $value);
-			}
-		}
+        foreach ($prefs->listAll() as $key=>$value) {
+            if ($value != null) {
+                Settings::set($key, $value);
+            }
+        }
 
-		//clear preferences
-		$prefs->clearAll();
+        //clear preferences
+        $prefs->clearAll();
 
-		return true;
-	}
+        return true;
+    }
 
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		return $this->install($plugin, $install_json);
-	}
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        return $this->install($plugin, $install_json);
+    }
 
 }
 

system/core/driver/mysqldriver.php

Spacing +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
 
     protected $prepared_cache = array();
 
-    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)) {
@@ -66,15 +66,15 @@ 
         }
     }
 
-    public function update ($sql, $params = array()) {
+    public function update($sql, $params = array()) {
         $this->execute($sql, $params);
     }
 
-    public function close () {
+    public function close() {
         $this->conn = null;
     }
 
-    public function execute ($sql, $params = array()) {
+    public function execute($sql, $params = array()) {
         //dont allow SELECT statements
         if (strstr($sql, "SELECT")) {
             throw new IllegalArgumentException("method DBDriver::execute() isnt for select statements, its only for write statements, use getRow() or listRows() instead.");
@@ -104,7 +104,7 @@ 
 
             if (!$res) {
 				if (DEBUG_MODE) {
-					echo "SQL Query: " + $sql;
+					echo "SQL Query: " +$sql;
 				} else {
 					echo "Debug Mode is disabled. You can enable it in config/config.php file.<br />";
 				}
@@ -160,15 +160,15 @@ 
         }
     }
 
-    public function listAllDrivers () {
+    public function listAllDrivers() {
         return $this->conn->getAvailableDrivers();
     }
 
-    public function quote ($str) : string {
+    public function quote($str) : string {
         return $this->conn->quote($str);
     }
 
-    protected function getQuery ($sql, bool $allow_information_schema = false) {
+    protected function getQuery($sql, bool $allow_information_schema = false) {
         /**
          * check, if sql query contains comments
          *
@@ -314,7 +314,7 @@ 
         return $this->queries;
     }
 
-    public function beginTransaction () {
+    public function beginTransaction() {
         $this->conn->beginTransaction();
     }
 

Indentation +25 added lines, -25 removed lines

@@ -55,12 +55,12 @@ 
             $this->conn = new PDO("mysql:host=" . $this->host . ";port=" . $this->port . ";dbname=" . $this->database . "", $this->username, $this->password, $this->options);
 
             //throw exception
-			$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+            $this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
             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();
@@ -106,18 +106,18 @@ 
             $res = $stmt->execute();
 
             if (!$res) {
-				if (DEBUG_MODE) {
-					echo "SQL Query: " + $sql;
-				} else {
-					echo "Debug Mode is disabled. You can enable it in config/config.php file.<br />";
-				}
+                if (DEBUG_MODE) {
+                    echo "SQL Query: " + $sql;
+                } else {
+                    echo "Debug Mode is disabled. You can enable it in config/config.php file.<br />";
+                }
 
                 //TODO: throw exception instead
 
                 print_r($stmt->errorInfo());
 
-				flush();
-				ob_end_flush();
+                flush();
+                ob_end_flush();
                 exit;
             }
 
@@ -129,7 +129,7 @@ 
                 exit;
             }
 
-			print_r($e);
+            print_r($e);
 
             echo "<br /><br /><b>Query</b>: " . $sql . ", parameters: ";
             var_dump($params);
@@ -148,7 +148,7 @@ 
                 exit;
             }
 
-			print_r($e);
+            print_r($e);
 
             echo "<br /><br /><b>Query</b>: " . $sql . ", parameters: ";
             var_dump($params);
@@ -212,8 +212,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);
     }
 
@@ -261,10 +261,10 @@ 
         $res = $stmt->execute();
 
         if (!$res) {
-        	if (DEBUG_MODE) {
-        		echo "SQL Query: " . $sql . "<br />";
-        		var_dump($params);
-			}
+            if (DEBUG_MODE) {
+                echo "SQL Query: " . $sql . "<br />";
+                var_dump($params);
+            }
 
             throw new PDOException("PDOException while getRow(): " . ($this->getErrorInfo())[3] . "\n" . ($stmt->errorInfo())[2] . "");
         }
@@ -302,9 +302,9 @@ 
         $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
         if ($rows === FALSE) {
-        	//failure, http://php.net/manual/de/pdostatement.fetchall.php
-			throw new PDOException("Failure while listRows(): " . print_r($this->getErrorInfo(), true));
-		}
+            //failure, http://php.net/manual/de/pdostatement.fetchall.php
+            throw new PDOException("Failure while listRows(): " . print_r($this->getErrorInfo(), true));
+        }
 
         return $rows;
     }
@@ -350,9 +350,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/packages/com.jukusoft.cms.preferences/classes/preferences.php

Indentation +71 added lines, -71 removed lines

@@ -27,106 +27,106 @@
 
 class Preferences {
 
-	protected $area = "";
-	protected $prefs = array();
-	protected $changed_prefs = array();
+    protected $area = "";
+    protected $prefs = array();
+    protected $changed_prefs = array();
 
-	public function __construct(string $area) {
-		$area = strtolower($area);
+    public function __construct(string $area) {
+        $area = strtolower($area);
 
-		if (!PHPUtils::startsWith($area, "plugin_") && !PHPUtils::startsWith($area, "style_")) {
-			throw new IllegalArgumentException("preferences area name should start with 'plugin_' or 'style_'´.");
-		}
+        if (!PHPUtils::startsWith($area, "plugin_") && !PHPUtils::startsWith($area, "style_")) {
+            throw new IllegalArgumentException("preferences area name should start with 'plugin_' or 'style_'´.");
+        }
 
-		$this->area = $area;
+        $this->area = $area;
 
-		if (Cache::contains("preferences", "preferences-" . $area)) {
-			$this->prefs = Cache::get("preferences", "preferences-" . $area);
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}preferences` WHERE `area` = :area; ", array('area' => $area));
+        if (Cache::contains("preferences", "preferences-" . $area)) {
+            $this->prefs = Cache::get("preferences", "preferences-" . $area);
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}preferences` WHERE `area` = :area; ", array('area' => $area));
 
-			foreach ($rows as $row) {
-				$this->prefs[$row['key']] = unserialize($row['value']);
-			}
+            foreach ($rows as $row) {
+                $this->prefs[$row['key']] = unserialize($row['value']);
+            }
 
-			//cache preferences
-			Cache::put("preferences", "preferences-" . $area, $this->prefs);
-		}
-	}
+            //cache preferences
+            Cache::put("preferences", "preferences-" . $area, $this->prefs);
+        }
+    }
 
-	public function contains (string $key) : bool {
-		return isset($this->prefs[$key]);
-	}
+    public function contains (string $key) : bool {
+        return isset($this->prefs[$key]);
+    }
 
-	public function get (string $key, $default = null) {
-		if (!isset($this->prefs[$key])) {
-			return $default;
-		}
+    public function get (string $key, $default = null) {
+        if (!isset($this->prefs[$key])) {
+            return $default;
+        }
 
-		return $this->prefs[$key];
-	}
+        return $this->prefs[$key];
+    }
 
-	public function put (string $key, $value, bool $auto_save = false) {
-		$contains_key = $this->contains($key);
+    public function put (string $key, $value, bool $auto_save = false) {
+        $contains_key = $this->contains($key);
 
-		$this->prefs[$key] = $value;
+        $this->prefs[$key] = $value;
 
-		if ($auto_save) {
-			//update database
-			Database::getInstance()->execute("INSERT INTO `{praefix}preferences` (
+        if ($auto_save) {
+            //update database
+            Database::getInstance()->execute("INSERT INTO `{praefix}preferences` (
 				`key`, `area`, `value`
 			) VALUES (
 				:key, :area, :value
 			) ON DUPLICATE KEY UPDATE `value` = :value; ", array(
-				'key' => $key,
-				'area' => $this->area,
-				'value' => serialize($value)
-			));
-		} else {
-			$this->changed_prefs[$key] = $contains_key;
-		}
-	}
+                'key' => $key,
+                'area' => $this->area,
+                'value' => serialize($value)
+            ));
+        } else {
+            $this->changed_prefs[$key] = $contains_key;
+        }
+    }
 
-	public function listAll () : array {
-		return $this->prefs;
-	}
+    public function listAll () : array {
+        return $this->prefs;
+    }
 
-	public function clearAll () {
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}preferences` WHERE `area` = :area; ", array('area' => $this->area));
+    public function clearAll () {
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}preferences` WHERE `area` = :area; ", array('area' => $this->area));
 
-		$this->prefs = array();
-		$this->changed_prefs = array();
+        $this->prefs = array();
+        $this->changed_prefs = array();
 
-		//clear cache
-		Cache::clear("preferences", "preferences-" . $this->area);
-	}
+        //clear cache
+        Cache::clear("preferences", "preferences-" . $this->area);
+    }
 
-	/**
-	 * write all values to database
-	 */
-	public function save () {
-		$lines = array();
-		$values = array();
+    /**
+     * write all values to database
+     */
+    public function save () {
+        $lines = array();
+        $values = array();
 
-		$values['area'] = $this->area;
+        $values['area'] = $this->area;
 
-		$i = 1;
+        $i = 1;
 
-		foreach ($this->changed_prefs as $key=>$contains_key) {
-			$lines[] = "(:key" . $i . ", :area, :value" . $i . ")";
-			$values['key' . $i] = $key;
-			$values['value' . $i] = serialize($this->prefs[$key]);
+        foreach ($this->changed_prefs as $key=>$contains_key) {
+            $lines[] = "(:key" . $i . ", :area, :value" . $i . ")";
+            $values['key' . $i] = $key;
+            $values['value' . $i] = serialize($this->prefs[$key]);
 
-			$i++;
-		}
+            $i++;
+        }
 
-		$lines_str = implode(",\r\n", $lines);
+        $lines_str = implode(",\r\n", $lines);
 
-		Database::getInstance()->execute("INSERT INTO `{praefix}preferences` (
+        Database::getInstance()->execute("INSERT INTO `{praefix}preferences` (
 			`key`, `area`, `value`
 		) VALUES " . $lines_str . " ON DUPLICATE KEY UPDATE `value` = VALUES(value); ", $values);
-	}
+    }
 
 }
 

Spacing +6 added lines, -6 removed lines

@@ -54,11 +54,11 @@ 
 		}
 	}
 
-	public function contains (string $key) : bool {
+	public function contains(string $key) : bool {
 		return isset($this->prefs[$key]);
 	}
 
-	public function get (string $key, $default = null) {
+	public function get(string $key, $default = null) {
 		if (!isset($this->prefs[$key])) {
 			return $default;
 		}
@@ -66,7 +66,7 @@ 
 		return $this->prefs[$key];
 	}
 
-	public function put (string $key, $value, bool $auto_save = false) {
+	public function put(string $key, $value, bool $auto_save = false) {
 		$contains_key = $this->contains($key);
 
 		$this->prefs[$key] = $value;
@@ -87,11 +87,11 @@ 
 		}
 	}
 
-	public function listAll () : array {
+	public function listAll() : array {
 		return $this->prefs;
 	}
 
-	public function clearAll () {
+	public function clearAll() {
 		//delete from database
 		Database::getInstance()->execute("DELETE FROM `{praefix}preferences` WHERE `area` = :area; ", array('area' => $this->area));
 
@@ -105,7 +105,7 @@ 
 	/**
 	 * write all values to database
 	 */
-	public function save () {
+	public function save() {
 		$lines = array();
 		$values = array();
 

system/core/init.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	exit;
 }
 
-register_shutdown_function(function () {
+register_shutdown_function(function() {
 	//flush gzip cache
 	flush();
 	@ob_end_flush();

Indentation +30 added lines, -30 removed lines

@@ -17,18 +17,18 @@ 
  */
 
 if (PHP_MAJOR_VERSION < 7) {
-	echo "CMS is required PHP 7.0.0 or greater! Please install PHP 7 (current version: " . PHP_VERSION . ").";
-	ob_flush();
-	exit;
+    echo "CMS is required PHP 7.0.0 or greater! Please install PHP 7 (current version: " . PHP_VERSION . ").";
+    ob_flush();
+    exit;
 }
 
 register_shutdown_function(function () {
-	//flush gzip cache
-	flush();
-	@ob_end_flush();
+    //flush gzip cache
+    flush();
+    @ob_end_flush();
 
-	//throw event, for example to write logs to file
-	@Events::throwEvent("shutdown_function");
+    //throw event, for example to write logs to file
+    @Events::throwEvent("shutdown_function");
 });
 
 //define some constants
@@ -41,13 +41,13 @@ 
 
 //check, if cache directory is writable
 if (!file_exists(CACHE_PATH)) {
-	echo "Error! cache directory doesnt exists!";
-	exit;
+    echo "Error! cache directory doesnt exists!";
+    exit;
 }
 
 if (!is_writable(CACHE_PATH)) {
-	echo "Error! directory isnt writable!";
-	exit;
+    echo "Error! directory isnt writable!";
+    exit;
 }
 
 //set default charset to UTF-8
@@ -69,7 +69,7 @@ 
 
 //load pre-loaded classes, if option is enabled
 if (OPTION_PRELOAD_CLASSES) {
-	AutoLoaderCache::load();
+    AutoLoaderCache::load();
 }
 
 //initialize cache
@@ -101,29 +101,29 @@ 
 
 //check, if allow_url_fopen is enabled
 if (!PHPUtils::isUrlfopenEnabled() && !PHPUtils::isCurlAvailable()) {
-	echo "CMS requires PHP option 'allow_url_fopen' enabled OR extension 'curl', change your php.ini or hosting settings to enable this option!";
-	ob_flush();
-	exit;
+    echo "CMS requires PHP option 'allow_url_fopen' enabled OR extension 'curl', change your php.ini or hosting settings to enable this option!";
+    ob_flush();
+    exit;
 }
 
 Events::throwEvent("init_security");
 
 //check for maintenance mode
 if (Settings::get("maintenance_mode_enabled", false) == true) {
-	$html = Settings::get("maintenance_text", "Maintenance mode enabled!");
-
-	//throw event
-	Events::throwEvent("maintenance_html", array(
-		'html' => &$html
-	));
-
-	if (file_exists(ROOT_PATH . "maintenance.html")) {
-		echo file_get_contents(ROOT_PATH . "maintenance.html");
-	} else if (file_exists(ROOT_PATH . "setup/maintenance.html")) {
-		echo file_get_contents(ROOT_PATH . "setup/maintenance.html");
-	} else {
-		echo $html;
-	}
+    $html = Settings::get("maintenance_text", "Maintenance mode enabled!");
+
+    //throw event
+    Events::throwEvent("maintenance_html", array(
+        'html' => &$html
+    ));
+
+    if (file_exists(ROOT_PATH . "maintenance.html")) {
+        echo file_get_contents(ROOT_PATH . "maintenance.html");
+    } else if (file_exists(ROOT_PATH . "setup/maintenance.html")) {
+        echo file_get_contents(ROOT_PATH . "setup/maintenance.html");
+    } else {
+        echo $html;
+    }
 }
 
 //initialize logging