use $CONF[page_size] in viewlog.php

This replaces the hardcoded "LIMIT 10" with "LIMIT <page_size>". Patch by Dan <dannyro @SF>, https://sourceforge.net/p/postfixadmin/patches/133/ Additional change on top of Dan's patch: - wrap $CONF['page_size'] in intval() to avoid that a broken config setting can break or exploit the query
7 years ago · 67a6d0e27a
parent 29364b4734
commit 67a6d0e27a
33 changed files with 34 additions and 34 deletions
--- a/languages/bg.lang
+++ b/languages/bg.lang
@ -186,7 +186,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Разглеждане на последните 10 действия за ';
+$PALANG['pViewlog_welcome'] = 'Разглеждане на последните %s действия за ';
 $PALANG['pViewlog_timestamp'] = 'Дата';
 $PALANG['pViewlog_action'] = 'Действие';
 $PALANG['pViewlog_data'] = 'Данни';
--- a/languages/ca.lang
+++ b/languages/ca.lang
@ -184,7 +184,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Veure les últimes 10 accions per ';
+$PALANG['pViewlog_welcome'] = 'Veure les últimes %s accions per ';
 $PALANG['pViewlog_timestamp'] = 'Data/Hora';
 $PALANG['pViewlog_action'] = 'Acció';
 $PALANG['pViewlog_data'] = 'Dades';
--- a/languages/cn.lang
+++ b/languages/cn.lang
@ -185,7 +185,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = '查看最新的10项操作日志 域名: ';
+$PALANG['pViewlog_welcome'] = '查看最新的%s项操作日志 域名: ';
 $PALANG['pViewlog_timestamp'] = '时间';
 $PALANG['pViewlog_action'] = '操作';
 $PALANG['pViewlog_data'] = '内容';
--- a/languages/cs.lang
+++ b/languages/cs.lang
@ -193,7 +193,7 @@ $PALANG['reply_every_mail'] = 'Odpovědět na každý mail';
 $PALANG['reply_once_per_day'] = 'Odpovědět jednou za den';
 $PALANG['reply_once_per_week'] = 'Odpovědět jednou za týden';

-$PALANG['pViewlog_welcome'] = 'Prohlížet 10 posledních akcí pro ';
+$PALANG['pViewlog_welcome'] = 'Prohlížet %s posledních akcí pro ';
 $PALANG['pViewlog_timestamp'] = 'Časová značka';
 $PALANG['pViewlog_action'] = 'Akce';
 $PALANG['pViewlog_data'] = 'Poznámka';
--- a/languages/da.lang
+++ b/languages/da.lang
@ -192,7 +192,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Vis de sidste 10 poster for ';
+$PALANG['pViewlog_welcome'] = 'Vis de sidste %s poster for ';
 $PALANG['pViewlog_timestamp'] = 'Tidsstempel';
 $PALANG['pViewlog_action'] = 'Handling';
 $PALANG['pViewlog_data'] = 'Data';
--- a/languages/de.lang
+++ b/languages/de.lang
@ -189,7 +189,7 @@ $PALANG['reply_every_mail'] = 'Jede Mail beantworten';
 $PALANG['reply_once_per_day'] = 'Einmal pro Tag antworten';
 $PALANG['reply_once_per_week'] = 'Einmal pro Woche antworten';

-$PALANG['pViewlog_welcome'] = 'Zeigt die letzten 10 Aktionen für ';
+$PALANG['pViewlog_welcome'] = 'Zeigt die letzten %s Aktionen für ';
 $PALANG['pViewlog_timestamp'] = 'Zeitpunkt';
 $PALANG['pViewlog_action'] = 'Aktion';
 $PALANG['pViewlog_data'] = 'Daten';
--- a/languages/en.lang
+++ b/languages/en.lang
@ -190,7 +190,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail';
 $PALANG['reply_once_per_day'] = 'Reply once a day';
 $PALANG['reply_once_per_week'] = 'Reply once a week';

-$PALANG['pViewlog_welcome'] = 'View the last 10 actions for ';
+$PALANG['pViewlog_welcome'] = 'View the last %s actions for ';
 $PALANG['pViewlog_timestamp'] = 'Timestamp';
 $PALANG['pViewlog_action'] = 'Action';
 $PALANG['pViewlog_data'] = 'Data';
--- a/languages/es.lang
+++ b/languages/es.lang
@ -186,7 +186,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Ver las últimas 10 acciones para ';
+$PALANG['pViewlog_welcome'] = 'Ver las últimas %s acciones para ';
 $PALANG['pViewlog_timestamp'] = 'Fecha/Hora';
 $PALANG['pViewlog_action'] = 'Acción';
 $PALANG['pViewlog_data'] = 'Datos';
--- a/languages/et.lang
+++ b/languages/et.lang
@ -185,7 +185,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Vaata 10 viimast muudatust domeeniga ';
+$PALANG['pViewlog_welcome'] = 'Vaata %s viimast muudatust domeeniga ';
 $PALANG['pViewlog_timestamp'] = 'Ajatempel';
 $PALANG['pViewlog_action'] = 'Toiming';
 $PALANG['pViewlog_data'] = 'Andmed';
--- a/languages/eu.lang
+++ b/languages/eu.lang
@ -183,7 +183,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Honen azken 10 ekintzak ikusi ';
+$PALANG['pViewlog_welcome'] = 'Honen azken %s ekintzak ikusi ';
 $PALANG['pViewlog_timestamp'] = 'Data/ordua';
 $PALANG['pViewlog_action'] = 'Ekintza';
 $PALANG['pViewlog_data'] = 'Datuak';
--- a/languages/fo.lang
+++ b/languages/fo.lang
@ -185,7 +185,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Vís seinastu 10 hendingarnar fyri ';
+$PALANG['pViewlog_welcome'] = 'Vís seinastu %s hendingarnar fyri ';
 $PALANG['pViewlog_timestamp'] = 'Tíðarstempul';
 $PALANG['pViewlog_action'] = 'Hending';
 $PALANG['pViewlog_data'] = 'Dáta';
--- a/languages/fr.lang
+++ b/languages/fr.lang
@ -186,7 +186,7 @@ $PALANG['reply_every_mail'] = 'Répondre à chaque message';
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Répondre une fois par semaine';

-$PALANG['pViewlog_welcome'] = 'Visualiser les 10 dernières actions pour ';
+$PALANG['pViewlog_welcome'] = 'Visualiser les %s dernières actions pour ';
 $PALANG['pViewlog_timestamp'] = 'Date/Heure';
 $PALANG['pViewlog_action'] = 'Action';
 $PALANG['pViewlog_data'] = 'Information';
--- a/languages/hr.lang
+++ b/languages/hr.lang
@ -184,7 +184,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Pogledaj zadnjih 10 akcija za ';
+$PALANG['pViewlog_welcome'] = 'Pogledaj zadnjih %s akcija za ';
 $PALANG['pViewlog_timestamp'] = 'Vrijeme';
 $PALANG['pViewlog_action'] = 'Akcija';
 $PALANG['pViewlog_data'] = 'Podaci';
--- a/languages/hu.lang
+++ b/languages/hu.lang
@ -189,7 +189,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Az utolsó 10 esemény megtekintése: ';
+$PALANG['pViewlog_welcome'] = 'Az utolsó %s esemény megtekintése: ';
 $PALANG['pViewlog_timestamp'] = 'Idõbélyeg';
 $PALANG['pViewlog_action'] = 'Akció';
 $PALANG['pViewlog_data'] = 'Adat';
--- a/languages/is.lang
+++ b/languages/is.lang
@ -185,7 +185,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Skoða síðustu 10 aðgerðir fyrir ';
+$PALANG['pViewlog_welcome'] = 'Skoða síðustu %s aðgerðir fyrir ';
 $PALANG['pViewlog_timestamp'] = 'Tími';
 $PALANG['pViewlog_action'] = 'aðgerð';
 $PALANG['pViewlog_data'] = 'gögn';
--- a/languages/it.lang
+++ b/languages/it.lang
@ -186,7 +186,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Elenca gli ultimi dieci eventi per ';
+$PALANG['pViewlog_welcome'] = 'Elenca gli ultimi %s eventi per ';
 $PALANG['pViewlog_timestamp'] = 'Orario';
 $PALANG['pViewlog_action'] = 'Azione';
 $PALANG['pViewlog_data'] = 'Dati';
--- a/languages/ja.lang
+++ b/languages/ja.lang
@ -189,7 +189,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = '過去10個のアクション ';
+$PALANG['pViewlog_welcome'] = '過去%s個のアクション ';
 $PALANG['pViewlog_timestamp'] = 'タイムスタンプ';
 $PALANG['pViewlog_action'] = 'アクション';
 $PALANG['pViewlog_data'] = 'データ';
--- a/languages/lt.lang
+++ b/languages/lt.lang
@ -186,7 +186,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Peržiūrėti paskutinius 10 vartotojo veiksmų ';
+$PALANG['pViewlog_welcome'] = 'Peržiūrėti paskutinius %s vartotojo veiksmų ';
 $PALANG['pViewlog_timestamp'] = 'Laikas';
 $PALANG['pViewlog_action'] = 'Veiksmas';
 $PALANG['pViewlog_data'] = 'Duomenys';
--- a/languages/mk.lang
+++ b/languages/mk.lang
@ -185,7 +185,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Преглед на последните 10 операции за: ';
+$PALANG['pViewlog_welcome'] = 'Преглед на последните %s операции за: ';
 $PALANG['pViewlog_timestamp'] = 'Маркер (Timestamp)';
 $PALANG['pViewlog_action'] = 'Операција';
 $PALANG['pViewlog_data'] = 'Датум';
--- a/languages/nb.lang
+++ b/languages/nb.lang
@ -186,7 +186,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Vis de 10 siste handlingene for ';
+$PALANG['pViewlog_welcome'] = 'Vis de %s siste handlingene for ';
 $PALANG['pViewlog_timestamp'] = 'Klokkeslett';
 $PALANG['pViewlog_action'] = 'Handling';
 $PALANG['pViewlog_data'] = 'Data';
--- a/languages/nl.lang
+++ b/languages/nl.lang
@ -187,7 +187,7 @@ $PALANG['reply_every_mail'] = 'Beantwoord elke keer'; # XXX
 $PALANG['reply_once_per_day'] = 'Beantwoord een keer per dag'; # XXX
 $PALANG['reply_once_per_week'] = 'Beantwoord een keer per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Laat de laatste 10 actie\'s zien van ';
+$PALANG['pViewlog_welcome'] = 'Laat de laatste %s actie\'s zien van ';
 $PALANG['pViewlog_timestamp'] = 'Tijd';
 $PALANG['pViewlog_action'] = 'Actie';
 $PALANG['pViewlog_data'] = 'Aanpassing';
--- a/languages/nn.lang
+++ b/languages/nn.lang
@ -184,7 +184,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Vis de 10 siste handlingene ';
+$PALANG['pViewlog_welcome'] = 'Vis de %s siste handlingene ';
 $PALANG['pViewlog_timestamp'] = 'Klokkeslett';
 $PALANG['pViewlog_action'] = 'Handling';
 $PALANG['pViewlog_data'] = 'Data';
--- a/languages/pl.lang
+++ b/languages/pl.lang
@ -188,7 +188,7 @@ $PALANG['reply_every_mail'] = 'Odpowiedz na każdy email';
 $PALANG['reply_once_per_day'] = 'Odpowiedz raz na dzień';
 $PALANG['reply_once_per_week'] = 'Odpowiedz raz na tydzień';

-$PALANG['pViewlog_welcome'] = 'Pokaż 10 ostatnich działań dla ';
+$PALANG['pViewlog_welcome'] = 'Pokaż %s ostatnich działań dla ';
 $PALANG['pViewlog_timestamp'] = 'Data';
 $PALANG['pViewlog_action'] = 'Działanie';
 $PALANG['pViewlog_data'] = 'Dane';
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@ -191,7 +191,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Últimas 10 ações para ';
+$PALANG['pViewlog_welcome'] = 'Últimas %s ações para ';
 $PALANG['pViewlog_timestamp'] = 'Data/Hora';
 $PALANG['pViewlog_action'] = 'Ação';
 $PALANG['pViewlog_data'] = 'Descrição';
--- a/languages/ro.lang
+++ b/languages/ro.lang
@ -189,7 +189,7 @@ $PALANG['reply_every_mail'] = 'Raspunde la fiecare mail';
 $PALANG['reply_once_per_day'] = 'Raspunde odata pe zi';
 $PALANG['reply_once_per_week'] = 'Raspunde odata pe saptamana';

-$PALANG['pViewlog_welcome'] = 'Vizualizati ultimele 100 operatii pentru ';
+$PALANG['pViewlog_welcome'] = 'Vizualizati ultimele %s operatii pentru ';
 $PALANG['pViewlog_timestamp'] = 'Data si ora';
 $PALANG['pViewlog_action'] = 'Operatie';
 $PALANG['pViewlog_data'] = 'Detalii';
--- a/languages/ru.lang
+++ b/languages/ru.lang
@ -191,7 +191,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Просмотреть 10 последних действий для  ';
+$PALANG['pViewlog_welcome'] = 'Просмотреть %s последних действий для  ';
 $PALANG['pViewlog_timestamp'] = 'Время создания/модификации';
 $PALANG['pViewlog_action'] = 'Действие';
 $PALANG['pViewlog_data'] = 'Данные';
--- a/languages/sk.lang
+++ b/languages/sk.lang
@ -186,7 +186,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Prehľad 10 posledných akcií pre ';
+$PALANG['pViewlog_welcome'] = 'Prehľad %s posledných akcií pre ';
 $PALANG['pViewlog_timestamp'] = 'Časová značka';
 $PALANG['pViewlog_action'] = 'Akcia';
 $PALANG['pViewlog_data'] = 'Podrobnosti';
--- a/languages/sl.lang
+++ b/languages/sl.lang
@ -185,7 +185,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Seznam zadnjih 10 operacij za ';
+$PALANG['pViewlog_welcome'] = 'Seznam zadnjih %s operacij za ';
 $PALANG['pViewlog_timestamp'] = 'Čas';
 $PALANG['pViewlog_action'] = 'Operacija';
 $PALANG['pViewlog_data'] = 'Podatki';
--- a/languages/sv.lang
+++ b/languages/sv.lang
@ -190,7 +190,7 @@ $PALANG['reply_every_mail'] = 'Svara på varje meddelande';
 $PALANG['reply_once_per_day'] = 'Svara en gång om dagen';
 $PALANG['reply_once_per_week'] = 'Svara en gång i veckan';

-$PALANG['pViewlog_welcome'] = 'Visa de senaste 10 åtgärderna för ';
+$PALANG['pViewlog_welcome'] = 'Visa de senaste %s åtgärderna för ';
 $PALANG['pViewlog_timestamp'] = 'Tidpunkt';
 $PALANG['pViewlog_action'] = 'Åtgärd';
 $PALANG['pViewlog_data'] = 'Data';
--- a/languages/tr.lang
+++ b/languages/tr.lang
@ -185,7 +185,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = 'Reply once per week'; # XXX

-$PALANG['pViewlog_welcome'] = 'Son 10 hareket:';
+$PALANG['pViewlog_welcome'] = 'Son %s hareket:';
 $PALANG['pViewlog_timestamp'] = 'Timestamp';
 $PALANG['pViewlog_action'] = 'Aksiyon';
 $PALANG['pViewlog_data'] = 'Veri';
--- a/languages/tw.lang
+++ b/languages/tw.lang
@ -187,7 +187,7 @@ $PALANG['reply_every_mail'] = 'Reply on every mail'; # XXX
 $PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
 $PALANG['reply_once_per_week'] = '每星期回覆一次';

-$PALANG['pViewlog_welcome'] = '查看最新的10項操作日誌 網域: ';
+$PALANG['pViewlog_welcome'] = '查看最新的%s項操作日誌 網域: ';
 $PALANG['pViewlog_timestamp'] = '時間';
 $PALANG['pViewlog_action'] = '操作';
 $PALANG['pViewlog_data'] = '內容';
--- a/templates/viewlog.tpl
+++ b/templates/viewlog.tpl
@ -7,7 +7,7 @@
 {if $tLog}
 <table id="log_table">
 	<tr>
-		<th colspan="5">{$PALANG.pViewlog_welcome} {$fDomain}</th>
+	    <th colspan="5">{$PALANG.pViewlog_welcome|replace:"%s":$CONF.page_size} {$fDomain} </th>
 	</tr>
 	{#tr_header#}
 		<td>{$PALANG.pViewlog_timestamp}</td>
--- a/viewlog.php
+++ b/viewlog.php
@ -57,9 +57,9 @@ $tLog = array();
 if ($error != 1)
 {
   $table_log = table_by_key('log');
-   $query = "SELECT timestamp,username,domain,action,data FROM $table_log WHERE domain='$fDomain' ORDER BY timestamp DESC LIMIT 10";
+   $query = "SELECT timestamp,username,domain,action,data FROM $table_log WHERE domain='$fDomain' ORDER BY timestamp DESC LIMIT " . intval($CONF[page_size]);
   if (db_pgsql()) {
-      $query = "SELECT extract(epoch from timestamp) as timestamp,username,domain,action,data FROM $table_log WHERE domain='$fDomain' ORDER BY timestamp DESC LIMIT 10";
+      $query = "SELECT extract(epoch from timestamp) as timestamp,username,domain,action,data FROM $table_log WHERE domain='$fDomain' ORDER BY timestamp DESC LIMIT " . intval($CONF[page_size]);
   }
   $result=db_query($query);
   if ($result['rows'] > 0)