Skip to content

GlobalScreen: Don't convert mailto:email to http(s)://mailto:email #10748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lscharmer wants to merge 1 commit into
base: release_10
Choose a base branch
from
+9 −11
Open

GlobalScreen: Don't convert mailto:email to http(s)://mailto:email #10748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/ILIAS/GlobalScreen_/classes/UI/Footer/class.ilFooterStandardGroupsProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ public function getEntries(): array
}

// system support contacts
if (($system_support_url = \ilSystemSupportContactsGUI::getFooterLink()) !== '') {
if (($system_support_url = \ilSystemSupportContactsGUI::getFooterLink()) !== null) {
$system_support_title = \ilSystemSupportContactsGUI::getFooterText();
$entries[] = $this->item_factory
->link(
$this->id_factory->identifier('system_support'),
$system_support_title
)
->withAction($this->buildURI($system_support_url))
->withAction($system_support_url)
->withParent($this->getIdentificationFor(ilFooterStandardGroups::SUPPORT));
}

Expand Down
16 changes: 7 additions & 9 deletions components/ILIAS/SystemFolder/classes/class.ilSystemSupportContactsGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*
*********************************************************************/

use ILIAS\Data\URI;

/**
* System support contacts
*
Expand Down Expand Up @@ -93,18 +95,13 @@ public function showContacts()
$this->tpl->printToStdout();
}


/**
* Get footer link
*
* @return string footer link
*/
public static function getFooterLink()
public static function getFooterLink(): null|URI|string
{
global $DIC;

$ilCtrl = $DIC->ctrl();
$ilUser = $DIC->user();
$uri = $DIC->http()->request()->getUri();

$users = ilSystemSupportContacts::getValidSupportContactIds();
if (count($users) > 0) {
Expand All @@ -114,11 +111,12 @@ public static function getFooterLink()
ilSystemSupportContacts::getMailsToAddress()
);
} else {
return $ilCtrl->getLinkTargetByClass("ilsystemsupportcontactsgui", "", "", false, false);
$path = $ilCtrl->getLinkTargetByClass("ilsystemsupportcontactsgui", "", "", false, false);
return new URI($uri->getScheme() . '://' . $uri->getHost() . '/' . $path);
}
}

return "";
return null;
}

/**
Expand Down