diff --git a/functions.inc.php b/functions.inc.php index 9bc11881..2deecc73 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -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. diff --git a/languages/bg.lang b/languages/bg.lang index 977e6ea7..e35f5471 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -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'] = 'Данни'; diff --git a/languages/ca.lang b/languages/ca.lang index 10b251e4..56896150 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -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'; diff --git a/languages/cn.lang b/languages/cn.lang index b988adea..c8212d38 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -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'] = '内容'; diff --git a/languages/cs.lang b/languages/cs.lang index c8ec18f1..52682530 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -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'; diff --git a/languages/da.lang b/languages/da.lang index 35684e19..9e5ed2f9 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -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'; diff --git a/languages/de.lang b/languages/de.lang index 88922ee9..495f40aa 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -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'; diff --git a/languages/en.lang b/languages/en.lang index bae2da1a..ea8d4d4f 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -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'; diff --git a/languages/es.lang b/languages/es.lang index 75513cb9..ab893426 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -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'; diff --git a/languages/et.lang b/languages/et.lang index c6329c5e..57b95272 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -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'; diff --git a/languages/eu.lang b/languages/eu.lang index eb5b791a..83dd8965 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -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'; diff --git a/languages/fi.lang b/languages/fi.lang index 61c8da88..55e7fc1b 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -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'; diff --git a/languages/fo.lang b/languages/fo.lang index e0c04cc6..d1986772 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -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'; diff --git a/languages/fr.lang b/languages/fr.lang index 2d278279..f74b9901 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -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'; diff --git a/languages/gl.lang b/languages/gl.lang index 518a4795..74df993a 100644 --- a/languages/gl.lang +++ b/languages/gl.lang @@ -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'; diff --git a/languages/hr.lang b/languages/hr.lang index af5e0116..c13bcac9 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -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'; diff --git a/languages/hu.lang b/languages/hu.lang index 037e9a39..e54b319f 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -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'; diff --git a/languages/is.lang b/languages/is.lang index 8d103d9f..64c2fbc2 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -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'; diff --git a/languages/it.lang b/languages/it.lang index ecd37ba5..9fab90e6 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -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'; diff --git a/languages/ja.lang b/languages/ja.lang index 1ae8ff1e..3076349f 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -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'] = 'データ'; diff --git a/languages/lt.lang b/languages/lt.lang index 8c401af3..1af64086 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -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'; diff --git a/languages/mk.lang b/languages/mk.lang index 5b178ee7..7a1a8ce3 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -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'] = 'Датум'; diff --git a/languages/nb.lang b/languages/nb.lang index 1fa4db5f..8f4a72f6 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -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'; diff --git a/languages/nl.lang b/languages/nl.lang index 84293bda..d0bd16e0 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -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'; diff --git a/languages/nn.lang b/languages/nn.lang index 409cf100..099dfefb 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -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'; diff --git a/languages/pl.lang b/languages/pl.lang index b49512e9..542eb39d 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -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'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index 69fc000c..584d0a98 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -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'; diff --git a/languages/pt-pt.lang b/languages/pt-pt.lang index ec94b0bc..01e7ae88 100644 --- a/languages/pt-pt.lang +++ b/languages/pt-pt.lang @@ -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'; diff --git a/languages/ro.lang b/languages/ro.lang index 09435e8d..27ff7cb0 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -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'; diff --git a/languages/ru.lang b/languages/ru.lang index 87a050a3..88220355 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -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'] = 'Данные'; diff --git a/languages/sk.lang b/languages/sk.lang index 55fc3385..6db28678 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -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'; diff --git a/languages/sl.lang b/languages/sl.lang index 17ac89a5..9b22c14e 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -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'; diff --git a/languages/sv.lang b/languages/sv.lang index 5694f016..0ef389f6 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -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'; diff --git a/languages/tr.lang b/languages/tr.lang index 2e971b0b..07fb7cba 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -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'; diff --git a/languages/tw.lang b/languages/tw.lang index 4550136f..2cb91086 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -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'] = '內容'; diff --git a/languages/ua.lang b/languages/ua.lang index 1fee6b4a..d1cf1203 100644 --- a/languages/ua.lang +++ b/languages/ua.lang @@ -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'] = 'Данні'; diff --git a/public/viewlog.php b/public/viewlog.php index e6121113..cb2f2b2f 100644 --- a/public/viewlog.php +++ b/public/viewlog.php @@ -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); diff --git a/templates/viewlog.tpl b/templates/viewlog.tpl index 7b02cc6d..a5517d92 100644 --- a/templates/viewlog.tpl +++ b/templates/viewlog.tpl @@ -1,7 +1,12 @@