(Wrong)[WIP] Refactoring for Exercise Submissions

.gitignore

@@ -33,6 +33,7 @@
 /Customizing/clients
 /setup/sql/ilDBTemplate
 virtual-data
+/libs/composer/vendor
 
 # /dicto
 /dicto/results/*

.travis.yml

@@ -14,4 +14,4 @@ install:
 - cd ./libs/composer && composer install && cd ../..
 env:
   global:
-   - secure: "DQK6Kn+XksLsf+8VwH8MCGDdqUgX1UDMRUayw8gcCNhVIU97cTdRjZKzMLkW1vhSgiMuDDMKost9vVkHAbfDOw6yuVS368NC4PNpU1zqHHHoP4zlHc+mfQzN23w/8oYkbL0wi3BtRDYCokeE9SJECXDVuShBmiMsb6voqH/272C6bmTdVaUYrwuyGpyDt55IX7zFMXXIwMdiN7Z2YBLQVvQu9VwFrDFQCudn8pZ2zcv94RNXImWHqMuhPtGn6+TrrboxAIgC7OT5CGMlcxuQUaqxPeOX/tcwezSGJ/nLJSMEmx3hRU9TniWYHouFOoZHWKbxdLVX4dSJYKxN3wFu6CzD3aIZMqKT/lSIV3PMceq8aHv2w+Op3Lw/lyWm8lkM+6C8qOxsqsj1S5+5CPGAKMSs9gg9L9of21k6xEzUb2FSUaPnEy93GolrFCbcLxtz8ymlZs25/oYzMImqvIdlTcLmvzZ3YIoxjDY/9rrjWfmcx9YGIFZo2Cm6s2nvzkKQPAF7I93JG/2CrVFqzLI2Z95+dRQW3rLqnCCZcNTQ+7Pr/OnQeCccOCF2+enwaK2ZwXfnQA8Qri4ThYyb3y1SJirPF/RGSuxCxxjUkX2yo8v8HN6deuy/nWQOMhV+bKrpY2ITHT3Hy68Q1Xn755uHLZTbNltrAUX+knzI4/of20Y="
+  - secure: C6xIKZPxv6CwEK5YOOX8lwM+Q1nFEF6+k9zZnnyckaA+lIgqvVOiUdhT7JV5GAM3S2Tabb67BA3VN/bJ0hykhIiRsS1UO67MJIxD8qI0atoflN7SUGiDne7nAFZYj8yhDstmj38NR27TpUcGJh/khQ+4Iu0jgJKpDqMOiCExRX8YY+3CDtXr1f2AenLvXqulnlQqpD5fnEoOFw9kMtmLET2okswotguTu6rxWcUMuumA1u0YCy9MfgRqnijz4PiV1evX/QJeWtTZLkRVVz3n21XIlHBv8Qj32Nus/yLoclbmMPvJpzqrNrehE9IYgNP97nhXLjZqy9+a+zdN1bvNTP+NAGbbT8KzjBaWUKZfZ5f+G9CBzh7CL/1xz366l2b+b2oxiOexaY2JwL0CdpSnsBVsC/SizJF7uFbGKuYDl/IZwp1Ece37dBzbTHYrfUwwQZb45tvU5UDRiiLT5HJSw/ZEifJ6usxR94k6D2d/ZZ9wYQb1nbNzkmfaKgA3EZ4TQyHA5lFzc8ANdf7lZq4Qlq0sznMmrvMfCjsTmB2Wd0z80W/m4azFdEsK5hBNX/hJ7f57TnPKr+zTpZ/7gx5Hx5fQ6RpEF+sxM0Lwh0hCJxkXC8r4EwmKiCHPAILrF4dGxCo05OZKQxSrsHjoIjkZWUqxUlnLFTPDIwjYRmco7EY=

Modules/Bibliographic/classes/class.ilObjBibliographicAccess.php

@@ -33,8 +33,8 @@ public static function _getCommands() {
 				"lang_var"   => "show",
 				"default"    => true,
 			),
-			array( "permission" => "write", "cmd" => "view", "lang_var" => "edit_content" ),
-			array( "permission" => "write", "cmd" => "edit", "lang_var" => "settings" ),
+			array("permission" => "write", "cmd" => "view", "lang_var" => "edit_content"),
+			array("permission" => "write", "cmd" => "edit", "lang_var" => "settings"),
 		);
 
 		return $commands;
@@ -66,11 +66,11 @@ public static function _checkGoto($a_target) {
 	 * checks wether a user may invoke a command or not
 	 * (this method is called by ilAccessHandler::checkAccess)
 	 *
-	 * @param    string  $a_cmd command (not permission!)
-	 * @param    string  $a_permission permission
-	 * @param    int     $a_ref_id reference id
-	 * @param    int     $a_obj_id object id
-	 * @param int|string $a_user_id user id (if not provided, current user is taken)
+	 * @param string     $a_cmd        command (not permission!)
+	 * @param string     $a_permission permission
+	 * @param int        $a_ref_id     reference id
+	 * @param int        $a_obj_id     object id
+	 * @param int|string $a_user_id    user id (if not provided, current user is taken)
 	 *
 	 * @return    boolean        true, if everything is ok
 	 */
@@ -83,10 +83,17 @@ public function _checkAccess($a_cmd, $a_permission, $a_ref_id, $a_obj_id, $a_use
 		if ($a_user_id == "") {
 			$a_user_id = $ilUser->getId();
 		}
+
+		if (isset($_GET[ilObjBibliographicGUI::P_ENTRY_ID])) {
+			if (!self::checkEntryIdMatch($a_obj_id, $_GET[ilObjBibliographicGUI::P_ENTRY_ID])) {
+				return false;
+			}
+		}
+
 		switch ($a_cmd) {
 			case "view":
 				if (!self::_lookupOnline($a_obj_id)
-				    && !$rbacsystem->checkAccessOfUser($a_user_id, 'write', $a_ref_id)
+					&& !$rbacsystem->checkAccessOfUser($a_user_id, 'write', $a_ref_id)
 				) {
 					$ilAccess->addInfoItem(IL_NO_OBJECT_ACCESS, $lng->txt("offline"));
 
@@ -106,7 +113,7 @@ public function _checkAccess($a_cmd, $a_permission, $a_ref_id, $a_obj_id, $a_use
 			case "read":
 			case "visible":
 				if (!self::_lookupOnline($a_obj_id)
-				    && (!$rbacsystem->checkAccessOfUser($a_user_id, 'write', $a_ref_id))
+					&& (!$rbacsystem->checkAccessOfUser($a_user_id, 'write', $a_ref_id))
 				) {
 					$ilAccess->addInfoItem(IL_NO_OBJECT_ACCESS, $lng->txt("offline"));
 
@@ -119,10 +126,29 @@ public function _checkAccess($a_cmd, $a_permission, $a_ref_id, $a_obj_id, $a_use
 	}
 
 
+	/**
+	 * @param $ref_id
+	 * @param $obj_id
+	 *
+	 * @return bool
+	 */
+	private static function checkEntryIdMatch($obj_id, $entry_id) {
+		/**
+		 * @var $ilBiblEntry ilBiblEntry
+		 */
+		$ilBiblEntry = ilBiblEntry::find($entry_id);
+		if (is_null($ilBiblEntry)) {
+			return false;
+		}
+
+		return ($ilBiblEntry->getDataId() == $obj_id);
+	}
+
+
 	/**
 	 * Check wether bibliographic is online or not
 	 *
-	 * @param    int $a_id bibl id
+	 * @param int $a_id bibl id
 	 */
 	public static function _lookupOnline($a_id) {
 		global $DIC;

Modules/Bibliographic/classes/class.ilObjBibliographicGUI.php

@@ -97,9 +97,9 @@ public function getStandardCmd() {
 	/**
 	 * getType
 	 *
+	 * @return String
 	 * @deprecated REFACTOR use type factory via Facade
 	 *
-	 * @return String
 	 */
 	public function getType() {
 		return "bibl";
@@ -119,6 +119,12 @@ public function executeCommand() {
 			$ilNavigationHistory->addItem($this->object->getRefId(), $link, "bibl");
 			$this->addHeaderAction();
 		}
+
+		// general Access Check, especially for single entries not matching the object
+		if ($this->object instanceof ilObjBibliographic && !$DIC->access()->checkAccess('visible', "", $this->object->getRefId())) {
+			$this->handleNonAccess();
+		}
+
 		$next_class = $this->dic()->ctrl()->getNextClass($this);
 		$this->cmd = $this->dic()->ctrl()->getCmd();
 		switch ($next_class) {
@@ -179,6 +185,7 @@ public function executeCommand() {
 				}
 				break;
 		}
+
 		return true;
 	}
 
@@ -240,16 +247,20 @@ public static function _goto($a_target) {
 		// Detail-View
 		if ($id[1]) {
 			$DIC->ctrl()
-			    ->setParameterByClass(ilObjBibliographicGUI::class, ilObjBibliographicGUI::P_ENTRY_ID, $id[1]);
-			$DIC->ctrl()->redirectByClass(array(
-				ilRepositoryGUI::class,
-				ilObjBibliographicGUI::class,
-			), self::CMD_SHOW_DETAILS);
+				->setParameterByClass(ilObjBibliographicGUI::class, ilObjBibliographicGUI::P_ENTRY_ID, $id[1]);
+			$DIC->ctrl()->redirectByClass(
+				array(
+					ilRepositoryGUI::class,
+					ilObjBibliographicGUI::class,
+				), self::CMD_SHOW_DETAILS
+			);
 		} else {
-			$DIC->ctrl()->redirectByClass(array(
-				ilRepositoryGUI::class,
-				ilObjBibliographicGUI::class,
-			), self::CMD_VIEW);
+			$DIC->ctrl()->redirectByClass(
+				array(
+					ilRepositoryGUI::class,
+					ilObjBibliographicGUI::class,
+				), self::CMD_VIEW
+			);
 		}
 	}
 
@@ -264,8 +275,8 @@ protected function initCreationForms($a_new_type) {
 
 		$forms = parent::initCreationForms($a_new_type);
 		// Add File-Upload
-		$in_file = new ilFileInputGUI($DIC->language()->txt("bibliography file"), "bibliographic_file");
-		$in_file->setSuffixes(array( "ris", "bib", "bibtex" ));
+		$in_file = new ilFileInputGUI($DIC->language()->txt("bibliography_file"), "bibliographic_file");
+		$in_file->setSuffixes(array("ris", "bib", "bibtex"));
 		$in_file->setRequired(true);
 		$forms[self::CFORM_NEW]->addItem($in_file);
 		$this->ctrl->saveParameterByClass('ilobjrootfoldergui', 'new_type');
@@ -319,39 +330,54 @@ public function setTabs() {
 		$ilHelp->setScreenIdComponent('bibl');
 		// info screen
 		if ($DIC->access()->checkAccess('read', "", $this->object->getRefId())) {
-			$DIC->tabs()->addTab(self::TAB_CONTENT, $DIC->language()
-			                                            ->txt(self::TAB_CONTENT), $this->ctrl->getLinkTarget($this, self::CMD_SHOW_CONTENT));
+			$DIC->tabs()->addTab(
+				self::TAB_CONTENT, $DIC->language()
+				->txt(self::TAB_CONTENT), $this->ctrl->getLinkTarget($this, self::CMD_SHOW_CONTENT)
+			);
 		}
 		// info screen
 		if ($DIC->access()->checkAccess('visible', "", $this->object->getRefId())
-		    || $DIC->access()->checkAccess('read', "", $this->object->getRefId())) {
-			$DIC->tabs()->addTab(self::TAB_ID_INFO, $DIC->language()
-			                                            ->txt("info_short"), $this->ctrl->getLinkTargetByClass("ilinfoscreengui", "showSummary"));
+			|| $DIC->access()->checkAccess('read', "", $this->object->getRefId())
+		) {
+			$DIC->tabs()->addTab(
+				self::TAB_ID_INFO, $DIC->language()
+				->txt("info_short"), $this->ctrl->getLinkTargetByClass("ilinfoscreengui", "showSummary")
+			);
 		}
 		// settings
 		if ($DIC->access()->checkAccess('write', "", $this->object->getRefId())) {
-			$DIC->tabs()->addTab(self::SUBTAB_SETTINGS, $DIC->language()
-			                                                ->txt(self::SUBTAB_SETTINGS), $this->ctrl->getLinkTarget($this, self::CMD_EDIT_OBJECT));
+			$DIC->tabs()->addTab(
+				self::SUBTAB_SETTINGS, $DIC->language()
+				->txt(self::SUBTAB_SETTINGS), $this->ctrl->getLinkTarget($this, self::CMD_EDIT_OBJECT)
+			);
 		}
 		// export
 		if ($DIC->access()->checkAccess("write", "", $this->object->getRefId())) {
-			$DIC->tabs()->addTab(self::TAB_EXPORT, $DIC->language()
-			                                           ->txt(self::TAB_EXPORT), $this->ctrl->getLinkTargetByClass("ilexportgui", ""));
+			$DIC->tabs()->addTab(
+				self::TAB_EXPORT, $DIC->language()
+				->txt(self::TAB_EXPORT), $this->ctrl->getLinkTargetByClass("ilexportgui", "")
+			);
 		}
 		// edit permissions
 		if ($DIC->access()->checkAccess('edit_permission', "", $this->object->getRefId())) {
-			$DIC->tabs()->addTab(self::TAB_ID_PERMISSIONS, $DIC->language()
-			                                                   ->txt("perm_settings"), $this->ctrl->getLinkTargetByClass("ilpermissiongui", "perm"));
+			$DIC->tabs()->addTab(
+				self::TAB_ID_PERMISSIONS, $DIC->language()
+				->txt("perm_settings"), $this->ctrl->getLinkTargetByClass("ilpermissiongui", "perm")
+			);
 		}
 	}
 
 
 	protected function initSubTabs() {
 		global $DIC;
-		$DIC->tabs()->addSubTab(self::SUBTAB_SETTINGS, $DIC->language()
-		                                                   ->txt(self::SUBTAB_SETTINGS), $this->ctrl->getLinkTarget($this, self::CMD_EDIT_OBJECT));
-		$DIC->tabs()->addSubTab(self::SUB_TAB_FILTER, $DIC->language()
-		                                                  ->txt("bibl_filter"), $this->ctrl->getLinkTargetByClass(ilBiblFieldFilterGUI::class, ilBiblFieldFilterGUI::CMD_STANDARD));
+		$DIC->tabs()->addSubTab(
+			self::SUBTAB_SETTINGS, $DIC->language()
+			->txt(self::SUBTAB_SETTINGS), $this->ctrl->getLinkTarget($this, self::CMD_EDIT_OBJECT)
+		);
+		$DIC->tabs()->addSubTab(
+			self::SUB_TAB_FILTER, $DIC->language()
+			->txt("bibl_filter"), $this->ctrl->getLinkTargetByClass(ilBiblFieldFilterGUI::class, ilBiblFieldFilterGUI::CMD_STANDARD)
+		);
 	}
 
 
@@ -360,12 +386,16 @@ public function initEditForm() {
 
 		$form = parent::initEditForm();
 		// Add File-Upload
-		$in_file = new ilFileStandardDropzoneInputGUI($DIC->language()
-		                                                  ->txt("bibliographic_file"), "bibliographic_file");
-		$in_file->setSuffixes(array( "ris", "bib", "bibtex" ));
+		$in_file = new ilFileInputGUI(
+			$DIC->language()
+				->txt("bibliography_file"), "bibliographic_file"
+		);
+		$in_file->setSuffixes(array("ris", "bib", "bibtex"));
 		$in_file->setRequired(false);
-		$cb_override = new ilCheckboxInputGUI($DIC->language()
-		                                          ->txt("override_entries"), "override_entries");
+		$cb_override = new ilCheckboxInputGUI(
+			$DIC->language()
+				->txt("override_entries"), "override_entries"
+		);
 		$cb_override->addSubItem($in_file);
 
 		$form->addItem($cb_override);
@@ -432,11 +462,14 @@ public function showContent() {
 			$DIC->ui()->mainTemplate()->setPermanentLink("bibl", $this->object->getRefId());
 		} else {
 			$object_title = ilObject::_lookupTitle(ilObject::_lookupObjId($_GET["ref_id"]));
-			ilUtil::sendFailure(sprintf($DIC->language()
-			                                ->txt("msg_no_perm_read_item"), $object_title), true);
+			ilUtil::sendFailure(
+				sprintf(
+					$DIC->language()
+						->txt("msg_no_perm_read_item"), $object_title
+				), true
+			);
 			//redirect to repository without any parameters
-			unset($_GET);
-			ilObjectGUI::_gotoRepositoryRoot();
+			$this->handleNonAccess();
 		}
 	}
 
@@ -474,8 +507,7 @@ public function sendFile() {
 				}
 			}
 		} else {
-			ilUtil::sendFailure($DIC['lng']->txt("no_permission"), true);
-			ilObjectGUI::_gotoRepositoryRoot();
+			$this->handleNonAccess();
 		}
 	}
 
@@ -486,13 +518,12 @@ public function showDetails() {
 		if ($DIC->access()->checkAccess('read', "", $this->object->getRefId())) {
 			$id = $DIC->http()->request()->getQueryParams()[self::P_ENTRY_ID];
 			$entry = $this->facade->entryFactory()
-			                      ->findByIdAndTypeString($id, $this->object->getFileTypeAsString());
+				->findByIdAndTypeString($id, $this->object->getFileTypeAsString());
 			$bibGUI = new ilBiblEntryDetailPresentationGUI($entry, $this->facade);
 
 			$DIC->ui()->mainTemplate()->setContent($bibGUI->getHTML());
 		} else {
-			ilUtil::sendFailure($DIC->language()->txt("no_permission"), true);
-			ilObjectGUI::_gotoRepositoryRoot();
+			$this->handleNonAccess();
 		}
 	}
 
@@ -517,8 +548,7 @@ public function updateCustom(ilPropertyFormGUI $a_form) {
 				$this->addNews($this->object->getId(), 'updated');
 			}
 		} else {
-			ilUtil::sendFailure($DIC->language()->txt("no_permission"), true);
-			ilObjectGUI::_gotoRepositoryRoot();
+			$this->handleNonAccess();
 		}
 	}
 
@@ -528,12 +558,16 @@ public function toggleNotification() {
 
 		switch ($_GET["ntf"]) {
 			case 1:
-				ilNotification::setNotification(ilNotification::TYPE_DATA_COLLECTION, $DIC->user()
-				                                                                          ->getId(), $this->obj_id, false);
+				ilNotification::setNotification(
+					ilNotification::TYPE_DATA_COLLECTION, $DIC->user()
+					->getId(), $this->obj_id, false
+				);
 				break;
 			case 2:
-				ilNotification::setNotification(ilNotification::TYPE_DATA_COLLECTION, $DIC->user()
-				                                                                          ->getId(), $this->obj_id, true);
+				ilNotification::setNotification(
+					ilNotification::TYPE_DATA_COLLECTION, $DIC->user()
+					->getId(), $this->obj_id, true
+				);
 				break;
 		}
 		$DIC->ctrl()->redirect($this, "");
@@ -616,4 +650,13 @@ protected function afterImport(ilObject $a_new_object) {
 
 		parent::afterImport($a_new_object);
 	}
+
+
+	private function handleNonAccess() {
+		global $DIC;
+
+		unset($_GET);
+		ilUtil::sendFailure($DIC->language()->txt("no_permission"), true);
+		ilObjectGUI::_gotoRepositoryRoot();
+	}
 }

Modules/Blog/classes/class.ilBlogGlobalTemplate.php

@@ -10,7 +10,7 @@
 * @author	Sascha Hofmann <[email protected]>
 * @version	$Id$
 */
-class ilBlogGlobalTemplate
+class ilBlogGlobalTemplate implements ilGlobalTemplateInterface
 {
 
 
@@ -67,6 +67,11 @@ public function hideFooter()
 	{
 		$this->show_footer = false;
 	}
+
+
+	public function hasMessage() {
+		return isset($this->message);
+	}
 
 	/**
 	 * Fill the footer area.