JuKu / JuKuCMS

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Plugins/Functions/PluginTif.php

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
         if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
             try {
                 $compiler->getCore()->getLoader()->loadPlugin('if');
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
             }
         }

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Plugins/Functions/PluginReverse.php

Spacing +2 added lines, -2 removed lines

@@ -40,12 +40,12 @@
         if (is_array($value)) {
             return array_reverse($value, $preserve_keys);
         } elseif (($charset = $this->core->getCharset()) === 'iso-8859-1') {
-            return strrev((string)$value);
+            return strrev((string) $value);
         }
 
         $strlen = mb_strlen($value);
         $out    = '';
-        while ($strlen --) {
+        while ($strlen--) {
             $out .= mb_substr($value, $strlen, 1, $charset);
         }
 

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Plugins/Filters/PluginHtmlFormat.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
      */
     protected static function openTag($tag, $add, $whitespace)
     {
-        $tabs = str_pad('', self::$tabCount ++, "\t");
+        $tabs = str_pad('', self::$tabCount++, "\t");
 
         if (preg_match('#^<(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)(?: [^>]*|)>#', $tag)) {
             // if it's one of those tag it's inline so it does not require a leading line break

twig_performance/dwoo.php

Indentation +6 added lines, -6 removed lines

@@ -59,13 +59,13 @@
 define('DWOO_PATH', ROOT_PATH . "system/packages/com.jukusoft.cms.dwoo/dwoo/lib/");
 
 function dwoo_autoload ($class_name) {
-	$class_name = str_replace("\\", "/", $class_name);
+    $class_name = str_replace("\\", "/", $class_name);
 
-	if (file_exists(DWOO_PATH . $class_name . ".php")) {
-		require(DWOO_PATH . $class_name . ".php");
-	} else {
-		echo "Cannot load class '" . $class_name . "'!";
-	}
+    if (file_exists(DWOO_PATH . $class_name . ".php")) {
+        require(DWOO_PATH . $class_name . ".php");
+    } else {
+        echo "Cannot load class '" . $class_name . "'!";
+    }
 }
 
 //register autoloader

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 define('ROOT_PATH', dirname(__FILE__) . "/../");
 define('DWOO_PATH', ROOT_PATH . "system/packages/com.jukusoft.cms.dwoo/dwoo/lib/");
 
-function dwoo_autoload ($class_name) {
+function dwoo_autoload($class_name) {
 	$class_name = str_replace("\\", "/", $class_name);
 
 	if (file_exists(DWOO_PATH . $class_name . ".php")) {

system/packages/com.jukusoft.cms.dwoo/classes/dwooautoloader.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 class DwooAutoloader {
 
-	public static function loadClass (string $class_name) {
+	public static function loadClass(string $class_name) {
 		$class_name = str_replace("\\", "/", $class_name);
 
 		if (file_exists(DWOO_PATH . $class_name . ".php")) {

Indentation +9 added lines, -9 removed lines

@@ -29,15 +29,15 @@
 
 class DwooAutoloader {
 
-	public static function loadClass (string $class_name) {
-		$class_name = str_replace("\\", "/", $class_name);
-
-		if (file_exists(DWOO_PATH . $class_name . ".php")) {
-			require(DWOO_PATH . $class_name . ".php");
-		} else {
-			//echo "Cannot load Dwoo Template Engine class '" . $class_name . "' (search path: " . DWOO_PATH . $class_name . ".php)!";
-		}
-	}
+    public static function loadClass (string $class_name) {
+        $class_name = str_replace("\\", "/", $class_name);
+
+        if (file_exists(DWOO_PATH . $class_name . ".php")) {
+            require(DWOO_PATH . $class_name . ".php");
+        } else {
+            //echo "Cannot load Dwoo Template Engine class '" . $class_name . "' (search path: " . DWOO_PATH . $class_name . ".php)!";
+        }
+    }
 
 }
 

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
@@ -925,35 +925,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", "DataType_MenuSelector", "", true, "none", "none", 1);
+    //set setting
+    Settings::create("main_menuID", $main_menuID, "Main MenuID", "id of main menu (in menu area)", "system", "general", "DataType_MenuSelector", "", true, "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", "DataType_MenuSelector", "", true, "none", "none", 2);
+    //set setting
+    Settings::create("admin_menuID", $admin_menuID, "Admin MenuID", "id of admin menu (in admin area)", "system", "general", "DataType_MenuSelector", "", true, "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", "DataType_MenuSelector", "", true, "none", "none", 3);
+    //set setting
+    Settings::create("local_menuID", $local_menuID, "Default Local MenuID", "id of default local menu (in menu area)", "system", "general", "DataType_MenuSelector", "", true, "none", "none", 3);
 } else {
-	$local_menuID = Settings::get("local_menuID");
+    $local_menuID = Settings::get("local_menuID");
 }
 
 //create default folders, if absent
@@ -1098,11 +1098,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!";
 }
 
 ?>

Spacing +26 added lines, -26 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");
 
@@ -416,7 +416,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->addEnum("sitemap_changefreq", array("ALWAYS", "HOURLY", "DAILY", "WEEKLY", "MONTHLY", "YEARLY", "NEVER"), true, "weekly");
 $table->addDecimal("sitemap_priority", 5, 2, true, "0.5");
 $table->addInt("published", 10, true, false, 0);
@@ -431,7 +431,7 @@ 
 $table->addInt("sidebar_right", 10, true, false, -1);
 $table->addVarchar("meta_description", 600, true, "");
 $table->addVarchar("meta_keywords", 255, true, "");
-$table->addVarchar("meta_robots", 255, true, "");//none means not set
+$table->addVarchar("meta_robots", 255, true, ""); //none means not set
 $table->addVarchar("meta_canonicals", 255, true, "");
 $table->addInt("locked_by", 10, true, false, -1);
 $table->addTimestamp("locked_timestamp", true, "0000-00-00 00:00:00");
@@ -463,10 +463,10 @@ 
 //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->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->addVarchar("owner", 255, true, "system");
-$table->addInt("order", 10, true, false, 10);//order in admin area on page creation selection
+$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
@@ -527,13 +527,13 @@ 
 $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);
 $table->addInt("parent", 10, true, false, -1);
 $table->addVarchar("unique_name", 255, false, "");
-$table->addVarchar("extensions", 255, true, "none");//for example: private messages
+$table->addVarchar("extensions", 255, true, "none"); //for example: private messages
 $table->addVarchar("owner", 255, true, "user");
 $table->addInt("order", 10, true, false, 10);
 $table->addInt("activated", 10, true, false, 1);
@@ -610,9 +610,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
@@ -777,7 +777,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);
 
@@ -938,11 +938,11 @@ 
 $table->setCharset("utf8");
 
 //fields
-$table->addVarchar("name", 255, true);//directory name of plugin
-$table->addVarchar("version", 255, true, "1.0.0");//installed version of plugin
+$table->addVarchar("name", 255, true); //directory name of plugin
+$table->addVarchar("version", 255, true, "1.0.0"); //installed version of plugin
 //$table->addInt("build", 10, true, false, 1);//optional: build number of plugin
-$table->addInt("installed", 10, true, false, 1);//flag, if plugin is installed
-$table->addInt("activated", 10, true, false, 1);//flag, if plugin is activated
+$table->addInt("installed", 10, true, false, 1); //flag, if plugin is installed
+$table->addInt("activated", 10, true, false, 1); //flag, if plugin is activated
 
 //add keys to table
 $table->addPrimaryKey("name");
@@ -968,7 +968,7 @@ 
 $table->setCharset("utf8");
 
 //fields
-$table->addVarchar("class_name", 255, true);//directory name of plugin
+$table->addVarchar("class_name", 255, true); //directory name of plugin
 $table->addVarchar("path", 600, true);
 
 //add keys to table
@@ -995,7 +995,7 @@ 
 //fields
 $table->addInt("id", 10, true, true);
 $table->addVarchar("title", 255, true);
-$table->addVarchar("unique_name", 255, true, "");//unique name, so plugins or upgrade can find task easier
+$table->addVarchar("unique_name", 255, true, ""); //unique name, so plugins or upgrade can find task easier
 $table->addEnum("type", array("FILE", "FUNCTION", "CLASS_STATIC_METHOD", ""), true);
 $table->addVarchar("type_params", 255, false, "NULL");
 $table->addText("params", true);
@@ -1111,7 +1111,7 @@ 
 //fields
 $table->addVarchar("secret_key", 255, true);
 $table->addInt("userID", 10, true, false);
-$table->addTimestamp("created", true, "CURRENT_TIMESTAMP", false);//to check, if secret key is valide
+$table->addTimestamp("created", true, "CURRENT_TIMESTAMP", false); //to check, if secret key is valide
 $table->addTimestamp("expires", true, "0000-00-00 00:00:00", false);
 
 //add keys to table
@@ -1140,7 +1140,7 @@ 
 $table->addVarchar("name", 255, true);
 $table->addVarchar("description", 600, true, "");
 $table->addVarchar("class_name", 255, true);
-$table->addInt("editable", 10, true, false, 1);//flag, if widget type is editable (this means added widgets with this type can be edited)
+$table->addInt("editable", 10, true, false, 1); //flag, if widget type is editable (this means added widgets with this type can be edited)
 $table->addVarchar("owner", 255, true, "system");
 
 //add keys to table
@@ -1199,7 +1199,7 @@ 
 $table->addVarchar("title", 255, true, "");
 $table->addText("content", true, "");
 $table->addVarchar("class_name", 255, true, "");
-$table->addText("widget_params", true);//json encoded string, e.q. "{}"
+$table->addText("widget_params", true); //json encoded string, e.q. "{}"
 $table->addVarchar("css_id", 255, true, "");
 $table->addVarchar("css_class", 255, true, "");
 $table->addVarchar("before_widget", 600, true, "");
@@ -1256,7 +1256,7 @@ 
 Settings::create("guest_username", "Guest", "Guest Username", "Username of not-logged-in users (default: Guest).", "system", "general", "DataType_Username");
 Settings::create("online_interval", 5, "Online Interval", "Interval in minues, how long a user is set as online (since last page request). IMPORTANT: This is independent from login interval!", "system", "general", "DataType_Integer");
 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", "DataType_String");
-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", "DataType_String");
+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", "DataType_String");
 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", "DataType_String");
 //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", "DataType_SelectBox", array("expires_header", "etag_header", "none"));
@@ -1461,7 +1461,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);
@@ -1494,7 +1494,7 @@ 
 
 echo "Create default permission categories...<br />";
 Permissions::createOrUpdateCategory("general", "General", 1);
-Permissions::createOrUpdateCategory("users", "Users", 2);//user permissions, like "can_create_user"
+Permissions::createOrUpdateCategory("users", "Users", 2); //user permissions, like "can_create_user"
 Permissions::createOrUpdateCategory("groups", "Groups", 3);
 Permissions::createOrUpdateCategory("pages", "Pages", 4);
 Permissions::createOrUpdateCategory("media", "Media", 5);
@@ -1513,7 +1513,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);
@@ -1604,7 +1604,7 @@ 
 ApiMethod::addMethod("oauth", "ApiOAuth", "apiOAuth", "package_com.jukusoft.cms.api");
 
 echo "Add default tasks...<br />";
-Task::createStaticMethodTask("Cleanup outdated oauth tokens", "ApiOAuth", "removeAllOutdatedTokens", 1440, "oauth_cleanup_tokens", "system", array(), false);//cleanup outdated oauth tokens every day
+Task::createStaticMethodTask("Cleanup outdated oauth tokens", "ApiOAuth", "removeAllOutdatedTokens", 1440, "oauth_cleanup_tokens", "system", array(), false); //cleanup outdated oauth tokens every day
 
 echo "Add default widgets...<br />";
 WidgetType::register("TextWidget", "Text Widget", "Widget which shows text without html code.", true, "system");

system/packages/com.jukusoft.cms.permissions/classes/permissionchecker.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 		}
 	}
 
-	protected function mergeRow (string $token, int $value) {
+	protected function mergeRow(string $token, int $value) {
 		if ($value < 0 || $value > 2) {
 			throw new IllegalArgumentException("token ('" . $token . "') value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
 		}
@@ -84,7 +84,7 @@ 
 		}
 	}
 
-	public function hasRight (string $token) {
+	public function hasRight(string $token) {
 		//check, if user is super admin
 		if (/*$this->userID == 1 || */(isset($this->permissions["super_admin"]) && $this->permissions["super_admin"] == 1) && $token !== "not_logged_in") {
 			//super admin has all rights
@@ -98,7 +98,7 @@ 
 		return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
 	}
 
-	public static function &current () {
+	public static function &current() {
 		if (self::$instance == null) {
 			self::$instance = new PermissionChecker(User::current()->getID());
 		}

Indentation +78 added lines, -78 removed lines

@@ -27,84 +27,84 @@
 
 class PermissionChecker {
 
-	protected $userID = -1;
-
-	//list with all permissions - values: 0 (no), 1 (yes), 2 (never)
-	protected $permissions = array();
-
-	//singleton instance
-	protected static $instance = null;
-
-	public function __construct(int $userID) {
-		$this->userID = $userID;
-
-		if (Cache::contains("permissions", "permissions_user_" . $this->userID)) {
-			$this->permissions = Cache::get("permissions", "permissions_user_" . $this->userID);
-		} else {
-			//get all groups, where user is member on
-			$groups = new Groups();
-			$groups->loadMyGroups($userID);
-			$my_group_ids = $groups->listGroupIDs();
-
-			//iterate through all groups user is member on
-			foreach ($my_group_ids as $groupID) {
-				$group_rights = new GroupRights($groupID);
-
-				//affect group rights
-				foreach ($group_rights->listRights() as $token=>$value) {
-					$this->mergeRow($token, $value);
-				}
-			}
-
-			//get user rights
-			$user_rights = new UserRights($userID);
-
-			foreach ($user_rights->listRights() as $token=>$value) {
-				$this->mergeRow($token, $value);
-			}
-
-			//cache result
-			Cache::put("permissions", "permissions_user_" . $this->userID, $this->permissions);
-		}
-	}
-
-	protected function mergeRow (string $token, int $value) {
-		if ($value < 0 || $value > 2) {
-			throw new IllegalArgumentException("token ('" . $token . "') value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
-		}
-
-		if (!isset($this->permissions[$token])) {
-			$this->permissions[$token] = $value;
-		} else {
-			$current_value = $this->permissions[$token];
-
-			if ($value > $current_value) {
-				$this->permissions[$token] = $value;
-			}
-		}
-	}
-
-	public function hasRight (string $token) {
-		//check, if user is super admin
-		if (/*$this->userID == 1 || */(isset($this->permissions["super_admin"]) && $this->permissions["super_admin"] == 1) && $token !== "not_logged_in") {
-			//super admin has all rights
-			return true;
-		}
-
-		if ($token === "none" || $token === "all") {
-			return true;
-		}
-
-		return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
-	}
-
-	public static function &current () {
-		if (self::$instance == null) {
-			self::$instance = new PermissionChecker(User::current()->getID());
-		}
-
-		return self::$instance;
-	}
+    protected $userID = -1;
+
+    //list with all permissions - values: 0 (no), 1 (yes), 2 (never)
+    protected $permissions = array();
+
+    //singleton instance
+    protected static $instance = null;
+
+    public function __construct(int $userID) {
+        $this->userID = $userID;
+
+        if (Cache::contains("permissions", "permissions_user_" . $this->userID)) {
+            $this->permissions = Cache::get("permissions", "permissions_user_" . $this->userID);
+        } else {
+            //get all groups, where user is member on
+            $groups = new Groups();
+            $groups->loadMyGroups($userID);
+            $my_group_ids = $groups->listGroupIDs();
+
+            //iterate through all groups user is member on
+            foreach ($my_group_ids as $groupID) {
+                $group_rights = new GroupRights($groupID);
+
+                //affect group rights
+                foreach ($group_rights->listRights() as $token=>$value) {
+                    $this->mergeRow($token, $value);
+                }
+            }
+
+            //get user rights
+            $user_rights = new UserRights($userID);
+
+            foreach ($user_rights->listRights() as $token=>$value) {
+                $this->mergeRow($token, $value);
+            }
+
+            //cache result
+            Cache::put("permissions", "permissions_user_" . $this->userID, $this->permissions);
+        }
+    }
+
+    protected function mergeRow (string $token, int $value) {
+        if ($value < 0 || $value > 2) {
+            throw new IllegalArgumentException("token ('" . $token . "') value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
+        }
+
+        if (!isset($this->permissions[$token])) {
+            $this->permissions[$token] = $value;
+        } else {
+            $current_value = $this->permissions[$token];
+
+            if ($value > $current_value) {
+                $this->permissions[$token] = $value;
+            }
+        }
+    }
+
+    public function hasRight (string $token) {
+        //check, if user is super admin
+        if (/*$this->userID == 1 || */(isset($this->permissions["super_admin"]) && $this->permissions["super_admin"] == 1) && $token !== "not_logged_in") {
+            //super admin has all rights
+            return true;
+        }
+
+        if ($token === "none" || $token === "all") {
+            return true;
+        }
+
+        return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
+    }
+
+    public static function &current () {
+        if (self::$instance == null) {
+            self::$instance = new PermissionChecker(User::current()->getID());
+        }
+
+        return self::$instance;
+    }
 
 }
 

system/packages/com.jukusoft.cms.mail/classes/mailsender.php

Indentation +2 added lines, -2 removed lines

@@ -27,9 +27,9 @@
 
 interface MailSender {
 
-	public function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
+    public function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
 
-	public function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
+    public function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -27,9 +27,9 @@
 
 interface MailSender {
 
-	public function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
+	public function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
 
-	public function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
+	public function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
 
 }
 

system/packages/com.jukusoft.cms.mail/classes/phpmail.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 		return mail($to, $subject, $message, $headers);
 	}
 
-	public static function getOptions (array $options = array(), string $from = "", string $reply_to = "") : array {
+	public static function getOptions(array $options = array(), string $from = "", string $reply_to = "") : array {
 		if (!is_null($from) && !empty($from)) {
 			$options['from'] = $from;
 		}
@@ -110,7 +110,7 @@ 
 		return $options;
 	}
 
-	public static function convertToArray ($to) : string {
+	public static function convertToArray($to) : string {
 		if (is_array($to)) {
 			//convert array to RFC 2822 string
 			$to = implode(", ", $to);
@@ -119,7 +119,7 @@ 
 		return $to;
 	}
 
-	public static function generateHeader (array $options, string $to, bool $html_mail = false) {
+	public static function generateHeader(array $options, string $to, bool $html_mail = false) {
 		//generate header
 		$headers = array();
 

Indentation +145 added lines, -145 removed lines

@@ -27,152 +27,152 @@
 
 class PHPMail implements MailSender {
 
-	public function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
-		//http://php.net/manual/de/function.mail.php
-
-		// In case any of our lines are larger than 70 characters, we should use wordwrap()
-		$message = wordwrap($message, 70, "\r\n");
-
-		//throw event, so plugins can interact
-		Events::throwEvent("send_plain_mail_php", array(
-			'to' => &$to,
-			'subject' => &$subject,
-			'message' => &$message,
-			'options' => &$options,
-			'from' => &$from,
-			'reply_to' => &$reply_to
-		));
-
-		$options = self::getOptions($options, $from, $reply_to);
-		$to = self::convertToArray($to);
-		$headers = self::generateHeader($options, $to);
-
-		//add signature at end of message
-		$message .= MailApi::getSignature();
-
-		//send mail
-		return mail($to, $subject, $message, $headers);
-	}
-
-	public function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
-		// In case any of our lines are larger than 70 characters, we should use wordwrap()
-		$message = wordwrap($message, 70, "<br />");
-
-		//throw event, so plugins can interact
-		Events::throwEvent("send_html_mail_php", array(
-			'to' => &$to,
-			'subject' => &$subject,
-			'message' => &$message,
-			'options' => &$options,
-			'from' => &$from,
-			'reply_to' => &$reply_to
-		));
-
-		$options = $this->getOptions($options, $from, $reply_to);
-		$to = self::convertToArray($to);
-		$headers = self::generateHeader($options, $to, true);
-
-		//add signature at end of message
-		$message .= MailApi::getSignature();
-
-		//send mail
-		return mail($to, $subject, $message, $headers);
-	}
-
-	public static function getOptions (array $options = array(), string $from = "", string $reply_to = "") : array {
-		if (!is_null($from) && !empty($from)) {
-			$options['from'] = $from;
-		}
-
-		if (!is_null($reply_to) && !empty($reply_to)) {
-			$options['reply_to'] = $reply_to;
-		}
-
-		//set from address
-		if (!isset($options['from']) || empty($options['from'])) {
-			//get from address from settings
-			$from_mail = Settings::get("mail_sender_address", "none");
-			$from_name = Settings::get("mail_sender_name", "");
-
-			if ($from_mail !== "none") {
-				$options['from'] = (!empty($from_name) ? $from_name . " " : "") . $from_mail;
-			}
-		}
-
-		if (!isset($options['reply_to']) || empty($options['reply_to'])) {
-			$reply_to = Settings::get("mail_reply_to", "");
-
-			if (!empty($reply_to)) {
-				$options['reply_to'] = $reply_to;
-			}
-		}
-
-		return $options;
-	}
-
-	public static function convertToArray ($to) : string {
-		if (is_array($to)) {
-			//convert array to RFC 2822 string
-			$to = implode(", ", $to);
-		}
-
-		return $to;
-	}
-
-	public static function generateHeader (array $options, string $to, bool $html_mail = false) {
-		//generate header
-		$headers = array();
-
-		if ($html_mail) {
-			$charset = Settings::get("mail_default_charset", "urf-8");
-
-			//add mime version, content type and charset
-			$headers[] = "MIME-Version: 1.0";
-			$headers[] = "Content-type: text/html; charset=" . $charset;
-
-			$headers[] = "To: " . $to;
-		}
-
-		$headers[] = "Content-Transfer-Encoding: quoted-printable";
-
-		if (isset($options['from']) && !empty($options['from'])) {
-			$headers[] = "From: " . $options['from'];
-		}
-
-		if (isset($options['reply_to']) && !empty($options['reply_to'])) {
-			$headers[] = "Reply-To: " . $options['reply_to'];
-		}
-
-		if (isset($options['cc'])) {
-			if (is_array($options['cc'])) {
-				//convert array to string
-				$options['cc'] = implode(", ", $options['cc']);
-			}
-
-			$headers[] = "Cc: " . $options['cc'];
-		}
-
-		if (isset($options['bcc'])) {
-			if (is_array($options['bcc'])) {
-				//convert array to string
-				$options['bcc'] = implode(", ", $options['bcc']);
-			}
-
-			$headers[] = "Bcc: " . $options['bcc'];
-		}
-
-		//add php X-Mailer header
-		$headers[] = "X-Mailer: PHP/" . phpversion();
-
-		if (count($headers) == 0) {
-			$headers = null;
-		} else {
-			//convert array to string
-			$headers = implode("\r\n", $headers);
-		}
+    public function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
+        //http://php.net/manual/de/function.mail.php
+
+        // In case any of our lines are larger than 70 characters, we should use wordwrap()
+        $message = wordwrap($message, 70, "\r\n");
+
+        //throw event, so plugins can interact
+        Events::throwEvent("send_plain_mail_php", array(
+            'to' => &$to,
+            'subject' => &$subject,
+            'message' => &$message,
+            'options' => &$options,
+            'from' => &$from,
+            'reply_to' => &$reply_to
+        ));
+
+        $options = self::getOptions($options, $from, $reply_to);
+        $to = self::convertToArray($to);
+        $headers = self::generateHeader($options, $to);
+
+        //add signature at end of message
+        $message .= MailApi::getSignature();
+
+        //send mail
+        return mail($to, $subject, $message, $headers);
+    }
+
+    public function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
+        // In case any of our lines are larger than 70 characters, we should use wordwrap()
+        $message = wordwrap($message, 70, "<br />");
+
+        //throw event, so plugins can interact
+        Events::throwEvent("send_html_mail_php", array(
+            'to' => &$to,
+            'subject' => &$subject,
+            'message' => &$message,
+            'options' => &$options,
+            'from' => &$from,
+            'reply_to' => &$reply_to
+        ));
+
+        $options = $this->getOptions($options, $from, $reply_to);
+        $to = self::convertToArray($to);
+        $headers = self::generateHeader($options, $to, true);
+
+        //add signature at end of message
+        $message .= MailApi::getSignature();
+
+        //send mail
+        return mail($to, $subject, $message, $headers);
+    }
+
+    public static function getOptions (array $options = array(), string $from = "", string $reply_to = "") : array {
+        if (!is_null($from) && !empty($from)) {
+            $options['from'] = $from;
+        }
+
+        if (!is_null($reply_to) && !empty($reply_to)) {
+            $options['reply_to'] = $reply_to;
+        }
+
+        //set from address
+        if (!isset($options['from']) || empty($options['from'])) {
+            //get from address from settings
+            $from_mail = Settings::get("mail_sender_address", "none");
+            $from_name = Settings::get("mail_sender_name", "");
+
+            if ($from_mail !== "none") {
+                $options['from'] = (!empty($from_name) ? $from_name . " " : "") . $from_mail;
+            }
+        }
+
+        if (!isset($options['reply_to']) || empty($options['reply_to'])) {
+            $reply_to = Settings::get("mail_reply_to", "");
+
+            if (!empty($reply_to)) {
+                $options['reply_to'] = $reply_to;
+            }
+        }
+
+        return $options;
+    }
+
+    public static function convertToArray ($to) : string {
+        if (is_array($to)) {
+            //convert array to RFC 2822 string
+            $to = implode(", ", $to);
+        }
+
+        return $to;
+    }
+
+    public static function generateHeader (array $options, string $to, bool $html_mail = false) {
+        //generate header
+        $headers = array();
+
+        if ($html_mail) {
+            $charset = Settings::get("mail_default_charset", "urf-8");
+
+            //add mime version, content type and charset
+            $headers[] = "MIME-Version: 1.0";
+            $headers[] = "Content-type: text/html; charset=" . $charset;
+
+            $headers[] = "To: " . $to;
+        }
+
+        $headers[] = "Content-Transfer-Encoding: quoted-printable";
+
+        if (isset($options['from']) && !empty($options['from'])) {
+            $headers[] = "From: " . $options['from'];
+        }
+
+        if (isset($options['reply_to']) && !empty($options['reply_to'])) {
+            $headers[] = "Reply-To: " . $options['reply_to'];
+        }
+
+        if (isset($options['cc'])) {
+            if (is_array($options['cc'])) {
+                //convert array to string
+                $options['cc'] = implode(", ", $options['cc']);
+            }
+
+            $headers[] = "Cc: " . $options['cc'];
+        }
+
+        if (isset($options['bcc'])) {
+            if (is_array($options['bcc'])) {
+                //convert array to string
+                $options['bcc'] = implode(", ", $options['bcc']);
+            }
+
+            $headers[] = "Bcc: " . $options['bcc'];
+        }
+
+        //add php X-Mailer header
+        $headers[] = "X-Mailer: PHP/" . phpversion();
+
+        if (count($headers) == 0) {
+            $headers = null;
+        } else {
+            //convert array to string
+            $headers = implode("\r\n", $headers);
+        }
 
-		return $headers;
-	}
+        return $headers;
+    }
 
 }