".$ret."
");
$tpl->printToStdout();
@@ -1992,7 +1992,11 @@ public function initBulkUploadForm()
$form->setFormAction($ctrl->getFormAction($this));
$form->setPreventDoubleSubmission(false);
- $item = new ilFileStandardDropzoneInputGUI($lng->txt("mep_media_files"), 'media_files');
+ $item = new ilFileStandardDropzoneInputGUI(
+ 'cancel',
+ $lng->txt("mep_media_files"),
+ 'media_files'
+ );
$item->setUploadUrl($ctrl->getLinkTarget($this, "performBulkUpload", "", true, true));
$item->setMaxFiles(20);
$form->addItem($item);
diff --git a/Modules/OrgUnit/classes/Positions/class.ilOrgUnitPositionGUI.php b/Modules/OrgUnit/classes/Positions/class.ilOrgUnitPositionGUI.php
index 1f6ec759546c..72e0224a23bb 100644
--- a/Modules/OrgUnit/classes/Positions/class.ilOrgUnitPositionGUI.php
+++ b/Modules/OrgUnit/classes/Positions/class.ilOrgUnitPositionGUI.php
@@ -253,7 +253,7 @@ public function addSubTabs()
$this->ctrl()->saveParameter($this, 'arid');
$this->ctrl()->saveParameterByClass(ilOrgUnitDefaultPermissionGUI::class, 'arid');
$this->pushSubTab(self::SUBTAB_SETTINGS, $this->ctrl()
- ->getLinkTarget($this, self::CMD_INDEX));
+ ->getLinkTarget($this, self::CMD_EDIT));
$this->pushSubTab(self::SUBTAB_PERMISSIONS, $this->ctrl()
->getLinkTargetByClass(ilOrgUnitDefaultPermissionGUI::class, self::CMD_INDEX));
}
diff --git a/Modules/OrgUnit/classes/class.ilObjOrgUnitGUI.php b/Modules/OrgUnit/classes/class.ilObjOrgUnitGUI.php
index 9e13fdc72ca4..5443b36b92e5 100644
--- a/Modules/OrgUnit/classes/class.ilObjOrgUnitGUI.php
+++ b/Modules/OrgUnit/classes/class.ilObjOrgUnitGUI.php
@@ -730,11 +730,13 @@ public function &__initTableGUI()
*/
public function confirmedDeleteObject()
{
+ global $DIC;
if (count($_POST['id']) > 0) {
foreach ($_POST['id'] as $ref_id) {
$il_obj_orgunit = new ilObjOrgUnit($ref_id);
$il_obj_orgunit->delete();
}
+ ilUtil::sendSuccess($DIC->language()->txt("info_deleted"), true);
}
$this->ctrl->returnToParent($this);
}
diff --git a/Modules/Poll/classes/class.ilObjPollAccess.php b/Modules/Poll/classes/class.ilObjPollAccess.php
index 17f6cb6c195a..abaebc05c4f4 100644
--- a/Modules/Poll/classes/class.ilObjPollAccess.php
+++ b/Modules/Poll/classes/class.ilObjPollAccess.php
@@ -70,6 +70,13 @@ 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 (
+ $a_cmd == 'preview' &&
+ $a_permission == 'read'
+ ) {
+ return false;
+ }
// check "global" online switch
if (!self::_lookupOnline($a_obj_id) &&
diff --git a/Modules/Portfolio/classes/class.ilObjPortfolioBaseGUI.php b/Modules/Portfolio/classes/class.ilObjPortfolioBaseGUI.php
index 95d83d46ba15..2b3e11c6deef 100644
--- a/Modules/Portfolio/classes/class.ilObjPortfolioBaseGUI.php
+++ b/Modules/Portfolio/classes/class.ilObjPortfolioBaseGUI.php
@@ -743,6 +743,7 @@ protected function showEditButton($page_id)
$page_class = ($this->getType() == "prtt")
? "ilPortfolioTemplatePageGUI"
: "ilportfoliopagegui";
+ $button = null;
if (ilPortfolioPage::lookupType($page_id) == ilPortfolioPage::TYPE_PAGE) {
$this->ctrl->setParameterByClass($page_class, "ppage", $page_id);
$button = $this->ui->factory()->button()->standard(
@@ -750,14 +751,21 @@ protected function showEditButton($page_id)
$this->ctrl->getLinkTargetByClass($page_class, "edit")
);
} else {
- $this->ctrl->setParameterByClass("ilobjbloggui", "ppage", $page_id);
- $this->ctrl->setParameterByClass("ilobjbloggui", "prt_id", (int) $_GET["prt_id"]);
- $button = $this->ui->factory()->button()->standard(
- $this->lng->txt("edit"),
- $this->ctrl->getLinkTargetByClass([$page_class, "ilobjbloggui"], "render")
- );
+ if ($this->getType() != "prtt") {
+ $this->ctrl->setParameterByClass("ilobjbloggui", "ppage", $page_id);
+ $this->ctrl->setParameterByClass("ilobjbloggui", "prt_id", (int) $_GET["prt_id"]);
+ $button = $this->ui->factory()->button()->standard(
+ $this->lng->txt("edit"),
+ $this->ctrl->getLinkTargetByClass([$page_class, "ilobjbloggui"], "render")
+ );
+ } else { // portfolio template, blog page cannot be edited -> link to overview
+ $button = $this->ui->factory()->button()->standard(
+ $this->lng->txt("edit"),
+ $this->ctrl->getLinkTargetByClass(["ilobjportfoliotemplategui"], "view")
+ );
+ }
}
- if ($this->checkPermissionBool("write")) {
+ if ($button && $this->checkPermissionBool("write")) {
$this->tpl->setHeaderActionMenu($this->ui->renderer()->render($button));
}
}
diff --git a/Modules/Portfolio/classes/class.ilObjPortfolioGUI.php b/Modules/Portfolio/classes/class.ilObjPortfolioGUI.php
index e9101867e9da..1e7db57e12a2 100644
--- a/Modules/Portfolio/classes/class.ilObjPortfolioGUI.php
+++ b/Modules/Portfolio/classes/class.ilObjPortfolioGUI.php
@@ -127,6 +127,7 @@ public function executeCommand()
case "ilobjstylesheetgui":
$this->ctrl->setReturn($this, "editStyleProperties");
$style_gui = new ilObjStyleSheetGUI("", $this->object->getStyleSheetId(), false, false);
+ $style_gui->enableWrite(true);
$style_gui->omitLocator();
if ($cmd == "create" || $_GET["new_type"] == "sty") {
$style_gui->setCreationMode(true);
@@ -331,13 +332,13 @@ protected function getCreateInfoMessage()
// #18147
$this->lng->loadLanguageModule('pd');
$url = $this->ctrl->getLinkTargetByClass("ilDashboardGUI", "jumpToWorkspace");
- $text = $this->lng->txt("pd_personal_workspace");
+ $text = $this->lng->txt("mm_personal_and_shared_r");
$text = sprintf($this->lng->txt("prtf_no_blogs_info"), $text);
$mbox = $ui->factory()->messageBox()->info($text)
->withLinks([$ui->factory()->link()->standard(
- $this->lng->txt("pd_personal_workspace"),
+ $this->lng->txt("mm_personal_and_shared_r"),
$url
)]);
diff --git a/Modules/Portfolio/classes/class.ilObjPortfolioTemplateAccess.php b/Modules/Portfolio/classes/class.ilObjPortfolioTemplateAccess.php
index 4c9816870a6f..2c9b705e619a 100644
--- a/Modules/Portfolio/classes/class.ilObjPortfolioTemplateAccess.php
+++ b/Modules/Portfolio/classes/class.ilObjPortfolioTemplateAccess.php
@@ -104,7 +104,29 @@ public static function _lookupOnline($a_id)
{
return ilObjPortfolioTemplate::lookupOnline($a_id);
}
-
+
+ /**
+ * Check wether booking pool is online (legacy version)
+ *
+ * @deprecated
+ */
+ public static function _lookupOnlineStatus($a_ids)
+ {
+ global $DIC;
+
+ $ilDB = $DIC->database();
+
+ $q = "SELECT id, is_online FROM usr_portfolio WHERE " .
+ $ilDB->in("id", $a_ids, false, "integer");
+ $lm_set = $ilDB->query($q);
+ $status = [];
+ while ($r = $ilDB->fetchAssoc($lm_set)) {
+ $status[$r["id"]] = $r["is_online"];
+ }
+ return $status;
+ }
+
+
/**
* check whether goto script will succeed
*/
diff --git a/Modules/Portfolio/classes/class.ilPortfolioPage.php b/Modules/Portfolio/classes/class.ilPortfolioPage.php
index 0c98c6dbe5c7..9ad86bdb292b 100644
--- a/Modules/Portfolio/classes/class.ilPortfolioPage.php
+++ b/Modules/Portfolio/classes/class.ilPortfolioPage.php
@@ -364,7 +364,7 @@ public static function getGotoForPortfolioPageTarget($a_target, $a_offline = fal
"ilRepositoryGUI",
"ilObjPortfolioTemplateGUI",
"ilobjportfoliotemplategui"
- ), "preview");
+ ), "preview", "", false, true);
} else {
if (!$a_offline) {
$href = "./goto.php?client_id=" . CLIENT_ID . "&target=prtf_" . $pid . "_" . $a_target;
diff --git a/Modules/Scorm2004/Editor/class.ilSCORMMediaOverviewTableGUI.php b/Modules/Scorm2004/Editor/class.ilSCORMMediaOverviewTableGUI.php
new file mode 100644
index 000000000000..b673844fe33e
--- /dev/null
+++ b/Modules/Scorm2004/Editor/class.ilSCORMMediaOverviewTableGUI.php
@@ -0,0 +1,88 @@
+id = "sahs_sco_media";
+ $this->lng = $DIC->language();
+ $this->ctrl = $DIC->ctrl();
+ $this->ui = $DIC->ui();
+
+ parent::__construct($a_parent_obj, $a_parent_cmd);
+
+ $this->setTitle($this->lng->txt("cont_files"));
+
+ $this->addColumn($this->lng->txt("cont_format"));
+ $this->addColumn($this->lng->txt("cont_file"));
+ $this->addColumn($this->lng->txt("size"));
+ $this->addColumn($this->lng->txt("date"));
+ $this->addColumn($this->lng->txt("actions"));
+
+ $this->setFormAction($this->ctrl->getFormAction($a_parent_obj));
+ $this->setRowTemplate("tpl.media_overview_row.html", "Modules/Scorm2004/Editor");
+ }
+
+ /**
+ * Fill table row
+ */
+ protected function fillRow($a_set)
+ {
+ $tpl = $this->tpl;
+ $ctrl = $this->ctrl;
+ $ui = $this->ui;
+ $lng = $this->lng;
+
+ $tpl->setVariable("FILE", $a_set["file"]);
+ $tpl->setVariable("SIZE", $a_set["size"]);
+ $tpl->setVariable("FORMAT", $a_set["type"]);
+
+ $tpl->setVariable("DATE", $a_set["date"]);
+
+ if ($a_set["size"] > 0) {
+ $tpl->setVariable("TXT_DOWNLOAD", $lng->txt("download"));
+ $ctrl->setParameter($this->parent_obj, "resource", rawurlencode($a_set["path"]));
+ $ctrl->setParameter($this->parent_obj, "file_id", rawurlencode($a_set["file_id"]));
+ $link = $ui->factory()->link()->standard(
+ $lng->txt("download"),
+ $ctrl->getLinkTarget($this->parent_obj, "downloadResource")
+ );
+ } else {
+ $link = $ui->factory()->link()->standard(
+ $lng->txt("show"),
+ $a_set["path"]
+ )->withOpenInNewViewport(true);
+ }
+ $tpl->setVariable(
+ "DOWNLOAD",
+ $ui->renderer()->render($link)
+ );
+ }
+}
\ No newline at end of file
diff --git a/Modules/Scorm2004/Editor/class.ilSCORMQuestionOverviewTableGUI.php b/Modules/Scorm2004/Editor/class.ilSCORMQuestionOverviewTableGUI.php
new file mode 100644
index 000000000000..cdb2f20ad8bb
--- /dev/null
+++ b/Modules/Scorm2004/Editor/class.ilSCORMQuestionOverviewTableGUI.php
@@ -0,0 +1,67 @@
+id = "sahs_sco_quest";
+ $this->lng = $DIC->language();
+ $this->ctrl = $DIC->ctrl();
+ $this->ui = $DIC->ui();
+
+ parent::__construct($a_parent_obj, $a_parent_cmd);
+
+ $this->setTitle($this->lng->txt("sahs_questions"));
+
+ $this->addColumn($this->lng->txt("page"));
+ $this->addColumn($this->lng->txt("question"));
+
+ $this->setFormAction($this->ctrl->getFormAction($a_parent_obj));
+ $this->setRowTemplate("tpl.question_overview_row.html", "Modules/Scorm2004/Editor");
+ }
+
+ /**
+ * Fill table row
+ */
+ protected function fillRow($a_set)
+ {
+ $tpl = $this->tpl;
+ $ctrl = $this->ctrl;
+ $ui = $this->ui;
+
+ $ctrl->setParameterByClass("ilscorm2004pagenodegui", "obj_id", $a_set["page"]["obj_id"]);
+ $link = $ui->factory()->link()->standard(
+ $a_set["page"]["title"],
+ $ctrl->getLinkTargetByClass("ilscorm2004pagenodegui", "edit")
+ );
+ $tpl->setVariable("PAGE", $ui->renderer()->render($link));
+ $tpl->setVariable("QUESTION", \assQuestion::_getTitle($a_set["qid"]));
+ }
+}
\ No newline at end of file
diff --git a/Modules/Scorm2004/Editor/templates/default/tpl.media_overview_row.html b/Modules/Scorm2004/Editor/templates/default/tpl.media_overview_row.html
new file mode 100644
index 000000000000..917b7f87df2a
--- /dev/null
+++ b/Modules/Scorm2004/Editor/templates/default/tpl.media_overview_row.html
@@ -0,0 +1,17 @@
+'; $html .= $this->buildToolbar('review_nav_bottom')->getHTML(); + + if ($this->object->isShowExamIdInTestPassEnabled() && !$this->object->getKioskMode()) { + $examIdTpl = new ilTemplate("tpl.exam_id_block.html", true, true, 'Modules/Test'); + $examIdTpl->setVariable('EXAM_ID_VAL', ilObjTest::lookupExamId( + $this->testSession->getActiveId(), + $this->testSession->getPass(), + $this->object->getId() + )); + $examIdTpl->setVariable('EXAM_ID_TXT', $this->lng->txt('exam_id')); + $html .= $examIdTpl->get(); + } - $this->tpl->setVariable($this->getContentBlockName(), $html); + $this->tpl->setVariable( + $this->getContentBlockName(), $html + ); } protected function pdfDownload() diff --git a/Modules/Test/classes/tables/class.ilEvaluationAllTableGUI.php b/Modules/Test/classes/tables/class.ilEvaluationAllTableGUI.php index c791dca90308..2f8b71565d92 100644 --- a/Modules/Test/classes/tables/class.ilEvaluationAllTableGUI.php +++ b/Modules/Test/classes/tables/class.ilEvaluationAllTableGUI.php @@ -51,6 +51,9 @@ public function __construct($a_parent_obj, $a_parent_cmd, $anonymity = false, $o if (strcmp($c, 'email') == 0) { $this->addColumn($this->lng->txt("email"), 'email', ''); } + if (strcmp($c, 'exam_id') == 0 && $this->parent_obj->object->isShowExamIdInTestResultsEnabled()) { + $this->addColumn($this->lng->txt("exam_id_label"), 'exam_id', ''); + } if (strcmp($c, 'institution') == 0) { $this->addColumn($this->lng->txt("institution"), 'institution', ''); } @@ -133,6 +136,7 @@ public function numericOrdering($a_field) break; case 'reached': case 'hint_count': + case 'exam_id': case 'answered': return true; break; @@ -191,6 +195,12 @@ public function getSelectableColumns() "txt" => $lng->txt("matriculation"), "default" => false ); + if ($this->parent_obj->object->isShowExamIdInTestResultsEnabled()) { + $cols["exam_id"] = array( + "txt" => $lng->txt("exam_id_label"), + "default" => false + ); + } } if ($this->parent_obj->object->getECTSOutput()) { $cols["ects_grade"] = array( @@ -308,6 +318,12 @@ protected function fillRow($data) $this->tpl->setVariable("MATRICULATION", strlen($data['matriculation']) ? $data['matriculation'] : ' '); $this->tpl->parseCurrentBlock(); } + if (strcmp($c, 'exam_id') == 0 && $this->parent_obj->object->isShowExamIdInTestResultsEnabled()) { + $this->tpl->setCurrentBlock('exam_id'); + $examId = is_string($data['exam_id']) && strlen($data['exam_id']) ? $data['exam_id'] : ' '; + $this->tpl->setVariable('EXAM_ID', $examId); + $this->tpl->parseCurrentBlock(); + } } if ($this->parent_obj->object->getECTSOutput()) { if (strcmp($c, 'ects_grade') == 0) { diff --git a/Modules/Test/templates/default/tpl.exam_id_block.html b/Modules/Test/templates/default/tpl.exam_id_block.html new file mode 100644 index 000000000000..8dd2564e5c28 --- /dev/null +++ b/Modules/Test/templates/default/tpl.exam_id_block.html @@ -0,0 +1 @@ +
{EXAM_ID_TXT} {EXAM_ID_VAL}
\ No newline at end of file diff --git a/Modules/Test/templates/default/tpl.il_as_tst_correct_solution_output.html b/Modules/Test/templates/default/tpl.il_as_tst_correct_solution_output.html index a2a44fefac1d..d8c23736ff5d 100755 --- a/Modules/Test/templates/default/tpl.il_as_tst_correct_solution_output.html +++ b/Modules/Test/templates/default/tpl.il_as_tst_correct_solution_output.html @@ -12,6 +12,11 @@{QUESTION_TITLE}
{TEXT_SOLUTION_OUTPUT}:
{SOLUTION_OUTPUT}+ +
{TEXT_ASOLUTION_OUTPUT}:
+ {ASOLUTION_OUTPUT} ++
{TEXT_RECEIVED_POINTS}:
{RECEIVED_POINTS}
diff --git a/Modules/Test/templates/default/tpl.il_as_tst_question_summary.html b/Modules/Test/templates/default/tpl.il_as_tst_question_summary.html index ffb94ac33203..e6e17b5c2cef 100644 --- a/Modules/Test/templates/default/tpl.il_as_tst_question_summary.html +++ b/Modules/Test/templates/default/tpl.il_as_tst_question_summary.html @@ -11,4 +11,7 @@ {TEXT_CANCELTEST}
{EXAM_ID_TXT} {EXAM_ID_VAL}
+ \ No newline at end of file diff --git a/Modules/Test/templates/default/tpl.table_evaluation_all.html b/Modules/Test/templates/default/tpl.table_evaluation_all.html index 61196522320b..d8eacc08bfc4 100644 --- a/Modules/Test/templates/default/tpl.table_evaluation_all.html +++ b/Modules/Test/templates/default/tpl.table_evaluation_all.html @@ -10,6 +10,7 @@".$e->getMessage().""; + $is_error = true; + } + } if (($this->getOutputMode() == "presentation" || $this->getOutputMode() == "preview") && !$this->getAbstractOnly() && $this->obj->old_nr == 0) { @@ -1859,61 +1866,63 @@ public function showPage() xslt_free($xh); } - // unmask user html - if (($this->getOutputMode() != "edit" || - $this->user->getPref("ilPageEditor_HTMLMode") != "disable") - && !$this->getPageConfig()->getPreventHTMLUnmasking()) { - $output = str_replace("<", "<", $output); - $output = str_replace(">", ">", $output); - } - $output = str_replace("&", "&", $output); - - include_once './Services/MathJax/classes/class.ilMathJax.php'; - $output = ilMathJax::getInstance()->insertLatexImages($output); + if (!$is_error) { + // unmask user html + if (($this->getOutputMode() != "edit" || + $this->user->getPref("ilPageEditor_HTMLMode") != "disable") + && !$this->getPageConfig()->getPreventHTMLUnmasking()) { + $output = str_replace("<", "<", $output); + $output = str_replace(">", ">", $output); + } + $output = str_replace("&", "&", $output); - // insert page snippets - //$output = $this->insertContentIncludes($output); + include_once './Services/MathJax/classes/class.ilMathJax.php'; + $output = ilMathJax::getInstance()->insertLatexImages($output); - // insert resource blocks - $output = $this->insertResources($output); + // insert page snippets + //$output = $this->insertContentIncludes($output); - // insert page toc - if ($this->getPageConfig()->getEnablePageToc()) { - $output = $this->insertPageToc($output); - } + // insert resource blocks + $output = $this->insertResources($output); - // insert advanced output trigger - $output = $this->insertAdvTrigger($output); + // insert page toc + if ($this->getPageConfig()->getEnablePageToc()) { + $output = $this->insertPageToc($output); + } - // workaround for preventing template engine - // from hiding paragraph text that is enclosed - // in curly brackets (e.g. "{a}", see ilLMEditorGUI::executeCommand()) - $output = $this->replaceCurlyBrackets($output); + // insert advanced output trigger + $output = $this->insertAdvTrigger($output); - // remove all newlines (important for code / pre output) - $output = str_replace("\n", "", $output); + // workaround for preventing template engine + // from hiding paragraph text that is enclosed + // in curly brackets (e.g. "{a}", see ilLMEditorGUI::executeCommand()) + $output = $this->replaceCurlyBrackets($output); - //echo htmlentities($output); - $output = $this->postOutputProcessing($output); - //echo htmlentities($output); - if ($this->getOutputMode() == "edit" && - !$this->getPageObject()->getActive($this->getPageConfig()->getEnableScheduledActivation())) { - $output = '
".htmlentities($content)."
' . $this->getDisabledText() . '
' . $output . '' . $this->getDisabledText() . '
' . $output . '
-
- {TXT_DAY_SHORT}
+
- {TXT_F_DAY}
+ {TXT_F_DAY}
@@ -46,9 +46,9 @@
-
+
{TIME}
-
+
diff --git a/Services/Certificate/test/ilCertificateTemplatePreviewActionTest.php b/Services/Certificate/test/ilCertificateTemplatePreviewActionTest.php
index 84638d214105..4b8e72b5b98e 100644
--- a/Services/Certificate/test/ilCertificateTemplatePreviewActionTest.php
+++ b/Services/Certificate/test/ilCertificateTemplatePreviewActionTest.php
@@ -8,11 +8,11 @@ class ilCertificateTemplatePreviewActionTest extends ilCertificateBaseTestCase
{
public function testA()
{
- $templateRepository = $this->getMockBuilder('ilCertificateTemplateRepository')
+ $templateRepository = $this->getMockBuilder(ilCertificateTemplateRepository::class)
->disableOriginalConstructor()
->getMock();
- $placeholderValuesObject = $this->getMockBuilder('ilCertificatePlaceholderValues')
+ $placeholderValuesObject = $this->getMockBuilder(ilCertificatePlaceholderValues::class)
->disableOriginalConstructor()
->getMock();
@@ -23,34 +23,42 @@ public function testA()
'USER_FIRSTNAME' => 'SomeFirstName'
));
- $logger = $this->getMockBuilder('ilLogger')
+ $logger = $this->getMockBuilder(ilLogger::class)
->disableOriginalConstructor()
->getMock();
- $user = $this->getMockBuilder('ilObjUser')
+ $user = $this->getMockBuilder(ilObjUser::class)
->disableOriginalConstructor()
->getMock();
+ $pdfFileNameFactory = $this->getMockBuilder(ilCertificatePdfFileNameFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $pdfFileNameFactory
+ ->expects($this->once())
+ ->method('create')
+ ->willReturn('test');
+
$user->method('getId')
->willReturn(100);
- $utilHelper = $this->getMockBuilder('ilCertificateUtilHelper')
+ $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
->getMock();
$utilHelper
->expects($this->once())
->method('deliverData');
- $mathJaxHelper = $this->getMockBuilder('ilCertificateMathJaxHelper')
+ $mathJaxHelper = $this->getMockBuilder(ilCertificateMathJaxHelper::class)
->getMock();
$mathJaxHelper->method('fillXlsFoContent')
->willReturn(' Some filled XML content ');
- $userDefinedFieldsHelper = $this->getMockBuilder('ilCertificateUserDefinedFieldsHelper')
+ $userDefinedFieldsHelper = $this->getMockBuilder(ilCertificateUserDefinedFieldsHelper::class)
->getMock();
- $definitionsMock = $this->getMockBuilder('ilUserDefinedFields')
+ $definitionsMock = $this->getMockBuilder(ilUserDefinedFields::class)
->disableOriginalConstructor()
->getMock();
@@ -68,10 +76,10 @@ public function testA()
$userDefinedFieldsHelper->method('createInstance')
->willReturn($definitionsMock);
- $rpcClientFactoryHelper = $this->getMockBuilder('ilCertificateRpcClientFactoryHelper')
+ $rpcClientFactoryHelper = $this->getMockBuilder(ilCertificateRpcClientFactoryHelper::class)
->getMock();
- $mock = $this->getMockBuilder('StdClass')
+ $mock = $this->getMockBuilder(stdClass::class)
->disableOriginalConstructor()
->getMock();
@@ -91,7 +99,8 @@ public function testA()
$mathJaxHelper,
$userDefinedFieldsHelper,
$rpcClientFactoryHelper,
- 'some/where/'
+ 'some/where/',
+ $pdfFileNameFactory
);
$previewAction->createPreviewPdf(100);
diff --git a/Services/Clipboard/classes/class.ilClipboardTableGUI.php b/Services/Clipboard/classes/class.ilClipboardTableGUI.php
index a8cf0867f3f1..a44bc97b2e98 100755
--- a/Services/Clipboard/classes/class.ilClipboardTableGUI.php
+++ b/Services/Clipboard/classes/class.ilClipboardTableGUI.php
@@ -108,6 +108,21 @@ protected function fillRow($a_set)
$this->tpl->setVariable("IMG_THUMB", $target);
$this->tpl->parseCurrentBlock();
}
+ if ($med && ilUtil::deducibleSize($med->getFormat()) &&
+ $med->getLocationType() == "Reference") {
+ $size = @getimagesize($med->getLocation());
+ if ($size[0] > 0 && $size[1] > 0) {
+ $wr = $size[0] / 80;
+ $hr = $size[1] / 80;
+ $r = max($wr, $hr);
+ $w = (int) ($size[0] / $r);
+ $h = (int) ($size[1] / $r);
+ $this->tpl->setVariable(
+ "IMG",
+ ilUtil::img($med->getLocation(), "", $w, $h)
+ );
+ }
+ }
} elseif ($a_set["type"] == "incl") {
$this->tpl->setCurrentBlock("thumbnail");
$this->tpl->setVariable(
diff --git a/Services/Clipboard/templates/default/tpl.clipboard_tbl_row.html b/Services/Clipboard/templates/default/tpl.clipboard_tbl_row.html
index 0bef40dacdce..22dd38e001c4 100755
--- a/Services/Clipboard/templates/default/tpl.clipboard_tbl_row.html
+++ b/Services/Clipboard/templates/default/tpl.clipboard_tbl_row.html
@@ -5,7 +5,7 @@
-
+ {IMG}
diff --git a/Services/Component/classes/class.ilPluginAdmin.php b/Services/Component/classes/class.ilPluginAdmin.php
index 96eecd008175..cc008b0dda9f 100644
--- a/Services/Component/classes/class.ilPluginAdmin.php
+++ b/Services/Component/classes/class.ilPluginAdmin.php
@@ -64,7 +64,7 @@ public function __construct()
*
* @throws ilPluginException
*/
- final private function getPluginData($a_ctype, $a_cname, $a_slot_id, $a_pname)
+ private function getPluginData($a_ctype, $a_cname, $a_slot_id, $a_pname)
{
if (!isset($this->got_data[$a_ctype][$a_cname][$a_slot_id][$a_pname])) {
$slot_name = ilPluginSlot::lookupSlotName($a_ctype, $a_cname, $a_slot_id);
diff --git a/Services/Contact/BuddySystem/test/ilBuddyListTest.php b/Services/Contact/BuddySystem/test/ilBuddyListTest.php
index 2e8127afcba8..0d60e0707b0a 100644
--- a/Services/Contact/BuddySystem/test/ilBuddyListTest.php
+++ b/Services/Contact/BuddySystem/test/ilBuddyListTest.php
@@ -448,7 +448,7 @@ public function testDifferentRelationStatesCanBeRetrieved() : void
* @param ilBuddySystemRelationState $state
* @throws ReflectionException
*/
- final private function setPriorRelationState(
+ private function setPriorRelationState(
ilBuddySystemRelation $relation,
ilBuddySystemRelationState $state
) : void {
diff --git a/Services/Contact/classes/class.ilContactGUI.php b/Services/Contact/classes/class.ilContactGUI.php
index ea71e24b4491..de40343cb156 100644
--- a/Services/Contact/classes/class.ilContactGUI.php
+++ b/Services/Contact/classes/class.ilContactGUI.php
@@ -374,7 +374,6 @@ protected function mailToUsers()
$mail_data['rcp_to'],
$mail_data['rcp_cc'],
$mail_data['rcp_bcc'],
- $mail_data['m_type'],
$mail_data['m_email'],
$mail_data['m_subject'],
$mail_data['m_message'],
diff --git a/Services/Contact/classes/class.ilMailSearchCoursesGUI.php b/Services/Contact/classes/class.ilMailSearchCoursesGUI.php
index bc2a33728023..ddc80ee9996d 100644
--- a/Services/Contact/classes/class.ilMailSearchCoursesGUI.php
+++ b/Services/Contact/classes/class.ilMailSearchCoursesGUI.php
@@ -207,7 +207,6 @@ public function mailCourses()
$mail_data["rcp_to"],
$mail_data["rcp_cc"],
$mail_data["rcp_bcc"],
- $mail_data["m_type"],
$mail_data["m_email"],
$mail_data["m_subject"],
$mail_data["m_message"],
@@ -253,7 +252,6 @@ public function mailMembers()
$mail_data["rcp_to"],
$mail_data["rcp_cc"],
$mail_data["rcp_bcc"],
- $mail_data["m_type"],
$mail_data["m_email"],
$mail_data["m_subject"],
$mail_data["m_message"],
diff --git a/Services/Contact/classes/class.ilMailSearchGUI.php b/Services/Contact/classes/class.ilMailSearchGUI.php
index 4c357bc4a9fa..09997652da3c 100644
--- a/Services/Contact/classes/class.ilMailSearchGUI.php
+++ b/Services/Contact/classes/class.ilMailSearchGUI.php
@@ -134,7 +134,6 @@ private function saveMailData()
$mail_data["rcp_to"],
$mail_data["rcp_cc"],
$mail_data["rcp_bcc"],
- $mail_data["m_type"],
$mail_data["m_email"],
$mail_data["m_subject"],
$mail_data["m_message"],
@@ -365,7 +364,7 @@ public function showResults()
$query_parser->setMinWordLength(3);
$query_parser->parse();
- $user_search = &ilObjectSearchFactory::_getUserSearchInstance($query_parser);
+ $user_search = ilObjectSearchFactory::_getUserSearchInstance($query_parser);
$user_search->enableActiveCheck(true);
$user_search->setFields(array('login'));
$result_obj = $user_search->performSearch();
diff --git a/Services/Contact/classes/class.ilMailSearchGroupsGUI.php b/Services/Contact/classes/class.ilMailSearchGroupsGUI.php
index e2a55fa91a40..3e3f8bf53254 100644
--- a/Services/Contact/classes/class.ilMailSearchGroupsGUI.php
+++ b/Services/Contact/classes/class.ilMailSearchGroupsGUI.php
@@ -203,7 +203,6 @@ public function mailGroups()
$mail_data["rcp_to"],
$mail_data["rcp_cc"],
$mail_data["rcp_bcc"],
- $mail_data["m_type"],
$mail_data["m_email"],
$mail_data["m_subject"],
$mail_data["m_message"],
@@ -248,7 +247,6 @@ public function mailMembers()
$mail_data["rcp_to"],
$mail_data["rcp_cc"],
$mail_data["rcp_bcc"],
- $mail_data["m_type"],
$mail_data["m_email"],
$mail_data["m_subject"],
$mail_data["m_message"],
diff --git a/Services/Contact/classes/class.ilMailingListsGUI.php b/Services/Contact/classes/class.ilMailingListsGUI.php
index e37d53187424..eace3eb77c85 100644
--- a/Services/Contact/classes/class.ilMailingListsGUI.php
+++ b/Services/Contact/classes/class.ilMailingListsGUI.php
@@ -195,7 +195,6 @@ public function mailToList()
$mail_data['rcp_to'],
$mail_data['rcp_cc'],
$mail_data['rcp_bcc'],
- $mail_data['m_type'],
$mail_data['m_email'],
$mail_data['m_subject'],
$mail_data['m_message'],
diff --git a/Services/Container/classes/class.ilContainer.php b/Services/Container/classes/class.ilContainer.php
index 57827940e2b6..cf96618dcbcf 100755
--- a/Services/Container/classes/class.ilContainer.php
+++ b/Services/Container/classes/class.ilContainer.php
@@ -1258,7 +1258,6 @@ protected function applyContainerUserFilter($objects, ilContainerUserFilter $con
return $i["obj_id"];
}, $objects);
$filter_data = $container_user_filter->getData();
-
foreach ($filter_data as $key => $val) {
if (count($obj_ids) == 0) { // stop if no object ids are left
continue;
@@ -1306,6 +1305,7 @@ protected function applyContainerUserFilter($objects, ilContainerUserFilter $con
$result_obj_ids[] = $rec["obj_id"];
}
$obj_ids = array_intersect($obj_ids, $result_obj_ids);
+ $obj_ids = $this->legacyOnlineFilter($obj_ids, $objects, $val);
}
} elseif ($field_id == ilContainerFilterField::STD_FIELD_TUTORIAL_SUPPORT) {
$result = null;
@@ -1416,4 +1416,65 @@ function ($i) {
return $objects;
}
+
+ /**
+ * Legacy online filter
+ *
+ * This can be removed, once all objects use the central online/offline property
+ *
+ * @param $obj_ids
+ * @param $objects
+ * @param $val
+ * @return mixed
+ */
+ protected function legacyOnlineFilter($obj_ids, $objects, $val)
+ {
+ $legacy_types = ["glo", "wiki", "qpl", "book", "dcl", "prtt"];
+ foreach ($legacy_types as $type) {
+ $lobjects = array_filter($objects, function($o) use ($type) {
+ return ($o["type"] == $type);
+ });
+ $lobj_ids = array_map(function($i){
+ return $i["obj_id"];
+ }, $lobjects);
+ switch($type) {
+ case "glo":
+ $status = ilObjGlossaryAccess::_lookupOnlineStatus($lobj_ids);
+ break;
+ case "wiki":
+ $status = ilObjWikiAccess::_lookupOnlineStatus($lobj_ids);
+ break;
+ case "book":
+ $status = ilObjBookingPoolAccess::_lookupOnlineStatus($lobj_ids);
+ break;
+ case "qpl":
+ $status = [];
+ foreach ($lobj_ids as $lid) {
+ $status[$lid] = ilObjQuestionPoolAccess::isOnline($lid);
+ }
+ break;
+ case "dcl":
+ $status = [];
+ foreach ($lobj_ids as $lid) {
+ $status[$lid] = ilObjDataCollectionAccess::_lookupOnline($lid);
+ }
+ break;
+ case "prtt":
+ $status = ilObjPortfolioTemplateAccess::_lookupOnlineStatus($lobj_ids);
+ break;
+ }
+ foreach($status as $obj_id => $online) {
+ if ($val == 1 && !$online || $val == 2 && $online) {
+ if (($key = array_search($obj_id, $obj_ids)) !== false) {
+ unset($obj_ids[$key]);
+ }
+ } else if (!in_array($obj_id, $obj_ids)) {
+ $obj_ids[] = $obj_id;
+ }
+ }
+ }
+
+ return $obj_ids;
+ }
+
} // END class ilContainer
diff --git a/Services/Container/classes/class.ilContainerContentGUI.php b/Services/Container/classes/class.ilContainerContentGUI.php
index 57067ae69c82..6d60afa70ecf 100644
--- a/Services/Container/classes/class.ilContainerContentGUI.php
+++ b/Services/Container/classes/class.ilContainerContentGUI.php
@@ -917,7 +917,17 @@ public function renderItemGroup($a_itgr)
include_once('./Services/Container/classes/class.ilContainerSorting.php');
include_once('./Services/Object/classes/class.ilObjectActivation.php');
$items = ilObjectActivation::getItemsByItemGroup($a_itgr['ref_id']);
-
+
+ // get all valid ids (this is filtered)
+ $all_ids = array_map(function($i) {
+ return $i["child"];
+ }, $this->items["_all"]);
+
+ // remove filtered items
+ $items = array_filter($items, function ($i) use ($all_ids) {
+ return in_array($i["ref_id"], $all_ids);
+ });
+
// if no permission is given, set the items to "rendered" but
// do not display the whole block
if (!$perm_ok) {
diff --git a/Services/Container/classes/class.ilContainerSorting.php b/Services/Container/classes/class.ilContainerSorting.php
index 25ae22f6979b..acd03de96ed6 100644
--- a/Services/Container/classes/class.ilContainerSorting.php
+++ b/Services/Container/classes/class.ilContainerSorting.php
@@ -409,7 +409,7 @@ public function savePost($a_type_positions)
if ($key == "blocks") {
$this->saveBlockPositions($position);
} elseif (!is_array($position)) {
- $items[$key] = $position * 100;
+ $items[$key] = ((float) $position) * 100;
} else {
foreach ($position as $parent_id => $sub_items) {
$this->saveSubItems($key, $parent_id, $sub_items ? $sub_items : array());
@@ -498,7 +498,6 @@ protected function saveSubItems($a_parent_type, $a_parent_id, $a_items)
protected function saveBlockPositions(array $a_values)
{
$ilDB = $this->db;
-
asort($a_values);
$ilDB->replace(
'container_sorting_bl',
diff --git a/Services/Cron/templates/default/tpl.cron_job_row.html b/Services/Cron/templates/default/tpl.cron_job_row.html
index 4ebb6f15492b..b1bbdf20a80d 100644
--- a/Services/Cron/templates/default/tpl.cron_job_row.html
+++ b/Services/Cron/templates/default/tpl.cron_job_row.html
@@ -1,37 +1,23 @@
-
-
-
-
- {VAL_ID}
-
-
-
- {VAL_COMPONENT}
-
-
- {VAL_SCHEDULE}
-
-
- {VAL_STATUS}
-
-
- {VAL_STATUS_INFO}
-
-
- {VAL_RESULT}
-
-
- {VAL_RESULT_INFO}
-
-
- {VAL_LAST_RUN}
-
-
-
- {TXT_ACTION}
- -
+
+
+
+
+ {VAL_ID}
+
+
+ {VAL_COMPONENT}
+ {VAL_SCHEDULE}
+ {VAL_STATUS}
+ {VAL_STATUS_INFO}
+ {VAL_RESULT}
+ {VAL_RESULT_INFO}
+ {VAL_LAST_RUN}
+
+
+ {TXT_ACTION}
+ +
\ No newline at end of file
diff --git a/Services/Dashboard/Access/class.DashboardAccess.php b/Services/Dashboard/Access/class.DashboardAccess.php
new file mode 100644
index 000000000000..af95c97102aa
--- /dev/null
+++ b/Services/Dashboard/Access/class.DashboardAccess.php
@@ -0,0 +1,67 @@
+
+ */
+class DashboardAccess
+{
+ /**
+ * @var \ilRbacSystem
+ */
+ protected $rbac_system;
+
+ /**
+ * @var \ilDBInterface
+ */
+ protected $db;
+
+ /**
+ * @var int
+ */
+ protected static $setting_ref_id = 0;
+
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ global $DIC;
+
+ $this->db = $DIC->database();
+ $this->rbac_system = $DIC->rbac()->system();
+ }
+
+ /**
+ * Get dashboard settings ref id
+ */
+ protected function getSettingsRefId(): int
+ {
+ if (self::$setting_ref_id == 0) {
+ $set = $this->db->queryF(
+ 'SELECT object_reference.ref_id FROM object_reference, tree, object_data
+ WHERE tree.parent = %s
+ AND object_data.type = %s
+ AND object_reference.ref_id = tree.child
+ AND object_reference.obj_id = object_data.obj_id',
+ array('integer', 'text'),
+ array(SYSTEM_FOLDER_ID, 'dshs')
+ );
+ $rec = $this->db->fetchAssoc($set);
+ self::$setting_ref_id = (int) $rec["ref_id"];
+ }
+ return self::$setting_ref_id;
+ }
+
+ /**
+ * @param int $user_id
+ */
+ public function canChangePresentation(int $user_id): bool {
+ return $this->rbac_system->checkAccessOfUser($user_id, "change_presentation", $this->getSettingsRefId());
+ }
+}
\ No newline at end of file
diff --git a/Services/Dashboard/ItemsBlock/classes/class.ilPDMembershipBlockGUI.php b/Services/Dashboard/ItemsBlock/classes/class.ilPDMembershipBlockGUI.php
index d55a6262b8e1..a372111d3341 100755
--- a/Services/Dashboard/ItemsBlock/classes/class.ilPDMembershipBlockGUI.php
+++ b/Services/Dashboard/ItemsBlock/classes/class.ilPDMembershipBlockGUI.php
@@ -77,7 +77,7 @@ protected function getViewTitle()
*
* @return string
*/
- protected function getNoItemFoundContent() : string
+ public function getNoItemFoundContent() : string
{
$txt = $this->lng->txt("rep_mo_mem_dash");
return $txt;
diff --git a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockGUI.php b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockGUI.php
index efa48d837fda..a97b89ab62f1 100755
--- a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockGUI.php
+++ b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockGUI.php
@@ -870,15 +870,18 @@ protected function renderManageList() : string
*
* @return string
*/
- protected function getNoItemFoundContent() : string
+ public function getNoItemFoundContent() : string
{
+
$txt = $this->lng->txt("rep_fav_intro1") . "
"; $txt .= sprintf( $this->lng->txt('rep_fav_intro2'), - '' . $this->getRepositoryTitle() . '' + $this->getRepositoryTitle() ) . "
"; $txt .= $this->lng->txt("rep_fav_intro3"); - return $txt; + $mbox = $this->ui->factory()->messageBox()->info($txt); + $mbox = $mbox->withLinks([$this->ui->factory()->link()->standard($this->getRepositoryTitle(), ilLink::_getStaticLink(1, 'root', true))]); + return $this->ui->renderer()->render($mbox); } /** diff --git a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewGUI.php b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewGUI.php index 3652abf29371..912169f0534a 100644 --- a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewGUI.php +++ b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewGUI.php @@ -44,7 +44,7 @@ abstract class ilPDSelectedItemsBlockViewGUI * @param ilPDSelectedItemsBlockViewSettings $viewSettings * @param ilPDSelectedItemsBlockProvider $provider */ - final private function __construct(ilPDSelectedItemsBlockViewSettings $viewSettings, ilPDSelectedItemsBlockProvider $provider) + private function __construct(ilPDSelectedItemsBlockViewSettings $viewSettings, ilPDSelectedItemsBlockProvider $provider) { global $DIC; diff --git a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewSettings.php b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewSettings.php index 39fb0efa036d..6f2d5053c72f 100644 --- a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewSettings.php +++ b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewSettings.php @@ -81,6 +81,11 @@ class ilPDSelectedItemsBlockViewSettings implements ilPDSelectedItemsBlockConsta /** @var string */ protected $currentPresentationOption = self::PRESENTATION_LIST; + /** + * @var \ILIAS\Dashboard\Access\DashboardAccess + */ + protected $access; + /** * ilPDSelectedItemsBlockViewSettings constructor. * @param ilObjUser $actor @@ -96,6 +101,8 @@ public function __construct(ilObjUser $actor, int $view = self::VIEW_SELECTED_IT $this->actor = $actor; $this->currentView = $view; + include_once("./Services/Dashboard/Access/class.DashboardAccess.php"); + $this->access = new \ILIAS\Dashboard\Access\DashboardAccess(); } /** @@ -487,6 +494,9 @@ public function getSelectableSortingModes() : array */ public function getSelectablePresentationModes() : array { + if (!$this->access->canChangePresentation($this->actor->getId())) { + return [$this->getDefaultSortingByView($this->currentView)]; + } return array_intersect( $this->getActivePresentationsByView($this->currentView), $this->getAvailablePresentationsByView($this->currentView) diff --git a/Services/Database/classes/PDO/class.ilDBPdoMySQL.php b/Services/Database/classes/PDO/class.ilDBPdoMySQL.php index 1bec1407ac69..c2adb3a8b93d 100644 --- a/Services/Database/classes/PDO/class.ilDBPdoMySQL.php +++ b/Services/Database/classes/PDO/class.ilDBPdoMySQL.php @@ -28,7 +28,7 @@ public function initHelpers() protected function initSQLMode() { - $this->pdo->query("SET SESSION sql_mode = 'IGNORE_SPACE,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';"); + $this->pdo->query("SET SESSION sql_mode = 'IGNORE_SPACE,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION';"); } diff --git a/Services/Form/classes/class.ilFileInputGUI.php b/Services/Form/classes/class.ilFileInputGUI.php index ec078c88208d..ad49b51ed1ab 100755 --- a/Services/Form/classes/class.ilFileInputGUI.php +++ b/Services/Form/classes/class.ilFileInputGUI.php @@ -511,6 +511,16 @@ protected function getMaxFileSizeString() return $max_filesize; } + /** + * Get number of maximum file uploads as declared in php.ini + * + * @return int + */ + protected function getMaxFileUploads() + { + return (int) ini_get("max_file_uploads"); + } + /** * Get deletion flag */ diff --git a/Services/Form/classes/class.ilFileStandardDropzoneInputGUI.php b/Services/Form/classes/class.ilFileStandardDropzoneInputGUI.php index 9a34c35e61ec..f2e9f93ce843 100755 --- a/Services/Form/classes/class.ilFileStandardDropzoneInputGUI.php +++ b/Services/Form/classes/class.ilFileStandardDropzoneInputGUI.php @@ -62,6 +62,22 @@ class ilFileStandardDropzoneInputGUI extends ilFileInputGUI implements ilToolbar */ protected $dropzone_message = ''; + /** + * @var string Bugfix mantis 0025881: used to determine the cancel-button to prevent file upload validation when cancelling + */ + protected $cancel_command; + + /** + * ilFileStandardDropzoneInputGUI constructor. + * @param string $cancel_command required as a bugfix for mantis 0025881 + * @param string $a_title + * @param string $a_postvar + */ + public function __construct($cancel_command, $a_title = "", $a_postvar = "") + { + $this->cancel_command = $cancel_command; + parent::__construct($a_title, $a_postvar); + } /** * @return string the URL where the form will be sent to. @@ -178,7 +194,7 @@ public function render($a_mode = "") // We need some javascript magic $this->ui()->mainTemplate()->addJavaScript('./Services/Form/js/ilFileStandardDropzoneInputGUI.js'); - $this->ui()->mainTemplate()->addOnLoadCode("ilFileStandardDropzoneInputGUI.init('ilFileStandardDropzoneInputGUIWrapper{$n}');"); + $this->ui()->mainTemplate()->addOnLoadCode("ilFileStandardDropzoneInputGUI.init('ilFileStandardDropzoneInputGUIWrapper{$n}', '{$this->cancel_command}');"); return $out; } diff --git a/Services/Form/classes/class.ilFileWizardInputGUI.php b/Services/Form/classes/class.ilFileWizardInputGUI.php index 745a91f1fe08..724fe15ece94 100644 --- a/Services/Form/classes/class.ilFileWizardInputGUI.php +++ b/Services/Form/classes/class.ilFileWizardInputGUI.php @@ -55,6 +55,7 @@ public function __construct($a_title = "", $a_postvar = "") global $DIC; $this->lng = $DIC->language(); + $this->lng->loadLanguageModule("form"); $this->tpl = $DIC["tpl"]; parent::__construct($a_title, $a_postvar); } @@ -259,7 +260,7 @@ public function insert($a_tpl) } $this->outputSuffixes($tpl, "allowed_image_suffixes"); - + $tpl->setCurrentBlock("row"); $tpl->setVariable("POST_VAR", $this->getPostVar() . "[$i]"); $tpl->setVariable("ID", $this->getFieldId() . "[$i]"); @@ -278,6 +279,8 @@ public function insert($a_tpl) $tpl->setVariable("ADD_BUTTON", ilGlyphGUI::get(ilGlyphGUI::ADD)); $tpl->setVariable("REMOVE_BUTTON", ilGlyphGUI::get(ilGlyphGUI::REMOVE)); $tpl->setVariable("TXT_MAX_SIZE", $lng->txt("file_notice") . " " . $this->getMaxFileSizeString()); + $tpl->setVariable("MAX_UPLOAD_VALUE", $this->getMaxFileUploads()); + $tpl->setVariable("TXT_MAX_UPLOADS", $lng->txt("form_msg_max_upload") . " " . $this->getMaxFileUploads()); $tpl->parseCurrentBlock(); $i++; } diff --git a/Services/Form/js/Form.js b/Services/Form/js/Form.js index 74608348385a..72a9ee7d69e1 100644 --- a/Services/Form/js/Form.js +++ b/Services/Form/js/Form.js @@ -441,4 +441,9 @@ il.Form = { }; // init forms -il.Util.addOnLoad(il.Form.init); \ No newline at end of file +il.Util.addOnLoad(il.Form.init); + +// see #27281 +$(document).on('dp.show', function(event) { + il.UI.page.fit($('.bootstrap-datetimepicker-widget')); +}); \ No newline at end of file diff --git a/Services/Form/js/ServiceFormWizardInput.js b/Services/Form/js/ServiceFormWizardInput.js index 9a5abbaed18a..9ac38f8a1490 100644 --- a/Services/Form/js/ServiceFormWizardInput.js +++ b/Services/Form/js/ServiceFormWizardInput.js @@ -23,7 +23,7 @@ var ilWizardInput = { addRow: function(e) { // clone row var source = this.getRowFromEvent(e); - var target = $(source).clone(); + var target = $(source).clone(); // add events this.initEvents(target); @@ -36,6 +36,12 @@ var ilWizardInput = { this.reindexRows(this.getContainerFromEvent(e)); il.Form.registerFileUploadInputEventTrigger(); + + let current_upload_fields = $("#files").children().length; + let max_upload_fields = parseInt(source.children(".imagewizard_add").attr("data-val")); + if(current_upload_fields === max_upload_fields) { + $(".imagewizard_add").hide(); + } }, removeRow: function(e) { @@ -51,7 +57,13 @@ var ilWizardInput = { this.cleanRow(source); } - this.reindexRows(tbody); + this.reindexRows(tbody); + + let current_upload_fields = $("#files").children().length; + let max_upload_fields = parseInt(source.children(".imagewizard_remove").attr("data-val")); + if(current_upload_fields <= max_upload_fields) { + $(".imagewizard_add").show(); + } }, moveRowUp: function(e) { diff --git a/Services/Form/js/ilFileStandardDropzoneInputGUI.js b/Services/Form/js/ilFileStandardDropzoneInputGUI.js index 637cc6c769c2..c5334725c5d7 100644 --- a/Services/Form/js/ilFileStandardDropzoneInputGUI.js +++ b/Services/Form/js/ilFileStandardDropzoneInputGUI.js @@ -1,23 +1,37 @@ var ilFileStandardDropzoneInputGUI = (function ($) { - var init = function (wrapper_id) { - var wrapper = $('#' + wrapper_id); - var uploadId = wrapper.find('.il-dropzone-base').attr('id'); - var form = wrapper.closest('form'); - var handledUpload = false; - var buttonName = form.find('input[type=submit]:first').attr('name'); - form.find('input[type=submit]').on("click", function () { - buttonName = $(this).attr('name'); - }); + var init = function (wrapper_id, cancel_command) { + var cancelButtonName = "cmd[" + cancel_command + "]"; + var wrapper = $('#' + wrapper_id); + var uploadId = wrapper.find('.il-dropzone-base').attr('id'); + var form = wrapper.closest('form'); + var handledUpload = false; + var buttonName = form.find('input[type=submit]:first').attr('name'); + var formAdded = false; - var params = {}; - params[buttonName] = true; - il.UI.uploader.addForm(uploadId, form.attr('id')); - il.UI.uploader.setUploadParams(uploadId, params); - }; + // bugfix mantis 0025881: + // Don't add the form to the uploader when cancel was clicked as this leads to a faulty validation or even worse an unwanted upload. + form.find('input[type=submit]').on("click", function (e) { + buttonName = $(this).attr('name'); + if (buttonName !== cancelButtonName) { + if (formAdded === false) { + il.UI.uploader.addForm(uploadId, form.attr('id')); + formAdded = true; + } + } else { + e.preventDefault(); + var preCancelFormAction = form.attr('action'); + var newFormAction = preCancelFormAction.replace(/cmd=.+?(?=&)/, ("cmd=" + cancel_command)); + location.assign(newFormAction); + } + }); + var params = {}; + params[buttonName] = true; + il.UI.uploader.setUploadParams(uploadId, params); + }; - return { - init: init - } + return { + init: init + } -})($); \ No newline at end of file +})($); diff --git a/Services/Form/templates/default/tpl.prop_filewizardinput.html b/Services/Form/templates/default/tpl.prop_filewizardinput.html index 8fe8238b1f3d..59b59e4e662e 100644 --- a/Services/Form/templates/default/tpl.prop_filewizardinput.html +++ b/Services/Form/templates/default/tpl.prop_filewizardinput.html @@ -3,13 +3,14 @@
- - + +
+".$hr."+".$size[1]."+".$h."+"; $r = max($wr, $hr); if ($r > 0) { - $width = (int) ($size[0] / $r); - $height = (int) ($size[1] / $r); + $width = (int) round($size[0] / $r); + $height = (int) round($size[1] / $r); } } } diff --git a/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php b/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php index fb947e53da66..677fa723ae36 100644 --- a/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php +++ b/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php @@ -79,6 +79,12 @@ protected function checkAccessMob($obj_id) } break; + case "clip": + if ($usage["id"] == $this->user->getId()) { + return true; + } + break; + default: if ($this->checkAccessMobUsage($usage, $oid)) { return true; diff --git a/Services/Membership/classes/class.ilMembershipCronNotifications.php b/Services/Membership/classes/class.ilMembershipCronNotifications.php index 6ac37695bae1..345099267140 100644 --- a/Services/Membership/classes/class.ilMembershipCronNotifications.php +++ b/Services/Membership/classes/class.ilMembershipCronNotifications.php @@ -289,7 +289,10 @@ protected function parseNewsItem($a_parent_ref_id, array &$a_filter_map, array $ if (is_array($sub) && sizeof($sub)) { $res .= "\n" . implode("\n", $sub); } - + // see 29967 + $res = str_replace("
", " ", $res); + $res = strip_tags($res); + return trim($res); } @@ -458,7 +461,10 @@ protected function sendMail($a_user_id, array $a_objects, $a_last_run) // :TODO: does it make sense to add client to subject? $client = $ilClientIniFile->readVariable('client', 'name'); $subject = sprintf($lng->txt("crs_subject_course_group_notification"), $client); - + + $mail_content = $ntf->composeAndGetMessage($a_user_id, null, "read", true); + $log->debug("sending mail content: ".$mail_content); + // #10044 $mail = new ilMail(ANONYMOUS_USER_ID); $mail->enqueue( @@ -466,7 +472,7 @@ protected function sendMail($a_user_id, array $a_objects, $a_last_run) null, null, $subject, - $ntf->composeAndGetMessage($a_user_id, null, "read", true), + $mail_content, [] ); } diff --git a/Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php b/Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php index 9966a62a2a01..2638ec0eab58 100644 --- a/Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php +++ b/Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php @@ -53,6 +53,14 @@ public function getData(array $options) $data = []; $users_per_position = ilMyStaffAccess::getInstance()->getUsersForUserPerPosition($this->dic->user()->getId()); + if (empty($users_per_position)) { + if ($options["count"]) { + return 0; + } else { + return []; + } + } + $arr_query = []; foreach ($users_per_position as $position_id => $users) { $obj_ids = ilMyStaffAccess::getInstance()->getIdsForUserAndOperation($this->dic->user()->getId(), $operation_access); diff --git a/Services/MyStaff/classes/ListCourses/class.ilMStListCourses.php b/Services/MyStaff/classes/ListCourses/class.ilMStListCourses.php index ea2c60616766..1c278c174d99 100644 --- a/Services/MyStaff/classes/ListCourses/class.ilMStListCourses.php +++ b/Services/MyStaff/classes/ListCourses/class.ilMStListCourses.php @@ -78,6 +78,14 @@ public function getData(array $arr_usr_ids = array(), array $options = array()) $data = []; $users_per_position = ilMyStaffAccess::getInstance()->getUsersForUserPerPosition($this->dic->user()->getId()); + if (empty($users_per_position)) { + if ($options["count"]) { + return 0; + } else { + return []; + } + } + $arr_query = []; foreach ($users_per_position as $position_id => $users) { $obj_ids = ilMyStaffAccess::getInstance()->getIdsForUserAndOperation($this->dic->user()->getId(), $operation_access); diff --git a/Services/Object/classes/class.ilObjectDefinition.php b/Services/Object/classes/class.ilObjectDefinition.php index e146e02f881e..cb17cf198709 100755 --- a/Services/Object/classes/class.ilObjectDefinition.php +++ b/Services/Object/classes/class.ilObjectDefinition.php @@ -827,6 +827,27 @@ public function isSideBlock($a_obj_name) return (bool) $this->obj_data[$a_obj_name]["sideblock"]; } + /** + * @param bool $filter_repository_types + * @return string[] + */ + public function getSideBlockTypes(bool $filter_repository_types = true) : array + { + $side_block_types = []; + foreach (array_keys($this->obj_data) as $type) { + if ( + $filter_repository_types && + !$this->isAllowedInRepository($type) + ) { + continue; + } + if ($this->isSideBlock($type)) { + $side_block_types[] = $type; + } + } + return $side_block_types; + } + /** * Get all repository object types of component */ diff --git a/Services/Object/classes/class.ilObjectListGUI.php b/Services/Object/classes/class.ilObjectListGUI.php index affaceabec3d..e2f2cea4f9ac 100644 --- a/Services/Object/classes/class.ilObjectListGUI.php +++ b/Services/Object/classes/class.ilObjectListGUI.php @@ -3226,6 +3226,7 @@ public function insertIconsAndCheckboxes() // icon link if ($this->title_link_disabled || !$this->default_command || (!$this->getCommandsStatus() && !$this->restrict_to_goto)) { } else { + /* see #28926 $this->tpl->setCurrentBlock("icon_link_s"); if ($this->default_command["frame"] != "") { @@ -3238,14 +3239,15 @@ public function insertIconsAndCheckboxes() ); $this->tpl->parseCurrentBlock(); $this->tpl->touchBlock("icon_link_e"); + */ } $this->tpl->setCurrentBlock("icon"); if (!$objDefinition->isPlugin($this->getIconImageType())) { - $this->tpl->setVariable("ALT_ICON", $lng->txt("icon") . " " . $lng->txt("obj_" . $this->getIconImageType())); + $this->tpl->setVariable("ALT_ICON", $lng->txt("obj_" . $this->getIconImageType())); } else { include_once("Services/Component/classes/class.ilPlugin.php"); - $this->tpl->setVariable("ALT_ICON", $lng->txt("icon") . " " . + $this->tpl->setVariable("ALT_ICON", ilObjectPlugin::lookupTxtById($this->getIconImageType(), "obj_" . $this->getIconImageType())); } diff --git a/Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfConfig.php b/Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfConfig.php index c6e2fee7ef68..ea71324355ef 100644 --- a/Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfConfig.php +++ b/Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfConfig.php @@ -207,6 +207,7 @@ protected function readConfigFromArray($config) $this->setKeyIfExists('setFooterType', 'footer_select', $config); $this->setKeyIfExists('setHeaderHtmlSpacing', 'head_html_spacing', $config); $this->setKeyIfExists('setHeaderHtmlLine', 'head_html_line', $config); + $this->setKeyIfExists('setHeaderHtml', 'head_html', $config); $this->setKeyIfExists('setHeaderTextLine', 'head_text_line', $config); $this->setKeyIfExists('setHeaderTextSpacing', 'head_text_spacing', $config); $this->setKeyIfExists('setHeaderTextRight', 'head_text_right', $config); @@ -251,8 +252,6 @@ protected function readConfigFromObject($config) $this->setPageSize($config->getPageSize()); $this->setMarginLeft($config->getMarginLeft()); $this->setMarginRight($config->getMarginRight()); - $this->setFooterHtmlSpacing($config->getFooterHtmlSpacing()); - $this->setFooterHtml($config->getFooterHtml()); $this->setFooterTextLine($config->isFooterTextLine()); $this->setFooterTextCenter($config->getFooterTextCenter()); $this->setFooterTextSpacing($config->getFooterTextSpacing()); @@ -261,7 +260,11 @@ protected function readConfigFromObject($config) $this->setFooterType($config->getFooterType()); $this->setFooterHtmlSpacing($config->getFooterHtmlSpacing()); + $this->setFooterHtml($config->getFooterHtml()); $this->setFooterHtmlLine($config->isFooterHtmlLine()); + $this->setHeaderHtmlSpacing($config->getHeaderHtmlSpacing()); + $this->setHeaderHtml($config->getHeaderHtml()); + $this->setHeaderHtmlLine($config->isHeaderHtmlLine()); $this->setHeaderTextLine($config->isHeaderTextLine()); $this->setHeaderTextSpacing($config->getHeaderTextSpacing()); $this->setHeaderTextRight($config->getHeaderTextRight()); diff --git a/Services/QTI/classes/class.ilQTIParser.php b/Services/QTI/classes/class.ilQTIParser.php index 06406f63ae74..e1368359155d 100644 --- a/Services/QTI/classes/class.ilQTIParser.php +++ b/Services/QTI/classes/class.ilQTIParser.php @@ -1260,9 +1260,12 @@ public function handlerParseEndTag($a_xml_parser, $a_name) } require_once 'Services/QTI/classes/class.ilQtiMatImageSecurity.php'; - $matImageSecurity = new ilQtiMatImageSecurity($this->matimage); - $matImageSecurity->sanitizeLabel(); - + try { + $matImageSecurity = new ilQtiMatImageSecurity($this->matimage); + $matImageSecurity->sanitizeLabel(); + } catch (Exception $e) { + break; + } if (!$matImageSecurity->validate()) { break; } diff --git a/Services/Repository/Favourites/classes/class.ilFavouritesListGUI.php b/Services/Repository/Favourites/classes/class.ilFavouritesListGUI.php index 9d3a56113938..20ef2660422e 100644 --- a/Services/Repository/Favourites/classes/class.ilFavouritesListGUI.php +++ b/Services/Repository/Favourites/classes/class.ilFavouritesListGUI.php @@ -66,17 +66,23 @@ public function render() $item_groups[] = $f->item()->group($group->getLabel(), $items); } } - $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "view", "0"); - $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "col_side", "center"); - $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "block_type", "pditems"); - $panel = $f->panel()->secondary()->listing("", $item_groups); - $panel = $panel->withActions($f->dropdown()->standard([$f->link()->standard( - $this->lng->txt("rep_configure"), - $ctrl->getLinkTargetByClass( - ["ilDashboardGUI", "ilColumnGUI", "ilPDSelectedItemsBlockGUI"], - "manage" - ) - )])); - return $this->ui->renderer()->render([$panel]); + if (count($item_groups) > 0) { + $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "view", "0"); + $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "col_side", "center"); + $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "block_type", "pditems"); + $panel = $f->panel()->secondary()->listing("", $item_groups); + $panel = $panel->withActions($f->dropdown()->standard([$f->link()->standard( + $this->lng->txt("rep_configure"), + $ctrl->getLinkTargetByClass( + ["ilDashboardGUI", "ilColumnGUI", "ilPDSelectedItemsBlockGUI"], + "manage" + ) + ) + ])); + return $this->ui->renderer()->render([$panel]); + } else { + $pdblock = new ilPDSelectedItemsBlockGUI(); + return $pdblock->getNoItemFoundContent(); + } } } diff --git a/Services/Repository/GlobalScreen/classes/RepositoryMainBarProvider.php b/Services/Repository/GlobalScreen/classes/RepositoryMainBarProvider.php index 87c7c6c4214a..dae9100f1d09 100644 --- a/Services/Repository/GlobalScreen/classes/RepositoryMainBarProvider.php +++ b/Services/Repository/GlobalScreen/classes/RepositoryMainBarProvider.php @@ -12,9 +12,17 @@ use InvalidArgumentException; /** - * Class RepositoryMainBarProvider + * Repository related main menu items + * - Repository Home + * - Repository Tree + * - Last Visited + * + * Note: The Favourites menut item is currently part of the Dashboard PDMainBarProvider + * and should be moved here, since the Favourites services is implemented as a sub-service + * of the repository service. * * @author Fabian Schmid
+ * @author Alexander Killing
*/
class RepositoryMainBarProvider extends AbstractStaticMainMenuProvider
{
@@ -42,7 +50,7 @@ public function getStaticSubItems() : array
// Home
$entries[] = $this->getHomeItem()
- ->withVisibilityCallable($access_helper->isRepositoryReadable())
+ ->withVisibilityCallable($access_helper->isRepositoryVisible())
->withParent($top)
->withSymbol($icon)
->withPosition(10);
@@ -64,7 +72,7 @@ public function getStaticSubItems() : array
$entries[]
= $this->mainmenu->complex($this->if->identifier('rep_tree_view'))
- ->withVisibilityCallable($access_helper->isRepositoryReadable())
+ ->withVisibilityCallable($access_helper->isRepositoryVisible())
->withContentWrapper(function () {
return $this->dic->ui()->factory()->legacy($this->renderRepoTree());
})
@@ -145,7 +153,7 @@ protected function renderLastVisited()
$f = $this->dic->ui()->factory();
foreach ($nav_items as $k => $nav_item) {
- if ($cnt >= 10) {
+ if ($cnt++ >= 10) {
break;
}
diff --git a/Services/Repository/classes/class.ilObjectPluginGUI.php b/Services/Repository/classes/class.ilObjectPluginGUI.php
index 375ab9cc0659..c81e0781b086 100644
--- a/Services/Repository/classes/class.ilObjectPluginGUI.php
+++ b/Services/Repository/classes/class.ilObjectPluginGUI.php
@@ -80,12 +80,11 @@ public function executeCommand()
$this->setAdminTabs();
}
- // add entry to navigation history
- if ($ilAccess->checkAccess("read", "", $_GET["ref_id"])) {
+ if ($ilAccess->checkAccess('read', '', $this->object->getRefId())) {
$ilNavigationHistory->addItem(
- $_GET["ref_id"],
- $ilCtrl->getLinkTarget($this, $this->getStandardCmd()),
- $this->getType()
+ $this->object->getRefId(),
+ ilLink::_getLink($this->object->getRefId(), $this->object->getType()),
+ $this->object->getType()
);
}
} else {
diff --git a/Services/SOAPAuth/classes/class.ilAuthProviderSoap.php b/Services/SOAPAuth/classes/class.ilAuthProviderSoap.php
new file mode 100644
index 000000000000..10696cf3477c
--- /dev/null
+++ b/Services/SOAPAuth/classes/class.ilAuthProviderSoap.php
@@ -0,0 +1,226 @@
+
+ */
+class ilAuthProviderSoap extends ilAuthProvider implements ilAuthProviderInterface
+{
+ /** @var string */
+ protected $server_host = '';
+ /** @var string */
+ protected $server_port = '';
+ /** @var string */
+ protected $server_uri = '';
+ /** @var string */
+ protected $server_https = '';
+ /** @var string */
+ protected $server_nms = '';
+ /** @var string */
+ protected $use_dot_net = false;
+ /** @var string */
+ protected $uri = '';
+ /** @var nusoap_client */
+ protected $client;
+ /** @var ilLogger */
+ protected $logger;
+ /** @var ilSetting */
+ protected $settings;
+ /** @var ilLanguage */
+ protected $language;
+ /** @var ilRbacAdmin */
+ protected $rbacAdmin;
+
+ /**
+ * @inheritDoc
+ */
+ public function __construct(ilAuthCredentials $credentials)
+ {
+ global $DIC;
+
+ $this->settings = $DIC->settings();
+ $this->logger = $DIC->logger()->auth();
+ $this->language = $DIC->language();
+ $this->rbacAdmin = $DIC->rbac()->admin();
+
+ parent::__construct($credentials);
+ }
+
+ /**
+ *
+ */
+ private function initClient()
+ {
+ $this->server_host = (string) $this->settings->get('soap_auth_server', '');
+ $this->server_port = (string) $this->settings->get('soap_auth_port', '');
+ $this->server_uri = (string) $this->settings->get('soap_auth_uri', '');
+ $this->server_nms = (string) $this->settings->get('soap_auth_namespace', '');
+ $this->server_https = (bool) $this->settings->get('soap_auth_use_https', false);
+ $this->use_dot_net = (bool) $this->settings->get('use_dotnet', false);
+
+ $this->uri = $this->server_https ? 'https://' : 'http://';
+ $this->uri .= $this->server_host;
+
+ if ($this->server_port > 0) {
+ $this->uri .= (':' . $this->server_port);
+ }
+ if ($this->server_uri) {
+ $this->uri .= ('/' . $this->server_uri);
+ }
+
+ require_once './webservice/soap/lib/nusoap.php';
+ $this->client = new nusoap_client($this->uri);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function doAuthentication(ilAuthStatus $status)
+ {
+ try {
+ $this->initClient();
+ $this->handleSoapAuth($status);
+ } catch (Exception $e) {
+ $this->getLogger()->error($e->getMessage());
+ $status->setTranslatedReason($e->getMessage());
+ }
+
+ if ($status->getAuthenticatedUserId() > 0) {
+ $this->logger->info('Successfully authenticated user via SOAP: ' . $this->getCredentials()->getUsername());
+ $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATED);
+ ilSession::set('used_external_auth', true);
+
+ return true;
+ }
+
+ $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATION_FAILED);
+
+ return false;
+ }
+
+ /**
+ * @param ilAuthStatus $status
+ * @return bool
+ */
+ private function handleSoapAuth(ilAuthStatus $status) : bool
+ {
+ $this->logger->debug(sprintf(
+ 'Login observer called for SOAP authentication request of ext_account "%s" and auth_mode "%s".',
+ $this->getCredentials()->getUsername(),
+ 'soap'
+ ));
+ $this->logger->debug(sprintf(
+ 'Trying to find ext_account "%s" for auth_mode "%s".',
+ $this->getCredentials()->getUsername(),
+ 'soap'
+ ));
+
+ $internalLogin = ilObjUser::_checkExternalAuthAccount(
+ 'soap',
+ $this->getCredentials()->getUsername()
+ );
+
+ $isNewUser = false;
+ if ('' === $internalLogin || false === $internalLogin) {
+ $isNewUser = true;
+ }
+
+ $soapAction = '';
+ $nspref = '';
+ if ($this->use_dot_net) {
+ $soapAction = $this->server_nms . '/isValidSession';
+ $nspref = 'ns1:';
+ }
+
+ $valid = $this->client->call(
+ 'isValidSession',
+ [
+ $nspref . 'ext_uid' => $this->getCredentials()->getUsername(),
+ $nspref . 'soap_pw' => $this->getCredentials()->getPassword(),
+ $nspref . 'new_user' => $isNewUser
+ ],
+ $this->server_nms,
+ $soapAction
+ );
+
+ if ($valid['valid'] !== true) {
+ $valid['valid'] = false;
+ }
+
+ if (!$valid['valid']) {
+ $status->setReason('err_wrong_login');
+ return false;
+ }
+
+ if (!$isNewUser) {
+ $status->setAuthenticatedUserId(ilObjUser::_lookupId($internalLogin));
+ return true;
+ } elseif (!$this->settings->get('soap_auth_create_users')) {
+ // Translate the reasons, otherwise the default failure is displayed
+ $status->setTranslatedReason($this->language->txt('err_valid_login_account_creation_disabled'));
+ return false;
+ }
+
+ $userObj = new ilObjUser();
+ $internalLogin = ilAuthUtils::_generateLogin($this->getCredentials()->getUsername());
+
+ $usrData = [];
+ $usrData['firstname'] = $valid['firstname'];
+ $usrData['lastname'] = $valid['lastname'];
+ $usrData['email'] = $valid['email'];
+ $usrData['login'] = $internalLogin;
+ $usrData['passwd'] = '';
+ $usrData['passwd_type'] = IL_PASSWD_CRYPTED;
+
+ $password = '';
+ if ($this->settings->get('soap_auth_allow_local')) {
+ $passwords = ilUtil::generatePasswords(1);
+ $password = $passwords[0];
+ $usrData['passwd'] = $password;
+ $usrData['passwd_type'] = IL_PASSWD_PLAIN;
+ }
+
+ $usrData['auth_mode'] = 'soap';
+ $usrData['ext_account'] = $this->getCredentials()->getUsername();
+ $usrData['profile_incomplete'] = 1;
+
+ $userObj->assignData($usrData);
+ $userObj->setTitle($userObj->getFullname());
+ $userObj->setDescription($userObj->getEmail());
+ $userObj->setLanguage($this->language->getDefaultLanguage());
+
+ $userObj->setTimeLimitOwner(USER_FOLDER_ID);
+ $userObj->setTimeLimitUnlimited(1);
+ $userObj->setTimeLimitFrom(time());
+ $userObj->setTimeLimitUntil(time());
+ $userObj->setOwner(0);
+ $userObj->create();
+ $userObj->setActive(1);
+ $userObj->updateOwner();
+ $userObj->saveAsNew(false);
+ $userObj->writePrefs();
+
+ $this->rbacAdmin->assignUser(
+ $this->settings->get('soap_auth_user_default_role', 4),
+ $userObj->getId()
+ );
+
+ if ($this->settings->get('soap_auth_account_mail', false)) {
+ $registrationSettings = new ilRegistrationSettings();
+ $registrationSettings->setPasswordGenerationStatus(true);
+
+ $accountMail = new ilAccountRegistrationMail(
+ $registrationSettings,
+ $this->language,
+ $this->logger
+ );
+ $accountMail
+ ->withDirectRegistrationMode()
+ ->send($userObj, $password, false);
+ }
+
+ $status->setAuthenticatedUserId($userObj->getId());
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/Services/SOAPAuth/classes/class.ilSOAPAuth.php b/Services/SOAPAuth/classes/class.ilSOAPAuth.php
index cf948bcb89c5..accf9b9a2ac4 100755
--- a/Services/SOAPAuth/classes/class.ilSOAPAuth.php
+++ b/Services/SOAPAuth/classes/class.ilSOAPAuth.php
@@ -22,7 +22,6 @@
*/
-include_once("Auth/Auth.php");
include_once("./webservice/soap/lib/nusoap.php");
/**
@@ -31,9 +30,9 @@
* SOAP Authentication class.
*
*/
-class ilSOAPAuth extends Auth
+class ilSOAPAuth
{
- public $valid = array();
+ public $valid = array();
/**
* Constructor
@@ -60,14 +59,14 @@ public static function testConnection($a_ext_uid, $a_soap_pw, $a_new_user)
$uri = "http://";
}
- $uri .= $server_hostname;
+ $uri.= $server_hostname;
if ($server_port > 0) {
- $uri .= ":" . $server_port;
+ $uri.= ":" . $server_port;
}
if ($server_uri != "") {
- $uri .= "/" . $server_uri;
+ $uri.= "/" . $server_uri;
}
$soap_client = new nusoap_client($uri);
diff --git a/Services/SOAPAuth/dummy_server.php b/Services/SOAPAuth/dummy_server.php
index 15d0ac3b36f3..dbd8137ca3f7 100755
--- a/Services/SOAPAuth/dummy_server.php
+++ b/Services/SOAPAuth/dummy_server.php
@@ -32,8 +32,13 @@
*/
chdir('../..');
+global $HTTP_RAW_POST_DATA;
+
+ini_set("display_errors", 0);
+error_reporting(E_ALL & ~E_NOTICE);
+
include_once './Services/SOAPAuth/classes/class.ilSoapDummyAuthServer.php';
-$server =& new ilSoapDummyAuthServer();
+$server = new ilSoapDummyAuthServer();
$server->start();
-?>
\ No newline at end of file
+?>
diff --git a/Services/Search/classes/Lucene/class.ilLuceneSearchGUI.php b/Services/Search/classes/Lucene/class.ilLuceneSearchGUI.php
index 4d0d9adbbe64..96a04f41a19f 100644
--- a/Services/Search/classes/Lucene/class.ilLuceneSearchGUI.php
+++ b/Services/Search/classes/Lucene/class.ilLuceneSearchGUI.php
@@ -581,6 +581,7 @@ protected function showSearchForm()
// begin-patch creation_date
$this->tpl->setVariable('TXT_FILTER_BY_CDATE', $this->lng->txt('search_filter_cd'));
$this->tpl->setVariable('TXT_CD_OFF', $this->lng->txt('search_off'));
+ $this->tpl->setVariable('TXT_CD_ON', $this->lng->txt('search_on'));
$this->tpl->setVariable('FORM_CD', $this->getCreationDateForm()->getHTML());
$this->tpl->setVariable("ARR_IMG_CD", ilGlyphGUI::get(ilGlyphGUI::CARET));
// end-patch creation_date
diff --git a/Services/Search/classes/Provider/SearchMetaBarProvider.php b/Services/Search/classes/Provider/SearchMetaBarProvider.php
index b18313954e58..f375afeec32d 100644
--- a/Services/Search/classes/Provider/SearchMetaBarProvider.php
+++ b/Services/Search/classes/Provider/SearchMetaBarProvider.php
@@ -62,9 +62,6 @@ public function getMetaBarItems() : array
$item = $mb
->topLegacyItem($this->getId())
->withLegacyContent($content())
- ->withVisibilityCallable(function () {
- return !$this->dic->user()->isAnonymous();
- })
->withSymbol($this->dic->ui()->factory()->symbol()->glyph()->search())
->withTitle($this->dic->language()->txt("Search"))
->withPosition(1)
diff --git a/Services/Search/classes/class.ilMainMenuSearchGUI.php b/Services/Search/classes/class.ilMainMenuSearchGUI.php
index 20d6f90bcfcd..3b3a53c8fe9d 100644
--- a/Services/Search/classes/class.ilMainMenuSearchGUI.php
+++ b/Services/Search/classes/class.ilMainMenuSearchGUI.php
@@ -103,14 +103,14 @@ public function getHTML()
$this->tpl->setVariable('FORMACTION', 'ilias.php?baseClass=ilSearchController&cmd=post' .
'&rtoken=' . $ilCtrl->getRequestToken() . '&fallbackCmd=remoteSearch');
$this->tpl->setVariable('BTN_SEARCH', $this->lng->txt('search'));
-
+ $this->tpl->setVariable('SEARCH_INPUT_LABEL', $this->lng->txt('search_field'));
$this->tpl->setVariable('AC_DATASOURCE', "ilias.php?baseClass=ilSearchController&cmd=autoComplete");
$this->tpl->setVariable('IMG_MM_SEARCH', ilUtil::img(
ilUtil::getImagePath("icon_seas.svg"),
$lng->txt("search")
));
-
+
if ($ilUser->getId() != ANONYMOUS_USER_ID) {
$this->tpl->setVariable('HREF_SEARCH_LINK', "ilias.php?baseClass=ilSearchController");
$this->tpl->setVariable('TXT_SEARCH_LINK', $lng->txt("last_search_result"));
diff --git a/Services/Search/classes/class.ilSearchGUI.php b/Services/Search/classes/class.ilSearchGUI.php
index 17023cd75ef9..15d6aa7877d6 100644
--- a/Services/Search/classes/class.ilSearchGUI.php
+++ b/Services/Search/classes/class.ilSearchGUI.php
@@ -283,6 +283,7 @@ public function showSearch()
// begin-patch creation_date
$this->tpl->setVariable('TXT_FILTER_BY_CDATE', $this->lng->txt('search_filter_cd'));
$this->tpl->setVariable('TXT_CD_OFF', $this->lng->txt('search_off'));
+ $this->tpl->setVariable('TXT_CD_ON', $this->lng->txt('search_on'));
$this->tpl->setVariable('FORM_CD', $this->getCreationDateForm()->getHTML());
$this->tpl->setVariable("ARR_IMG_CD", ilGlyphGUI::get(ilGlyphGUI::CARET));
// end-patch creation_date
diff --git a/Services/Search/classes/class.ilSearchResultTableGUI.php b/Services/Search/classes/class.ilSearchResultTableGUI.php
index 36f84b990bc1..1b285e2c5d48 100644
--- a/Services/Search/classes/class.ilSearchResultTableGUI.php
+++ b/Services/Search/classes/class.ilSearchResultTableGUI.php
@@ -137,8 +137,6 @@ protected function fillRow($a_set)
$item_html[$ref_id]['html'] = $html;
$item_html[$ref_id]['type'] = $type;
}
-
- $this->tpl->setVariable("HREF_IMG", $item_list_gui->default_command["link"]);
global $DIC;
diff --git a/Services/Search/js/Search.js b/Services/Search/js/Search.js
index e833aa79907a..507830e55497 100644
--- a/Services/Search/js/Search.js
+++ b/Services/Search/js/Search.js
@@ -81,11 +81,14 @@ il.Search = {
// cdates
ctype = $('input[name=screation]').is(':checked');
+
+ $('#sop_cd_on').hide();
+ $('#sop_cd_off').hide();
if(!ctype) {
- $('#sop_cd').html(il.Search.search_filter_by_cd_off);
+ $('#sop_cd').html($('#sop_cd_off').html());
}
else {
- $('#sop_cd').html('On');
+ $('#sop_cd').html($('#sop_cd_on').html());
}
var area = $('a[name=area_anchor]').html();
diff --git a/Services/Search/templates/default/tpl.lucene_search.html b/Services/Search/templates/default/tpl.lucene_search.html
index a3fc0648803a..f50868fb4373 100644
--- a/Services/Search/templates/default/tpl.lucene_search.html
+++ b/Services/Search/templates/default/tpl.lucene_search.html
@@ -12,7 +12,12 @@
{TXT_FILTER_BY_CDATE}:
- {TXT_CD_OFF} {ARR_IMG_CD}
+
+ {TXT_CD_OFF}
+ {TXT_CD_ON}
+ {ARR_IMG_CD}
+
+
diff --git a/Services/Search/templates/default/tpl.main_menu_search.html b/Services/Search/templates/default/tpl.main_menu_search.html
index 01916530daa0..7dcda11d9e38 100644
--- a/Services/Search/templates/default/tpl.main_menu_search.html
+++ b/Services/Search/templates/default/tpl.main_menu_search.html
@@ -1,7 +1,7 @@
{VAL_DESC}
-
- - -
{VAL_DESC}
+
+ + +
"; $txt .= sprintf( $this->lng->txt('rep_fav_intro2'), - '' . $this->getRepositoryTitle() . '' + $this->getRepositoryTitle() ) . "
"; $txt .= $this->lng->txt("rep_fav_intro3"); - return $txt; + $mbox = $this->ui->factory()->messageBox()->info($txt); + $mbox = $mbox->withLinks([$this->ui->factory()->link()->standard($this->getRepositoryTitle(), ilLink::_getStaticLink(1, 'root', true))]); + return $this->ui->renderer()->render($mbox); } /** diff --git a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewGUI.php b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewGUI.php index 3652abf29371..912169f0534a 100644 --- a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewGUI.php +++ b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewGUI.php @@ -44,7 +44,7 @@ abstract class ilPDSelectedItemsBlockViewGUI * @param ilPDSelectedItemsBlockViewSettings $viewSettings * @param ilPDSelectedItemsBlockProvider $provider */ - final private function __construct(ilPDSelectedItemsBlockViewSettings $viewSettings, ilPDSelectedItemsBlockProvider $provider) + private function __construct(ilPDSelectedItemsBlockViewSettings $viewSettings, ilPDSelectedItemsBlockProvider $provider) { global $DIC; diff --git a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewSettings.php b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewSettings.php index 39fb0efa036d..6f2d5053c72f 100644 --- a/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewSettings.php +++ b/Services/Dashboard/ItemsBlock/classes/class.ilPDSelectedItemsBlockViewSettings.php @@ -81,6 +81,11 @@ class ilPDSelectedItemsBlockViewSettings implements ilPDSelectedItemsBlockConsta /** @var string */ protected $currentPresentationOption = self::PRESENTATION_LIST; + /** + * @var \ILIAS\Dashboard\Access\DashboardAccess + */ + protected $access; + /** * ilPDSelectedItemsBlockViewSettings constructor. * @param ilObjUser $actor @@ -96,6 +101,8 @@ public function __construct(ilObjUser $actor, int $view = self::VIEW_SELECTED_IT $this->actor = $actor; $this->currentView = $view; + include_once("./Services/Dashboard/Access/class.DashboardAccess.php"); + $this->access = new \ILIAS\Dashboard\Access\DashboardAccess(); } /** @@ -487,6 +494,9 @@ public function getSelectableSortingModes() : array */ public function getSelectablePresentationModes() : array { + if (!$this->access->canChangePresentation($this->actor->getId())) { + return [$this->getDefaultSortingByView($this->currentView)]; + } return array_intersect( $this->getActivePresentationsByView($this->currentView), $this->getAvailablePresentationsByView($this->currentView) diff --git a/Services/Database/classes/PDO/class.ilDBPdoMySQL.php b/Services/Database/classes/PDO/class.ilDBPdoMySQL.php index 1bec1407ac69..c2adb3a8b93d 100644 --- a/Services/Database/classes/PDO/class.ilDBPdoMySQL.php +++ b/Services/Database/classes/PDO/class.ilDBPdoMySQL.php @@ -28,7 +28,7 @@ public function initHelpers() protected function initSQLMode() { - $this->pdo->query("SET SESSION sql_mode = 'IGNORE_SPACE,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';"); + $this->pdo->query("SET SESSION sql_mode = 'IGNORE_SPACE,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION';"); } diff --git a/Services/Form/classes/class.ilFileInputGUI.php b/Services/Form/classes/class.ilFileInputGUI.php index ec078c88208d..ad49b51ed1ab 100755 --- a/Services/Form/classes/class.ilFileInputGUI.php +++ b/Services/Form/classes/class.ilFileInputGUI.php @@ -511,6 +511,16 @@ protected function getMaxFileSizeString() return $max_filesize; } + /** + * Get number of maximum file uploads as declared in php.ini + * + * @return int + */ + protected function getMaxFileUploads() + { + return (int) ini_get("max_file_uploads"); + } + /** * Get deletion flag */ diff --git a/Services/Form/classes/class.ilFileStandardDropzoneInputGUI.php b/Services/Form/classes/class.ilFileStandardDropzoneInputGUI.php index 9a34c35e61ec..f2e9f93ce843 100755 --- a/Services/Form/classes/class.ilFileStandardDropzoneInputGUI.php +++ b/Services/Form/classes/class.ilFileStandardDropzoneInputGUI.php @@ -62,6 +62,22 @@ class ilFileStandardDropzoneInputGUI extends ilFileInputGUI implements ilToolbar */ protected $dropzone_message = ''; + /** + * @var string Bugfix mantis 0025881: used to determine the cancel-button to prevent file upload validation when cancelling + */ + protected $cancel_command; + + /** + * ilFileStandardDropzoneInputGUI constructor. + * @param string $cancel_command required as a bugfix for mantis 0025881 + * @param string $a_title + * @param string $a_postvar + */ + public function __construct($cancel_command, $a_title = "", $a_postvar = "") + { + $this->cancel_command = $cancel_command; + parent::__construct($a_title, $a_postvar); + } /** * @return string the URL where the form will be sent to. @@ -178,7 +194,7 @@ public function render($a_mode = "") // We need some javascript magic $this->ui()->mainTemplate()->addJavaScript('./Services/Form/js/ilFileStandardDropzoneInputGUI.js'); - $this->ui()->mainTemplate()->addOnLoadCode("ilFileStandardDropzoneInputGUI.init('ilFileStandardDropzoneInputGUIWrapper{$n}');"); + $this->ui()->mainTemplate()->addOnLoadCode("ilFileStandardDropzoneInputGUI.init('ilFileStandardDropzoneInputGUIWrapper{$n}', '{$this->cancel_command}');"); return $out; } diff --git a/Services/Form/classes/class.ilFileWizardInputGUI.php b/Services/Form/classes/class.ilFileWizardInputGUI.php index 745a91f1fe08..724fe15ece94 100644 --- a/Services/Form/classes/class.ilFileWizardInputGUI.php +++ b/Services/Form/classes/class.ilFileWizardInputGUI.php @@ -55,6 +55,7 @@ public function __construct($a_title = "", $a_postvar = "") global $DIC; $this->lng = $DIC->language(); + $this->lng->loadLanguageModule("form"); $this->tpl = $DIC["tpl"]; parent::__construct($a_title, $a_postvar); } @@ -259,7 +260,7 @@ public function insert($a_tpl) } $this->outputSuffixes($tpl, "allowed_image_suffixes"); - + $tpl->setCurrentBlock("row"); $tpl->setVariable("POST_VAR", $this->getPostVar() . "[$i]"); $tpl->setVariable("ID", $this->getFieldId() . "[$i]"); @@ -278,6 +279,8 @@ public function insert($a_tpl) $tpl->setVariable("ADD_BUTTON", ilGlyphGUI::get(ilGlyphGUI::ADD)); $tpl->setVariable("REMOVE_BUTTON", ilGlyphGUI::get(ilGlyphGUI::REMOVE)); $tpl->setVariable("TXT_MAX_SIZE", $lng->txt("file_notice") . " " . $this->getMaxFileSizeString()); + $tpl->setVariable("MAX_UPLOAD_VALUE", $this->getMaxFileUploads()); + $tpl->setVariable("TXT_MAX_UPLOADS", $lng->txt("form_msg_max_upload") . " " . $this->getMaxFileUploads()); $tpl->parseCurrentBlock(); $i++; } diff --git a/Services/Form/js/Form.js b/Services/Form/js/Form.js index 74608348385a..72a9ee7d69e1 100644 --- a/Services/Form/js/Form.js +++ b/Services/Form/js/Form.js @@ -441,4 +441,9 @@ il.Form = { }; // init forms -il.Util.addOnLoad(il.Form.init); \ No newline at end of file +il.Util.addOnLoad(il.Form.init); + +// see #27281 +$(document).on('dp.show', function(event) { + il.UI.page.fit($('.bootstrap-datetimepicker-widget')); +}); \ No newline at end of file diff --git a/Services/Form/js/ServiceFormWizardInput.js b/Services/Form/js/ServiceFormWizardInput.js index 9a5abbaed18a..9ac38f8a1490 100644 --- a/Services/Form/js/ServiceFormWizardInput.js +++ b/Services/Form/js/ServiceFormWizardInput.js @@ -23,7 +23,7 @@ var ilWizardInput = { addRow: function(e) { // clone row var source = this.getRowFromEvent(e); - var target = $(source).clone(); + var target = $(source).clone(); // add events this.initEvents(target); @@ -36,6 +36,12 @@ var ilWizardInput = { this.reindexRows(this.getContainerFromEvent(e)); il.Form.registerFileUploadInputEventTrigger(); + + let current_upload_fields = $("#files").children().length; + let max_upload_fields = parseInt(source.children(".imagewizard_add").attr("data-val")); + if(current_upload_fields === max_upload_fields) { + $(".imagewizard_add").hide(); + } }, removeRow: function(e) { @@ -51,7 +57,13 @@ var ilWizardInput = { this.cleanRow(source); } - this.reindexRows(tbody); + this.reindexRows(tbody); + + let current_upload_fields = $("#files").children().length; + let max_upload_fields = parseInt(source.children(".imagewizard_remove").attr("data-val")); + if(current_upload_fields <= max_upload_fields) { + $(".imagewizard_add").show(); + } }, moveRowUp: function(e) { diff --git a/Services/Form/js/ilFileStandardDropzoneInputGUI.js b/Services/Form/js/ilFileStandardDropzoneInputGUI.js index 637cc6c769c2..c5334725c5d7 100644 --- a/Services/Form/js/ilFileStandardDropzoneInputGUI.js +++ b/Services/Form/js/ilFileStandardDropzoneInputGUI.js @@ -1,23 +1,37 @@ var ilFileStandardDropzoneInputGUI = (function ($) { - var init = function (wrapper_id) { - var wrapper = $('#' + wrapper_id); - var uploadId = wrapper.find('.il-dropzone-base').attr('id'); - var form = wrapper.closest('form'); - var handledUpload = false; - var buttonName = form.find('input[type=submit]:first').attr('name'); - form.find('input[type=submit]').on("click", function () { - buttonName = $(this).attr('name'); - }); + var init = function (wrapper_id, cancel_command) { + var cancelButtonName = "cmd[" + cancel_command + "]"; + var wrapper = $('#' + wrapper_id); + var uploadId = wrapper.find('.il-dropzone-base').attr('id'); + var form = wrapper.closest('form'); + var handledUpload = false; + var buttonName = form.find('input[type=submit]:first').attr('name'); + var formAdded = false; - var params = {}; - params[buttonName] = true; - il.UI.uploader.addForm(uploadId, form.attr('id')); - il.UI.uploader.setUploadParams(uploadId, params); - }; + // bugfix mantis 0025881: + // Don't add the form to the uploader when cancel was clicked as this leads to a faulty validation or even worse an unwanted upload. + form.find('input[type=submit]').on("click", function (e) { + buttonName = $(this).attr('name'); + if (buttonName !== cancelButtonName) { + if (formAdded === false) { + il.UI.uploader.addForm(uploadId, form.attr('id')); + formAdded = true; + } + } else { + e.preventDefault(); + var preCancelFormAction = form.attr('action'); + var newFormAction = preCancelFormAction.replace(/cmd=.+?(?=&)/, ("cmd=" + cancel_command)); + location.assign(newFormAction); + } + }); + var params = {}; + params[buttonName] = true; + il.UI.uploader.setUploadParams(uploadId, params); + }; - return { - init: init - } + return { + init: init + } -})($); \ No newline at end of file +})($); diff --git a/Services/Form/templates/default/tpl.prop_filewizardinput.html b/Services/Form/templates/default/tpl.prop_filewizardinput.html index 8fe8238b1f3d..59b59e4e662e 100644 --- a/Services/Form/templates/default/tpl.prop_filewizardinput.html +++ b/Services/Form/templates/default/tpl.prop_filewizardinput.html @@ -3,13 +3,14 @@
- - + +
{TXT_MAX_SIZE}
+ {TXT_MAX_UPLOADS}
{TXT_ALLOWED_SUFFIXES}
diff --git a/Services/GlobalScreen/classes/Helper/BasicAccessCheckClosures.php b/Services/GlobalScreen/classes/Helper/BasicAccessCheckClosures.php
index ef96bed713d9..91cfc6f20c85 100644
--- a/Services/GlobalScreen/classes/Helper/BasicAccessCheckClosures.php
+++ b/Services/GlobalScreen/classes/Helper/BasicAccessCheckClosures.php
@@ -57,6 +57,23 @@ public function isRepositoryReadable(?Closure $additional = null) : Closure
}, $additional);
}
+ public function isRepositoryVisible(?Closure $additional = null) : Closure
+ {
+ static $repo_visible;
+ if (!isset($repo_visible)) {
+ $is_user_logged_in = $this->isUserLoggedIn()();
+ if (!$is_user_logged_in) {
+ $repo_visible = (bool) $this->dic->settings()->get('pub_section') && $this->dic->access()->checkAccess('visible', '', ROOT_FOLDER_ID);
+ } else {
+ $repo_visible = (bool) $this->dic->access()->checkAccess('visible', '', ROOT_FOLDER_ID);
+ }
+ }
+
+ return $this->getClosureWithOptinalClosure(static function () use ($repo_visible) : bool {
+ return $repo_visible;
+ }, $additional);
+ }
+
public function isUserLoggedIn(?Closure $additional = null) : Closure
{
static $is_anonymous;
diff --git a/Services/Init/classes/class.ilInitialisation.php b/Services/Init/classes/class.ilInitialisation.php
index 3af8a5195f19..ccd9de072e38 100644
--- a/Services/Init/classes/class.ilInitialisation.php
+++ b/Services/Init/classes/class.ilInitialisation.php
@@ -1903,6 +1903,14 @@ protected static function redirect($a_target, $a_message_id = '', array $a_messa
$a_target = ILIAS_HTTP_PATH . "/" . $a_target;
}
+ foreach (['ext_uid', 'soap_pw'] as $param) {
+ if (false === strpos($a_target, $param . '=') && isset($GLOBALS['DIC']->http()->request()->getQueryParams()[$param])) {
+ $a_target = \ilUtil::appendUrlParameterString($a_target, $param . '=' . \ilUtil::stripSlashes(
+ $GLOBALS['DIC']->http()->request()->getQueryParams()[$param]
+ ));
+ }
+ }
+
if (ilContext::supportsRedirects()) {
ilUtil::redirect($a_target);
} else {
diff --git a/Services/Init/classes/class.ilStartUpGUI.php b/Services/Init/classes/class.ilStartUpGUI.php
index 144dab4c57e0..c7831648ab48 100755
--- a/Services/Init/classes/class.ilStartUpGUI.php
+++ b/Services/Init/classes/class.ilStartUpGUI.php
@@ -206,6 +206,23 @@ protected function showLoginPage(ilPropertyFormGUI $form = null)
$this->getLogger()->debug('Showing login page');
+ $extUid = '';
+ if (isset($_GET['ext_uid']) && is_string($_GET['ext_uid'])) {
+ $extUid = $_GET['ext_uid'];
+ }
+ $soapPw = '';
+ if (isset($_GET['soap_pw']) && is_string($_GET['soap_pw'])) {
+ $soapPw = $_GET['soap_pw'];
+ }
+
+ require_once 'Services/Authentication/classes/Frontend/class.ilAuthFrontendCredentialsSoap.php';
+ $credentials = new ilAuthFrontendCredentialsSoap($GLOBALS['DIC']->http()->request(), $this->ctrl, $ilSetting);
+ $credentials->setUsername(ilUtil::stripSlashes($extUid));
+ $credentials->setPassword(ilUtil::stripSlashes($soapPw));
+ $credentials->tryAuthenticationOnLoginPage();
+
+ // try apache auth
+ include_once './Services/Authentication/classes/Frontend/class.ilAuthFrontendCredentialsApache.php';
$frontend = new ilAuthFrontendCredentialsApache($this->httpRequest, $this->ctrl);
$frontend->tryAuthenticationOnLoginPage();
diff --git a/Services/JavaScript/js/Basic.js b/Services/JavaScript/js/Basic.js
index 02b78e436f67..7bb916c10757 100644
--- a/Services/JavaScript/js/Basic.js
+++ b/Services/JavaScript/js/Basic.js
@@ -1062,7 +1062,9 @@ function startSAHS(SAHSurl, SAHStarget, SAHSopenMode, SAHSwidth, SAHSheight)
*/
$.fn.inputFilter = function(inputFilter) {
return this.on("input keydown keyup mousedown mouseup select contextmenu drop", function(e) {
- if (inputFilter(this.value)) {
+ if ("-" === $.trim(this.value)) {
+ // https://mantis.ilias.de/view.php?id=29417
+ } else if (inputFilter(this.value)) {
this.oldValue = this.value;
this.oldSelectionStart = this.selectionStart;
this.oldSelectionEnd = this.selectionEnd;
diff --git a/Services/LDAP/classes/class.ilLDAPQuery.php b/Services/LDAP/classes/class.ilLDAPQuery.php
index 7325ab064ebb..5769a3e43dc8 100644
--- a/Services/LDAP/classes/class.ilLDAPQuery.php
+++ b/Services/LDAP/classes/class.ilLDAPQuery.php
@@ -41,6 +41,22 @@
*/
class ilLDAPQuery
{
+ /**
+ * @var string
+ * @deprecated with PHP 7.3 (LDAP_CONTROL_PAGEDRESULTS)
+ */
+ const IL_LDAP_CONTROL_PAGEDRESULTS = '1.2.840.113556.1.4.319';
+
+ /**
+ * @var string
+ */
+ const IL_LDAP_SUPPORTED_CONTROL = 'supportedControl';
+
+ /**
+ * @var int
+ */
+ const PAGINATION_SIZE = 100;
+
private $ldap_server_url = null;
private $settings = null;
@@ -263,11 +279,16 @@ private function runReadAllUsersPaged($dn)
$tmp_result = new ilLDAPResult($this->lh);
$cookie = '';
-
+ $estimated_results = 0;
do {
try {
- ldap_control_paged_result($this->lh, 100, true, $cookie);
+ $res = ldap_control_paged_result($this->lh, self::PAGINATION_SIZE, true, $cookie);
+ if ($res === false) {
+ throw new ilLDAPPagingException('Result pagination failed.');
+ }
+
} catch (Exception $e) {
+ $this->log->warning('Result pagination failed with message: ' . $e->getMessage());
throw new ilLDAPPagingException($e->getMessage());
}
@@ -280,12 +301,16 @@ private function runReadAllUsersPaged($dn)
$tmp_result->setResult($res);
$tmp_result->run();
try {
- ldap_control_paged_result_response($this->lh, $res, $cookie);
+ ldap_control_paged_result_response($this->lh, $res, $cookie, $estimated_results);
+ $this->log->debug('Estimated number of results: ' . $estimated_results);
} catch (Exception $e) {
+ $this->log->warning('Result pagination failed with message: ' . $e->getMessage());
throw new ilLDAPPagingException($e->getMessage());
}
} while ($cookie !== null && $cookie != '');
+ // finally reset cookie
+ ldap_control_paged_result($this->lh, 10000, false, $cookie);
return $tmp_result;
}
@@ -742,12 +767,32 @@ public function __destruct()
}
/**
- *
+ * Check if pagination is enabled (rfc: 2696)
* @return bool
*/
- public function checkPaginationEnabled()
+ public function checkPaginationEnabled() : bool
{
- return LDAP_OPT_PROTOCOL_VERSION >= 3;
+ if ($this->getServer()->getVersion() != 3) {
+ $this->log->info('Pagination control unavailable for ldap v' . $this->getServer()->getVersion());
+ return false;
+ }
+
+ $result = ldap_read($this->lh, '', '(objectClass=*)', [self::IL_LDAP_SUPPORTED_CONTROL]);
+ if ($result === false) {
+ $this->log->warning('Failed to query for pagination control');
+ return false;
+ }
+ $entries = (array) (ldap_get_entries($this->lh, $result)[0] ?? []);
+ if (
+ array_key_exists(strtolower(self::IL_LDAP_SUPPORTED_CONTROL), $entries) &&
+ is_array($entries[strtolower(self::IL_LDAP_SUPPORTED_CONTROL)]) &&
+ in_array(self::IL_LDAP_CONTROL_PAGEDRESULTS, $entries[strtolower(self::IL_LDAP_SUPPORTED_CONTROL)])
+ ) {
+ $this->log->info('Using paged control');
+ return true;
+ }
+ $this->log->info('Paged control disabled');
+ return false;
}
}
diff --git a/Services/LDAP/classes/class.ilLDAPRoleGroupMapping.php b/Services/LDAP/classes/class.ilLDAPRoleGroupMapping.php
index b6d03790fcdc..6b1492078d19 100644
--- a/Services/LDAP/classes/class.ilLDAPRoleGroupMapping.php
+++ b/Services/LDAP/classes/class.ilLDAPRoleGroupMapping.php
@@ -33,6 +33,9 @@
*/
class ilLDAPRoleGroupMapping
{
+ /**
+ * @var ilLogger
+ */
private $log = null;
private static $instance = null;
private $servers = null;
@@ -40,6 +43,11 @@ class ilLDAPRoleGroupMapping
private $mapping_members = array();
private $query = array();
private $active_servers = false;
+
+ /**
+ * @var array
+ */
+ private $users = [];
/**
* Singleton contructor
@@ -51,9 +59,8 @@ private function __construct()
{
global $DIC;
- $ilLog = $DIC['ilLog'];
+ $this->log = $DIC->logger()->auth();
- $this->log = $ilLog;
$this->initServers();
}
@@ -118,10 +125,10 @@ public function assign($a_role_id, $a_usr_id)
return false;
}
if (!$this->isHandledUser($a_usr_id)) {
- $this->log->write('LDAP assign: User ID: ' . $a_usr_id . ' has no LDAP account');
+ $this->log->info('LDAP assign: User ID: ' . $a_usr_id . ' has no LDAP account');
return false;
}
- $this->log->write('LDAP assign: User ID: ' . $a_usr_id . ' Role Id: ' . $a_role_id);
+ $this->log->info('LDAP assigned: User ID: ' . $a_usr_id . ' Role Id: ' . $a_role_id);
$this->assignToGroup($a_role_id, $a_usr_id);
return true;
@@ -179,7 +186,7 @@ public function deassign($a_role_id, $a_usr_id)
if (!$this->isHandledUser($a_usr_id)) {
return false;
}
- $this->log->write('LDAP deassign: User ID: ' . $a_usr_id . ' Role Id: ' . $a_role_id);
+ $this->log->info('LDAP deassigned: User ID: ' . $a_usr_id . ' Role Id: ' . $a_role_id);
$this->deassignFromGroup($a_role_id, $a_usr_id);
return true;
@@ -220,9 +227,14 @@ private function initServers()
$this->active_servers = true;
$this->mappings = array();
+ $this->users = [];
foreach ($server_ids as $server_id) {
$this->servers[$server_id] = new ilLDAPServer($server_id);
$this->mappings = ilLDAPRoleGroupMappingSettings::_getAllActiveMappings();
+ $this->users[$server_id] = ilObjUser::_getExternalAccountsByAuthMode(
+ 'ldap_' . $server_id,
+ true
+ );
}
$this->mapping_info = array();
$this->mapping_info_strict = array();
@@ -236,8 +248,6 @@ private function initServers()
}
}
}
- $this->users = ilObjUser::_getExternalAccountsByAuthMode('ldap', true);
-
return true;
}
@@ -261,7 +271,12 @@ private function isHandledRole($a_role_id)
*/
private function isHandledUser($a_usr_id)
{
- return array_key_exists($a_usr_id, $this->users);
+ foreach ($this->users as $server_id => $users) {
+ if (array_key_exists($a_usr_id, $users)) {
+ return true;
+ }
+ }
+ return false;
}
@@ -279,23 +294,14 @@ private function assignToGroup($a_role_id, $a_usr_id)
if ($data['isdn']) {
$external_account = $this->readDN($a_usr_id, $data['server_id']);
} else {
- $external_account = $this->users[$a_usr_id];
+ $external_account = $this->users[$data['server_id']][$a_usr_id];
}
-
// Forcing modAdd since Active directory is too slow and i cannot check if a user is member or not.
- #if($this->isMember($external_account,$data))
- #{
- # $this->log->write("LDAP assign: User already assigned to group '".$data['dn']."'");
- #}
- #else
- {
- // Add user
- $query_obj = $this->getLDAPQueryInstance($data['server_id'], $data['url']);
- $query_obj->modAdd($data['dn'], array($data['member'] => $external_account));
- $this->log->write('LDAP assign: Assigned ' . $external_account . ' to group ' . $data['dn']);
- }
+ $query_obj = $this->getLDAPQueryInstance($data['server_id'], $data['url']);
+ $query_obj->modAdd($data['dn'], array($data['member'] => $external_account));
+ $this->log->info('LDAP assign: Assigned ' . $external_account . ' to group ' . $data['dn']);
} catch (ilLDAPQueryException $exc) {
- $this->log->write($exc->getMessage());
+ $this->log->warning($exc->getMessage());
// try next mapping
continue;
}
@@ -317,25 +323,18 @@ private function deassignFromGroup($a_role_id, $a_usr_id)
if ($data['isdn']) {
$external_account = $this->readDN($a_usr_id, $data['server_id']);
} else {
- $external_account = $this->users[$a_usr_id];
+ $external_account = $this->users[$data['server_id']][$a_usr_id];
}
// Check for other role membership
if ($role_id = $this->checkOtherMembership($a_usr_id, $a_role_id, $data)) {
- $this->log->write('LDAP deassign: User is still assigned to role "' . $role_id . '".');
+ $this->log->info('LDAP deassign: User is still assigned to role "' . $role_id . '".');
continue;
}
- /*
- if(!$this->isMember($external_account,$data))
- {
- $this->log->write("LDAP deassign: User not assigned to group '".$data['dn']."'");
- continue;
- }
- */
// Deassign user
$query_obj = $this->getLDAPQueryInstance($data['server_id'], $data['url']);
$query_obj->modDelete($data['dn'], array($data['member'] => $external_account));
- $this->log->write('LDAP deassign: Deassigned ' . $external_account . ' from group ' . $data['dn']);
+ $this->log->info('LDAP deassign: Deassigned ' . $external_account . ' from group ' . $data['dn']);
// Delete from cache
if (is_array($this->mapping_members[$data['mapping_id']])) {
@@ -345,50 +344,14 @@ private function deassignFromGroup($a_role_id, $a_usr_id)
}
}
} catch (ilLDAPQueryException $exc) {
- $this->log->write($exc->getMessage());
+ $this->log->warning($exc->getMessage());
// try next mapping
continue;
}
}
}
- /**
- * Check if user is member
- *
- * @access private
- * @throws ilLDAPQueryException
- */
- private function isMember($a_uid, $data)
- {
- if (!isset($this->mapping_members["$data[mapping_id]"])) {
- // Read members
- try {
- $server = $this->servers["$data[server_id]"];
- $query_obj = $this->getLDAPQueryInstance($data['server_id'], $server->getUrl());
- // query for members
- $res = $query_obj->query(
- $data['dn'],
- '(objectClass=*)',
- IL_LDAP_SCOPE_BASE,
- array($data['member'])
- );
-
- $this->storeMembers($data['mapping_id'], $res->get());
- unset($res);
- } catch (ilLDAPQueryException $exc) {
- throw $exc;
- }
- }
- #var_dump("",$a_uid,$this->mapping_members,""); - - // Now check for membership in stored result - if (in_array($a_uid, $this->mapping_members["$data[mapping_id]"])) { - return true; - } - return false; - } - /** * Check other membership * @@ -461,7 +424,7 @@ private function readDN($a_usr_id, $a_server_id) return $this->user_dns[$a_usr_id]; } - $external_account = $this->users[$a_usr_id]; + $external_account = $this->users[$a_server_id][$a_usr_id]; try { $server = $this->servers[$a_server_id]; diff --git a/Services/Mail/classes/class.ilMailTemplateContext.php b/Services/Mail/classes/class.ilMailTemplateContext.php index b02b173d8400..4f5aa428c886 100644 --- a/Services/Mail/classes/class.ilMailTemplateContext.php +++ b/Services/Mail/classes/class.ilMailTemplateContext.php @@ -92,7 +92,7 @@ abstract public function getDescription() : string; /** * @return array */ - final private function getGenericPlaceholders() : array + private function getGenericPlaceholders() : array { return [ 'mail_salutation' => [ diff --git a/Services/MainMenu/classes/Administration/class.ilMMTopItemGUI.php b/Services/MainMenu/classes/Administration/class.ilMMTopItemGUI.php index 08ec0d4a6864..b7a7d6431b28 100644 --- a/Services/MainMenu/classes/Administration/class.ilMMTopItemGUI.php +++ b/Services/MainMenu/classes/Administration/class.ilMMTopItemGUI.php @@ -26,6 +26,7 @@ class ilMMTopItemGUI extends ilMMAbstractItemGUI const CMD_RENDER_INTERRUPTIVE = 'render_interruptive_modal'; const CMD_CONFIRM_RESTORE = 'confirmRestore'; const CMD_UPLOAD = 'upload'; + const CMD_FLUSH = 'flush'; private function dispatchCommand($cmd) { @@ -85,6 +86,10 @@ private function dispatchCommand($cmd) $this->access->checkAccessAndThrowException('write'); $this->renderInterruptiveModal(); break; + case self::CMD_FLUSH: + $this->access->checkAccessAndThrowException('write'); + $this->flush(); + break; case self::CMD_UPLOAD: $this->access->checkAccessAndThrowException('write'); return $this->upload(); @@ -151,6 +156,14 @@ private function index() : string $b->setCaption($this->lng->txt(self::CMD_RESTORE), false); $b->setUrl($this->ctrl->getLinkTarget($this, self::CMD_CONFIRM_RESTORE)); $this->toolbar->addButtonInstance($b); + + // REMOVE LOST ITEMS + if ($this->repository->hasLostItems()) { + $b = ilLinkButton::getInstance(); + $b->setUrl($this->ctrl->getLinkTarget($this, self::CMD_FLUSH)); + $b->setCaption($this->lng->txt(self::CMD_FLUSH), false); + $this->toolbar->addButtonInstance($b); + } } // TABLE @@ -268,6 +281,13 @@ private function confirmRestore() : string return $c->getHTML(); } + private function flush() : void + { + $this->repository->flushLostItems(); + ilUtil::sendSuccess($this->lng->txt("msg_subitem_flushed"), true); + $this->cancel(); + } + private function restore() : void { ilMMItemStorage::flushDB(); diff --git a/Services/MainMenu/classes/Items/Facade/class.ilMMAbstractItemFacade.php b/Services/MainMenu/classes/Items/Facade/class.ilMMAbstractItemFacade.php index fe7a4c25ede9..54ffe069cb6b 100644 --- a/Services/MainMenu/classes/Items/Facade/class.ilMMAbstractItemFacade.php +++ b/Services/MainMenu/classes/Items/Facade/class.ilMMAbstractItemFacade.php @@ -325,12 +325,32 @@ public function create() ilMMItemStorage::register($this->gs_item); } + /** + * deletes all translations associated with the current identification. + * @throws Exception + */ + protected function deleteAssociatedTranslations() + { + $ts = ilMMItemTranslationStorage::where([ + 'identification' => $this->identification->serialize(), + ], '=')->get(); + + if (!empty($ts)) { + foreach ($ts as $translation) { + if ($translation instanceof ilMMItemTranslationStorage) { + $translation->delete(); + } + } + } + } + /** * @inheritDoc */ public function delete() { if ($this->isDeletable()) { + $this->deleteAssociatedTranslations(); $serialize = $this->identification->serialize(); $mm = ilMMItemStorage::find($serialize); if ($mm instanceof ilMMItemStorage) { diff --git a/Services/MainMenu/classes/Items/class.ilMMItemRepository.php b/Services/MainMenu/classes/Items/class.ilMMItemRepository.php index 13de59e8b5a0..2a4193485924 100644 --- a/Services/MainMenu/classes/Items/class.ilMMItemRepository.php +++ b/Services/MainMenu/classes/Items/class.ilMMItemRepository.php @@ -6,6 +6,7 @@ use ILIAS\GlobalScreen\Scope\MainMenu\Collector\Handler\TypeHandler; use ILIAS\GlobalScreen\Scope\MainMenu\Factory\isItem; use ILIAS\GlobalScreen\Scope\MainMenu\Factory\isParent; +use ILIAS\GlobalScreen\Scope\MainMenu\Factory\Item\Lost; use ILIAS\GlobalScreen\Scope\MainMenu\Factory\TopItem\TopParentItem; use ILIAS\MainMenu\Provider\CustomMainBarProvider; @@ -106,6 +107,41 @@ public function getSubItemsForTable() : array return $return; } + public function flushLostItems() + { + foreach ($this->getTopItems() as $item) { + $item_facade = $this->getItemFacade($this->services->identification()->fromSerializedIdentification($item['identification'])); + if (Lost::class === $item_facade->getType()) { + $item_facade->delete(); + } + } + + foreach ($this->getSubItemsForTable() as $item) { + $item_facade = $this->getItemFacade($this->services->identification()->fromSerializedIdentification($item['identification'])); + if (Lost::class === $item_facade->getType()) { + $item_facade->delete(); + } + } + } + + public function hasLostItems() : bool + { + foreach ($this->getTopItems() as $item) { + $item_facade = $this->getItemFacade($this->services->identification()->fromSerializedIdentification($item['identification'])); + if (Lost::class === $item_facade->getType()) { + return true; + } + } + + foreach ($this->getSubItemsForTable() as $item) { + $item_facade = $this->getItemFacade($this->services->identification()->fromSerializedIdentification($item['identification'])); + if (Lost::class === $item_facade->getType()) { + return true; + } + } + return false; + } + /** * @param IdentificationInterface|null $identification * @return ilMMItemFacadeInterface diff --git a/Services/Maps/templates/default/tpl.openlayers_map.html b/Services/Maps/templates/default/tpl.openlayers_map.html index 981cab0a19d3..2c246e017518 100755 --- a/Services/Maps/templates/default/tpl.openlayers_map.html +++ b/Services/Maps/templates/default/tpl.openlayers_map.html @@ -13,5 +13,5 @@ diff --git a/Services/MediaObjects/classes/class.ilObjMediaObject.php b/Services/MediaObjects/classes/class.ilObjMediaObject.php index e1d32d8b315f..2a19e66caf62 100755 --- a/Services/MediaObjects/classes/class.ilObjMediaObject.php +++ b/Services/MediaObjects/classes/class.ilObjMediaObject.php @@ -1560,8 +1560,8 @@ public static function _determineWidthHeight( //echo "
+".$hr."+".$size[1]."+".$h."+"; $r = max($wr, $hr); if ($r > 0) { - $width = (int) ($size[0] / $r); - $height = (int) ($size[1] / $r); + $width = (int) round($size[0] / $r); + $height = (int) round($size[1] / $r); } } } diff --git a/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php b/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php index fb947e53da66..677fa723ae36 100644 --- a/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php +++ b/Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php @@ -79,6 +79,12 @@ protected function checkAccessMob($obj_id) } break; + case "clip": + if ($usage["id"] == $this->user->getId()) { + return true; + } + break; + default: if ($this->checkAccessMobUsage($usage, $oid)) { return true; diff --git a/Services/Membership/classes/class.ilMembershipCronNotifications.php b/Services/Membership/classes/class.ilMembershipCronNotifications.php index 6ac37695bae1..345099267140 100644 --- a/Services/Membership/classes/class.ilMembershipCronNotifications.php +++ b/Services/Membership/classes/class.ilMembershipCronNotifications.php @@ -289,7 +289,10 @@ protected function parseNewsItem($a_parent_ref_id, array &$a_filter_map, array $ if (is_array($sub) && sizeof($sub)) { $res .= "\n" . implode("\n", $sub); } - + // see 29967 + $res = str_replace("
", " ", $res); + $res = strip_tags($res); + return trim($res); } @@ -458,7 +461,10 @@ protected function sendMail($a_user_id, array $a_objects, $a_last_run) // :TODO: does it make sense to add client to subject? $client = $ilClientIniFile->readVariable('client', 'name'); $subject = sprintf($lng->txt("crs_subject_course_group_notification"), $client); - + + $mail_content = $ntf->composeAndGetMessage($a_user_id, null, "read", true); + $log->debug("sending mail content: ".$mail_content); + // #10044 $mail = new ilMail(ANONYMOUS_USER_ID); $mail->enqueue( @@ -466,7 +472,7 @@ protected function sendMail($a_user_id, array $a_objects, $a_last_run) null, null, $subject, - $ntf->composeAndGetMessage($a_user_id, null, "read", true), + $mail_content, [] ); } diff --git a/Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php b/Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php index 9966a62a2a01..2638ec0eab58 100644 --- a/Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php +++ b/Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php @@ -53,6 +53,14 @@ public function getData(array $options) $data = []; $users_per_position = ilMyStaffAccess::getInstance()->getUsersForUserPerPosition($this->dic->user()->getId()); + if (empty($users_per_position)) { + if ($options["count"]) { + return 0; + } else { + return []; + } + } + $arr_query = []; foreach ($users_per_position as $position_id => $users) { $obj_ids = ilMyStaffAccess::getInstance()->getIdsForUserAndOperation($this->dic->user()->getId(), $operation_access); diff --git a/Services/MyStaff/classes/ListCourses/class.ilMStListCourses.php b/Services/MyStaff/classes/ListCourses/class.ilMStListCourses.php index ea2c60616766..1c278c174d99 100644 --- a/Services/MyStaff/classes/ListCourses/class.ilMStListCourses.php +++ b/Services/MyStaff/classes/ListCourses/class.ilMStListCourses.php @@ -78,6 +78,14 @@ public function getData(array $arr_usr_ids = array(), array $options = array()) $data = []; $users_per_position = ilMyStaffAccess::getInstance()->getUsersForUserPerPosition($this->dic->user()->getId()); + if (empty($users_per_position)) { + if ($options["count"]) { + return 0; + } else { + return []; + } + } + $arr_query = []; foreach ($users_per_position as $position_id => $users) { $obj_ids = ilMyStaffAccess::getInstance()->getIdsForUserAndOperation($this->dic->user()->getId(), $operation_access); diff --git a/Services/Object/classes/class.ilObjectDefinition.php b/Services/Object/classes/class.ilObjectDefinition.php index e146e02f881e..cb17cf198709 100755 --- a/Services/Object/classes/class.ilObjectDefinition.php +++ b/Services/Object/classes/class.ilObjectDefinition.php @@ -827,6 +827,27 @@ public function isSideBlock($a_obj_name) return (bool) $this->obj_data[$a_obj_name]["sideblock"]; } + /** + * @param bool $filter_repository_types + * @return string[] + */ + public function getSideBlockTypes(bool $filter_repository_types = true) : array + { + $side_block_types = []; + foreach (array_keys($this->obj_data) as $type) { + if ( + $filter_repository_types && + !$this->isAllowedInRepository($type) + ) { + continue; + } + if ($this->isSideBlock($type)) { + $side_block_types[] = $type; + } + } + return $side_block_types; + } + /** * Get all repository object types of component */ diff --git a/Services/Object/classes/class.ilObjectListGUI.php b/Services/Object/classes/class.ilObjectListGUI.php index affaceabec3d..e2f2cea4f9ac 100644 --- a/Services/Object/classes/class.ilObjectListGUI.php +++ b/Services/Object/classes/class.ilObjectListGUI.php @@ -3226,6 +3226,7 @@ public function insertIconsAndCheckboxes() // icon link if ($this->title_link_disabled || !$this->default_command || (!$this->getCommandsStatus() && !$this->restrict_to_goto)) { } else { + /* see #28926 $this->tpl->setCurrentBlock("icon_link_s"); if ($this->default_command["frame"] != "") { @@ -3238,14 +3239,15 @@ public function insertIconsAndCheckboxes() ); $this->tpl->parseCurrentBlock(); $this->tpl->touchBlock("icon_link_e"); + */ } $this->tpl->setCurrentBlock("icon"); if (!$objDefinition->isPlugin($this->getIconImageType())) { - $this->tpl->setVariable("ALT_ICON", $lng->txt("icon") . " " . $lng->txt("obj_" . $this->getIconImageType())); + $this->tpl->setVariable("ALT_ICON", $lng->txt("obj_" . $this->getIconImageType())); } else { include_once("Services/Component/classes/class.ilPlugin.php"); - $this->tpl->setVariable("ALT_ICON", $lng->txt("icon") . " " . + $this->tpl->setVariable("ALT_ICON", ilObjectPlugin::lookupTxtById($this->getIconImageType(), "obj_" . $this->getIconImageType())); } diff --git a/Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfConfig.php b/Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfConfig.php index c6e2fee7ef68..ea71324355ef 100644 --- a/Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfConfig.php +++ b/Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfConfig.php @@ -207,6 +207,7 @@ protected function readConfigFromArray($config) $this->setKeyIfExists('setFooterType', 'footer_select', $config); $this->setKeyIfExists('setHeaderHtmlSpacing', 'head_html_spacing', $config); $this->setKeyIfExists('setHeaderHtmlLine', 'head_html_line', $config); + $this->setKeyIfExists('setHeaderHtml', 'head_html', $config); $this->setKeyIfExists('setHeaderTextLine', 'head_text_line', $config); $this->setKeyIfExists('setHeaderTextSpacing', 'head_text_spacing', $config); $this->setKeyIfExists('setHeaderTextRight', 'head_text_right', $config); @@ -251,8 +252,6 @@ protected function readConfigFromObject($config) $this->setPageSize($config->getPageSize()); $this->setMarginLeft($config->getMarginLeft()); $this->setMarginRight($config->getMarginRight()); - $this->setFooterHtmlSpacing($config->getFooterHtmlSpacing()); - $this->setFooterHtml($config->getFooterHtml()); $this->setFooterTextLine($config->isFooterTextLine()); $this->setFooterTextCenter($config->getFooterTextCenter()); $this->setFooterTextSpacing($config->getFooterTextSpacing()); @@ -261,7 +260,11 @@ protected function readConfigFromObject($config) $this->setFooterType($config->getFooterType()); $this->setFooterHtmlSpacing($config->getFooterHtmlSpacing()); + $this->setFooterHtml($config->getFooterHtml()); $this->setFooterHtmlLine($config->isFooterHtmlLine()); + $this->setHeaderHtmlSpacing($config->getHeaderHtmlSpacing()); + $this->setHeaderHtml($config->getHeaderHtml()); + $this->setHeaderHtmlLine($config->isHeaderHtmlLine()); $this->setHeaderTextLine($config->isHeaderTextLine()); $this->setHeaderTextSpacing($config->getHeaderTextSpacing()); $this->setHeaderTextRight($config->getHeaderTextRight()); diff --git a/Services/QTI/classes/class.ilQTIParser.php b/Services/QTI/classes/class.ilQTIParser.php index 06406f63ae74..e1368359155d 100644 --- a/Services/QTI/classes/class.ilQTIParser.php +++ b/Services/QTI/classes/class.ilQTIParser.php @@ -1260,9 +1260,12 @@ public function handlerParseEndTag($a_xml_parser, $a_name) } require_once 'Services/QTI/classes/class.ilQtiMatImageSecurity.php'; - $matImageSecurity = new ilQtiMatImageSecurity($this->matimage); - $matImageSecurity->sanitizeLabel(); - + try { + $matImageSecurity = new ilQtiMatImageSecurity($this->matimage); + $matImageSecurity->sanitizeLabel(); + } catch (Exception $e) { + break; + } if (!$matImageSecurity->validate()) { break; } diff --git a/Services/Repository/Favourites/classes/class.ilFavouritesListGUI.php b/Services/Repository/Favourites/classes/class.ilFavouritesListGUI.php index 9d3a56113938..20ef2660422e 100644 --- a/Services/Repository/Favourites/classes/class.ilFavouritesListGUI.php +++ b/Services/Repository/Favourites/classes/class.ilFavouritesListGUI.php @@ -66,17 +66,23 @@ public function render() $item_groups[] = $f->item()->group($group->getLabel(), $items); } } - $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "view", "0"); - $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "col_side", "center"); - $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "block_type", "pditems"); - $panel = $f->panel()->secondary()->listing("", $item_groups); - $panel = $panel->withActions($f->dropdown()->standard([$f->link()->standard( - $this->lng->txt("rep_configure"), - $ctrl->getLinkTargetByClass( - ["ilDashboardGUI", "ilColumnGUI", "ilPDSelectedItemsBlockGUI"], - "manage" - ) - )])); - return $this->ui->renderer()->render([$panel]); + if (count($item_groups) > 0) { + $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "view", "0"); + $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "col_side", "center"); + $ctrl->setParameterByClass("ilPDSelectedItemsBlockGUI", "block_type", "pditems"); + $panel = $f->panel()->secondary()->listing("", $item_groups); + $panel = $panel->withActions($f->dropdown()->standard([$f->link()->standard( + $this->lng->txt("rep_configure"), + $ctrl->getLinkTargetByClass( + ["ilDashboardGUI", "ilColumnGUI", "ilPDSelectedItemsBlockGUI"], + "manage" + ) + ) + ])); + return $this->ui->renderer()->render([$panel]); + } else { + $pdblock = new ilPDSelectedItemsBlockGUI(); + return $pdblock->getNoItemFoundContent(); + } } } diff --git a/Services/Repository/GlobalScreen/classes/RepositoryMainBarProvider.php b/Services/Repository/GlobalScreen/classes/RepositoryMainBarProvider.php index 87c7c6c4214a..dae9100f1d09 100644 --- a/Services/Repository/GlobalScreen/classes/RepositoryMainBarProvider.php +++ b/Services/Repository/GlobalScreen/classes/RepositoryMainBarProvider.php @@ -12,9 +12,17 @@ use InvalidArgumentException; /** - * Class RepositoryMainBarProvider + * Repository related main menu items + * - Repository Home + * - Repository Tree + * - Last Visited + * + * Note: The Favourites menut item is currently part of the Dashboard PDMainBarProvider + * and should be moved here, since the Favourites services is implemented as a sub-service + * of the repository service. * * @author Fabian Schmid