Cleanup, docu and refactoring in ilCtrl, thanks to rklees, see ILIAS-…

…eLearning#615
conceptsandtraining · Nov 2, 2018 · 0fce550 · 0fce550
1 parent 42fab50
commit 0fce550
Show file tree

Hide file tree

Showing 28 changed files with 180 additions and 390 deletions.
diff --git a/Modules/Bibliographic/classes/class.ilObjBibliographicGUI.php b/Modules/Bibliographic/classes/class.ilObjBibliographicGUI.php
@@ -235,7 +235,6 @@ public static function _goto($a_target) {
 		global $DIC;
 
 		$id = explode("_", $a_target);
-		$DIC->ctrl()->setTargetScript("ilias.php");
 		$DIC->ctrl()->initBaseClass(ilRepositoryGUI::class);
 		$DIC->ctrl()->setParameterByClass(ilObjBibliographicGUI::class, "ref_id", $id[0]);
 		// Detail-View

diff --git a/Modules/Course/classes/class.ilObjCourseGUI.php b/Modules/Course/classes/class.ilObjCourseGUI.php
@@ -2212,17 +2212,6 @@ function getTabs()
 								 array("perm","info","owner"), 'ilpermissiongui');
 		}
 
-		if ($this->ctrl->getTargetScript() == "adm_object.php")
-		{
-			$this->tabs_gui->addTarget("show_owner",
-								 $this->ctrl->getLinkTarget($this, "owner"), "owner", get_class($this));
-
-			if ($this->tree->getSavedNodeData($this->ref_id))
-			{
-				$this->tabs_gui->addTarget("trash",
-									 $this->ctrl->getLinkTarget($this, "trash"), "trash", get_class($this));
-			}
-		}
 		// Join/Leave
 		if($ilAccess->checkAccess('join','',$this->ref_id)
 			and !$this->object->getMemberObject()->isAssigned())

diff --git a/Modules/OrgUnit/classes/class.ilObjOrgUnitGUI.php b/Modules/OrgUnit/classes/class.ilObjOrgUnitGUI.php
@@ -657,7 +657,6 @@ public static function _goto($ref_id) {
 		global $DIC;
 		$ilCtrl = $DIC['ilCtrl'];
 		$ilCtrl->initBaseClass("ilAdministrationGUI");
-		$ilCtrl->setTargetScript("ilias.php");
 		$ilCtrl->setParameterByClass("ilObjOrgUnitGUI", "ref_id", $ref_id);
 		$ilCtrl->setParameterByClass("ilObjOrgUnitGUI", "admin_mode", self::TAB_SETTINGS);
 		$ilCtrl->setParameterByClass("IlObjPluginDispatchGUI", "admin_mode", self::TAB_SETTINGS);

diff --git a/Modules/StudyProgramme/classes/class.ilObjStudyProgrammeAdminGUI.php b/Modules/StudyProgramme/classes/class.ilObjStudyProgrammeAdminGUI.php
@@ -144,7 +144,6 @@ public function getAdminTabs() {
 
 	public function _goto($ref_id) {
 		$this->ctrl->initBaseClass("ilAdministrationGUI");
-		$this->ctrl->setTargetScript("ilias.php");
 		$this->ctrl->setParameterByClass("ilObjStudyProgrammeAdminGUI", "ref_id", $ref_id);
 		$this->ctrl->setParameterByClass("ilObjStudyProgrammeAdminGUI", "admin_mode", "settings");
 		$this->ctrl->redirectByClass(array( "ilAdministrationGUI", "ilObjStudyProgrammeAdminGUI" ), "view");
@@ -153,4 +152,4 @@ public function _goto($ref_id) {
 	protected function save(ilPropertyFormGUI $a_form) {
 		return true;
 	}
-}
+}
diff --git a/Modules/StudyProgramme/classes/class.ilObjStudyProgrammeGUI.php b/Modules/StudyProgramme/classes/class.ilObjStudyProgrammeGUI.php
@@ -671,7 +671,6 @@ public static function _goto($a_target) {
 		$ilErr = $DIC['ilErr'];
 		$ilCtrl = $DIC['ilCtrl'];
 		$id = explode("_", $a_target);
-		$ilCtrl->setTargetScript("ilias.php");
 		$ilCtrl->initBaseClass("ilRepositoryGUI");
 		$ilCtrl->setParameterByClass("ilobjstudyprogrammegui", "ref_id", $id[0]);
 

diff --git a/Modules/Wiki/classes/class.ilWikiUtil.php b/Modules/Wiki/classes/class.ilWikiUtil.php
@@ -511,7 +511,6 @@ static function makeLink( &$nt, $a_wiki_id, $text = '', $query = '', $trail = ''
 				}
 			}
 
-//$ilCtrl->debug("ilWikiUtil::makeLink:-$inside-$trail-");
 /*			if ( $nt->isExternal() ) {
 				$nr = array_push( $this->mInterwikiLinkHolders['texts'], $prefix.$text.$inside );
 				$this->mInterwikiLinkHolders['titles'][] = $nt;
@@ -779,4 +778,4 @@ static function sendNotification($a_action, $a_type, $a_wiki_ref_id, $a_page_id,
 	}
 }
 
-?>
+?>
diff --git a/Services/Component/classes/class.ilObjComponentSettingsGUI.php b/Services/Component/classes/class.ilObjComponentSettingsGUI.php
@@ -554,7 +554,6 @@ protected function update(ilPlugin $plugin) {
 		$ilCtrl->setParameterByClass("iladministrationgui", "cname", $_GET["cname"]);
 		$ilCtrl->setParameterByClass("iladministrationgui", "slot_id", $_GET["slot_id"]);
 		$ilCtrl->setParameterByClass("iladministrationgui", "plugin_id", $_GET["plugin_id"]);
-		$ilCtrl->setTargetScript("ilias.php");
 		ilUtil::redirect("ilias.php?admin_mode=settings&baseClass=ilAdministrationGUI".
 			"&cmd=jumpToPluginSlot&ref_id=".$_GET["ref_id"]."&ctype=".$_GET["ctype"].
 			"&cname=".$_GET["cname"]."&slot_id=".$_GET["slot_id"]."&plugin_id=".$_GET["plugin_id"]);
@@ -700,4 +699,4 @@ protected function uninstallPlugin()
 		$ilCtrl->setParameter($this, "slot_id", $_GET["slot_id"]);
 		$ilCtrl->redirect($this, "listPlugins");
 	}
-}
+}
diff --git a/Services/Component/classes/class.ilPlugin.php b/Services/Component/classes/class.ilPlugin.php
@@ -993,11 +993,8 @@ public function update() {
 		// load control structure
 		include_once("./setup/classes/class.ilCtrlStructureReader.php");
 		$structure_reader = new ilCtrlStructureReader();
-		$structure_reader->readStructure(
-			true, "./" . $this->getDirectory(), $this->getPrefix(),
-			$this->getDirectory()
-		);
-		//		$ilCtrl->storeCommonStructures();
+		$structure_reader->readStructure(true, "./".$this->getDirectory(), $this->getPrefix(),
+			$this->getDirectory());
 
 		// add config gui to the ctrl calls
 		$ilCtrl->insertCtrlCalls(

diff --git a/Services/Init/classes/class.ilStartUpGUI.php b/Services/Init/classes/class.ilStartUpGUI.php
@@ -214,8 +214,6 @@ protected function showLoginPage(ilPropertyFormGUI $form = null)
 		$tpl->setVariable("PAGETITLE",  "- ".$this->lng->txt("startpage"));
 		$tpl->setVariable("ILIAS_RELEASE", $ilSetting->get("ilias_version"));
 
-		$this->ctrl->setTargetScript("ilias.php");
-
 		// check expired session and send message
 		if($GLOBALS['DIC']['ilAuthSession']->isExpired())
 		{
@@ -474,7 +472,6 @@ protected function showLogin()
 		$tpl->setVariable("PAGETITLE",  "- ".$lng->txt("startpage"));
 		$tpl->setVariable("ILIAS_RELEASE", $ilSetting->get("ilias_version"));
 
-		$this->ctrl->setTargetScript("ilias.php");
 		$tpl->setVariable("PHP_SELF", $_SERVER['PHP_SELF']);
 
 		// browser does not accept cookies

diff --git a/Services/MainMenu/classes/class.ilMainMenuGUI.php b/Services/MainMenu/classes/class.ilMainMenuGUI.php
@@ -565,16 +565,12 @@ private function renderHelpButtons() {
 
 
 			// always set ajax url
-			$ts = $ilCtrl->getTargetScript();
-			$ilCtrl->setTargetScript("ilias.php");
-
 			$ilHelp->setCtrlPar();
 			$this->main_tpl->addOnLoadCode(
 				"il.Help.setAjaxUrl('" .
 				$ilCtrl->getLinkTargetByClass("ilhelpgui", "", "", true)
 				. "');"
 			);
-			$ilCtrl->setTargetScript($ts);
 		}
 	}
 

diff --git a/Services/MediaObjects/classes/class.ilObjMediaObjectGUI.php b/Services/MediaObjects/classes/class.ilObjMediaObjectGUI.php
@@ -1874,7 +1874,6 @@ function setTabs()
 		// catch feedback message
 		$this->getTabs();
 
-		//$tabs_gui->setTargetScript($this->ctrl->getLinkTarget($this));
 		$this->tpl->clearHeader();
 		if (is_object($this->object) && strtolower(get_class($this->object)) == "ilobjmediaobject")
 		{
@@ -1899,7 +1898,6 @@ function getTabs()
 
 		$ilHelp->setScreenIdComponent("mob");
 
-		//$this->tabs_gui->setTargetScript($this->ctrl->getLinkTarget($this));
 		if (is_object($this->object) && strtolower(get_class($this->object)) == "ilobjmediaobject"
 			&& $this->object->getId() > 0)
 		{	

diff --git a/Services/News/classes/class.ilNewsItemGUI.php b/Services/News/classes/class.ilNewsItemGUI.php
@@ -739,7 +739,7 @@ function setTabs()
 
 		$ilTabs->clearTargets();
 		$ilTabs->setBackTarget($lng->txt("back"),
-			$ilCtrl->getParentReturnByClass("ilnewsitemgui"));
+			$ilCtrl->getParentReturn($this));
 	}
 
 	/**

diff --git a/Services/Repository/classes/class.ilObjectPluginGUI.php b/Services/Repository/classes/class.ilObjectPluginGUI.php
@@ -382,14 +382,8 @@ function afterSave(ilObject $newObj)
 		ilUtil::sendSuccess($this->lng->txt("object_added"),true);
 
 		$ilCtrl->initBaseClass("ilObjPluginDispatchGUI");
-		$ilCtrl->setTargetScript("ilias.php");
 		$ilCtrl->getCallStructure(strtolower("ilObjPluginDispatchGUI"));
 
-//var_dump($ilCtrl->call_node);
-//var_dump($ilCtrl->forward);
-//var_dump($ilCtrl->parent);
-//var_dump($ilCtrl->root_class);
-
 		$ilCtrl->setParameterByClass(get_class($this), "ref_id", $newObj->getRefId());
 		$ilCtrl->redirectByClass(array("ilobjplugindispatchgui", get_class($this)), $this->getAfterCreationCmd());
 	}
@@ -509,15 +503,13 @@ public static function _goto($a_target)
 		if ($ilAccess->checkAccess("read", "", $ref_id))
 		{
 			$ilCtrl->initBaseClass("ilObjPluginDispatchGUI");
-			$ilCtrl->setTargetScript("ilias.php");
 			$ilCtrl->getCallStructure(strtolower("ilObjPluginDispatchGUI"));
 			$ilCtrl->setParameterByClass($class_name, "ref_id", $ref_id);
 			$ilCtrl->redirectByClass(array("ilobjplugindispatchgui", $class_name), "");
 		}
 		else if($ilAccess->checkAccess("visible", "", $ref_id))
 		{
 			$ilCtrl->initBaseClass("ilObjPluginDispatchGUI");
-			$ilCtrl->setTargetScript("ilias.php");
 			$ilCtrl->getCallStructure(strtolower("ilObjPluginDispatchGUI"));
 			$ilCtrl->setParameterByClass($class_name, "ref_id", $ref_id);
 			$ilCtrl->redirectByClass(array("ilobjplugindispatchgui", $class_name), "infoScreen");

diff --git a/Services/Repository/classes/class.ilRepositoryExplorer.php b/Services/Repository/classes/class.ilRepositoryExplorer.php
@@ -130,8 +130,6 @@ function buildLinkTarget($a_node_id, $a_type)
 	{
 		$ilCtrl = $this->ctrl;
 
-		$ilCtrl->setTargetScript("ilias.php");
-
 		switch($a_type)
 		{
 			case "cat":