commit 9206863d3fcfdafe3992557b32c4b34326ac08ce parent 5f73a81479375688b19fe427667566e4df53ab14 Author: Jan Dankert <devnull@localhost> Date: Sun, 23 Sep 2018 22:26:00 +0200 Die IndexAction soll beim Start des UI auch die Action und Id ermitteln. Damit die Id gesetzt werden kann, muss die Id über den Dispatcher in die Action gebracht werden. Dazu muss erst der Request gesetzt werden, bevor die weitere Verarbeitung geschieht, daher geschieht die fachliche Initialisierung der Actions jetzt (wieder) über eine init()-Methode, die vom Dispatcher aufgerufen wird. Diffstat:
30 files changed, 138 insertions(+), 77 deletions(-)
diff --git a/modules/cms-core/Dispatcher.class.php b/modules/cms-core/Dispatcher.class.php @@ -283,6 +283,7 @@ class Dispatcher $do = new $actionClassNameWithNamespace; $do->request = $this->request; + $do->init(); if(!defined('OR_ID')) if (isset($REQ[REQ_PARAM_ID])) diff --git a/modules/cms-core/action/Action.class.php b/modules/cms-core/action/Action.class.php @@ -56,21 +56,24 @@ namespace cms\action { public $request; - protected function setStyle($style) + /** + * Will be called by the Dispatcher right after the contruction of this class instance. + */ + public function init() { - $this->setControlVar("new_style", $style); + } - function nextView($viewName) + protected function setStyle($style) { - $this->setControlVar("next_view", $viewName); + $this->setControlVar("new_style", $style); } public function __construct() { - $this->request = new RequestParams(); + //$this->request = new RequestParams(); $this->currentUser = Session::getUser(); @@ -169,6 +172,7 @@ namespace cms\action { * * @param String $varName Schl�ssel * @param Mixed $value + * @deprecated Diese Schicht soll keine Dialog-Logik enthalten. */ protected function setControlVar($varName, $value) { diff --git a/modules/cms-core/action/ElementAction.class.php b/modules/cms-core/action/ElementAction.class.php @@ -48,6 +48,11 @@ class ElementAction extends Action { parent::__construct(); + } + + + public function init() + { if ( $this->getRequestId() == 0 ) die('no element-id available'); diff --git a/modules/cms-core/action/FileAction.class.php b/modules/cms-core/action/FileAction.class.php @@ -46,8 +46,12 @@ class FileAction extends ObjectAction */ function __construct() { - parent::__construct(); + parent::__construct(); + } + + public function init() + { $this->file = new File( $this->getRequestId() ); $this->file->languageid = $this->getRequestVar(REQ_PARAM_LANGUAGE_ID); $this->file->load(); diff --git a/modules/cms-core/action/FolderAction.class.php b/modules/cms-core/action/FolderAction.class.php @@ -53,6 +53,11 @@ class FolderAction extends ObjectAction public function __construct() { parent::__construct(); + } + + + public function init() + { $this->folder = new Folder( $this->getRequestId() ); $this->folder->languageid = $this->request->getLanguageId(); $this->folder->load(); diff --git a/modules/cms-core/action/GroupAction.class.php b/modules/cms-core/action/GroupAction.class.php @@ -47,7 +47,12 @@ class GroupAction extends Action { parent::__construct(); - $this->group = new Group( $this->getRequestId() ); + } + + + public function init() + { + $this->group = new Group( $this->getRequestId() ); $this->group->load(); $this->setTemplateVar( 'groupid',$this->group->groupid ); } @@ -155,7 +160,6 @@ class GroupAction extends Action foreach( Group::getAll() as $id=>$name ) { $list[$id] = array(); - $list[$id]['url' ] = Html::url('main','group',$id,array(REQ_PARAM_TARGETSUBACTION=>'edit')); $list[$id]['name'] = $name; } diff --git a/modules/cms-core/action/ImageAction.class.php b/modules/cms-core/action/ImageAction.class.php @@ -31,6 +31,11 @@ class ImageAction extends FileAction { parent::__construct(); + } + + + public function init() + { $this->image = new Image( $this->getRequestId() ); $this->image->load(); diff --git a/modules/cms-core/action/LanguageAction.class.php b/modules/cms-core/action/LanguageAction.class.php @@ -48,6 +48,11 @@ class LanguageAction extends Action { parent::__construct(); + } + + + public function init() + { $this->language = new Language( $this->getRequestId() ); $this->language->load(); } diff --git a/modules/cms-core/action/LinkAction.class.php b/modules/cms-core/action/LinkAction.class.php @@ -48,8 +48,15 @@ class LinkAction extends ObjectAction { parent::__construct(); + } + + + public function init() + { $this->link = new Link( $this->getRequestId() ); $this->link->load(); + + parent::init(); } diff --git a/modules/cms-core/action/LoginAction.class.php b/modules/cms-core/action/LoginAction.class.php @@ -1400,15 +1400,12 @@ class LoginAction extends Action if ( $mail->send() ) { $this->addNotice('','','mail_sent',OR_NOTICE_OK); - $this->nextView('registeruserdata'); } else { $this->addNotice('','','mail_not_sent',OR_NOTICE_ERROR,array(),$mail->error); return; } - - $this->nextView('registercode'); } @@ -1463,8 +1460,6 @@ class LoginAction extends Action $newUser->setPassword( $this->getRequestVar('password'),true ); $this->addNotice('user',$newUser->name,'user_added','ok'); - - $this->nextView('login'); } @@ -1580,7 +1575,6 @@ class LoginAction extends Action } $this->setSessionVar("password_commit_name",$user->name); - $this->nextView('passwordcode'); } diff --git a/modules/cms-core/action/ModelAction.class.php b/modules/cms-core/action/ModelAction.class.php @@ -45,6 +45,11 @@ class ModelAction extends Action { parent::__construct(); + } + + + public function init() + { $this->model = new Model( $this->getRequestId() ); $this->model->load(); } diff --git a/modules/cms-core/action/ObjectAction.class.php b/modules/cms-core/action/ObjectAction.class.php @@ -53,6 +53,11 @@ class ObjectAction extends Action { parent::__construct(); + } + + + public function init() + { $this->baseObject = new BaseObject( $this->getRequestId() ); $this->baseObject->objectLoad(); } diff --git a/modules/cms-core/action/PageAction.class.php b/modules/cms-core/action/PageAction.class.php @@ -36,7 +36,12 @@ class PageAction extends ObjectAction { parent::__construct(); - $this->page = new Page( $this->getRequestId() ); + } + + + public function init() + { + $this->page = new Page( $this->getRequestId() ); if ( $this->request->hasLanguageId()) $this->page->languageid = $this->request->getLanguageId(); diff --git a/modules/cms-core/action/PageelementAction.class.php b/modules/cms-core/action/PageelementAction.class.php @@ -76,6 +76,11 @@ class PageelementAction extends Action function __construct() { parent::__construct(); + } + + + public function init() + { $this->value = new Value(); diff --git a/modules/cms-core/action/ProfileAction.class.php b/modules/cms-core/action/ProfileAction.class.php @@ -145,7 +145,6 @@ class ProfileAction extends Action if ( $mail->send() ) { $this->addNotice('user',$this->user->name,'mail_sent',OR_NOTICE_OK); // Meldung - $this->nextView('confirmmail'); } else { diff --git a/modules/cms-core/action/ProjectAction.class.php b/modules/cms-core/action/ProjectAction.class.php @@ -40,7 +40,11 @@ class ProjectAction extends Action function __construct() { parent::__construct(); + } + + public function init() + { $this->project = new Project( $this->getRequestId() ); $this->project->load(); } diff --git a/modules/cms-core/action/RequestParams.class.php b/modules/cms-core/action/RequestParams.class.php @@ -7,7 +7,6 @@ namespace { define('REQ_PARAM_TOKEN' ,'token' ); define('REQ_PARAM_ACTION' ,'action' ); define('REQ_PARAM_SUBACTION' ,'subaction' ); - define('REQ_PARAM_TARGETSUBACTION','targetSubAction'); define('REQ_PARAM_ID' ,'id' ); define('REQ_PARAM_OBJECT_ID' ,'objectid' ); define('REQ_PARAM_LANGUAGE_ID' ,'languageid' ); @@ -16,7 +15,6 @@ namespace { define('REQ_PARAM_ELEMENT_ID' ,'elementid' ); define('REQ_PARAM_TEMPLATE_ID' ,'templateid' ); define('REQ_PARAM_DATABASE_ID' ,'dbid' ); - define('REQ_PARAM_TARGET' ,'target' ); /* Filter Types */ define('OR_FILTER_ALPHA', 'abc'); @@ -39,6 +37,7 @@ namespace cms\action { { public $action; public $method; + public $id; public $isEmbedded; public $isAction; @@ -48,7 +47,8 @@ namespace cms\action { */ public function __construct() { - $this->action = @$_REQUEST[REQ_PARAM_ACTION]; + $this->id = @$_REQUEST[REQ_PARAM_ID ]; + $this->action = @$_REQUEST[REQ_PARAM_ACTION ]; $this->method = @$_REQUEST[REQ_PARAM_SUBACTION]; $this->isEmbedded = @$_REQUEST[REQ_PARAM_EMBED]=='1'; @@ -65,6 +65,9 @@ namespace cms\action { */ public function getRequestVar($varName, $transcode = OR_FILTER_FULL) { + if($varName == REQ_PARAM_ID) + return $this->id; + if($varName == REQ_PARAM_ACTION) return $this->action; diff --git a/modules/cms-core/action/StartAction.class.php b/modules/cms-core/action/StartAction.class.php @@ -45,6 +45,7 @@ if ( !defined('PROJECTID_ADMIN') ) * @author $Author$ * @version $Revision$ * @package openrat.actions + * @deprecated */ class StartAction extends Action diff --git a/modules/cms-core/action/TemplateAction.class.php b/modules/cms-core/action/TemplateAction.class.php @@ -51,6 +51,11 @@ class TemplateAction extends Action { parent::__construct(); + } + + + public function init() + { $this->template = new Template( $this->getRequestId() ); $this->template->modelid = $this->request->getModelId(); diff --git a/modules/cms-core/action/TextAction.class.php b/modules/cms-core/action/TextAction.class.php @@ -46,6 +46,11 @@ class TextAction extends FileAction function __construct() { parent::__construct(); + } + + + public function init() + { $this->text = new Text( $this->getRequestId() ); $this->text->load(); diff --git a/modules/cms-core/action/UrlAction.class.php b/modules/cms-core/action/UrlAction.class.php @@ -49,6 +49,11 @@ class UrlAction extends ObjectAction { parent::__construct(); + } + + + public function init() + { $this->url = new Url( $this->getRequestId() ); $this->url->load(); } diff --git a/modules/cms-core/action/UserAction.class.php b/modules/cms-core/action/UserAction.class.php @@ -57,6 +57,11 @@ class UserAction extends Action { parent::__construct(); + } + + + public function init() + { $this->user = new User( $this->getRequestId() ); $this->user->load(); $this->setTemplateVar('userid',$this->user->userid); @@ -224,8 +229,6 @@ class UserAction extends Action { /* @var $user User */ $list[$user->userid] = $user->getProperties(); - $list[$user->userid]['url' ] = Html::url('main','user',$user->userid, - array(REQ_PARAM_TARGETSUBACTION=>'edit') ); } $this->setTemplateVar('el',$list); } diff --git a/modules/cms-core/action/WebdavAction.class.php b/modules/cms-core/action/WebdavAction.class.php @@ -33,6 +33,7 @@ use cms\model\Link; * * @author Jan Dankert * @package openrat.actions + * @deprecated */ class WebdavAction extends Action diff --git a/modules/cms-ui/UI.class.php b/modules/cms-ui/UI.class.php @@ -103,12 +103,13 @@ class UI * Shows a UI fragment. * This can only be executed after a UI::execute()-call. */ - public static function executeEmbedded($action, $subaction) + public static function executeEmbedded($action, $subaction, $id) { $request = new RequestParams(); $request->isEmbedded = true; $request->action = $action; + $request->id = $id; $request->method = $subaction; // Embedded Actions are ALWAYS Queries (means: GET). diff --git a/modules/cms-ui/action/IndexAction.class.php b/modules/cms-ui/action/IndexAction.class.php @@ -134,8 +134,10 @@ class IndexAction extends Action $userIsLoggedIn = is_object($user); // Welche Aktion soll ausgeführt werden? - $action = $this->getStartAction(); - $id = $this->getRequestId(); + $action = $this->getRequestVar( REQ_PARAM_ACTION ); + $id = $this->getRequestId(); + + $this->updateStartAction( $action, $id ); $this->setTemplateVar('action',$action); $this->setTemplateVar('id' ,$id ); @@ -183,7 +185,8 @@ class IndexAction extends Action exit; } - + + private function getCSSFiles() { $productionCSSFile = OR_THEMES_DIR . 'default/production/combined.min.css'; @@ -772,20 +775,24 @@ class IndexAction extends Action } - - private function getStartAction() + /** + * Ermittelt die erste zu startende Aktion. + * @param $action + * @param $id + */ + private function updateStartAction( &$action, &$id ) { - if ( isset($_REQUEST['action']) ) { - return $_REQUEST['action']; - } - $user = Session::getUser(); if ( !is_object($user) ) - return 'login'; + { + $action = 'login'; + $id = 0; + return; + } - // Das zuletzt geänderte benutzen. + // Das zuletzt geänderte Objekt benutzen. if ( config('login','start','start_lastchanged_object') ) { $objectid = Value::getLastChangedObjectByUserId($user->userid); @@ -795,25 +802,25 @@ class IndexAction extends Action $object = new BaseObject($objectid); $object->objectLoad(); - return $object->getType(); + $action = $object->getType(); + $id = $objectid; + return; } } - + // Das einzige Projekt benutzen if ( config('login','start','start_single_project') ) { $projects = Project::getAllProjects(); if ( count($projects) == 1 ) { // Das einzige Projekt sofort starten. - return 'project'; - } - else{ - return 'projectlist'; + $action = 'project'; + $id = array_keys($projects)[0]; } } - - return 'projectlist'; + $action = 'projectlist'; + $id = 0; } } diff --git a/modules/cms-ui/themes/default/layout/index.php b/modules/cms-ui/themes/default/layout/index.php @@ -31,7 +31,7 @@ <div id="workbench" class="initial-hidden"> <header id="title" class="view view-static" data-action="title" data-method="show"> - <?php echo embedView('title','show'); ?> + <?php echo embedView('title','show', 0); ?> </header> @@ -42,7 +42,7 @@ <a href=""></a> </header> <div id="navigation" class="or-navtree view view-static" data-action="tree" data-method="tree"> - <?php embedView('tree','tree'); ?> + <?php embedView('tree','tree',0); ?> </div> </nav> @@ -53,7 +53,7 @@ </header> <?php foreach( $methodList as $method ) { ?> - <?php if (DEVELOPMENT) echo "<!-- Section for : $action / ".$method['name']." -->"; ?> + <?php if (DEVELOPMENT) echo "<!-- Section for : $action / ".$method['name']." / $id -->"; ?> <section class="toggle-open-close <?php echo $method ['open']?'open':'closed' ?>"> <header class="on-click-open-close"> @@ -73,7 +73,7 @@ --> - <div class="view view-loader" data-method="<?php echo $method['name'] ?>"><?php if($method ['open']) {embedView($action,$method['name']);}else{echo '';} ?></div> + <div class="view view-loader" data-method="<?php echo $method['name'] ?>"><?php if($method ['open']) {embedView($action,$method['name'],$id);}else{echo '';} ?></div> </section> <?php } ?> @@ -90,7 +90,7 @@ <div class="view"> <?php // Shows directly a modal dialog (if present) if(!empty($dialogAction)) - embedView($dialogAction,$dialogMethod); + embedView($dialogAction,$dialogMethod, 0); ?> </div> @@ -115,7 +115,7 @@ </body> </html> <?php -function embedView( $action, $method ) { - cms_ui\UI::executeEmbedded($action,$method); +function embedView( $action, $method,$id ) { + cms_ui\UI::executeEmbedded($action,$method,$id); } ?> \ No newline at end of file diff --git a/modules/util/Html.class.php b/modules/util/Html.class.php @@ -91,9 +91,6 @@ class Html $params[REQ_PARAM_ACTION ] = $action; $params[REQ_PARAM_SUBACTION] = $subaction; $params[REQ_PARAM_ID ] = $id; - - if ( !isset($params[REQ_PARAM_TARGET])) - $params[REQ_PARAM_TARGET ] = $view; } if ( count($params) > 0 ) diff --git a/modules/util/Session.class.php b/modules/util/Session.class.php @@ -53,6 +53,8 @@ class Session /** + * Liefert den Benutzer aus der Sitzung oder <code>null</code>, wenn kein Benutze angemeldet ist. + * * @return User */ public static function getUser() diff --git a/modules/util/Tree.class.php b/modules/util/Tree.class.php @@ -69,7 +69,6 @@ class Tree $treeElement->id = 0; $treeElement->text = lang('GLOBAL_PROJECTS'); $treeElement->description = lang('GLOBAL_PROJECTS'); - $treeElement->url = Html::url('projectlist', 'show', 0, array(REQ_PARAM_TARGET => 'content')); $treeElement->action = 'projectlist'; $treeElement->icon = 'projectlist'; $treeElement->type = 'projects'; @@ -111,7 +110,6 @@ class Tree $treeElement = new TreeElement(); $treeElement->text = lang('GLOBAL_USER'); $treeElement->description = lang('GLOBAL_USER'); - $treeElement->url = Html::url('user', 'listing', 0, array(REQ_PARAM_TARGET => 'content')); $treeElement->action = 'userlist'; $treeElement->icon = 'userlist'; $treeElement->type = 'users'; @@ -121,7 +119,6 @@ class Tree $treeElement = new TreeElement(); $treeElement->text = lang('GLOBAL_GROUPS'); $treeElement->description = lang('GLOBAL_GROUPS'); - $treeElement->url = Html::url('group', 'listing', 0, array(REQ_PARAM_TARGET => 'content')); $treeElement->action = 'grouplist'; $treeElement->icon = 'userlist'; $treeElement->type = 'groups'; @@ -147,10 +144,6 @@ class Tree $treeElement->internalId = $id; $treeElement->id = $id; $treeElement->text = $name; - - if ( $rootFolder->hasRight( ACL_PROP ) ) - // Project-Admins dürfen das Project bearbeiten. - $treeElement->url = Html::url('project', 'edit', $id, array(REQ_PARAM_TARGET => 'content')); $treeElement->icon = 'project'; $treeElement->action = 'project'; $treeElement->type = 'project'; @@ -277,8 +270,6 @@ class Tree $treeElement->id = $user->userid; $treeElement->internalId = $user->userid; $treeElement->text = $user->name; - $treeElement->url = Html::url('user', 'edit', - $user->userid, array(REQ_PARAM_TARGET => 'content')); $treeElement->action = 'user'; $treeElement->icon = 'user'; @@ -313,8 +304,6 @@ class Tree $treeElement->id = $id; $treeElement->internalId = $id; $treeElement->text = $g->name; - $treeElement->url = Html::url('group', 'edit', $id, - array(REQ_PARAM_TARGET => 'content')); $treeElement->icon = 'group'; $treeElement->description = lang('GLOBAL_GROUP') . ' ' . $g->name . ': ' . implode(', ', $g->getUsers()); $treeElement->type = 'userofgroup'; @@ -340,7 +329,6 @@ class Tree $u->load(); $treeElement->id = $u->userid; $treeElement->text = $u->name; - $treeElement->url = Html::url('user', 'edit', $id, array(REQ_PARAM_TARGET => 'content')); $treeElement->icon = 'user'; $treeElement->action = 'user'; $treeElement->description = $u->fullname; @@ -369,10 +357,6 @@ class Tree $treeElement->id = $id . '_' . $elementid; $treeElement->extraId['elementid'] = $elementid; $treeElement->text = $element->name; - $treeElement->url = Html::url('pageelement', 'edit', - $id . '_' . $elementid, - array('elementid' => $elementid, - REQ_PARAM_TARGETSUBACTION => 'edit', REQ_PARAM_TARGET => 'content')); $treeElement->action = 'pageelement'; $treeElement->icon = 'el_' . $element->type; $treeElement->extraId = array(REQ_PARAM_LANGUAGE_ID => $page->languageid, REQ_PARAM_MODEL_ID => $page->modelid); @@ -419,7 +403,6 @@ class Tree $treeElement->type = $object->getType(); $treeElement->internalId = $object->objectid; } - $treeElement->url = Html::url($object->getType(), '', $objectid, array(REQ_PARAM_TARGET => 'content')); $treeElement->action = $object->getType(); $treeElement->icon = $object->getType(); @@ -454,7 +437,6 @@ class Tree else $treeElement->description .= ' - ' . lang('GLOBAL_NO_DESCRIPTION_AVAILABLE'); - $treeElement->url = Html::url($o->getType(), '', $o->objectid, array(REQ_PARAM_TARGET => 'content')); $treeElement->action = $o->getType(); $treeElement->icon = $o->getType(); $treeElement->extraId = array(REQ_PARAM_LANGUAGE_ID => $_REQUEST[REQ_PARAM_LANGUAGE_ID], REQ_PARAM_MODEL_ID => $_REQUEST[REQ_PARAM_MODEL_ID]); @@ -498,7 +480,6 @@ class Tree else $treeElement->description .= ' - ' . lang('GLOBAL_NO_DESCRIPTION_AVAILABLE'); - $treeElement->url = Html::url($o->getType(), '', $o->objectid, array('readit' => '__OID__' . $o->objectid . '__', REQ_PARAM_TARGET => 'content')); $treeElement->action = $o->getType(); $treeElement->icon = $o->getType(); @@ -545,7 +526,6 @@ class Tree $t->load(); $treeElement->text = $t->name; $treeElement->id = $id; - $treeElement->url = Html::url('template', 'src', $id, array(REQ_PARAM_TARGETSUBACTION => 'src', REQ_PARAM_TARGET => 'content')); $treeElement->icon = 'template'; $treeElement->action = 'template'; $treeElement->internalId = $id; @@ -577,7 +557,6 @@ class Tree $treeElement->id = $elementid; $treeElement->extraId = array(REQ_PARAM_LANGUAGE_ID => $_REQUEST[REQ_PARAM_LANGUAGE_ID], REQ_PARAM_MODEL_ID => $_REQUEST[REQ_PARAM_MODEL_ID]); $treeElement->text = $e->name; - $treeElement->url = Html::url('element', '', $elementid, array(REQ_PARAM_TARGET => 'content')); $treeElement->icon = 'el_' . $e->type; $treeElement->action = 'element'; @@ -604,8 +583,6 @@ class Tree $treeElement = new TreeElement(); $treeElement->id = $languageid; $treeElement->text = $name; - $treeElement->url = Html::url('language', 'edit', $languageid, - array(REQ_PARAM_TARGETSUBACTION => 'edit', REQ_PARAM_TARGET => 'content')); $treeElement->icon = 'language'; $treeElement->action = 'language'; $treeElement->description = ''; @@ -625,8 +602,6 @@ class Tree $treeElement = new TreeElement(); $treeElement->id = $id; $treeElement->text = $name; - $treeElement->url = Html::url('model', 'edit', $id, - array(REQ_PARAM_TARGETSUBACTION => 'edit', REQ_PARAM_TARGET => 'content')); $treeElement->action = 'model'; $treeElement->icon = 'model'; $treeElement->description = ''; diff --git a/modules/util/TreeElement.class.php b/modules/util/TreeElement.class.php @@ -45,7 +45,6 @@ class TreeElement * @type String */ var $description = ""; - var $url = ""; var $icon = ""; var $action = "";