Changes to make QuickSignUp plugin work

Modules/Blog/classes/class.ilBlogPostingGUI.php

@@ -11,7 +11,7 @@
  * @version $Id$
  *
  * @ilCtrl_Calls ilBlogPostingGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector
- * @ilCtrl_Calls ilBlogPostingGUI: ilRatingGUI, ilPublicUserProfileGUI, ilPageObjectGUI, ilNoteGUI
+ * @ilCtrl_Calls ilBlogPostingGUI: ilRatingGUI, ilPublicUserProfileGUI, ilPageObjectGUI, ilNoteGUI, ilPCPluggedGUI
  *
  * @ingroup ModulesBlog
  */

Modules/Course/classes/Objectives/class.ilLOPageGUI.php

@@ -12,7 +12,7 @@
  *
  * @ilCtrl_Calls ilLOPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMDEditorGUI
  * @ilCtrl_Calls ilLOPageGUI: ilPublicUserProfileGUI, ilNoteGUI
- * @ilCtrl_Calls ilLOPageGUI: ilPropertyFormGUI, ilInternalLinkGUI, ilPageMultiLangGUI
+ * @ilCtrl_Calls ilLOPageGUI: ilPropertyFormGUI, ilInternalLinkGUI, ilPageMultiLangGUI, ilPCPluggedGUI
  *
  * @ingroup ModulesCourse
  */

Modules/DataCollection/classes/DetailedView/class.ilDclDetailedViewDefinitionGUI.php

@@ -11,7 +11,7 @@
  * @author       Jörg Lützenkirchen <luetzenkirchen@leifos.com>
  *
  * @ilCtrl_Calls ilDclDetailedViewDefinitionGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector
- * @ilCtrl_Calls ilDclDetailedViewDefinitionGUI: ilPublicUserProfileGUI, ilPageObjectGUI
+ * @ilCtrl_Calls ilDclDetailedViewDefinitionGUI: ilPublicUserProfileGUI, ilPageObjectGUI, ilPCPluggedGUI
  */
 class ilDclDetailedViewDefinitionGUI extends ilPageObjectGUI {
 

Modules/Glossary/classes/class.ilGlossaryDefPageGUI.php

@@ -12,7 +12,7 @@
  *
  * @ilCtrl_Calls ilGlossaryDefPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilObjectMetaDataGUI
  * @ilCtrl_Calls ilGlossaryDefPageGUI: ilPublicUserProfileGUI, ilNoteGUI
- * @ilCtrl_Calls ilGlossaryDefPageGUI: ilPropertyFormGUI, ilInternalLinkGUI
+ * @ilCtrl_Calls ilGlossaryDefPageGUI: ilPropertyFormGUI, ilInternalLinkGUI, ilPCPluggedGUI
  *
  * @ingroup ModulesGlossary
  */

Modules/LearningModule/classes/class.ilLMPageGUI.php

@@ -11,7 +11,7 @@
  * @author Alex Killing <alex.killing@gmx.de>
  * @version $Id$
  * @ilCtrl_Calls ilLMPageGUI: ilPageEditorGUI, ilObjectMetaDataGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector, ilCommonActionDispatcherGUI, ilPageObjectGUI
- * @ilCtrl_Calls ilLMPageGUI: ilNewsItemGUI, ilQuestionEditGUI, ilAssQuestionFeedbackEditingGUI, ilPageMultiLangGUI, ilPropertyFormGUI
+ * @ilCtrl_Calls ilLMPageGUI: ilNewsItemGUI, ilQuestionEditGUI, ilAssQuestionFeedbackEditingGUI, ilPageMultiLangGUI, ilPropertyFormGUI, ilPCPluggedGUI
  * @ingroup ModuleLearningModule
  */
 class ilLMPageGUI extends ilPageObjectGUI

Modules/MediaPool/classes/class.ilMediaPoolPageGUI.php

@@ -12,7 +12,7 @@
 * @version $Id$
 *
 * @ilCtrl_Calls ilMediaPoolPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector
-* @ilCtrl_Calls ilMediaPoolPageGUI: ilPublicUserProfileGUI
+* @ilCtrl_Calls ilMediaPoolPageGUI: ilPublicUserProfileGUI, ilPCPluggedGUI
 *
 * @ingroup ModulesMediaPool
 */

Modules/Portfolio/classes/class.ilPortfolioPageGUI.php

@@ -11,7 +11,7 @@
  *
  * @ilCtrl_Calls ilPortfolioPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector
  * @ilCtrl_Calls ilPortfolioPageGUI: ilPageObjectGUI, ilObjBlogGUI, ilBlogPostingGUI
- * @ilCtrl_Calls ilPortfolioPageGUI: ilCalendarMonthGUI, ilConsultationHoursGUI
+ * @ilCtrl_Calls ilPortfolioPageGUI: ilCalendarMonthGUI, ilConsultationHoursGUI, ilPCPluggedGUI
  *
  * @ingroup ModulesPortfolio
  */

Modules/Scorm2004/classes/class.ilSCORM2004PageGUI.php

@@ -13,7 +13,7 @@
  * @version $Id$
  *
  * @ilCtrl_Calls ilSCORM2004PageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector
- * @ilCtrl_Calls ilSCORM2004PageGUI: ilRatingGUI, ilPublicUserProfileGUI, ilPageObjectGUI, ilNoteGUI
+ * @ilCtrl_Calls ilSCORM2004PageGUI: ilRatingGUI, ilPublicUserProfileGUI, ilPageObjectGUI, ilNoteGUI, ilPCPluggedGUI
  * @ilCtrl_Calls ilSCORM2004PageGUI: ilObjectMetaDataGUI, ilQuestionEditGUI, ilAssQuestionFeedbackEditingGUI
  *
  * @ingroup ModulesScormAicc

Modules/TestQuestionPool/classes/class.ilAssHintPageGUI.php

@@ -11,7 +11,7 @@
  *
  * @ilCtrl_Calls ilAssHintPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMDEditorGUI
  * @ilCtrl_Calls ilAssHintPageGUI: ilPublicUserProfileGUI, ilNoteGUI
- * @ilCtrl_Calls ilAssHintPageGUI: ilPropertyFormGUI, ilInternalLinkGUI
+ * @ilCtrl_Calls ilAssHintPageGUI: ilPropertyFormGUI, ilInternalLinkGUI, ilPCPluggedGUI
  *
  * @ingroup ModulesTestQuestionPool
  * ilasshintpagegui

Modules/TestQuestionPool/classes/class.ilAssQuestionPageGUI.php

@@ -10,7 +10,7 @@
  * @author Alex Killing <alex.killing@gmx.de> 
  *
  * @ilCtrl_Calls ilAssQuestionPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMDEditorGUI
- * @ilCtrl_Calls ilAssQuestionPageGUI: ilPublicUserProfileGUI, ilNoteGUI
+ * @ilCtrl_Calls ilAssQuestionPageGUI: ilPublicUserProfileGUI, ilNoteGUI, ilPCPluggedGUI
  * @ilCtrl_Calls ilAssQuestionPageGUI: ilPropertyFormGUI, ilInternalLinkGUI
  *
  * @ingroup ModulesTestQuestionPool

Modules/TestQuestionPool/classes/feedback/class.ilAssGenFeedbackPageGUI.php

@@ -10,7 +10,7 @@
  * @author Alex Killing <alex.killing@gmx.de> 
  *
  * @ilCtrl_Calls ilAssGenFeedbackPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMDEditorGUI
- * @ilCtrl_Calls ilAssGenFeedbackPageGUI: ilPublicUserProfileGUI, ilNoteGUI
+ * @ilCtrl_Calls ilAssGenFeedbackPageGUI: ilPublicUserProfileGUI, ilNoteGUI, ilPCPluggedGUI
  * @ilCtrl_Calls ilAssGenFeedbackPageGUI: ilPropertyFormGUI, ilInternalLinkGUI
  *
  * @ingroup ModulesTestQuestionPool

Modules/TestQuestionPool/classes/feedback/class.ilAssSpecFeedbackPageGUI.php

@@ -10,7 +10,7 @@
  * @author Alex Killing <alex.killing@gmx.de> 
  *
  * @ilCtrl_Calls ilAssSpecFeedbackPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMDEditorGUI
- * @ilCtrl_Calls ilAssSpecFeedbackPageGUI: ilPublicUserProfileGUI, ilNoteGUI
+ * @ilCtrl_Calls ilAssSpecFeedbackPageGUI: ilPublicUserProfileGUI, ilNoteGUI, ilPCPluggedGUI
  * @ilCtrl_Calls ilAssSpecFeedbackPageGUI: ilPropertyFormGUI, ilInternalLinkGUI
  *
  * @ingroup ModulesTestQuestionPool

Modules/Wiki/classes/class.ilWikiPageGUI.php

@@ -11,7 +11,7 @@
 * @version $Id$
 *
 * @ilCtrl_Calls ilWikiPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector
-* @ilCtrl_Calls ilWikiPageGUI: ilPublicUserProfileGUI, ilPageObjectGUI, ilNoteGUI
+* @ilCtrl_Calls ilWikiPageGUI: ilPublicUserProfileGUI, ilPageObjectGUI, ilNoteGUI, ilPCPluggedGUI
 * @ilCtrl_Calls ilWikiPageGUI: ilCommonActionDispatcherGUI, ilRatingGUI, ilWikiStatGUI
 * @ilCtrl_Calls ilWikiPageGUI: ilObjectMetaDataGUI
 *

Services/Authentication/classes/class.ilLoginPageGUI.php

@@ -11,7 +11,7 @@
  * @author Alex Killing <alex.killing@gmx.de> 
  *
  * @ilCtrl_Calls ilLoginPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMDEditorGUI
- * @ilCtrl_Calls ilLoginPageGUI: ilPublicUserProfileGUI, ilNoteGUI
+ * @ilCtrl_Calls ilLoginPageGUI: ilPublicUserProfileGUI, ilNoteGUI, ilPCPluggedGUI
  * @ilCtrl_Calls ilLoginPageGUI: ilPropertyFormGUI, ilInternalLinkGUI
  *
  * @ingroup ServicesAuthentication

Services/COPage/Layout/classes/class.ilPageLayoutGUI.php

@@ -11,7 +11,7 @@
 * @version $Id$
 *
 * @ilCtrl_Calls ilPageLayoutGUI: ilPageEditorGUI, ilEditClipboardGUI
-* @ilCtrl_Calls ilPageLayoutGUI: ilPublicUserProfileGUI, ilPageObjectGUI
+* @ilCtrl_Calls ilPageLayoutGUI: ilPublicUserProfileGUI, ilPageObjectGUI, ilPCPluggedGUI
 *
 */
 class ilPageLayoutGUI extends ilPageObjectGUI

Services/COPage/classes/class.ilPCPluggedGUI.php

@@ -14,6 +14,7 @@
  * @author Alex Killing <alex.killing@gmx.de>
  * @version $Id$
  *
+ * @ilCtrl_Calls ilPCPluggedGUI: ilPasswordAssistanceGUI
  * @ingroup ServicesCOPage
  */
 class ilPCPluggedGUI extends ilPageContentGUI
@@ -34,7 +35,7 @@ class ilPCPluggedGUI extends ilPageContentGUI
 	* Constructor
 	* @access	public
 	*/
-	function __construct(&$a_pg_obj, &$a_content_obj, $a_hier_id, $a_plugin_name = "", $a_pc_id = "")
+	function __construct($a_pg_obj, $a_content_obj, $a_hier_id, $a_plugin_name = "", $a_pc_id = "")
 	{
 		global $DIC;
 

Services/COPage/classes/class.ilPageComponentPlugin.php

@@ -181,6 +181,16 @@ public function getParentType()
 		return '';
 	}
 
+	/**
+	 * Get name of page gui class
+	 *
+	 * @return string
+	 */
+	public function getPageGUIClass()
+	{
+		return get_class($this->page_obj)."GUI";
+	}
+
 	/**
 	 * This function is called when the page content is cloned
 	 * @param array 	$a_properties		(properties saved in the page, should be modified if neccessary)

Services/COPage/classes/class.ilPageObjectGUI.php

@@ -22,7 +22,7 @@
  * @version $Id$
  *
  * @ilCtrl_Calls ilPageObjectGUI: ilPageEditorGUI, ilEditClipboardGUI, ilObjectMetaDataGUI
- * @ilCtrl_Calls ilPageObjectGUI: ilPublicUserProfileGUI, ilNoteGUI, ilNewsItemGUI
+ * @ilCtrl_Calls ilPageObjectGUI: ilPublicUserProfileGUI, ilNoteGUI, ilNewsItemGUI, ilPCPluggedGUI
  * @ilCtrl_Calls ilPageObjectGUI: ilPropertyFormGUI, ilInternalLinkGUI, ilPageMultiLangGUI
  *
  * @ingroup ServicesCOPage
@@ -987,6 +987,7 @@ function executeCommand()
 
 		$next_class = $this->ctrl->getNextClass($this);
 		$this->log->debug("next_class: ".$next_class);
+
 		switch($next_class)
 		{
 			case 'ilobjectmetadatagui':
@@ -1039,6 +1040,14 @@ function executeCommand()
 				$ret = $this->ctrl->forwardCommand($page_editor);
 				break;
 
+			// Plugged Component
+			case "ilpcpluggedgui":
+				include_once ("./Services/COPage/classes/class.ilPCPluggedGUI.php");
+				$plugged_gui = new ilPCPluggedGUI($this->obj, null, 0, "", "");
+				$ret = $this->ctrl->forwardCommand($plugged_gui);
+				break;
+
+
 			case 'ilnewsitemgui':
 				include_once("./Services/News/classes/class.ilNewsItemGUI.php");
 				$news_item_gui = new ilNewsItemGUI();

Services/Container/classes/class.ilContainerGUI.php

@@ -269,15 +269,8 @@ function &forwardToPageObject()
 
 		$cmd = $ilCtrl->getCmd();
 
-		if (in_array($cmd, array("displayMediaFullscreen", "downloadFile", "displayMedia")))
-		{
-			$this->checkPermission("read");
-		}
-		else
-		{
-			$this->checkPermission("write");
-		}
-
+		$this->checkPermission("read");
+
 		$ilTabs->clearTargets();
 
 		if ($_GET["redirectSource"] == "ilinternallinkgui")
@@ -329,6 +322,11 @@ function &forwardToPageObject()
 		$page_gui->setStyleId(ilObjStyleSheet::getEffectiveContentStyleId(
 			$this->object->getStyleSheetId(), $this->object->getType()));
 
+		if (!$this->access->checkAccess("write", "", $this->ref_id))
+		{
+			$page_gui->setEnableEditing(false);
+		}
+
 		$page_gui->setTemplateTargetVar("ADM_CONTENT");
 		$page_gui->setFileDownloadLink("");
 		$page_gui->setFullscreenLink($this->ctrl->getLinkTarget($this, "showMediaFullscreen"));

Services/Container/classes/class.ilContainerPageGUI.php

@@ -11,7 +11,7 @@
  * @author Alex Killing <alex.killing@gmx.de> 
  *
  * @ilCtrl_Calls ilContainerPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMDEditorGUI
- * @ilCtrl_Calls ilContainerPageGUI: ilPublicUserProfileGUI, ilNoteGUI
+ * @ilCtrl_Calls ilContainerPageGUI: ilPublicUserProfileGUI, ilNoteGUI, ilPCPluggedGUI
  * @ilCtrl_Calls ilContainerPageGUI: ilPropertyFormGUI, ilInternalLinkGUI, ilPageMultiLangGUI
  *
  * @ingroup ServicesContainer

Services/Container/classes/class.ilContainerStartObjectsPageGUI.php

@@ -11,7 +11,7 @@
  * @author Jörg Lützenkirchen <luetzenkirchen@leifos.com>
  *
  * @ilCtrl_Calls ilContainerStartObjectsPageGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMDEditorGUI
- * @ilCtrl_Calls ilContainerStartObjectsPageGUI: ilPublicUserProfileGUI, ilNoteGUI
+ * @ilCtrl_Calls ilContainerStartObjectsPageGUI: ilPublicUserProfileGUI, ilNoteGUI, ilPCPluggedGUI
  * @ilCtrl_Calls ilContainerStartObjectsPageGUI: ilPropertyFormGUI, ilInternalLinkGUI, ilPageMultiLangGUI
  *
  * @ingroup ServicesContainer

Services/Imprint/classes/class.ilImprintGUI.php

@@ -10,7 +10,7 @@
 * @author Jörg Lützenkirchen <luetzenkirchen@leifos.com>
 * 
 * @ilCtrl_Calls ilImprintGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector
-* @ilCtrl_Calls ilImprintGUI: ilPublicUserProfileGUI, ilPageObjectGUI
+* @ilCtrl_Calls ilImprintGUI: ilPublicUserProfileGUI, ilPageObjectGUI, ilPCPluggedGUI
 * 
 * @ingroup ModulesImprint
 */

src/UI/Component/Modal/Modal.php

@@ -64,5 +64,4 @@ public function getShowSignal();
 	 * @return Signal
 	 */
 	public function getCloseSignal();
-
 }

src/UI/Component/Modal/ReplaceContentSignal.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace ILIAS\UI\Component\Modal;
+
+use ILIAS\UI\Component\Signal;
+
+/**
+ * This signal replaces the content of a Modal with some content returned by an ajax request.
+ *
+ * @author Jesús Lópéz <lopez@leifos.com>
+ * @package ILIAS\UI\Component\Modal
+ */
+interface ReplaceContentSignal extends Signal
+{
+
+	/**
+	 * Get the same signal returning the Modal content from the given url.
+	 *
+	 * @param string $url
+	 *
+	 * @return ReplaceContentSignal
+	 */
+	public function withAsyncRenderUrl($url);
+
+	/**
+	 * Get the url called to return the content.
+	 *
+	 * @return string
+	 */
+	public function getAsyncRenderUrl();
+}

src/UI/Component/Modal/RoundTrip.php

@@ -23,6 +23,14 @@ public function getTitle();
 	 */
 	public function getContent();
 
+	/**
+	 * Get Modal likee this with the provided components representing the content of the modal
+	 *
+	 * @param \ILIAS\UI\Component\Component[] $a_content
+	 * @return RoundTrip
+	 */
+	public function withContent($a_content);
+
 
 	/**
 	 * Get all action buttons in the footer of the modal
@@ -57,4 +65,25 @@ public function withActionButtons(array $buttons);
 	 * @return RoundTrip
 	 */
 	public function withCancelButtonLabel($label);
+
+	/**
+	 * Get the signal to replace the content of this modal.
+	 *
+	 * @return ReplaceContentSignal
+	 */
+	public function getReplaceContentSignal();
+
+	/**
+	 * Get the url returning the rendered content, if the popovers content is rendered via ajax.
+	 *
+	 * @return string
+	 */
+	public function getAsyncContentUrl();
+
+	public function withAsyncContentUrl($url);
+
+	/**
+	 * Init the default signals plus extra signals like replaceContent
+	 */
+	public function initSignals();
 }

src/UI/Implementation/Component/Modal/Modal.php

@@ -33,7 +33,6 @@ abstract class Modal implements Component\Modal\Modal {
 	 * @var Signal
 	 */
 	protected $close_signal;
-
 	/**
 	 * @var string
 	 */