mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2026-11-20 23:43:26 +03:00
Adds an **"All domains"** option to the View Log domain dropdown, so an admin managing many domains can see log entries across all of them in one view instead of picking each domain individually. Closes #1059. Thanks @knofte
This commit is contained in:
1 parent
a995eb3e27
commit
d6aabd7745
39 files changed
+174
-25
No files matched your search
@@ -1952,6 +1952,37 @@ function db_in_clause(string $field, array $values, array &$params = []): string
|
||||
return " $field IN (" . implode(",", $placeholders) . ") ";
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the log-table domain restriction for viewlog.php.
|
||||
*
|
||||
* Global admins may view every domain; any other admin is restricted to the
|
||||
* domains they manage, so the "All domains" option can never leak log entries
|
||||
* belonging to other admins' domains.
|
||||
*
|
||||
* @param bool $show_all - whether the "All domains" option is selected
|
||||
* @param bool $is_global_admin - whether the current admin is a global admin
|
||||
* @param string $fDomain - the single selected domain (ignored when $show_all)
|
||||
* @param array $allowed_domains - domains the current admin may view
|
||||
* @param array &$params - bound query parameters (appended to)
|
||||
* @return string - SQL condition for a WHERE clause, or '' for no restriction
|
||||
*/
|
||||
function viewlog_domain_condition(bool $show_all, bool $is_global_admin, string $fDomain, array $allowed_domains, array &$params): string
|
||||
{
|
||||
if ($show_all) {
|
||||
if ($is_global_admin) {
|
||||
return ''; # no restriction - every domain
|
||||
}
|
||||
return db_in_clause('domain', $allowed_domains, $params);
|
||||
}
|
||||
|
||||
if ($fDomain !== '') {
|
||||
$params['domain'] = $fDomain;
|
||||
return 'domain = :domain';
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* db_where_clause
|
||||
* Action: builds and returns a WHERE clause for database queries. All given conditions will be AND'ed.
|
||||
|
||||
@@ -216,6 +216,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Разглеждане на последните %s действия за ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Дата';
|
||||
$PALANG['pViewlog_action'] = 'Действие';
|
||||
$PALANG['pViewlog_data'] = 'Данни';
|
||||
|
||||
@@ -214,6 +214,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Veure les últimes %s accions per ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Veure les últimes %s accions ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Data/Hora';
|
||||
$PALANG['pViewlog_action'] = 'Acció';
|
||||
$PALANG['pViewlog_data'] = 'Dades';
|
||||
|
||||
@@ -215,6 +215,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = '查看最新的%s项操作日志 域名: ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = '时间';
|
||||
$PALANG['pViewlog_action'] = '操作';
|
||||
$PALANG['pViewlog_data'] = '内容';
|
||||
|
||||
@@ -225,6 +225,7 @@ $PALANG['reply_once_per_week'] = 'Odpovědět jednou za týden';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Prohlížet %s posledních akcí pro ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Prohlížet %s posledních akcí ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Časová značka';
|
||||
$PALANG['pViewlog_action'] = 'Akce';
|
||||
$PALANG['pViewlog_data'] = 'Poznámka';
|
||||
|
||||
@@ -222,6 +222,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Vis de sidste %s poster for ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Vis de sidste %s poster ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Tidsstempel';
|
||||
$PALANG['pViewlog_action'] = 'Handling';
|
||||
$PALANG['pViewlog_data'] = 'Data';
|
||||
|
||||
@@ -219,6 +219,7 @@ $PALANG['reply_once_per_week'] = 'Einmal pro Woche antworten';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Zeigt die letzten %s Aktionen für ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Zeigt die letzten %s Aktionen ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Zeitpunkt';
|
||||
$PALANG['pViewlog_action'] = 'Aktion';
|
||||
$PALANG['pViewlog_data'] = 'Daten';
|
||||
|
||||
@@ -274,6 +274,7 @@ $PALANG['reply_once_per_week'] = 'Reply once a week';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'View the last %s actions for ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Timestamp';
|
||||
$PALANG['pViewlog_action'] = 'Action';
|
||||
$PALANG['pViewlog_data'] = 'Data';
|
||||
|
||||
@@ -216,6 +216,7 @@ $PALANG['reply_once_per_week'] = 'Responder una vez por semana';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Ver las últimas %s acciones para ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Ver las últimas %s acciones ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Fecha/Hora';
|
||||
$PALANG['pViewlog_action'] = 'Acción';
|
||||
$PALANG['pViewlog_data'] = 'Datos';
|
||||
|
||||
@@ -215,6 +215,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Vaata %s viimast muudatust domeeniga ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Ajatempel';
|
||||
$PALANG['pViewlog_action'] = 'Toiming';
|
||||
$PALANG['pViewlog_data'] = 'Andmed';
|
||||
|
||||
@@ -213,6 +213,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Honen azken %s ekintzak ikusi ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Data/ordua';
|
||||
$PALANG['pViewlog_action'] = 'Ekintza';
|
||||
$PALANG['pViewlog_data'] = 'Datuak';
|
||||
|
||||
@@ -215,6 +215,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Näytä viimeiset kymmenen tapahtumaa domainille ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Aikaleima';
|
||||
$PALANG['pViewlog_action'] = 'Tapahtuma';
|
||||
$PALANG['pViewlog_data'] = 'Tiedot';
|
||||
|
||||
@@ -215,6 +215,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Vís seinastu %s hendingarnar fyri ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Tíðarstempul';
|
||||
$PALANG['pViewlog_action'] = 'Hending';
|
||||
$PALANG['pViewlog_data'] = 'Dáta';
|
||||
|
||||
@@ -219,6 +219,7 @@ $PALANG['reply_once_per_week'] = 'Répondre une fois par semaine';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Visualiser les %s dernières actions pour ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Visualiser les %s dernières actions ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Date/Heure';
|
||||
$PALANG['pViewlog_action'] = 'Action';
|
||||
$PALANG['pViewlog_data'] = 'Information';
|
||||
|
||||
@@ -214,6 +214,7 @@ $PALANG['reply_once_per_week'] = 'Respostar unha vez á semana'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Ver as últimas %s accións para ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Ver as últimas %s accións ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Data/Hora';
|
||||
$PALANG['pViewlog_action'] = 'Acción';
|
||||
$PALANG['pViewlog_data'] = 'Datos';
|
||||
|
||||
@@ -214,6 +214,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Pogledaj zadnjih %s akcija za ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Vrijeme';
|
||||
$PALANG['pViewlog_action'] = 'Akcija';
|
||||
$PALANG['pViewlog_data'] = 'Podaci';
|
||||
|
||||
@@ -219,6 +219,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Az utolsó %s esemény megtekintése: ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Idõbélyeg';
|
||||
$PALANG['pViewlog_action'] = 'Akció';
|
||||
$PALANG['pViewlog_data'] = 'Adat';
|
||||
|
||||
@@ -215,6 +215,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Skoða síðustu %s aðgerðir fyrir ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Tími';
|
||||
$PALANG['pViewlog_action'] = 'aðgerð';
|
||||
$PALANG['pViewlog_data'] = 'gögn';
|
||||
|
||||
@@ -216,6 +216,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Elenca gli ultimi %s eventi per ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Elenca gli ultimi %s eventi ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Orario';
|
||||
$PALANG['pViewlog_action'] = 'Azione';
|
||||
$PALANG['pViewlog_data'] = 'Dati';
|
||||
|
||||
@@ -219,6 +219,7 @@ $PALANG['reply_once_per_week'] = '週に一度返信';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = '過去 %s 個のアクション ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'タイムスタンプ';
|
||||
$PALANG['pViewlog_action'] = 'アクション';
|
||||
$PALANG['pViewlog_data'] = 'データ';
|
||||
|
||||
@@ -216,6 +216,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Peržiūrėti paskutinius %s vartotojo veiksmų ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Laikas';
|
||||
$PALANG['pViewlog_action'] = 'Veiksmas';
|
||||
$PALANG['pViewlog_data'] = 'Duomenys';
|
||||
|
||||
@@ -215,6 +215,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Преглед на последните %s операции за: ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Маркер (Timestamp)';
|
||||
$PALANG['pViewlog_action'] = 'Операција';
|
||||
$PALANG['pViewlog_data'] = 'Датум';
|
||||
|
||||
@@ -216,6 +216,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Vis de %s siste handlingene for ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Vis de %s siste handlingene ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Klokkeslett';
|
||||
$PALANG['pViewlog_action'] = 'Handling';
|
||||
$PALANG['pViewlog_data'] = 'Data';
|
||||
|
||||
@@ -218,6 +218,7 @@ $PALANG['reply_once_per_week'] = 'Beantwoord een keer per week';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Laat de laatste %s actie\'s zien van ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Laat de laatste %s actie\'s zien ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Tijd';
|
||||
$PALANG['pViewlog_action'] = 'Actie';
|
||||
$PALANG['pViewlog_data'] = 'Aanpassing';
|
||||
|
||||
@@ -214,6 +214,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Vis de %s siste handlingene ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Klokkeslett';
|
||||
$PALANG['pViewlog_action'] = 'Handling';
|
||||
$PALANG['pViewlog_data'] = 'Data';
|
||||
|
||||
@@ -218,6 +218,7 @@ $PALANG['reply_once_per_week'] = 'Odpowiedz raz na tydzień';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Pokaż %s ostatnich działań dla ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Data';
|
||||
$PALANG['pViewlog_action'] = 'Działanie';
|
||||
$PALANG['pViewlog_data'] = 'Dane';
|
||||
|
||||
@@ -221,6 +221,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Últimas %s ações para ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Últimas %s ações ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Data/Hora';
|
||||
$PALANG['pViewlog_action'] = 'Ação';
|
||||
$PALANG['pViewlog_data'] = 'Descrição';
|
||||
|
||||
@@ -221,6 +221,7 @@ $PALANG['reply_once_per_week'] = 'Responder uma vez por semana'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Últimas %s acções para ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Últimas %s acções ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Data/Hora';
|
||||
$PALANG['pViewlog_action'] = 'Acção';
|
||||
$PALANG['pViewlog_data'] = 'Descrição';
|
||||
|
||||
@@ -219,6 +219,7 @@ $PALANG['reply_once_per_week'] = 'Raspunde odata pe saptamana';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Vizualizati ultimele %s operatii pentru ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Data si ora';
|
||||
$PALANG['pViewlog_action'] = 'Operatie';
|
||||
$PALANG['pViewlog_data'] = 'Detalii';
|
||||
|
||||
@@ -222,6 +222,7 @@ $PALANG['reply_once_per_week'] = 'Отвечать один раз в недел
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Просмотр %s последних действий для ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Время создания/модификации';
|
||||
$PALANG['pViewlog_action'] = 'Действие';
|
||||
$PALANG['pViewlog_data'] = 'Данные';
|
||||
|
||||
@@ -216,6 +216,7 @@ $PALANG['reply_once_per_week'] = 'Odpovedať raz za týždeň';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Prehľad %s posledných akcií pre ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Prehľad %s posledných akcií ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Časová značka';
|
||||
$PALANG['pViewlog_action'] = 'Akcia';
|
||||
$PALANG['pViewlog_data'] = 'Podrobnosti';
|
||||
|
||||
@@ -215,6 +215,7 @@ $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Seznam zadnjih %s operacij za ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Čas';
|
||||
$PALANG['pViewlog_action'] = 'Operacija';
|
||||
$PALANG['pViewlog_data'] = 'Podatki';
|
||||
|
||||
@@ -220,6 +220,7 @@ $PALANG['reply_once_per_week'] = 'Svara en gång i veckan';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Visa de senaste %s åtgärderna för ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Visa de senaste %s åtgärderna ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Tidpunkt';
|
||||
$PALANG['pViewlog_action'] = 'Åtgärd';
|
||||
$PALANG['pViewlog_data'] = 'Data';
|
||||
|
||||
@@ -215,6 +215,7 @@ $PALANG['reply_once_per_week'] = 'Haftada bir kez yanıtla';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Son %s hareketi:';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Timestamp'; # XXX
|
||||
$PALANG['pViewlog_action'] = 'Hareket';
|
||||
$PALANG['pViewlog_data'] = 'Veri';
|
||||
|
||||
@@ -217,6 +217,7 @@ $PALANG['reply_once_per_week'] = '每星期回覆一次';
|
||||
|
||||
$PALANG['pViewlog_welcome'] = '查看最新的%s項操作日誌 網域: ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'View the last %s actions '; # XXX
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = '時間';
|
||||
$PALANG['pViewlog_action'] = '操作';
|
||||
$PALANG['pViewlog_data'] = '內容';
|
||||
|
||||
@@ -221,6 +221,7 @@ $PALANG['reply_once_per_week'] = 'Відповідати один раз на т
|
||||
|
||||
$PALANG['pViewlog_welcome'] = 'Перегляд %s останніх дій для ';
|
||||
$PALANG['pViewlog_welcome_all'] = 'Перегляд останніх %s дій ';
|
||||
$PALANG['pViewlog_all_domains'] = 'All domains';
|
||||
$PALANG['pViewlog_timestamp'] = 'Час створення/модифікації';
|
||||
$PALANG['pViewlog_action'] = 'Дія';
|
||||
$PALANG['pViewlog_data'] = 'Данні';
|
||||
|
||||
+30
-23
@@ -44,24 +44,30 @@ if (authentication_has_role('global-admin')) {
|
||||
|
||||
$fDomain = '';
|
||||
$error = 0;
|
||||
$show_all = false;
|
||||
$all_domains_value = '*'; # dropdown sentinel for the "All domains" option
|
||||
|
||||
|
||||
if ($_SERVER['REQUEST_METHOD'] == "GET") {
|
||||
if (isset($_GET['page']) && $_GET['fDomain']) {
|
||||
$fDomain_aux = $_GET['fDomain'];
|
||||
$flag_fDomain = 0;
|
||||
if ((is_array($list_domains) and sizeof($list_domains) > 0)) {
|
||||
foreach ($list_domains as $domain) {
|
||||
if ($domain == $fDomain_aux) {
|
||||
$fDomain = $domain;
|
||||
$flag_fDomain = 1;
|
||||
break;
|
||||
if ($fDomain_aux === $all_domains_value) {
|
||||
$show_all = true;
|
||||
} else {
|
||||
$flag_fDomain = 0;
|
||||
if ((is_array($list_domains) and sizeof($list_domains) > 0)) {
|
||||
foreach ($list_domains as $domain) {
|
||||
if ($domain == $fDomain_aux) {
|
||||
$fDomain = $domain;
|
||||
$flag_fDomain = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($flag_fDomain == 0) {
|
||||
throw new InvalidArgumentException('Unknown domain');
|
||||
if ($flag_fDomain == 0) {
|
||||
throw new InvalidArgumentException('Unknown domain');
|
||||
}
|
||||
}
|
||||
|
||||
$page_number = (int)($_GET['page'] ?? 0);
|
||||
@@ -76,14 +82,18 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") {
|
||||
}
|
||||
} elseif ($_SERVER['REQUEST_METHOD'] == "POST") {
|
||||
$page_number = 1;
|
||||
if (isset($_POST['fDomain']) && in_array($_POST['fDomain'], $list_domains)) {
|
||||
if (isset($_POST['fDomain']) && $_POST['fDomain'] === $all_domains_value) {
|
||||
$show_all = true;
|
||||
} elseif (isset($_POST['fDomain']) && in_array($_POST['fDomain'], $list_domains)) {
|
||||
$fDomain = $_POST['fDomain'];
|
||||
}
|
||||
} else {
|
||||
throw new InvalidArgumentException('Unsupported request method');
|
||||
}
|
||||
|
||||
if (!(check_owner($username, $fDomain) || authentication_has_role('global-admin'))) {
|
||||
# When "All domains" is selected, the query is scoped to the admin's domains
|
||||
# (see viewlog_domain_condition()), so the per-domain ownership check is skipped.
|
||||
if (!$show_all && !(check_owner($username, $fDomain) || authentication_has_role('global-admin'))) {
|
||||
$error = 1;
|
||||
flash_error($PALANG['pViewlog_result_error']);
|
||||
}
|
||||
@@ -95,17 +105,9 @@ if ($error != 1) {
|
||||
$page_size = isset($CONF['page_size']) ? intval($CONF['page_size']) : 35;
|
||||
|
||||
|
||||
$where = [];
|
||||
$params = [];
|
||||
if ($fDomain) {
|
||||
$where[] = 'domain = :domain';
|
||||
$params['domain'] = $fDomain;
|
||||
}
|
||||
|
||||
$where_sql = '';
|
||||
if (!empty($where)) {
|
||||
$where_sql = 'WHERE ' . implode(' AND ', $where);
|
||||
}
|
||||
$condition = viewlog_domain_condition($show_all, authentication_has_role('global-admin'), $fDomain, $list_domains, $params);
|
||||
$where_sql = ($condition !== '') ? "WHERE $condition" : '';
|
||||
|
||||
|
||||
$number_of_logs = 0;
|
||||
@@ -120,7 +122,9 @@ if ($error != 1) {
|
||||
}
|
||||
$number_of_pages = ceil($number_of_logs / $page_size);
|
||||
|
||||
if ($page_number > $number_of_pages) {
|
||||
# An empty result set (no matching log entries) has 0 pages; page 1 should
|
||||
# then render an empty table rather than throwing.
|
||||
if ($number_of_pages > 0 && $page_number > $number_of_pages) {
|
||||
throw new InvalidArgumentException('Unknown page number');
|
||||
}
|
||||
|
||||
@@ -159,6 +163,9 @@ $smarty->assign('domain_list', $list_domains);
|
||||
$smarty->assign('domain_selected', $fDomain);
|
||||
$smarty->assign('tLog', $tLog, false);
|
||||
$smarty->assign('fDomain', $fDomain);
|
||||
$smarty->assign('show_all', $show_all);
|
||||
$smarty->assign('all_domains_value', $all_domains_value);
|
||||
$smarty->assign('domain_param', $show_all ? $all_domains_value : $fDomain);
|
||||
|
||||
$smarty->assign('number_of_pages', $number_of_pages);
|
||||
$smarty->assign('page_number', $page_number);
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<form name="frmOverview" method="post" action="">
|
||||
{html_options name='fDomain' output=$domain_list values=$domain_list selected=$domain_selected onchange="this.form.submit();"}
|
||||
<select name="fDomain" class="form-control" onchange="this.form.submit();">
|
||||
<option value="{$all_domains_value}"{if $show_all} selected{/if}>{$PALANG.pViewlog_all_domains}</option>
|
||||
{foreach from=$domain_list item=d}
|
||||
<option value="{$d|escape}"{if !$show_all && $d==$domain_selected} selected{/if}>{$d|escape}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
<noscript><input class="button" type="submit" name="go" value="{$PALANG.go}"/></noscript>
|
||||
</form>
|
||||
</div>
|
||||
@@ -109,6 +114,6 @@
|
||||
|
||||
<script>
|
||||
function go2page(page){
|
||||
window.location.href = '{$url}?page='+page+'&fDomain={$fDomain}';
|
||||
window.location.href = '{$url}?page='+page+'&fDomain={$domain_param|escape:"url"}';
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,71 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Unit tests for viewlog_domain_condition() - the domain restriction used by
|
||||
* viewlog.php's "All domains" option.
|
||||
* @see https://github.com/postfixadmin/postfixadmin/issues/1059
|
||||
*/
|
||||
class ViewlogDomainConditionTest extends \PHPUnit\Framework\TestCase
|
||||
{
|
||||
public function testSingleDomainProducesEqualityCondition()
|
||||
{
|
||||
$params = [];
|
||||
$cond = viewlog_domain_condition(false, false, 'example.com', ['example.com'], $params);
|
||||
$this->assertSame('domain = :domain', $cond);
|
||||
$this->assertSame(['domain' => 'example.com'], $params);
|
||||
}
|
||||
|
||||
public function testNoDomainAndNotAllProducesNoCondition()
|
||||
{
|
||||
$params = [];
|
||||
$cond = viewlog_domain_condition(false, false, '', ['example.com'], $params);
|
||||
$this->assertSame('', $cond);
|
||||
$this->assertSame([], $params);
|
||||
}
|
||||
|
||||
public function testGlobalAdminAllHasNoRestriction()
|
||||
{
|
||||
$params = [];
|
||||
$cond = viewlog_domain_condition(true, true, '', ['a.com', 'b.com'], $params);
|
||||
// A global admin sees every domain, so there is no WHERE restriction.
|
||||
$this->assertSame('', $cond);
|
||||
$this->assertSame([], $params);
|
||||
}
|
||||
|
||||
/**
|
||||
* The security-critical case: a non-global admin selecting "All" must be
|
||||
* restricted to exactly the domains they manage.
|
||||
*/
|
||||
public function testDomainAdminAllIsScopedToOwnedDomains()
|
||||
{
|
||||
$params = [];
|
||||
$allowed = ['one.example.com', 'two.example.com'];
|
||||
$cond = viewlog_domain_condition(true, false, '', $allowed, $params);
|
||||
|
||||
// Must be an IN clause on the domain column, not an unrestricted query.
|
||||
$this->assertNotSame('', $cond);
|
||||
$this->assertMatchesRegularExpression('/domain\s+IN\s*\(/i', $cond);
|
||||
|
||||
// Exactly the allowed domains are bound - nothing more, nothing less.
|
||||
$this->assertEqualsCanonicalizing($allowed, array_values($params));
|
||||
|
||||
// Every placeholder in the clause has a matching bound parameter.
|
||||
preg_match_all('/:([a-zA-Z0-9_]+)/', $cond, $m);
|
||||
foreach ($m[1] as $placeholder) {
|
||||
$this->assertArrayHasKey($placeholder, $params);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Defence in depth: a non-global admin with no domains must NOT fall back
|
||||
* to an unrestricted "all domains" query.
|
||||
*/
|
||||
public function testDomainAdminAllWithNoDomainsMatchesNothing()
|
||||
{
|
||||
$params = [];
|
||||
$cond = viewlog_domain_condition(true, false, '', [], $params);
|
||||
// db_in_clause() returns a false predicate for an empty set.
|
||||
$this->assertStringContainsString('1=0', $cond);
|
||||
$this->assertSame([], $params);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user