JuKu / JuKuCMS

setup/db-repair.php

Spacing +14 added lines, -14 removed lines

@@ -159,10 +159,10 @@ 
 $table->addVarchar("home_page", 255, true, "home");
 $table->addEnum("wildcard", array("YES", "NO"), true, "NO");
 $table->addInt("styleID", 10, true, false, "-1");
-$table->addVarchar("redirect_url", 255, true, "none");#
+$table->addVarchar("redirect_url", 255, true, "none"); #
 $table->addInt("redirect_code", 10, true, false, "301");
 $table->addVarchar("base_dir", 255, true, "/");
-$table->addInt("force_ssl", 10, true, false, "0");//if 1 then all http urls would be rewritten to https urls
+$table->addInt("force_ssl", 10, true, false, "0"); //if 1 then all http urls would be rewritten to https urls
 $table->addTimestamp("lastUpdate", true, "CURRENT_TIMESTAMP");
 $table->addInt("activated", 10, true, false, "1");
 
@@ -412,7 +412,7 @@ 
 $table->addInt("local_menu", 10, true, false, -1);
 $table->addVarchar("page_type", 255, true, "HTMLPage");
 $table->addVarchar("design", 255, true, "none");
-$table->addInt("sitemap", 10, true, false, 1);//should page be shown in sitemap?
+$table->addInt("sitemap", 10, true, false, 1); //should page be shown in sitemap?
 $table->addInt("published", 10, true, false, 0);
 $table->addInt("version", 10, true, false, 1);
 $table->addTimestamp("last_update", true, "0000-00-00 00:00:00", true);
@@ -449,9 +449,9 @@ 
 //fields
 $table->addVarchar("page_type", 255, true);
 $table->addVarchar("title", 255, true);
-$table->addVarchar("create_permissions", 255, true, "none");//list with permissions (OR), one of this permissions is required to create pages with this page type
-$table->addInt("advanced", 10, true, false, 0);//flag, if page type is only shown in expert (advanced) mode
-$table->addInt("order", 10, true, false, 10);//order in admin area on page creation selection
+$table->addVarchar("create_permissions", 255, true, "none"); //list with permissions (OR), one of this permissions is required to create pages with this page type
+$table->addInt("advanced", 10, true, false, 0); //flag, if page type is only shown in expert (advanced) mode
+$table->addInt("order", 10, true, false, 10); //order in admin area on page creation selection
 $table->addInt("activated", 10, true, false, 1);
 
 //add keys to table
@@ -512,7 +512,7 @@ 
 $table->addInt("menuID", 10, true, false);
 $table->addVarchar("title", 255, true);
 $table->addVarchar("url", 600, true);
-$table->addVarchar("type", 255, true, "page");//page / link / url / external_link / js_link
+$table->addVarchar("type", 255, true, "page"); //page / link / url / external_link / js_link
 $table->addVarchar("icon", 255, true, "none");
 $table->addVarchar("permissions", 600, true, "all");
 $table->addInt("login_required", 10, true, false, 0);
@@ -590,9 +590,9 @@ 
 $table->addVarchar("color", 50, true, "#0066ff");
 $table->addVarchar("rank_title", 255, true, "none");
 $table->addVarchar("rank_image", 255, true, "none");
-$table->addInt("auto_assign_regist", 10, true, false, "0");//flag, if group is automatically assigned to registered users
+$table->addInt("auto_assign_regist", 10, true, false, "0"); //flag, if group is automatically assigned to registered users
 $table->addInt("system_group", 10, true, false, "0");
-$table->addInt("show", 10, true, false, "1");//show group name on index page
+$table->addInt("show", 10, true, false, "1"); //show group name on index page
 $table->addInt("activated", 10, true, false, "1");
 
 //https://www.w3schools.com/colors/colors_picker.asp
@@ -756,7 +756,7 @@ 
 $table->addVarchar("description", 600, true);
 $table->addVarchar("category", 255, true, "general");
 $table->addVarchar("owner", 255, true, "system");
-$table->addInt("show", 10, true, false, 1);//flag, if permission is shown on permissions page
+$table->addInt("show", 10, true, false, 1); //flag, if permission is shown on permissions page
 $table->addInt("order", 10, true, false, 100);
 $table->addInt("activated", 10, true, false, 1);
 
@@ -898,7 +898,7 @@ 
 Settings::create("guest_username", "Guest", "Guest Username", "Username of not-logged-in users (default: Guest).", "system", "general");
 Settings::create("online_interval", 5, "Online Interval", "Interval-Angabe in minues, how long a user is set as online (since last page request). IMPORTANT: This is independent from login interval!", "system", "general");
 Settings::create("x_frame_options", "DENY", "X-Frame-Options header value (none = dont set header).", "values: DENY, SAMEORIGIN, ALLOW-FROM https://example.com/, none", "system", "security");
-Settings::create("login_page","login", "Alias of Login Page (incl. directory, if necessary)", "Alias of Login Page (incl. directory, if necessary). Default: login", "system", "general");
+Settings::create("login_page", "login", "Alias of Login Page (incl. directory, if necessary)", "Alias of Login Page (incl. directory, if necessary). Default: login", "system", "general");
 Settings::create("logout_page", "logout", "Alias of Logout Page (incl. directory, if necessary)", "Alias of Logout Page (incl. directory, if necessary). Default: logout", "system", "general");
 //Settings::create("base_dir", "/", "Base directory", "Base directory (if this CMS is installed in root directory, the right option is '/', but if it is installed in a sub directory, the right option is '/sub-dir/'). Default: /", "system", "general");
 Settings::create("css_cache_strategy", "expires_header", "CSS Browser Cache Strategy", "CSS Browser Cache Strategy, values: expires_header, etag_header, none", "system", "general");
@@ -978,7 +978,7 @@ 
 
 echo "Create default page types if absent...<br />";
 
-PageType::createPageType("HTMLPage", "HTML page", false, 1);//order 1 - so show as first page type in admin area
+PageType::createPageType("HTMLPage", "HTML page", false, 1); //order 1 - so show as first page type in admin area
 PageType::createPageType("Error404Page", "Error 404 page", true);
 PageType::createPageType("Error403Page", "Error 403 page", true);
 PageType::createPageType("IndexPage", "index page (supports extra template)", true);
@@ -1009,7 +1009,7 @@ 
 
 echo "Create default permission categories...<br />";
 Permissions::createOrUpdateCategory("general", "General", 1);
-Permissions::createOrUpdateCategory("users", "Users", 3);//user permissions, like "can_create_user"
+Permissions::createOrUpdateCategory("users", "Users", 3); //user permissions, like "can_create_user"
 Permissions::createOrUpdateCategory("groups", "Groups", 3);
 Permissions::createOrUpdateCategory("pages", "Pages", 4);
 Permissions::createOrUpdateCategory("permissions", "Permissions", 5);
@@ -1025,7 +1025,7 @@ 
 Permissions::createPermission("can_see_own_permissions", "Can see own permissions", "User can see his own permissions", "permissions", "system", 1);
 Permissions::createPermission("can_see_permissions", "Can see permissions of other users", "Can see permissions of other users", "permissions", "system", 2);
 Permissions::createPermission("can_edit_group_permissions", "Can edit group permissions", "Can edit group permissions (expect administrator group)", "permissions", "system", 3);
-Permissions::createPermission("can_edit_administrator_group_permissions", "Can edit administrator group permissions", "Can edit administrator group permissions", "permissions", "system", 4);//can edit permissions of group "administrator"
+Permissions::createPermission("can_edit_administrator_group_permissions", "Can edit administrator group permissions", "Can edit administrator group permissions", "permissions", "system", 4); //can edit permissions of group "administrator"
 
 //user permissions
 Permissions::createPermission("can_see_all_users", "Can see all users", "Can see all users and see their private information like mail address, ip address and so on", "users", "system", 1);

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;
 				}
 
                 //TODO: throw exception instead
@@ -157,15 +157,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
          *
@@ -299,7 +299,7 @@ 
         return $this->queries;
     }
 
-    public function beginTransaction () {
+    public function beginTransaction() {
         $this->conn->beginTransaction();
     }
 

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

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

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

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

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 = "";