mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2025-12-13 09:56:01 +00:00
[Web] Support old style app links
This commit is contained in:
@@ -267,12 +267,13 @@ function customize($_action, $_item, $_data = null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach($app_links as $key => $value){
|
||||
foreach($value as $app => $details){
|
||||
if (empty($details['user_link']) || empty($_SESSION['mailcow_cc_username'])){
|
||||
$app_links[$key][$app]['user_link'] = $app_links[$key][$app]['link'];
|
||||
} else {
|
||||
$app_links[$key][$app]['user_link'] = str_replace('%u', $_SESSION['mailcow_cc_username'], $app_links[$key][$app]['user_link']);
|
||||
// convert from old style
|
||||
foreach($app_links as $i => $entry){
|
||||
foreach($entry as $app => $link){
|
||||
if (empty($link['link']) && empty($link['user_link'])){
|
||||
$app_links[$i][$app] = array();
|
||||
$app_links[$i][$app]['link'] = $link;
|
||||
$app_links[$i][$app]['user_link'] = $link;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,11 @@ for ($i = 0; $i < count($mailcow_apps_processed); $i++) {
|
||||
$hide_mailcow_apps = false;
|
||||
}
|
||||
if (!empty($_SESSION['mailcow_cc_username'])){
|
||||
$mailcow_apps_processed[$i]['user_link'] = str_replace('%u', $_SESSION['mailcow_cc_username'], $mailcow_apps_processed[$i]['user_link']);
|
||||
if ($app_links_processed[$i]['user_link']) {
|
||||
$mailcow_apps_processed[$i]['user_link'] = str_replace('%u', $_SESSION['mailcow_cc_username'], $mailcow_apps_processed[$i]['user_link']);
|
||||
} else {
|
||||
$mailcow_apps_processed[$i]['user_link'] = $mailcow_apps_processed[$i]['link'];
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($app_links_processed){
|
||||
@@ -49,7 +53,11 @@ if ($app_links_processed){
|
||||
$hide_mailcow_apps = false;
|
||||
}
|
||||
if (!empty($_SESSION['mailcow_cc_username'])){
|
||||
$app_links_processed[$i][$key]['user_link'] = str_replace('%u', $_SESSION['mailcow_cc_username'], $app_links_processed[$i][$key]['user_link']);
|
||||
if ($app_links_processed[$i][$key]['user_link']) {
|
||||
$app_links_processed[$i][$key]['user_link'] = str_replace('%u', $_SESSION['mailcow_cc_username'], $app_links_processed[$i][$key]['user_link']);
|
||||
} else {
|
||||
$app_links_processed[$i][$key]['user_link'] = $app_links_processed[$i][$key]['link'];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% for row in app_links %}
|
||||
{% for row in app_links_processed %}
|
||||
{% for key, val in row %}
|
||||
<li><a href="{{ val.user_link }}" class="dropdown-item">{{ key }}</a></li>
|
||||
{% endfor %}
|
||||
|
||||
Reference in New Issue
Block a user