commit 009238c555382379249ba81cf59b9aa384ceae4f parent 007f23032d386966da0858484b04eb0412f2142c Author: Jan Dankert <develop@jandankert.de> Date: Wed, 8 May 2019 21:55:46 +0200 Statt globalen Konstanten Klassenkonstanten verwenden. Diffstat:
34 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/modules/cms-core/Dispatcher.class.php b/modules/cms-core/Dispatcher.class.php @@ -137,14 +137,14 @@ class Dispatcher private function checkAccess($do) { switch (@$do->security) { - case SECURITY_GUEST: + case Action::SECURITY_GUEST: // Ok. break; - case SECURITY_USER: + case Action::SECURITY_USER: if (!is_object($do->currentUser)) throw new SecurityException('No user logged in, but this action requires a valid user'); break; - case SECURITY_ADMIN: + case Action::SECURITY_ADMIN: if (!is_object($do->currentUser) || !$do->currentUser->isAdmin) throw new SecurityException('This action requires administration privileges, but user ' . $do->currentUser->name . ' is not an admin'); break; diff --git a/modules/cms-core/action/Action.class.php b/modules/cms-core/action/Action.class.php @@ -39,7 +39,11 @@ namespace cms\action { */ class Action { - public $security = SECURITY_USER; // Default. + const SECURITY_GUEST = 1; // Jeder (auch nicht angemeldete) dürfen diese Aktion ausführen + const SECURITY_USER = 2; // Angemeldete Benutzer dürfen diese Aktion ausführen + const SECURITY_ADMIN = 3; // Nur Administratoren dürfen diese Aktion ausführen + + public $security = self::SECURITY_USER; // Default. protected $templateVars = Array(); diff --git a/modules/cms-core/action/ConfigurationAction.class.php b/modules/cms-core/action/ConfigurationAction.class.php @@ -27,7 +27,7 @@ use Session; */ class ConfigurationAction extends Action { - public $security = SECURITY_ADMIN; + public $security = Action::SECURITY_ADMIN; /** * Konstruktor diff --git a/modules/cms-core/action/ElementAction.class.php b/modules/cms-core/action/ElementAction.class.php @@ -35,7 +35,7 @@ use Text; */ class ElementAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** * @var Element diff --git a/modules/cms-core/action/FileAction.class.php b/modules/cms-core/action/FileAction.class.php @@ -38,7 +38,7 @@ use Upload; */ class FileAction extends ObjectAction { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** * @var File diff --git a/modules/cms-core/action/FilebrowserAction.class.php b/modules/cms-core/action/FilebrowserAction.class.php @@ -35,7 +35,7 @@ use \Html; */ class FilebrowserAction extends ObjectAction { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; var $command; var $resourceType; diff --git a/modules/cms-core/action/FolderAction.class.php b/modules/cms-core/action/FolderAction.class.php @@ -30,7 +30,7 @@ use Upload; class FolderAction extends ObjectAction { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** * @var Folder diff --git a/modules/cms-core/action/GroupAction.class.php b/modules/cms-core/action/GroupAction.class.php @@ -38,7 +38,7 @@ use \Html; class GroupAction extends Action { - public $security = SECURITY_ADMIN; + public $security = Action::SECURITY_ADMIN; private $group; diff --git a/modules/cms-core/action/GrouplistAction.class.php b/modules/cms-core/action/GrouplistAction.class.php @@ -31,7 +31,7 @@ use cms\model\Group; class GrouplistAction extends Action { - public $security = SECURITY_ADMIN; + public $security = Action::SECURITY_ADMIN; function __construct() { diff --git a/modules/cms-core/action/ImageAction.class.php b/modules/cms-core/action/ImageAction.class.php @@ -20,7 +20,7 @@ use Upload; */ class ImageAction extends FileAction { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; var $image; diff --git a/modules/cms-core/action/LanguageAction.class.php b/modules/cms-core/action/LanguageAction.class.php @@ -32,7 +32,7 @@ use \Html; */ class LanguageAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** * Zu bearbeitende Sprache, wird im Kontruktor instanziiert diff --git a/modules/cms-core/action/LanguagelistAction.class.php b/modules/cms-core/action/LanguagelistAction.class.php @@ -35,7 +35,7 @@ use \Html; */ class LanguagelistAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** * @var Project diff --git a/modules/cms-core/action/LinkAction.class.php b/modules/cms-core/action/LinkAction.class.php @@ -37,7 +37,7 @@ use Session; */ class LinkAction extends ObjectAction { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; private $link; diff --git a/modules/cms-core/action/LoginAction.class.php b/modules/cms-core/action/LoginAction.class.php @@ -58,7 +58,7 @@ define('PROJECTID_ADMIN',-1); class LoginAction extends Action { - public $security = SECURITY_GUEST; + public $security = Action::SECURITY_GUEST; public function __construct() diff --git a/modules/cms-core/action/ModelAction.class.php b/modules/cms-core/action/ModelAction.class.php @@ -35,7 +35,7 @@ use \Html; */ class ModelAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; var $defaultSubAction = 'listing'; var $model; diff --git a/modules/cms-core/action/ModellistAction.class.php b/modules/cms-core/action/ModellistAction.class.php @@ -38,7 +38,7 @@ class ModellistAction extends Action */ public $project; - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; function __construct() diff --git a/modules/cms-core/action/ObjectAction.class.php b/modules/cms-core/action/ObjectAction.class.php @@ -24,7 +24,7 @@ use Session; class ObjectAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; private $objectid; diff --git a/modules/cms-core/action/PageAction.class.php b/modules/cms-core/action/PageAction.class.php @@ -28,7 +28,7 @@ use Session; class PageAction extends ObjectAction { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** * @var Page diff --git a/modules/cms-core/action/PageelementAction.class.php b/modules/cms-core/action/PageelementAction.class.php @@ -47,7 +47,7 @@ use ValidationException; */ class PageelementAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** diff --git a/modules/cms-core/action/ProfileAction.class.php b/modules/cms-core/action/ProfileAction.class.php @@ -36,7 +36,7 @@ use \Session; */ class ProfileAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; private $user; var $defaultSubAction = 'edit'; diff --git a/modules/cms-core/action/ProjectAction.class.php b/modules/cms-core/action/ProjectAction.class.php @@ -31,7 +31,7 @@ use cms\model\Folder; */ class ProjectAction extends Action { - public $security = SECURITY_ADMIN; + public $security = Action::SECURITY_ADMIN; /** * @var Project diff --git a/modules/cms-core/action/ProjectlistAction.class.php b/modules/cms-core/action/ProjectlistAction.class.php @@ -31,7 +31,7 @@ use cms\model\Project; */ class ProjectlistAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; function __construct() { diff --git a/modules/cms-core/action/SearchAction.class.php b/modules/cms-core/action/SearchAction.class.php @@ -50,7 +50,7 @@ define('SEARCH_FLAG_VALUE' ,16); */ class SearchAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** diff --git a/modules/cms-core/action/StartAction.class.php b/modules/cms-core/action/StartAction.class.php @@ -50,7 +50,7 @@ if ( !defined('PROJECTID_ADMIN') ) class StartAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; var $mustChangePassword = false; diff --git a/modules/cms-core/action/TemplateAction.class.php b/modules/cms-core/action/TemplateAction.class.php @@ -41,7 +41,7 @@ use \Text; class TemplateAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; var $defaultSubAction = 'show'; diff --git a/modules/cms-core/action/TemplatelistAction.class.php b/modules/cms-core/action/TemplatelistAction.class.php @@ -33,7 +33,7 @@ use Session; class TemplatelistAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; /** * @var Project diff --git a/modules/cms-core/action/TextAction.class.php b/modules/cms-core/action/TextAction.class.php @@ -37,7 +37,7 @@ namespace cms\action */ class TextAction extends FileAction { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; var $text; diff --git a/modules/cms-core/action/TreeAction.class.php b/modules/cms-core/action/TreeAction.class.php @@ -37,7 +37,7 @@ use Session; class TreeAction extends Action { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; public function __construct() { diff --git a/modules/cms-core/action/UrlAction.class.php b/modules/cms-core/action/UrlAction.class.php @@ -37,7 +37,7 @@ use Session; */ class UrlAction extends ObjectAction { - public $security = SECURITY_USER; + public $security = Action::SECURITY_USER; var $url; var $defaultSubAction = 'prop'; diff --git a/modules/cms-core/action/UserAction.class.php b/modules/cms-core/action/UserAction.class.php @@ -43,7 +43,7 @@ use \Mail; */ class UserAction extends Action { - public $security = SECURITY_ADMIN; + public $security = Action::SECURITY_ADMIN; /** * @var User diff --git a/modules/cms-core/action/UserlistAction.class.php b/modules/cms-core/action/UserlistAction.class.php @@ -30,7 +30,7 @@ use cms\model\User; */ class UserlistAction extends Action { - public $security = SECURITY_ADMIN; + public $security = Action::SECURITY_ADMIN; function __construct() { diff --git a/modules/cms-core/init.php b/modules/cms-core/init.php @@ -49,10 +49,6 @@ define('REQUEST_ID' ,'req0' ); // Nicht mehr notwendig, kann entfallen define('OR_HTML_MODULES_DIR' ,'./modules/' ); define('OR_THEMES_DIR' ,OR_HTML_MODULES_DIR.'cms-ui/themes/'); -define('SECURITY_GUEST',1); // Jeder (auch nicht angemeldete) dürfen diese Aktion ausführen -define('SECURITY_USER' ,2); // Angemeldete Benutzer dürfen diese Aktion ausführen -define('SECURITY_ADMIN',3); // Nur Administratoren dürfen diese Aktion ausführen - /** diff --git a/modules/cms-ui/action/IndexAction.class.php b/modules/cms-ui/action/IndexAction.class.php @@ -25,7 +25,7 @@ use template_engine\TemplateEngineInfo; */ class IndexAction extends Action { - public $security = SECURITY_GUEST; + public $security = Action::SECURITY_GUEST; /** diff --git a/modules/cms-ui/action/TitleAction.class.php b/modules/cms-ui/action/TitleAction.class.php @@ -35,7 +35,7 @@ use \Html; */ class TitleAction extends Action { - public $security = SECURITY_GUEST; + public $security = Action::SECURITY_GUEST; /** * Fuellen der Variablen und Anzeigen der Titelleiste