From 137c9ac9d16bad53f92375ea4133bad30ffaf9c5 Mon Sep 17 00:00:00 2001
From: rmcaninch <rmcaninch@users.noreply.github.com>
Date: Sat, 5 Nov 2016 01:17:45 -0400
Subject: [PATCH 01/23] css id update-check added to footer.tpl

Simplify hiding the software update check from display. Not really for security. More for aesthetics; and keeping the more basic users from questioning it. Add #update-check {display: none;} to your custom css. See related feature patch: https://sourceforge.net/p/postfixadmin/patches/134/
---
 templates/footer.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/footer.tpl b/templates/footer.tpl
index cde37dc7..56a84ca1 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,8 +1,8 @@
 <!-- {$smarty.template} -->
 <div id="footer">
 	<a target="_blank" href="http://postfixadmin.sf.net/">Postfix Admin {$version}</a>
-	&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
-	<a target="_blank" href="http://postfixadmin.sf.net/update-check.php?version={$version|escape:"url"}">{$PALANG.check_update}</a>
+	<span id="update-check">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
+	<a target="_blank" href="http://postfixadmin.sf.net/update-check.php?version={$version|escape:"url"}">{$PALANG.check_update}</a></span>
     {if isset($smarty.session.sessid)}
         {if $smarty.session.sessid.username}
             &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;	

From 8c2d447421a21e56d6df90c0bbe87120c7dd2d9f Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Tue, 14 Feb 2017 09:21:35 +0000
Subject: [PATCH 02/23] remove silencing of @include_once - fixes #20

---
 index.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 13f6f370..e5f5e796 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@
  * This source file is subject to the GPL license that is bundled with  
  * this package in the file LICENSE.TXT. 
  * 
- * Further details on the project are available at http://postfixadmin.sf.net 
+ * Further details on the project are available at http://postfixadmin.sf.net or https://github.com/postfixadmin/postfixadmin
  * 
  * @version $Id$ 
  * @license GNU GPL v2 or later. 
@@ -20,8 +20,12 @@
  * Form POST \ GET Variables: -none-
  */
 
-$CONF['configured'] = FALSE;
-@include_once('config.inc.php'); # hide error message because only $CONF['configured'] is checked here
+$CONF = array('configured' => FALSE);
+
+if(file_exists(dirname(__FILE__) . '/config.inc.php')) {
+    require_once('config.inc.php');
+}
+
 if ( $CONF['configured'] === TRUE )
 {
     header ("Location: login.php");

From 71e412f6c239f5c3469e834959efe35d9b837fa8 Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Tue, 14 Feb 2017 09:23:17 +0000
Subject: [PATCH 03/23] make error messages red; fix slightly invalid html;
 remove templates_c check (unnecessary); note we want php5+; add label tags to
 input elements

---
 setup.php | 105 +++++++++++++++++++++++++-----------------------------
 1 file changed, 48 insertions(+), 57 deletions(-)

diff --git a/setup.php b/setup.php
index e48a4662..e729f5fc 100644
--- a/setup.php
+++ b/setup.php
@@ -1,16 +1,16 @@
 <?php
-/** 
- * Postfix Admin 
- * 
- * LICENSE 
- * This source file is subject to the GPL license that is bundled with  
- * this package in the file LICENSE.TXT. 
- * 
- * Further details on the project are available at http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
+/**
+ * Postfix Admin
+ *
+ * LICENSE
+ * This source file is subject to the GPL license that is bundled with
+ * this package in the file LICENSE.TXT.
+ *
+ * Further details on the project are available at http://postfixadmin.sf.net
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
  * File: setup.php
  * Used to help ensure a server is setup appropriately during installation/setup.
  * After setup, it should be renamed or removed.
@@ -60,10 +60,12 @@ $error = 0;
 //
 // Check for PHP version
 //
+$phpversion = 'unknown-version';
+
 if ($f_phpversion == 1)
 {
     if (phpversion() < 5) {
-        print "<li><b>Error: Depends on: PHP v5</b><br /></li>\n";
+        print "<li><b>Error: Depends on: PHP v5+</b><br /></li>\n";
         $error += 1;
     } elseif (version_compare(phpversion(), '5.2.3') < 0) {
         # smarty uses htmlentities() with 4 parameters, the 4th parameter was introduced in PHP 5.2.3
@@ -110,7 +112,7 @@ if ($f_get_magic_quotes_gpc == 1)
     }
     else
     {
-        print "<li><b>Warning: Magic Quotes: ON (internal workaround used)</b></li>\n";   
+        print "<li><b>Warning: Magic Quotes: ON (internal workaround used)</b></li>\n";
     }
 }
 else
@@ -146,26 +148,6 @@ else
     $error =+ 1;
 }
 
-//
-// Check if templates directory is writable
-//
-
-if (!is_writeable($incpath.'/templates_c'))
-{
-    if(!is_dir($incpath . '/templates_c')) {
-        print "<li><b>Error: Smarty template compile directory templates_c not found.</b><br />\n";
-        echo "<b>Please <code>mkdir -p $incpath/templates_c</code> and make it writeable by the web server</b>\n";
-        $error =+ 1;
-    }
-    else {
-        print "<li><b>Error: Smarty template compile directory templates_c is not writable.</b><br />\n";
-        print "<b>Please make it writable.</b><br />\n";
-        print "<b>If you are using SELinux or AppArmor, you might need to adjust their setup to allow write access.</b><br />\n";
-        $error =+ 1;
-    }
-} else {
-	print "<li>Smarty template compile directory is writable - OK<br />\n";
-}
 
 //
 // Check if there is support for at least 1 database
@@ -174,10 +156,10 @@ if (($f_mysql_connect == 0) and ($f_mysqli_connect == 0) and ($f_pg_connect == 0
 {
     print "<li><b>Error: There is no database support in your PHP setup</b><br />\n";
     print "To install MySQL 3.23 or 4.0 support on FreeBSD:<br />\n";
-    print "<pre>% cd /usr/ports/databases/php$phpversion-mysql/\n";
+    print "<pre>% cd /usr/ports/databases/php{$phpversion}-mysql/\n";
     print "% make clean install\n";
     print " - or with portupgrade -\n";
-    print "% portinstall php$phpversion-mysql</pre>\n";
+    print "% portinstall php{$phpversion}-mysql</pre>\n";
     if ($phpversion >= 5)
     {
         print "To install MySQL 4.1 support on FreeBSD:<br />\n";
@@ -187,10 +169,10 @@ if (($f_mysql_connect == 0) and ($f_mysqli_connect == 0) and ($f_pg_connect == 0
         print "% portinstall php5-mysqli</pre>\n";
     }
     print "To install PostgreSQL support on FreeBSD:<br />\n";
-    print "<pre>% cd /usr/ports/databases/php$phpversion-pgsql/\n";
+    print "<pre>% cd /usr/ports/databases/php{$phpversion}-pgsql/\n";
     print "% make clean install\n";
     print " - or with portupgrade -\n";
-    print "% portinstall php$phpversion-pgsql</pre></li>\n";
+    print "% portinstall php{$phpversion}-pgsql</pre></li>\n";
     $error =+ 1;
 }
 //
@@ -249,7 +231,7 @@ if ($config_loaded) {
         print "Please edit the \$CONF['database_*'] parameters in config.inc.php.\n";
         print "$error_text</li>\n";
         $error ++;
-    } 
+    }
 }
 
 //
@@ -386,7 +368,7 @@ else
             }
 
         }
-    } 
+    }
 
     if ( ($setuppw == "" || $setuppw == "changeme" || safeget("lostpw") == 1 || $lostpw_error != 0) /* && $_SERVER['REQUEST_METHOD'] != "POST" */ ) {
 # show "create setup password" form
@@ -397,15 +379,16 @@ else
 <form name="setuppw" method="post" action="setup.php">
 <input type="hidden" name="form" value="setuppw" />
 <table>
+   <tr>
       <td colspan="3"><h3>Change setup password</h3></td>
    </tr>
    <tr>
-      <td>Setup password</td>
+      <td><label for="setup_password">Setup password</label></td>
       <td><input class="flat" type="password" name="setup_password" value="" /></td>
       <td></td>
    </tr>
    <tr>
-      <td>Setup password (again)</td>
+      <td><label for="setup_password2">Setup password (again)</label></td>
       <td><input class="flat" type="password" name="setup_password2" value="" /></td>
       <td></td>
    </tr>
@@ -429,24 +412,24 @@ else
       <td colspan="3"><h3>Create superadmin account</h3></td>
    </tr>
    <tr>
-      <td>Setup password</td>
-      <td><input class="flat" type="password" name="setup_password" value="" /></td>
+       <td><label for="setup_password">Setup password</label></td>
+      <td><input id=setup_password class="flat" type="password" name="setup_password" value="" /></td>
       <td><a href="setup.php?lostpw=1">Lost password?</a></td>
    </tr>
    <tr>
-      <td><?php print $PALANG['admin'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="username" value="<?php print $tUsername; ?>" /></td>
-      <td><?php if (isset($errormsg['username'])) print $errormsg['username']; ?><?php print $PALANG['email_address'] ?></td>
+      <td><label for="username"><?php print $PALANG['admin'] . ":"; ?></label></td>
+      <td><input id="username" class="flat" type="text" name="username" value="<?php print $tUsername; ?>" /></td>
+      <td><?= _error_field($errormsg, 'username'); ?> <?php print $PALANG['email_address'] ?></td>
    </tr>
    <tr>
-      <td><?php print $PALANG['password'] . ":"; ?></td>
-      <td><input class="flat" type="password" name="password" /></td>
-      <td><?php if (isset($errormsg['password'])) print $errormsg['password']; ?></td>
+       <td><label for="password"><?php print $PALANG['password'] . ":"; ?></label></td>
+      <td><input id="password" class="flat" type="password" name="password" /></td>
+      <td><?= _error_field($errormsg, 'password'); ?></td>
    </tr>
    <tr>
-      <td><?php print $PALANG['password_again'] . ":"; ?></td>
-      <td><input class="flat" type="password" name="password2" /></td>
-      <td><?php if (isset($errormsg['password2'])) print $errormsg['password2']; ?></td>
+       <td><label for="password2"><?php print $PALANG['password_again'] . ":"; ?></label></td>
+      <td><input id="password2" class="flat" type="password" name="password2" /></td>
+      <td><?= _error_field($errormsg, 'password2'); ?></td>
    </tr>
    <tr>
       <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_admin_button']; ?>" /></td>
@@ -457,9 +440,10 @@ else
 
 <?php
     }
-
-    print "<b>Since version 2.3 there is no requirement to delete setup.php!</b><br />\n";
-    print "<b>Check the config.inc.php file for any other settings that you might need to change!<br />\n";
+?>
+    <b>Since version 2.3 there is no requirement to delete setup.php!</b><br />
+    <b>Check the config.inc.php file for any other settings that you might need to change!<br />
+<?php
 }
 ?>
 </div>
@@ -467,6 +451,13 @@ else
 </html>
 <?php
 
+function _error_field($errors, $key) {
+    if(!isset($errors[$key])) {
+        return '';
+    }
+    return "<span style='color: red'>{$errors[$key]}</span>";
+}
+
 function generate_setup_password_salt() {
     $salt = time() . '*' . $_SERVER['REMOTE_ADDR'] . '*' . mt_rand(0,60000);
     $salt = md5($salt);
@@ -526,7 +517,7 @@ function create_admin($values) {
 
     if (!$handler->init($values['username'])) {
         return array(1, "", $handler->errormsg);
-    } 
+    }
 
     if (!$handler->set($values)) {
         return array(1, "", $handler->errormsg);

From 1a7b2df81f41b4b47a6faa6c4d0e387b4900eade Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Fri, 24 Feb 2017 10:58:05 +0000
Subject: [PATCH 04/23] fix undefined variable

---
 setup.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.php b/setup.php
index e729f5fc..7aaba195 100644
--- a/setup.php
+++ b/setup.php
@@ -57,6 +57,8 @@ $file_config = file_exists (realpath ("./config.inc.php"));
 
 $error = 0;
 
+$errormsg = [];
+
 //
 // Check for PHP version
 //

From c253ef7dbdc2a92ff1c4193c587acfe1539d617e Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Fri, 24 Feb 2017 10:59:45 +0000
Subject: [PATCH 05/23] allow escape_string() to take a db connection as a
 parameter; should improve performance when there are a large number of things
 to escape

---
 functions.inc.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/functions.inc.php b/functions.inc.php
index 6ba7499c..3f3a9772 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -277,18 +277,24 @@ function check_email ($email) {
  * Clean a string, escaping any meta characters that could be
  * used to disrupt an SQL string. i.e. "'" => "\'" etc.
  *
- * @param String (or Array) 
+ * @param mixed string|array
+ * @param resource $db_conn optional (default null)
  * @return String (or Array) of cleaned data, suitable for use within an SQL
  *    statement.
  */
-function escape_string ($string) {
+function escape_string ($string, $db_conn = null) {
     global $CONF;
+
+    if($db_conn == null) {
+        $db_conn = db_connect();
+    }
+
     // if the string is actually an array, do a recursive cleaning.
     // Note, the array keys are not cleaned.
     if(is_array($string)) {
         $clean = array();
         foreach(array_keys($string) as $row) {
-            $clean[$row] = escape_string($string[$row]);  
+            $clean[$row] = escape_string($string[$row], $db_conn);
         }
         return $clean;
     }
@@ -296,12 +302,13 @@ function escape_string ($string) {
         $string = stripslashes($string);
     }
     if (!is_numeric($string)) {
-        $link = db_connect();
+
+
         if ($CONF['database_type'] == "mysql") {
-            $escaped_string = mysql_real_escape_string($string, $link);
+            $escaped_string = mysql_real_escape_string($string, $db_conn);
         }
         if ($CONF['database_type'] == "mysqli") {
-            $escaped_string = mysqli_real_escape_string($link, $string);
+            $escaped_string = mysqli_real_escape_string($db_conn, $string);
         }
         if (db_sqlite()) {
             $escaped_string = SQLite3::escapeString($string);
@@ -309,7 +316,7 @@ function escape_string ($string) {
         if (db_pgsql()) {
             // php 5.2+ allows for $link to be specified.
             if (version_compare(phpversion(), "5.2.0", ">=")) {
-                $escaped_string = pg_escape_string($link, $string);
+                $escaped_string = pg_escape_string($db_conn, $string);
             } else {
                 $escaped_string = pg_escape_string($string);
             }
@@ -1238,8 +1245,10 @@ $DEBUG_TEXT = "\n
  *    - call die() in case of connection problems
  * b) with $ignore_errors == TRUE
  *    array($link, $error_text);
+ *
+ * @return resource connection to db (normally)
  */
-function db_connect ($ignore_errors = 0) {
+function db_connect ($ignore_errors = false) {
     global $CONF;
     global $DEBUG_TEXT;
     if ($ignore_errors != 0) $DEBUG_TEXT = '';
@@ -1737,7 +1746,7 @@ function db_where_clause($condition, $struct, $additional_raw_where = '', $searc
             $querypart = $field . $operator . "'" . escape_string($value) . "'";
         }
 
-        if($struct[$field]['select'] != '') {
+        if(!empty($struct[$field]['select'])) {
             $having_parts[$field] = $querypart;
         } else {
             $where_parts[$field] = $querypart;

From 7e496094e0c61483a8b5579285e99d8942058b02 Mon Sep 17 00:00:00 2001
From: David Goodwin <david@palepurple.co.uk>
Date: Fri, 24 Feb 2017 11:00:04 +0000
Subject: [PATCH 06/23] fall back to sys_get_temp_dir() if we cannot write to a
 templates_c like place

---
 smarty.inc.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/smarty.inc.php b/smarty.inc.php
index a2c1632c..f6ff7ad0 100644
--- a/smarty.inc.php
+++ b/smarty.inc.php
@@ -20,6 +20,11 @@ class PFASmarty {
         if(is_dir($templates_c) && is_writeable($templates_c)) {
             $this->template->setCompileDir($templates_c);
         }
+        else {
+            $this->template->compile_check = false;
+            $this->template->caching = false;
+            $this->template->setCompileDir(sys_get_temp_dir());
+        }
 
         $this->template->setConfigDir(dirname(__FILE__) . '/configs');
     }

From ba94c3a75ea025762ad732b1a4c735251add8b0f Mon Sep 17 00:00:00 2001
From: Christian Boltz <opensuse@cboltz.de>
Date: Sat, 25 Feb 2017 22:14:21 +0100
Subject: [PATCH 07/23] fix problems with utf8mb4 as default charset

When trying to create a new database with utf8mb4 as default charset,
upgrade.php fails at various places because of too long indexes.

- no longer run upgrade_1_mysql, upgrade_2_mysql and upgrade_3_mysql
  which all affect updates from pre-2.1 database layout
- add {LATIN1} to vacation_notificatoin.notified,
  alias_domain.alias_domain and alias_domain.target_domain

Thanks to martinx who reported this on IRC and helped to debug it.
---
 upgrade.php | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/upgrade.php b/upgrade.php
index dd9a84a1..5fa544f7 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -339,6 +339,14 @@ function _add_index($table, $indexname, $fieldlist) {
 }
 
 function upgrade_1_mysql() {
+    #
+    # creating the tables in this very old layout (pre 2.1) causes trouble if the MySQL charset is not latin1 (multibyte vs. index length)
+    # therefore:
+
+        return; # <-- skip running this function at all.
+
+    # (remove the above "return" if you really want to start with a pre-2.1 database layout)
+
     // CREATE MYSQL DATABASE TABLES.
     $admin = table_by_key('admin');
     $alias = table_by_key('alias');
@@ -438,6 +446,14 @@ function upgrade_1_mysql() {
 }
 
 function upgrade_2_mysql() {
+    #
+    # updating the tables in this very old layout (pre 2.1) causes trouble if the MySQL charset is not latin1 (multibyte vs. index length)
+    # therefore:
+
+        return; # <-- skip running this function at all.
+
+    # (remove the above "return" if you really want to update a pre-2.1 database)
+
     # upgrade pre-2.1 database
     # from TABLE_BACKUP_MX.TXT
     $table_domain = table_by_key ('domain');
@@ -576,6 +592,14 @@ function upgrade_2_pgsql() {
 }
 
 function upgrade_3_mysql() {
+    #
+    # updating the tables in this very old layout (pre 2.1) causes trouble if the MySQL charset is not latin1 (multibyte vs. index length)
+    # therefore:
+
+        return; # <-- skip running this function at all.
+
+    # (remove the above "return" if you really want to update a pre-2.1 database)
+
     # upgrade pre-2.1 database
     # from TABLE_CHANGES.TXT
     $table_admin = table_by_key ('admin');
@@ -907,7 +931,7 @@ function upgrade_318_mysql() {
     db_query_parsed( "
         CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
             on_vacation varchar(255) {LATIN1} NOT NULL,
-            notified varchar(255) NOT NULL,
+            notified varchar(255) {LATIN1} NOT NULL,
             notified_at timestamp NOT NULL default CURRENT_TIMESTAMP,
             PRIMARY KEY on_vacation (`on_vacation`, `notified`),
         CONSTRAINT `vacation_notification_pkey` 
@@ -919,7 +943,7 @@ function upgrade_318_mysql() {
 
     # in case someone has manually created the table with utf8 fields before:
     $all_sql = explode("\n", trim("
-        ALTER TABLE `$table_vacation_notification` CHANGE `notified`    `notified`    VARCHAR( 255 ) NOT NULL
+        ALTER TABLE `$table_vacation_notification` CHANGE `notified`    `notified`    VARCHAR( 255 ) {LATIN1} NOT NULL
         ALTER TABLE `$table_vacation_notification` DEFAULT CHARACTER SET utf8
     "));
     # Possible errors that can be ignored:
@@ -1009,8 +1033,8 @@ function upgrade_438_mysql() {
     $table_alias_domain = table_by_key('alias_domain');
     db_query_parsed("
         CREATE TABLE IF NOT EXISTS $table_alias_domain (
-            `alias_domain` varchar(255) NOT NULL default '',
-            `target_domain` varchar(255) NOT NULL default '',
+            `alias_domain` varchar(255) {LATIN1} NOT NULL default '',
+            `target_domain` varchar(255) {LATIN1} NOT NULL default '',
             `created` {DATETIME},
             `modified` {DATETIME},
             `active` tinyint(1) NOT NULL default '1',

From 29364b473489171ccb6af77315c046414abe7173 Mon Sep 17 00:00:00 2001
From: Christian Boltz <opensuse@cboltz.de>
Date: Sat, 25 Feb 2017 23:22:47 +0100
Subject: [PATCH 08/23] ensure some fields are really latin1

The previous commit changed vacation_notificatoin.notified,
alias_domain.alias_domain and alias_domain.target_domain to latin1, but
did this only in their original upgrade function.

upgrade_1836_mysql() also applies this change to existing databases.
(It's unlikely that these fields are not latin1 - creating them as utf8
or utf8mb4 would break at the index length, but better safe than sorry ;-)
---
 upgrade.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/upgrade.php b/upgrade.php
index 5fa544f7..8695bd25 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -1657,6 +1657,21 @@ function upgrade_1835_mysql() {
     db_query_parsed("ALTER TABLE `$table` CHANGE `timestamp` `timestamp` {DATETIME}");
 }
 
+function upgrade_1836_mysql() {
+    $table_alias_domain = table_by_key ('alias_domain');
+    $table_vacation_notification = table_by_key('vacation_notification');
+
+    $all_sql = explode("\n", trim("
+        ALTER TABLE `$table_alias_domain`          CHANGE `alias_domain`    `alias_domain`  VARCHAR(255) {LATIN1} NOT NULL default ''
+        ALTER TABLE `$table_alias_domain`          CHANGE `target_domain`   `target_domain` VARCHAR(255) {LATIN1} NOT NULL default ''
+        ALTER TABLE `$table_vacation_notification` CHANGE `notified`        `notified`      VARCHAR(255) {LATIN1} NOT NULL default ''
+    "));
+
+    foreach ($all_sql as $sql) {
+        $result = db_query_parsed($sql, TRUE);
+    }
+
+}
 # TODO MySQL:
 # - various varchar fields do not have a default value
 #   https://sourceforge.net/projects/postfixadmin/forums/forum/676076/topic/3419725

From 67a6d0e27a5b4c9cb843684385eb7a46aea2f9c1 Mon Sep 17 00:00:00 2001
From: Christian Boltz <opensuse@cboltz.de>
Date: Sat, 4 Mar 2017 00:34:45 +0100
Subject: [PATCH 09/23] 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
---
 languages/bg.lang     | 2 +-
 languages/ca.lang     | 2 +-
 languages/cn.lang     | 2 +-
 languages/cs.lang     | 2 +-
 languages/da.lang     | 2 +-
 languages/de.lang     | 2 +-
 languages/en.lang     | 2 +-
 languages/es.lang     | 2 +-
 languages/et.lang     | 2 +-
 languages/eu.lang     | 2 +-
 languages/fo.lang     | 2 +-
 languages/fr.lang     | 2 +-
 languages/hr.lang     | 2 +-
 languages/hu.lang     | 2 +-
 languages/is.lang     | 2 +-
 languages/it.lang     | 2 +-
 languages/ja.lang     | 2 +-
 languages/lt.lang     | 2 +-
 languages/mk.lang     | 2 +-
 languages/nb.lang     | 2 +-
 languages/nl.lang     | 2 +-
 languages/nn.lang     | 2 +-
 languages/pl.lang     | 2 +-
 languages/pt-br.lang  | 2 +-
 languages/ro.lang     | 2 +-
 languages/ru.lang     | 2 +-
 languages/sk.lang     | 2 +-
 languages/sl.lang     | 2 +-
 languages/sv.lang     | 2 +-
 languages/tr.lang     | 2 +-
 languages/tw.lang     | 2 +-
 templates/viewlog.tpl | 2 +-
 viewlog.php           | 4 ++--
 33 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/languages/bg.lang b/languages/bg.lang
index 00eb4b1b..9415fadc 100644
--- 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'] = 'Данни';
diff --git a/languages/ca.lang b/languages/ca.lang
index d389a177..31fab18d 100644
--- 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';
diff --git a/languages/cn.lang b/languages/cn.lang
index 922ec76c..a70ced97 100644
--- 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'] = '内容';
diff --git a/languages/cs.lang b/languages/cs.lang
index 43203165..b6931901 100644
--- 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';
diff --git a/languages/da.lang b/languages/da.lang
index 53334fb7..69441238 100644
--- 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';
diff --git a/languages/de.lang b/languages/de.lang
index 7ff37496..781393d6 100644
--- 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';
diff --git a/languages/en.lang b/languages/en.lang
index 190a59c6..da2866fa 100644
--- 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';
diff --git a/languages/es.lang b/languages/es.lang
index ca689da4..a6db5e16 100644
--- 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';
diff --git a/languages/et.lang b/languages/et.lang
index 9642aa0d..917a2e74 100644
--- 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';
diff --git a/languages/eu.lang b/languages/eu.lang
index becf1011..f243c45e 100644
--- 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';
diff --git a/languages/fo.lang b/languages/fo.lang
index c1fb8e1c..7d077512 100644
--- 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';
diff --git a/languages/fr.lang b/languages/fr.lang
index c91fb099..3a269bb0 100644
--- 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';
diff --git a/languages/hr.lang b/languages/hr.lang
index cff835b5..353f8184 100644
--- 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';
diff --git a/languages/hu.lang b/languages/hu.lang
index 32313e71..ca8dc95f 100644
--- 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';
diff --git a/languages/is.lang b/languages/is.lang
index f39f2fdf..0eee69a6 100644
--- 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';
diff --git a/languages/it.lang b/languages/it.lang
index 30be0608..251607cc 100644
--- 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';
diff --git a/languages/ja.lang b/languages/ja.lang
index d91d4e3e..c7d42c25 100644
--- 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'] = 'データ';
diff --git a/languages/lt.lang b/languages/lt.lang
index ae6baf59..5546ff85 100644
--- 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';
diff --git a/languages/mk.lang b/languages/mk.lang
index 3f034eeb..474640f3 100644
--- 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'] = 'Датум';
diff --git a/languages/nb.lang b/languages/nb.lang
index 49f2be03..9a948a9a 100644
--- 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';
diff --git a/languages/nl.lang b/languages/nl.lang
index b80b5fe2..e796bae7 100644
--- 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';
diff --git a/languages/nn.lang b/languages/nn.lang
index 610c2775..c9aab61d 100644
--- 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';
diff --git a/languages/pl.lang b/languages/pl.lang
index c59836a1..60615e54 100644
--- 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';
diff --git a/languages/pt-br.lang b/languages/pt-br.lang
index ecbfbb1d..650c1393 100644
--- 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';
diff --git a/languages/ro.lang b/languages/ro.lang
index 4b28ed4d..9b6b6ac9 100644
--- 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';
diff --git a/languages/ru.lang b/languages/ru.lang
index 168dcb65..17e51e9f 100644
--- 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'] = 'Данные';
diff --git a/languages/sk.lang b/languages/sk.lang
index 44a59b6f..58a0d863 100644
--- 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';
diff --git a/languages/sl.lang b/languages/sl.lang
index c3eda1c9..5f2c457f 100644
--- 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';
diff --git a/languages/sv.lang b/languages/sv.lang
index f2c64570..14037fcc 100644
--- 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';
diff --git a/languages/tr.lang b/languages/tr.lang
index 7df1ad3b..abe4d2da 100644
--- 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';
diff --git a/languages/tw.lang b/languages/tw.lang
index 31f65987..84b59e71 100644
--- 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'] = '內容';
diff --git a/templates/viewlog.tpl b/templates/viewlog.tpl
index d068b179..d5324d6b 100644
--- 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>
diff --git a/viewlog.php b/viewlog.php
index fcdff5d6..b5175336 100644
--- 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)

From 061f9506614cdede1e25c08dcf7837bc1a84415c Mon Sep 17 00:00:00 2001
From: Carlos Ferreira <c.ferreira@acsiiweb.com>
Date: Sat, 11 Mar 2017 05:33:18 +0100
Subject: [PATCH 10/23] Update French language

---
 languages/fr.lang | 300 +++++++++++++++++++++++-----------------------
 1 file changed, 150 insertions(+), 150 deletions(-)

diff --git a/languages/fr.lang b/languages/fr.lang
index 3a269bb0..22a8bac6 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -14,29 +14,29 @@ $PALANG['del'] = 'Effacer';
 $PALANG['exit'] = 'Quitter';
 $PALANG['cancel'] = 'Annuler';
 $PALANG['save'] = 'Enregistrer les modifications';
-$PALANG['confirm'] = 'Etes vous sur de vouloir supprimer cet enregistrement\n';
-$PALANG['confirm_delete_admin'] = 'Do you really want to delete the admin %s?'; # XXX
-$PALANG['confirm_delete_alias'] = 'Do you really want to delete the alias %s?'; # XXX
-$PALANG['confirm_delete_aliasdomain'] = 'Do you really want to delete the alias domain %s?'; # XXX
-$PALANG['confirm_delete_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone'
-$PALANG['confirm_delete_fetchmail'] = 'Do you really want to delete the fetchmail job %s?'; # XXX
-$PALANG['confirm_delete_mailbox'] = 'Do you really want to delete the mailbox %s?'; # XXX
-$PALANG['confirm_delete_vacation'] = 'Do you really want to delete the vacation message for %s?'; # XXX
-$PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX
+$PALANG['confirm'] = 'Êtes-vous sûr de vouloir supprimer cet enregistrement\n';
+$PALANG['confirm_delete_admin'] = 'Êtes-vous sûr de vouloir supprimer l\'administrateur %s?'; # XXX
+$PALANG['confirm_delete_alias'] = 'Êtes-vous sûr de vouloir supprimer l\'alias %s?'; # XXX
+$PALANG['confirm_delete_aliasdomain'] = 'Êtes-vous sûr de vouloir supprimer l\'alias de domaine %s?'; # XXX
+$PALANG['confirm_delete_domain'] = 'Êtes-vous sûr de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone'
+$PALANG['confirm_delete_fetchmail'] = 'Êtes-vous sûr de vouloir supprimer la tâche de récupération de courrier %s?'; # XXX
+$PALANG['confirm_delete_mailbox'] = 'Êtes-vous sûr de vouloir supprimer la boîte %s?'; # XXX
+$PALANG['confirm_delete_vacation'] = 'Êtes-vous sûr de vouloir supprimer le message d\'absence pour %s?'; # XXX
+$PALANG['no_delete_permissions'] = 'Vous n\'êtes pas autorisé à supprimer %s!'; # XXX
 $PALANG['check_update'] = 'Vérifier les mises à jour';
 $PALANG['invalid_parameter'] = 'Paramètres invalides!';
 $PALANG['show'] = 'Afficher:';
 $PALANG['all'] = 'Tous';
 $PALANG['created'] = 'Créé';
 $PALANG['unknown'] = 'inconnu';
-$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX
+$PALANG['download_csv'] = 'Télécharger cette liste au format CSV'; # XXX
 $PALANG['missing_field'] = 'Le champ %s est manquant';
-$PALANG['must_be_numeric'] = '%s doit être numérique';
-$PALANG['must_be_numeric_bigger_than_null'] = '%s must be numeric and bigger than 0'; # XXX
+$PALANG['must_be_numeric'] = '%s doit être au format numérique';
+$PALANG['must_be_numeric_bigger_than_null'] = '%s doit être au format numérique et plus grand que 0'; # XXX
 $PALANG['must_be_boolean'] = '%s doit être booléen';
 $PALANG['invalid_value_given'] = 'Valeur incorrecte pour %s';
-$PALANG['edit_not_allowed'] = 'You are not allowed to edit %s'; # XXX
-$PALANG['searchparams'] = 'Search parameters:'; # XXX
+$PALANG['edit_not_allowed'] = 'Vous n\'êtes pas autorisé à editer %s'; # XXX
+$PALANG['searchparams'] = 'Paramètre de recherche :'; # XXX
 $PALANG['pFooter_logged_as'] = 'Connecté en tant que %s';
 
 $PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
@@ -44,7 +44,7 @@ $PALANG['pLogin_username'] = 'Adresse courriel';
 $PALANG['password'] = 'Mot de passe';
 $PALANG['pLogin_language'] = 'Langue';
 $PALANG['pLogin_button'] = 'Entrer';
-$PALANG['pLogin_failed'] = 'Votre email ou mot de passe est incorrect.';
+$PALANG['pLogin_failed'] = 'Votre courriel ou mot de passe est incorrect.';
 $PALANG['pLogin_login_users'] = 'Utilisateurs, cliquez ici pour rejoindre votre section.';
 $PALANG['pMenu_main'] = 'Menu principal';
 
@@ -73,25 +73,25 @@ $PALANG['pOverview_title'] = ':: Domaines définis';
 $PALANG['pOverview_up_arrow'] = 'Remonter';
 $PALANG['pOverview_right_arrow'] = 'Page suivante';
 $PALANG['pOverview_left_arrow'] = 'Page précédente';
-$PALANG['pOverview_alias_domain_title'] = ':: Alias Domaine';
+$PALANG['pOverview_alias_domain_title'] = ':: Alias de Domaine';
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Comptes courriels';
 $PALANG['go'] = 'Aller';
 $PALANG['pOverview_welcome'] = 'Vue d\'ensemble pour ';
-$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domaines';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias de Domaines';
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['active'] = 'Actif';
 $PALANG['and_x_more'] = '[et %s en plus...]';
 $PALANG['pOverview_mailbox_username'] = 'courriel';
 $PALANG['name'] = 'Nom';
-$PALANG['pOverview_mailbox_quota'] = 'Limite (MB)';
+$PALANG['pOverview_mailbox_quota'] = 'Limite (Mo)';
 $PALANG['pOverview_vacation_edit'] = 'REPONDEUR ACTIVE';
 $PALANG['pOverview_vacation_option'] = 'Configurer le répondeur';
 $PALANG['no_domains_for_this_admin'] = 'Vous n\'avez de permissions pour aucun domaine.';
-$PALANG['no_domains_exist'] = 'Vous devez créer au moins un domaine avant d\'utiliser Liste Virtuels.';
+$PALANG['no_domains_exist'] = 'Vous devez créer au moins un domaine avant d\'utiliser la Liste des Virtuels.';
 
 $PALANG['domain'] = 'Domaine';
-$PALANG['pOverview_get_alias_domains'] = 'Alias Domaine';
+$PALANG['pOverview_get_alias_domains'] = 'Alias de Domaine';
 $PALANG['mailboxes'] = 'Comptes courriels';
 $PALANG['pOverview_get_quota'] = 'Limite compte courriels (MB)';
 
@@ -100,33 +100,33 @@ $PALANG['pDelete_delete_success'] = '%s supprimé.';
 $PALANG['pDelete_domain_error'] = 'Ce domaine n\'est pas le votre ';
 $PALANG['pDelete_alias_error'] = 'Impossible d\'effacer cet alias ';
 $PALANG['pCreate_alias_domain_welcome'] = 'Les adresses mirroirs de l\'un de vos domaines vers un autre.';
-$PALANG['pCreate_alias_domain_alias'] = 'Alias Domaine';
+$PALANG['pCreate_alias_domain_alias'] = 'Alias de Domaine';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Le domaine dans lequel les courriels viennent.';
 $PALANG['pCreate_alias_domain_target'] = 'Domaine Cible';
 $PALANG['pCreate_alias_domain_target_text'] = 'Le domaine o??s mails doivent aller.';
-$PALANG['pCreate_alias_domain_error1'] = 'Vous n\'etes pas autorisé a créer la configuration choisie.';
-$PALANG['pCreate_alias_domain_error2'] = 'La configuration choisie est invalide, merci d\'en choisir une autre!';
-$PALANG['alias_domain_already_exists'] = 'Ce domaine est déjà un alias de domaine!';
-$PALANG['alias_domain_does_not_exist'] = 'Ce domaine n\'est pas un alias de domaine!';
-$PALANG['alias_domain_create_failed'] = 'Echec de la création de l\'alias de domaine!';
-$PALANG['alias_domain_change_failed'] = 'Echec de la modification de l\'alias de domaine!';
+$PALANG['pCreate_alias_domain_error1'] = 'Vous n\'êtes pas autorisé a créer la configuration choisie.';
+$PALANG['pCreate_alias_domain_error2'] = 'La configuration choisie est invalide, merci d\'en choisir une autre !';
+$PALANG['alias_domain_already_exists'] = 'Ce domaine est déjà un alias de domaine !';
+$PALANG['alias_domain_does_not_exist'] = 'Ce domaine n\'est pas un alias de domaine !';
+$PALANG['alias_domain_create_failed'] = 'Échec de la création de l\'alias de domaine!';
+$PALANG['alias_domain_change_failed'] = 'Échec de la modification de l\'alias de domaine!';
 $PALANG['pCreate_alias_domain_error4'] = 'Tous les domaines sont déjà un alias.';
 $PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine %s a été créé.';
 $PALANG['alias_domain_changed'] = 'L\'alias de domaine %s a été modifié.';
-$PALANG['alias_domain_to_itsself'] = 'Un domaine ne peut pas être son propre alias!';
-$PALANG['delete_domain_aliasdomain_target'] = 'Le domaine est la cible d\un ou plusieurs alias de domains et ne peut-être supprimé! (Supprimez les alias de domaine d\'abord.)';
-$PALANG['pCreate_alias_address_text_error1'] = 'Cet alias n\'est pas valide!';
-$PALANG['alias_does_not_exist'] = 'Cet alias n\'existe pas!';
-$PALANG['email_address_already_exists'] = 'Ce compte courriel existe déjà, choisissez-en un autre!';
+$PALANG['alias_domain_to_itsself'] = 'Un domaine ne peut pas être son propre alias !';
+$PALANG['delete_domain_aliasdomain_target'] = 'Le domaine est la cible d\'un ou plusieurs alias de domaine et ne peut-être supprimé ! (Supprimez les alias de domaine d\'abord.)';
+$PALANG['pCreate_alias_address_text_error1'] = 'Cet alias n\'est pas valide !';
+$PALANG['alias_does_not_exist'] = 'Cet alias n\'existe pas !';
+$PALANG['email_address_already_exists'] = 'Ce compte courriel existe déjà, choisissez-en un autre !';
 $PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !';
 $PALANG['pCreate_alias_goto_text'] = 'Destinataires des courriels.';
-$PALANG['pCreate_alias_goto_text_error'] = 'le champ À contient des erreurs!';
-$PALANG['pCreate_alias_result_error'] = 'Echec de la création de l\'alias %s!';
+$PALANG['pCreate_alias_goto_text_error'] = 'le champ À contient des erreurs !';
+$PALANG['pCreate_alias_result_error'] = 'Échec de la création de l\'alias %s !';
 $PALANG['pCreate_alias_result_success'] = 'L\'alias %s a été ajouté !';
-$PALANG['alias_updated'] = 'L\'alias %s a été mis à jour!'; # XXX
-$PALANG['pCreate_alias_catchall_text'] = 'Pour ajouter un alias global, utilisez "*". Pour un transfert de domaine à domaine, utilisez "*@domain.tld" dans le champs A.'; # XXX check/beautify - was split in two lines before
+$PALANG['alias_updated'] = 'L\'alias %s a été mis à jour !'; # XXX
+$PALANG['pCreate_alias_catchall_text'] = 'Pour ajouter un alias global, utilisez "*". Pour un transfert de domaine à domaine, utilisez "*@domain.tld" dans le champ À.'; # XXX check/beautify - was split in two lines before
 $PALANG['mailbox_alias_cant_be_deleted'] = 'Cet alias appartient à un compte courriel et ne peut être supprimé!';
-$PALANG['protected_alias_cant_be_deleted'] = 'The alias %s is protected and can only be deleted by a superadmin'; # XXX
+$PALANG['protected_alias_cant_be_deleted'] = 'L\'alias %s est protégé et ne peut être supprimé que par un Super Administrateur.'; # XXX
 
 $PALANG['pEdit_alias_welcome'] = 'Modifier les paramètres de transfert.';
 $PALANG['pEdit_alias_help'] = 'Cibles multiples acceptées, une entrée par ligne.';
@@ -135,29 +135,29 @@ $PALANG['to'] = 'À';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Vous devez entrer quelques choses dans le champ À';
 $PALANG['pEdit_alias_goto_text_error2'] = 'L\'adresse courriel que vous avez entré est invalide: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Impossible de modifier cet alias de domaine!';
-$PALANG['pEdit_alias_forward_and_store'] = 'Transferer une copie.';
-$PALANG['pEdit_alias_forward_only'] = 'Transferer les messages sans conserver de copie.';
-$PALANG['pEdit_alias_result_error'] = 'Echec de la modification de l\'alias %s!';
+$PALANG['pEdit_alias_forward_and_store'] = 'Transférer une copie.';
+$PALANG['pEdit_alias_forward_only'] = 'Transférer les messages sans conserver de copie.';
+$PALANG['pEdit_alias_result_error'] = 'Échec de la modification de l\'alias %s !';
 
 $PALANG['pCreate_mailbox_welcome'] = 'Ajouter un nouveau compte courriel à votre domaine.';
-$PALANG['pCreate_mailbox_username_text_error1'] = 'L\'adresse courriel est invalide!';
-$PALANG['pCreate_mailbox_username_text_error3'] = 'Vous avez atteint le nombre maximum de compte courriel !';
-$PALANG['pCreate_mailbox_password_text'] = 'Mot de passe pour compte POP3/IMAP';
+$PALANG['pCreate_mailbox_username_text_error1'] = 'L\'adresse courriel est invalide !';
+$PALANG['pCreate_mailbox_username_text_error3'] = 'Vous avez atteint le nombre maximum de comptes courriel !';
+$PALANG['pCreate_mailbox_password_text'] = 'Mot de passe pour le compte POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
 $PALANG['pCreate_mailbox_mail'] = 'Envoyer le message de bienvenue';
-$PALANG['pCreate_mailbox_result_error'] = 'Echec de la création du compte courriel %s!';
-$PALANG['pCreate_mailbox_result_success'] = 'Le compte courriel %s a été ajouté à la table des comptes!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Le compte courriel %s a été ajouté à la table, mais un ou plusieurs dossiers prédéfinis n\'ont pu être créés!';
+$PALANG['pCreate_mailbox_result_error'] = 'Échec de la création du compte courriel %s !';
+$PALANG['pCreate_mailbox_result_success'] = 'Le compte courriel %s a été ajouté à la table des comptes !';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Le compte courriel %s a été ajouté à la table, mais un ou plusieurs dossiers prédéfinis n\'ont pu être créés !';
 $PALANG['mailbox_updated'] = "Le compte courriel %s a été mis à jour.";
-$PALANG['mailbox_update_failed'] = "Echec de la mise à jour du compte courriel %s!";
+$PALANG['mailbox_update_failed'] = "Échec de la mise à jour du compte courriel %s !";
 
 $PALANG['pEdit_mailbox_welcome'] = 'Modifier un compte courriel.';
 $PALANG['pEdit_mailbox_username'] = 'Nom d\'utilisateur';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Le mot de passe entré ne correspond pas!';
 $PALANG['pEdit_mailbox_quota'] = 'Limite';
-$PALANG['pEdit_mailbox_quota_text'] = 'MB';
+$PALANG['pEdit_mailbox_quota_text'] = 'Mo';
 $PALANG['mb_max'] = 'Mo (max: %s)';
-$PALANG['pEdit_mailbox_quota_text_error'] = 'La limite fournie est trop haute!';
+$PALANG['pEdit_mailbox_quota_text_error'] = 'La limite fournie est trop élevée !';
 $PALANG['pEdit_mailbox_domain_error'] = 'Ce domaine n\'est pas le votre: ';
 $PALANG['pEdit_mailbox_result_error'] = 'Impossible de modifier le compte courriel !';
 
@@ -167,32 +167,32 @@ $PALANG['pPassword_password_current'] = 'Mot de passe actuel';
 $PALANG['pPassword_password_current_text_error'] = 'Vous n\'avez pas fournit le mot de passe actuel !';
 $PALANG['pPassword_password'] = 'Nouveau mot de passe';
 $PALANG['pPassword_password2'] = 'Nouveau mot de passe (confirmation)';
-$PALANG['pPassword_password_text_error'] = 'Le mot de passe fourni ne correspond pas ou est vide!';
+$PALANG['pPassword_password_text_error'] = 'Le mot de passe fourni ne correspond pas ou est vide !';
 $PALANG['change_password'] = 'Changer le mot de passe';
-$PALANG['pPassword_result_error'] = 'Impossible de changer le mot de passe de %s!';
+$PALANG['pPassword_result_error'] = 'Impossible de changer le mot de passe de %s !';
 $PALANG['pPassword_result_success'] = 'Le mot de passe de %s a été change!';
 $PALANG['pEdit_vacation_set'] = 'Activer le répondeur';
 $PALANG['pEdit_vacation_remove'] = 'Désactiver le répondeur';
 $PALANG['pVacation_result_error'] = 'Impossible de mettre à jour les réglages du répondeur de %s!';
-$PALANG['pVacation_result_removed'] = 'Le répondeur de %s a été désactivé!';
-$PALANG['pVacation_result_added'] = 'Le répondeur de %s a été activé!';
+$PALANG['pVacation_result_removed'] = 'Le répondeur de %s a été désactivé !';
+$PALANG['pVacation_result_added'] = 'Le répondeur de %s a été activé !';
 $PALANG['pVacation_reply_type'] = 'Type de réponse';
 $PALANG['pVacation_reply_delay_time'] = 'Intervalle';
 $PALANG['pVacation_reply_delay_time_text'] = 'Durée en secondes';
-$PALANG['pVacation_until_before_today'] = 'The Date of [Active until] is set  before Today'; # XXX
-$PALANG['pVacation_until_before_from'] = 'The Date of [Active until] is set before [Active from]'; # XXX
+$PALANG['pVacation_until_before_today'] = 'La date de [Actif jusqu\'au] est antèrieure à la date d\'aujourd\'hui'; # XXX
+$PALANG['pVacation_until_before_from'] = 'La date de [Actif jusqu\'au] est antèrieure à [Actif à partir de]'; # XXX
 $PALANG['reply_once'] = 'Répondre une fois';
 $PALANG['reply_every_mail'] = 'Répondre à chaque message';
-$PALANG['reply_once_per_day'] = 'Reply once a day'; # XXX
+$PALANG['reply_once_per_day'] = 'Répondre une fois par jour'; # XXX
 $PALANG['reply_once_per_week'] = 'Répondre une fois par semaine';
 
 $PALANG['pViewlog_welcome'] = 'Visualiser les %s dernières actions pour ';
 $PALANG['pViewlog_timestamp'] = 'Date/Heure';
 $PALANG['pViewlog_action'] = 'Action';
 $PALANG['pViewlog_data'] = 'Information';
-$PALANG['pViewlog_action_create_domain'] = 'créer domaine';
-$PALANG['pViewlog_action_delete_domain'] = 'supprimer domaine';
-$PALANG['pViewlog_action_edit_domain'] = 'modifier domaine';
+$PALANG['pViewlog_action_create_domain'] = 'créer le domaine';
+$PALANG['pViewlog_action_delete_domain'] = 'supprimer le domaine';
+$PALANG['pViewlog_action_edit_domain'] = 'modifier le domaine';
 $PALANG['pViewlog_action_create_mailbox'] = 'créer un compte courriel';
 $PALANG['pViewlog_action_delete_mailbox'] = 'supprimer un compte courriel';
 $PALANG['pViewlog_action_edit_mailbox'] = 'éditer un compte courriel';
@@ -204,32 +204,32 @@ $PALANG['pViewlog_action_delete_alias'] = 'supprimer un alias';
 $PALANG['pViewlog_action_delete_alias_domain'] = 'supprimer un alias de domaine';
 $PALANG['pViewlog_action_edit_alias'] = 'éditer un alias';
 $PALANG['pViewlog_action_edit_alias_state'] = 'activer un alias';
-$PALANG['pViewlog_action_edit_alias_domain_state'] = 'editer alias de domaine actif';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'éditer alias de domaine actif';
 $PALANG['pViewlog_action_edit_password'] = 'changer le mot de passe';
-$PALANG['pViewlog_action_create_admin'] = 'créer un admin';
-$PALANG['pViewlog_action_edit_admin'] = 'modifier un admin';
-$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX
+$PALANG['pViewlog_action_create_admin'] = 'créer un administrateur';
+$PALANG['pViewlog_action_edit_admin'] = 'modifier un administrateur';
+$PALANG['pViewlog_action_delete_admin'] = 'effacer un administrateur'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'modifier le répondeur';
-$PALANG['pViewlog_action_create_fetchmail'] = 'create fetchmail job'; # XXX
-$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX
-$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX
+$PALANG['pViewlog_action_create_fetchmail'] = 'créer une tâche de récupération du courrier'; # XXX
+$PALANG['pViewlog_action_edit_fetchmail'] = 'éditer la tâche de récupération du courrier'; # XXX
+$PALANG['pViewlog_action_delete_fetchmail'] = 'effacer la tâche de récupération du courrier'; # XXX
 
 $PALANG['pViewlog_result_error'] = 'Impossible de trouver le journal des événements!';
 
 $PALANG['pSendmail_welcome'] = 'Envoyer un courriel.';
 $PALANG['from'] = 'De';
 $PALANG['pSendmail_to'] = 'À';
-$PALANG['pSendmail_to_text_error'] = 'À est vide ou ce n\'est pas une adresse courriel valide!';
+$PALANG['pSendmail_to_text_error'] = '"À" est vide ou ce n\'est pas une adresse courriel valide !';
 $PALANG['subject'] = 'Sujet';
 $PALANG['pSendmail_subject_text'] = 'Bienvenue';
 $PALANG['pSendmail_body'] = 'Message';
 $PALANG['pSendmail_button'] = 'Envoyer le message';
-$PALANG['pSendmail_result_error'] = 'Erreur lors de l\'envoit du message! (%s)'; # XXX text change - new: Unable to send email to %s!
-$PALANG['pSendmail_result_success'] = 'Le message a été envoyé! (%s)'; # XXX text change - new: Email sent to %s.
+$PALANG['pSendmail_result_error'] = 'Impossible d\'envoyer le courriel à %s !'; # XXX text change - new: Unable to send email to %s!
+$PALANG['pSendmail_result_success'] = 'Le message a été envoyé à %s.'; # XXX text change - new: Email sent to %s.
 
-$PALANG['pAdminMenu_list_admin'] = 'Liste Administrateurs';
-$PALANG['pAdminMenu_list_domain'] = 'Liste Domaines';
-$PALANG['pAdminMenu_list_virtual'] = 'Liste Virtuels';
+$PALANG['pAdminMenu_list_admin'] = 'Liste des Administrateurs';
+$PALANG['pAdminMenu_list_domain'] = 'Liste des Domaines';
+$PALANG['pAdminMenu_list_virtual'] = 'Liste des Virtuels';
 $PALANG['pAdminMenu_backup'] = 'Sauvegarde';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administrateurs de domaines';
 $PALANG['pAdminMenu_create_admin'] = 'Nouvel administrateur';
@@ -245,54 +245,54 @@ $PALANG['last_modified'] = 'Dernière modification';
 
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Ajouter un nouveau domaine';
-$PALANG['pAdminCreate_domain_domain_text_error'] = 'Le domaine existe déjà!';
-$PALANG['domain_does_not_exist'] = 'Ce domaine n\'existe pas!';
-$PALANG['pAdminCreate_domain_domain_text_error2'] = 'Le domaine est non valide!';
+$PALANG['pAdminCreate_domain_domain_text_error'] = 'Le domaine existe déjà !';
+$PALANG['domain_does_not_exist'] = 'Ce domaine n\'existe pas !';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = 'Le domaine n\'est pas valide!';
 $PALANG['pAdminCreate_domain_defaultaliases'] = 'Ajouter les alias par défaut';
 $PALANG['pAdminCreate_domain_button'] = 'Ajouter un domaine';
-$PALANG['pAdminCreate_domain_result_error'] = 'Impossible d\'ajouter le domaine %s!';
-$PALANG['pAdminCreate_domain_result_success'] = 'Le domaine %s a été ajouté!';
+$PALANG['pAdminCreate_domain_result_error'] = 'Impossible d\'ajouter le domaine %s !';
+$PALANG['pAdminCreate_domain_result_success'] = 'Le domaine %s a été ajouté !';
 $PALANG['domain_updated'] = 'Le domaine %s a été mis à jour.';
-$PALANG['pAdminDelete_admin_error'] = 'Impossible de supprimer l\'admin!';
+$PALANG['pAdminDelete_admin_error'] = 'Impossible de supprimer l\'administrateur !';
 
-$PALANG['domain_postdel_failed'] = 'Le script postdeletion du domaine a échoué, consultez la log!';
-$PALANG['domain_postcreate_failed'] = 'Le script postcreate du domaine a échoué, consultez la log!';
-$PALANG['mailbox_postdel_failed'] = 'Le script postdeletion du compte courriel a échoué, consultez la log!';
-$PALANG['mailbox_postedit_failed'] = 'Le script postedit du compte courriel a échoué, consultez la log!';
-$PALANG['mailbox_postcreate_failed'] = 'Le script postcreate du compte courriel a échoué, consultez la log!';
-$PALANG['pAdminDelete_alias_domain_error'] = 'Impossible de supprimé cet alias de domaine!';
-$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'Le script "postdeletion" du domaine a échoué, consultez le journal !';
+$PALANG['domain_postcreate_failed'] = 'Le script "postcreate" du domaine a échoué, consultez le journal !';
+$PALANG['mailbox_postdel_failed'] = 'Le script "postdeletion" du compte courriel a échoué, consultez le journal !';
+$PALANG['mailbox_postedit_failed'] = 'Le script "postedit" du compte courriel a échoué, consultez le journal !';
+$PALANG['mailbox_postcreate_failed'] = 'Le script "postcreate" du compte courriel a échoué, consultez le journal !';
+$PALANG['pAdminDelete_alias_domain_error'] = 'Impossible de supprimer cet alias de domaine !';
+$PALANG['domain_conflict_vacation_domain'] = 'Vous ne pouvez pas utiliser le domaine vacant comme domaine !'; # XXX
 
 $PALANG['pAdminEdit_domain_welcome'] = 'Modifier un domaine';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = désactivé | 0 = illimité';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Limite maximum';
-$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = désactivé | 0 = illimité';
+$PALANG['pAdminEdit_domain_maxquota_text'] = 'Mo | -1 = désactivé | 0 = illimité';
 $PALANG['pAdminEdit_domain_quota'] = 'Quota du Domaine';
 $PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definir le transport';
-$PALANG['pAdminEdit_domain_backupmx'] = 'Le serveur est un "backup MX"';
-$PALANG['pAdminEdit_domain_result_error'] = 'Echec de la mise à jour du domaine %s';
+$PALANG['pAdminEdit_domain_backupmx'] = 'Le serveur est un "Backup MX"';
+$PALANG['pAdminEdit_domain_result_error'] = 'Échec de la mise à jour du domaine %s';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Ajouter un nouvel administrateur de domaine';
 $PALANG['email_address'] = 'adresse courriel';
-$PALANG['pAdminCreate_admin_username_text_error1'] = 'Ce n\'est pas une adresse courriel administrateur valide!';
-$PALANG['admin_already_exists'] = 'Cet administrateur existe déjà!';
-$PALANG['admin_does_not_exist'] = 'L\'administrateur n\'existe pas!';
+$PALANG['pAdminCreate_admin_username_text_error1'] = 'Ce n\'est pas une adresse courriel administrateur valide !';
+$PALANG['admin_already_exists'] = 'Cet administrateur existe déjà !';
+$PALANG['admin_does_not_exist'] = 'L\'administrateur n\'existe pas !';
 $PALANG['pAdminCreate_admin_button'] = 'Ajouter un administrateur';
 $PALANG['pAdminCreate_admin_result_error'] = 'L\'ajout de l\administrateur %s a échoué';
-$PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur %s a été ajouté!';
+$PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur %s a été ajouté !';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Modifier un domaine';
 $PALANG['admin'] = 'Administrateur';
 $PALANG['password_again'] = 'Mot de passe (confirmation)';
 $PALANG['super_admin'] = 'Super administrateur';
-$PALANG['super_admin_desc'] = 'Les Super administrateurs ont accès à tous les domaines, ils peuvent gérer les domaines et les comptes d\administrateur.';
-$PALANG['pAdminEdit_admin_result_error'] = 'Impossible de modifier l\'administrateur %s!';
-$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur %s a été ajouté!';
+$PALANG['super_admin_desc'] = 'Les Super administrateurs ont accès à tous les domaines, ils peuvent gérer les domaines et les comptes d\'administrateur.';
+$PALANG['pAdminEdit_admin_result_error'] = 'Impossible de modifier l\'administrateur %s !';
+$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur %s a été ajouté !';
 
 $PALANG['pUsersLogin_welcome'] = 'Entrer votre adresse courriel pour modifier votre mot de passe et vos transferts.';
-$PALANG['pUsersLogin_username_incorrect'] = 'L\'adresse courriel est invalide. Assurez-vous d\'avoir correctement saisie votre adresse courriel!';
-$PALANG['pUsersLogin_password_incorrect'] = 'Votre mot de passe est invalide!';
+$PALANG['pUsersLogin_username_incorrect'] = 'L\'adresse courriel est invalide. Assurez-vous d\'avoir correctement saisi votre adresse courriel!';
+$PALANG['pUsersLogin_password_incorrect'] = 'Votre mot de passe est invalide !';
 
 $PALANG['pUsersMenu_vacation'] = 'Réponse Automatique';
 $PALANG['pUsersMenu_edit_alias'] = 'Modifier votre transfert';
@@ -303,12 +303,12 @@ $PALANG['pUsersMain_edit_alias'] = 'Modifier vos transferts de courriel.';
 $PALANG['pUsersMain_password'] = 'Changer votre mot de passe.';
 
 $PALANG['pUsersVacation_welcome'] = 'Répondeur Automatique.';
-$PALANG['pUsersVacation_welcome_text'] = 'Votre repondeur automatique est déjà configuré! (%s)'; # XXX Text changed to: 'Auto response for %s is active!'
+$PALANG['pUsersVacation_welcome_text'] = 'Le repondeur automatique pour %s est déjà configuré !'; # XXX Text changed to: 'Auto response for %s is active!'
 $PALANG['pUsersVacation_subject_text'] = 'Notification d\'absence';
 $PALANG['message'] = 'Message';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Je suis absent du  au .
-Pour toute urgence, merci de contacter.
+Pour toute urgence, merci de contacter .
 EOM;
 $PALANG['pUsersVacation_activefrom'] = 'Depuis';
 $PALANG['pUsersVacation_activeuntil'] = 'Jusqu\'au';
@@ -323,62 +323,62 @@ $PALANG['pBroadcast_title'] = 'Envoyer un message général';
 $PALANG['pBroadcast_name'] = 'Votre nom';
 $PALANG['pBroadcast_success'] = 'Votre message général a été envoyé.';
 $PALANG['pAdminMenu_broadcast_message'] = 'message général';
-$PALANG['pBroadcast_error_empty'] = 'Les champs Nom, Sujet et Message ne peuvent pas être vides!';
+$PALANG['pBroadcast_error_empty'] = 'Les champs "Nom", "Sujet" et "Message" ne peuvent pas être vides!';
 $PALANG['pStatus_undeliverable'] = 'Non délivrable ';
 $PALANG['pStatus_custom'] = 'Délivré à ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['password_too_short'] = "Mot de passe trop court. - %s caractères minimum";
-$PALANG['password_no_characters'] = "Votre mot de passe doit contenir au moins %s caractères.";
-$PALANG['password_no_digits'] = "Votre mot de passe doit contenir au moins %s chiffres.";
-$PALANG['pInvalidDomainRegex'] = "Nom de domaine invalide %s, vérification regexp impossible";
-$PALANG['pInvalidDomainDNS'] = "Domaine invalide %s, et/ou non resolvable via les DNS";
-$PALANG['pInvalidMailRegex'] = "Adresse email %s invalide, vérification regexp impossible";
+$PALANG['password_too_short'] = 'Mot de passe trop court. - %s caractères minimum';
+$PALANG['password_no_characters'] = 'Votre mot de passe doit contenir au moins %s caractères.';
+$PALANG['password_no_digits'] = 'Votre mot de passe doit contenir au moins %s chiffres.';
+$PALANG['pInvalidDomainRegex'] = 'Nom de domaine invalide %s, vérification "regexp" impossible';
+$PALANG['pInvalidDomainDNS'] = 'Le domaine %s est invalide et/ou non resolvable via les DNS';
+$PALANG['pInvalidMailRegex'] = 'L\'adresse courriel %s est invalide, vérification "regexp" impossible';
 $PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
 $PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
-$PALANG['fetchmail_already_exists']         = 'This fetchmail job already exists!'; # XXX
-$PALANG['fetchmail_does_not_exist']         = 'This fetchmail job does not exist!'; # XXX
-$PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base!';
-$PALANG['pFetchmail_database_save_success'] = 'Entrée enregistrée dans la base.';
-$PALANG['pFetchmail_error_invalid_id'] = 'Aucune entrée trouvée avec l\'ID %s!';
-$PALANG['pFetchmail_invalid_mailbox'] = 'Compte courriel incorrect!';
-$PALANG['pFetchmail_server_missing'] = 'Merci d\'entrer le nom du serveur distant!';
-$PALANG['pFetchmail_user_missing'] = 'Merci d\'entrer le nom de l\'utilisateur distant!';
-$PALANG['pFetchmail_password_missing'] = 'Merci d\'entrer le mot de passe distant!';
-$PALANG['pFetchmail_field_id']              = 'ID';
-$PALANG['pFetchmail_field_mailbox']         = 'Compte courriel';
-$PALANG['pFetchmail_field_src_server']      = 'Serveur';
-$PALANG['pFetchmail_field_src_auth']        = 'Type Auth';
-$PALANG['pFetchmail_field_src_user']        = 'Utilisateur';
-$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
-$PALANG['pFetchmail_field_src_folder']      = 'Dossier';
-$PALANG['pFetchmail_field_poll_time']       = 'Fréquence';
-$PALANG['pFetchmail_field_fetchall']        = 'Tout récupérer';
-$PALANG['pFetchmail_field_keep']            = 'Conserver';
-$PALANG['pFetchmail_field_protocol']        = 'Protocole';
-$PALANG['pFetchmail_field_usessl']          = 'SSL activé';
-$PALANG['pFetchmail_field_sslcertck']       = 'Vérification du certificat SSL';
-$PALANG['pFetchmail_field_sslcertpath']     = 'Chemin des certificats SSL';
-$PALANG['pFetchmail_field_sslfingerprint']  = 'Empreinte SSL (md5)';
-$PALANG['pFetchmail_field_extra_options']   = 'Options supplémentaires';
-$PALANG['pFetchmail_field_mda']             = 'MDA';
-$PALANG['pFetchmail_field_date']            = 'Date';
-$PALANG['pFetchmail_field_returned_text']   = 'Message retour';
-$PALANG['pFetchmail_desc_id']               = 'Identifiant';
-$PALANG['pFetchmail_desc_mailbox']          = 'Compte courriel local';
-$PALANG['pFetchmail_desc_src_server']       = 'Serveur distant';
-$PALANG['pFetchmail_desc_src_auth']         = 'Surtout \'password\''; # Translators: Please do NOT translate 'password' here
-$PALANG['pFetchmail_desc_src_user']         = 'Utilisateur distant';
-$PALANG['pFetchmail_desc_src_password']     = 'Mot de passe distant';
-$PALANG['pFetchmail_desc_src_folder']       = 'Dossier distant';
-$PALANG['pFetchmail_desc_poll_time']        = 'Vérifier toutes les ... minutes';
-$PALANG['pFetchmail_desc_fetchall']         = 'Récupérer tous les messages, nouveaux et déjà lus';
-$PALANG['pFetchmail_desc_keep']             = 'Conserver une copie des messages sur le serveur';
-$PALANG['pFetchmail_desc_protocol']         = 'Protocole à utiliser';
-$PALANG['pFetchmail_desc_usessl']           = 'Encryption SSL';
-$PALANG['pFetchmail_desc_extra_options']    = 'Options supplémentaires de Fetchmail';
-$PALANG['pFetchmail_desc_mda']              = 'Mail Delivery Agent';
-$PALANG['pFetchmail_desc_date']             = 'Date dernière vérification/changement configuration';
-$PALANG['pFetchmail_desc_returned_text']    = 'Message dernière vérification';
+$PALANG['fetchmail_already_exists'] = 'Cette tâche de récupération du courrier existe déjà !'; # XXX
+$PALANG['fetchmail_does_not_exist'] = 'Cette tâche de récupération du courrier n\'existe pas !'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base !';
+$PALANG['pFetchmail_database_save_success'] = 'Entrée correctement enregistrée dans la base.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Aucune entrée trouvée avec l\'ID %s !';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Compte courriel incorrect !';
+$PALANG['pFetchmail_server_missing'] = 'Merci d\'entrer le nom du serveur distant !';
+$PALANG['pFetchmail_user_missing'] = 'Merci d\'entrer le nom de l\'utilisateur distant !';
+$PALANG['pFetchmail_password_missing'] = 'Merci d\'entrer le mot de passe distant !';
+$PALANG['pFetchmail_field_id'] = 'ID';
+$PALANG['pFetchmail_field_mailbox'] = 'Compte courriel';
+$PALANG['pFetchmail_field_src_server'] = 'Serveur';
+$PALANG['pFetchmail_field_src_auth'] = 'Type Auth';
+$PALANG['pFetchmail_field_src_user'] = 'Utilisateur';
+$PALANG['pFetchmail_field_src_password'] = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
+$PALANG['pFetchmail_field_src_folder'] = 'Dossier';
+$PALANG['pFetchmail_field_poll_time'] = 'Fréquence';
+$PALANG['pFetchmail_field_fetchall'] = 'Tout récupérer';
+$PALANG['pFetchmail_field_keep'] = 'Conserver';
+$PALANG['pFetchmail_field_protocol'] = 'Protocole';
+$PALANG['pFetchmail_field_usessl'] = 'SSL activé';
+$PALANG['pFetchmail_field_sslcertck'] = 'Vérification du certificat SSL';
+$PALANG['pFetchmail_field_sslcertpath'] = 'Chemin des certificats SSL';
+$PALANG['pFetchmail_field_sslfingerprint'] = 'Empreinte SSL (md5)';
+$PALANG['pFetchmail_field_extra_options'] = 'Options supplémentaires';
+$PALANG['pFetchmail_field_mda'] = 'MDA';
+$PALANG['pFetchmail_field_date'] = 'Date';
+$PALANG['pFetchmail_field_returned_text'] = 'Message retour';
+$PALANG['pFetchmail_desc_id'] = 'Identifiant';
+$PALANG['pFetchmail_desc_mailbox'] = 'Compte courriel local';
+$PALANG['pFetchmail_desc_src_server'] = 'Serveur distant';
+$PALANG['pFetchmail_desc_src_auth'] = 'Surtout \'password\''; # Translators: Please do NOT translate 'password' here
+$PALANG['pFetchmail_desc_src_user'] = 'Utilisateur distant';
+$PALANG['pFetchmail_desc_src_password'] = 'Mot de passe distant';
+$PALANG['pFetchmail_desc_src_folder'] = 'Dossier distant';
+$PALANG['pFetchmail_desc_poll_time'] = 'Vérifier toutes les ... minutes';
+$PALANG['pFetchmail_desc_fetchall'] = 'Récupérer tous les messages, nouveaux et déjà lus';
+$PALANG['pFetchmail_desc_keep'] = 'Conserver une copie des messages sur le serveur';
+$PALANG['pFetchmail_desc_protocol'] = 'Protocole à utiliser';
+$PALANG['pFetchmail_desc_usessl'] = 'Encryption SSL';
+$PALANG['pFetchmail_desc_extra_options'] = 'Options supplémentaires de Fetchmail';
+$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
+$PALANG['pFetchmail_desc_date'] = 'Date de la dernière vérification/changement de la configuration';
+$PALANG['pFetchmail_desc_returned_text'] = 'Message de la dernière vérification';
 $PALANG['dateformat_pgsql'] = 'dd-mm-YYYY'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format
 $PALANG['dateformat_mysql'] = '%d-%m-%Y';   # translators: rearrange to your local date format, but make sure it's a valid MySQL date format
 

From 1b9fa66493e849f2955e8de0b38bb97295e911c2 Mon Sep 17 00:00:00 2001
From: Carlos Ferreira <c.ferreira@acsiiweb.com>
Date: Sat, 11 Mar 2017 05:43:46 +0100
Subject: [PATCH 11/23] Small fix

---
 languages/fr.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages/fr.lang b/languages/fr.lang
index 22a8bac6..fffd430b 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -101,9 +101,9 @@ $PALANG['pDelete_domain_error'] = 'Ce domaine n\'est pas le votre ';
 $PALANG['pDelete_alias_error'] = 'Impossible d\'effacer cet alias ';
 $PALANG['pCreate_alias_domain_welcome'] = 'Les adresses mirroirs de l\'un de vos domaines vers un autre.';
 $PALANG['pCreate_alias_domain_alias'] = 'Alias de Domaine';
-$PALANG['pCreate_alias_domain_alias_text'] = 'Le domaine dans lequel les courriels viennent.';
+$PALANG['pCreate_alias_domain_alias_text'] = 'Le domaine de récéption du courrier (source).';
 $PALANG['pCreate_alias_domain_target'] = 'Domaine Cible';
-$PALANG['pCreate_alias_domain_target_text'] = 'Le domaine o??s mails doivent aller.';
+$PALANG['pCreate_alias_domain_target_text'] = 'Le domaine qui va réceptionner le courrier à la place.';
 $PALANG['pCreate_alias_domain_error1'] = 'Vous n\'êtes pas autorisé a créer la configuration choisie.';
 $PALANG['pCreate_alias_domain_error2'] = 'La configuration choisie est invalide, merci d\'en choisir une autre !';
 $PALANG['alias_domain_already_exists'] = 'Ce domaine est déjà un alias de domaine !';

From 83836a247710ab11552aa648827dc27abfcb070d Mon Sep 17 00:00:00 2001
From: Carlos Ferreira <c.ferreira@acsiiweb.com>
Date: Wed, 15 Mar 2017 22:46:01 +0100
Subject: [PATCH 12/23] Update fr.lang

---
 languages/fr.lang | 89 ++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/languages/fr.lang b/languages/fr.lang
index fffd430b..251446b5 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -4,7 +4,8 @@
 // Language file French
 // by Kuthz
 // updated by Olivier ETIENNE
-// updated by Francois Grange (rumbaya @sf)
+// updated by François GRANGE (rumbaya @sf)
+// updated by Carlos FERREIRA (@acs_ferreira)
 //
 
 $PALANG['YES'] = 'Oui';
@@ -15,28 +16,28 @@ $PALANG['exit'] = 'Quitter';
 $PALANG['cancel'] = 'Annuler';
 $PALANG['save'] = 'Enregistrer les modifications';
 $PALANG['confirm'] = 'Êtes-vous sûr de vouloir supprimer cet enregistrement\n';
-$PALANG['confirm_delete_admin'] = 'Êtes-vous sûr de vouloir supprimer l\'administrateur %s?'; # XXX
-$PALANG['confirm_delete_alias'] = 'Êtes-vous sûr de vouloir supprimer l\'alias %s?'; # XXX
-$PALANG['confirm_delete_aliasdomain'] = 'Êtes-vous sûr de vouloir supprimer l\'alias de domaine %s?'; # XXX
-$PALANG['confirm_delete_domain'] = 'Êtes-vous sûr de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n (%s)'; # XXX text changed to: 'Do you really want to delete all records for the domain %s? This can not be undone'
-$PALANG['confirm_delete_fetchmail'] = 'Êtes-vous sûr de vouloir supprimer la tâche de récupération de courrier %s?'; # XXX
-$PALANG['confirm_delete_mailbox'] = 'Êtes-vous sûr de vouloir supprimer la boîte %s?'; # XXX
-$PALANG['confirm_delete_vacation'] = 'Êtes-vous sûr de vouloir supprimer le message d\'absence pour %s?'; # XXX
-$PALANG['no_delete_permissions'] = 'Vous n\'êtes pas autorisé à supprimer %s!'; # XXX
+$PALANG['confirm_delete_admin'] = 'Êtes-vous sûr de vouloir supprimer l\'administrateur %s?';
+$PALANG['confirm_delete_alias'] = 'Êtes-vous sûr de vouloir supprimer l\'alias %s?';
+$PALANG['confirm_delete_aliasdomain'] = 'Êtes-vous sûr de vouloir supprimer l\'alias de domaine %s?';
+$PALANG['confirm_delete_domain'] = 'Êtes-vous sûr de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n (%s)';
+$PALANG['confirm_delete_fetchmail'] = 'Êtes-vous sûr de vouloir supprimer la tâche de récupération de courrier %s?';
+$PALANG['confirm_delete_mailbox'] = 'Êtes-vous sûr de vouloir supprimer la boîte %s?';
+$PALANG['confirm_delete_vacation'] = 'Êtes-vous sûr de vouloir supprimer le message d\'absence pour %s?';
+$PALANG['no_delete_permissions'] = 'Vous n\'êtes pas autorisé à supprimer %s !';
 $PALANG['check_update'] = 'Vérifier les mises à jour';
-$PALANG['invalid_parameter'] = 'Paramètres invalides!';
+$PALANG['invalid_parameter'] = 'Paramètres invalides !';
 $PALANG['show'] = 'Afficher:';
 $PALANG['all'] = 'Tous';
 $PALANG['created'] = 'Créé';
 $PALANG['unknown'] = 'inconnu';
-$PALANG['download_csv'] = 'Télécharger cette liste au format CSV'; # XXX
+$PALANG['download_csv'] = 'Télécharger cette liste au format CSV';
 $PALANG['missing_field'] = 'Le champ %s est manquant';
 $PALANG['must_be_numeric'] = '%s doit être au format numérique';
-$PALANG['must_be_numeric_bigger_than_null'] = '%s doit être au format numérique et plus grand que 0'; # XXX
+$PALANG['must_be_numeric_bigger_than_null'] = '%s doit être au format numérique et plus grand que 0';
 $PALANG['must_be_boolean'] = '%s doit être booléen';
 $PALANG['invalid_value_given'] = 'Valeur incorrecte pour %s';
-$PALANG['edit_not_allowed'] = 'Vous n\'êtes pas autorisé à editer %s'; # XXX
-$PALANG['searchparams'] = 'Paramètre de recherche :'; # XXX
+$PALANG['edit_not_allowed'] = 'Vous n\'êtes pas autorisé à editer %s';
+$PALANG['searchparams'] = 'Paramètre de recherche :';
 $PALANG['pFooter_logged_as'] = 'Connecté en tant que %s';
 
 $PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
@@ -58,7 +59,7 @@ $PALANG['pMenu_password'] = 'Mot de passe';
 $PALANG['pMenu_viewlog'] = 'Journal';
 $PALANG['pMenu_logout'] = 'Sortir';
 
-$PALANG['pMain_welcome'] = 'Bienvenue sur Postfix Admin!';
+$PALANG['pMain_welcome'] = 'Bienvenue sur Postfix Admin !';
 $PALANG['pMain_overview'] = 'Visualiser vos alias et comptes courriels. (Modifier/Effacer)';
 $PALANG['pMain_create_alias'] = 'Ajouter un nouvel alias à votre domaine.';
 $PALANG['pMain_create_mailbox'] = 'Ajouter un nouveau compte courriel à votre domaine.';
@@ -108,8 +109,8 @@ $PALANG['pCreate_alias_domain_error1'] = 'Vous n\'êtes pas autorisé a créer l
 $PALANG['pCreate_alias_domain_error2'] = 'La configuration choisie est invalide, merci d\'en choisir une autre !';
 $PALANG['alias_domain_already_exists'] = 'Ce domaine est déjà un alias de domaine !';
 $PALANG['alias_domain_does_not_exist'] = 'Ce domaine n\'est pas un alias de domaine !';
-$PALANG['alias_domain_create_failed'] = 'Échec de la création de l\'alias de domaine!';
-$PALANG['alias_domain_change_failed'] = 'Échec de la modification de l\'alias de domaine!';
+$PALANG['alias_domain_create_failed'] = 'Échec de la création de l\'alias de domaine !';
+$PALANG['alias_domain_change_failed'] = 'Échec de la modification de l\'alias de domaine !';
 $PALANG['pCreate_alias_domain_error4'] = 'Tous les domaines sont déjà un alias.';
 $PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine %s a été créé.';
 $PALANG['alias_domain_changed'] = 'L\'alias de domaine %s a été modifié.';
@@ -123,10 +124,10 @@ $PALANG['pCreate_alias_goto_text'] = 'Destinataires des courriels.';
 $PALANG['pCreate_alias_goto_text_error'] = 'le champ À contient des erreurs !';
 $PALANG['pCreate_alias_result_error'] = 'Échec de la création de l\'alias %s !';
 $PALANG['pCreate_alias_result_success'] = 'L\'alias %s a été ajouté !';
-$PALANG['alias_updated'] = 'L\'alias %s a été mis à jour !'; # XXX
-$PALANG['pCreate_alias_catchall_text'] = 'Pour ajouter un alias global, utilisez "*". Pour un transfert de domaine à domaine, utilisez "*@domain.tld" dans le champ À.'; # XXX check/beautify - was split in two lines before
-$PALANG['mailbox_alias_cant_be_deleted'] = 'Cet alias appartient à un compte courriel et ne peut être supprimé!';
-$PALANG['protected_alias_cant_be_deleted'] = 'L\'alias %s est protégé et ne peut être supprimé que par un Super Administrateur.'; # XXX
+$PALANG['alias_updated'] = 'L\'alias %s a été mis à jour !';
+$PALANG['pCreate_alias_catchall_text'] = 'Pour ajouter un alias global, utilisez "*". Pour un transfert de domaine à domaine, utilisez "*@domain.tld" dans le champ À.';
+$PALANG['mailbox_alias_cant_be_deleted'] = 'Cet alias appartient à un compte courriel et ne peut être supprimé !';
+$PALANG['protected_alias_cant_be_deleted'] = 'L\'alias %s est protégé et ne peut être supprimé que par un Super Administrateur.';
 
 $PALANG['pEdit_alias_welcome'] = 'Modifier les paramètres de transfert.';
 $PALANG['pEdit_alias_help'] = 'Cibles multiples acceptées, une entrée par ligne.';
@@ -134,7 +135,7 @@ $PALANG['alias'] = 'Alias';
 $PALANG['to'] = 'À';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Vous devez entrer quelques choses dans le champ À';
 $PALANG['pEdit_alias_goto_text_error2'] = 'L\'adresse courriel que vous avez entré est invalide: ';
-$PALANG['pEdit_alias_domain_result_error'] = 'Impossible de modifier cet alias de domaine!';
+$PALANG['pEdit_alias_domain_result_error'] = 'Impossible de modifier cet alias de domaine !';
 $PALANG['pEdit_alias_forward_and_store'] = 'Transférer une copie.';
 $PALANG['pEdit_alias_forward_only'] = 'Transférer les messages sans conserver de copie.';
 $PALANG['pEdit_alias_result_error'] = 'Échec de la modification de l\'alias %s !';
@@ -153,7 +154,7 @@ $PALANG['mailbox_update_failed'] = "Échec de la mise à jour du compte courriel
 
 $PALANG['pEdit_mailbox_welcome'] = 'Modifier un compte courriel.';
 $PALANG['pEdit_mailbox_username'] = 'Nom d\'utilisateur';
-$PALANG['pEdit_mailbox_password_text_error'] = 'Le mot de passe entré ne correspond pas!';
+$PALANG['pEdit_mailbox_password_text_error'] = 'Le mot de passe entré ne correspond pas !';
 $PALANG['pEdit_mailbox_quota'] = 'Limite';
 $PALANG['pEdit_mailbox_quota_text'] = 'Mo';
 $PALANG['mb_max'] = 'Mo (max: %s)';
@@ -170,20 +171,20 @@ $PALANG['pPassword_password2'] = 'Nouveau mot de passe (confirmation)';
 $PALANG['pPassword_password_text_error'] = 'Le mot de passe fourni ne correspond pas ou est vide !';
 $PALANG['change_password'] = 'Changer le mot de passe';
 $PALANG['pPassword_result_error'] = 'Impossible de changer le mot de passe de %s !';
-$PALANG['pPassword_result_success'] = 'Le mot de passe de %s a été change!';
+$PALANG['pPassword_result_success'] = 'Le mot de passe de %s a été changé !';
 $PALANG['pEdit_vacation_set'] = 'Activer le répondeur';
 $PALANG['pEdit_vacation_remove'] = 'Désactiver le répondeur';
-$PALANG['pVacation_result_error'] = 'Impossible de mettre à jour les réglages du répondeur de %s!';
+$PALANG['pVacation_result_error'] = 'Impossible de mettre à jour les réglages du répondeur de %s !';
 $PALANG['pVacation_result_removed'] = 'Le répondeur de %s a été désactivé !';
 $PALANG['pVacation_result_added'] = 'Le répondeur de %s a été activé !';
 $PALANG['pVacation_reply_type'] = 'Type de réponse';
 $PALANG['pVacation_reply_delay_time'] = 'Intervalle';
 $PALANG['pVacation_reply_delay_time_text'] = 'Durée en secondes';
-$PALANG['pVacation_until_before_today'] = 'La date de [Actif jusqu\'au] est antèrieure à la date d\'aujourd\'hui'; # XXX
-$PALANG['pVacation_until_before_from'] = 'La date de [Actif jusqu\'au] est antèrieure à [Actif à partir de]'; # XXX
+$PALANG['pVacation_until_before_today'] = 'La date de [Actif jusqu\'au] est antèrieure à la date d\'aujourd\'hui';
+$PALANG['pVacation_until_before_from'] = 'La date de [Actif jusqu\'au] est antèrieure à [Actif à partir de]';
 $PALANG['reply_once'] = 'Répondre une fois';
 $PALANG['reply_every_mail'] = 'Répondre à chaque message';
-$PALANG['reply_once_per_day'] = 'Répondre une fois par jour'; # XXX
+$PALANG['reply_once_per_day'] = 'Répondre une fois par jour';
 $PALANG['reply_once_per_week'] = 'Répondre une fois par semaine';
 
 $PALANG['pViewlog_welcome'] = 'Visualiser les %s dernières actions pour ';
@@ -208,13 +209,13 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'éditer alias de domaine a
 $PALANG['pViewlog_action_edit_password'] = 'changer le mot de passe';
 $PALANG['pViewlog_action_create_admin'] = 'créer un administrateur';
 $PALANG['pViewlog_action_edit_admin'] = 'modifier un administrateur';
-$PALANG['pViewlog_action_delete_admin'] = 'effacer un administrateur'; # XXX
+$PALANG['pViewlog_action_delete_admin'] = 'effacer un administrateur';
 $PALANG['pViewlog_action_edit_vacation'] = 'modifier le répondeur';
-$PALANG['pViewlog_action_create_fetchmail'] = 'créer une tâche de récupération du courrier'; # XXX
-$PALANG['pViewlog_action_edit_fetchmail'] = 'éditer la tâche de récupération du courrier'; # XXX
-$PALANG['pViewlog_action_delete_fetchmail'] = 'effacer la tâche de récupération du courrier'; # XXX
+$PALANG['pViewlog_action_create_fetchmail'] = 'créer une tâche de récupération du courrier';
+$PALANG['pViewlog_action_edit_fetchmail'] = 'éditer la tâche de récupération du courrier';
+$PALANG['pViewlog_action_delete_fetchmail'] = 'effacer la tâche de récupération du courrier';
 
-$PALANG['pViewlog_result_error'] = 'Impossible de trouver le journal des événements!';
+$PALANG['pViewlog_result_error'] = 'Impossible de trouver le journal des événements !';
 
 $PALANG['pSendmail_welcome'] = 'Envoyer un courriel.';
 $PALANG['from'] = 'De';
@@ -224,8 +225,8 @@ $PALANG['subject'] = 'Sujet';
 $PALANG['pSendmail_subject_text'] = 'Bienvenue';
 $PALANG['pSendmail_body'] = 'Message';
 $PALANG['pSendmail_button'] = 'Envoyer le message';
-$PALANG['pSendmail_result_error'] = 'Impossible d\'envoyer le courriel à %s !'; # XXX text change - new: Unable to send email to %s!
-$PALANG['pSendmail_result_success'] = 'Le message a été envoyé à %s.'; # XXX text change - new: Email sent to %s.
+$PALANG['pSendmail_result_error'] = 'Impossible d\'envoyer le courriel à %s !';
+$PALANG['pSendmail_result_success'] = 'Le message a été envoyé à %s.';
 
 $PALANG['pAdminMenu_list_admin'] = 'Liste des Administrateurs';
 $PALANG['pAdminMenu_list_domain'] = 'Liste des Domaines';
@@ -247,7 +248,7 @@ $PALANG['last_modified'] = 'Dernière modification';
 $PALANG['pAdminCreate_domain_welcome'] = 'Ajouter un nouveau domaine';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Le domaine existe déjà !';
 $PALANG['domain_does_not_exist'] = 'Ce domaine n\'existe pas !';
-$PALANG['pAdminCreate_domain_domain_text_error2'] = 'Le domaine n\'est pas valide!';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = 'Le domaine n\'est pas valide !';
 $PALANG['pAdminCreate_domain_defaultaliases'] = 'Ajouter les alias par défaut';
 $PALANG['pAdminCreate_domain_button'] = 'Ajouter un domaine';
 $PALANG['pAdminCreate_domain_result_error'] = 'Impossible d\'ajouter le domaine %s !';
@@ -261,7 +262,7 @@ $PALANG['mailbox_postdel_failed'] = 'Le script "postdeletion" du compte courriel
 $PALANG['mailbox_postedit_failed'] = 'Le script "postedit" du compte courriel a échoué, consultez le journal !';
 $PALANG['mailbox_postcreate_failed'] = 'Le script "postcreate" du compte courriel a échoué, consultez le journal !';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Impossible de supprimer cet alias de domaine !';
-$PALANG['domain_conflict_vacation_domain'] = 'Vous ne pouvez pas utiliser le domaine vacant comme domaine !'; # XXX
+$PALANG['domain_conflict_vacation_domain'] = 'Vous ne pouvez pas utiliser le domaine vacant comme domaine !';
 
 $PALANG['pAdminEdit_domain_welcome'] = 'Modifier un domaine';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = désactivé | 0 = illimité';
@@ -291,7 +292,7 @@ $PALANG['pAdminEdit_admin_result_error'] = 'Impossible de modifier l\'administra
 $PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur %s a été ajouté !';
 
 $PALANG['pUsersLogin_welcome'] = 'Entrer votre adresse courriel pour modifier votre mot de passe et vos transferts.';
-$PALANG['pUsersLogin_username_incorrect'] = 'L\'adresse courriel est invalide. Assurez-vous d\'avoir correctement saisi votre adresse courriel!';
+$PALANG['pUsersLogin_username_incorrect'] = 'L\'adresse courriel est invalide. Assurez-vous d\'avoir correctement saisi votre adresse courriel !';
 $PALANG['pUsersLogin_password_incorrect'] = 'Votre mot de passe est invalide !';
 
 $PALANG['pUsersMenu_vacation'] = 'Réponse Automatique';
@@ -303,7 +304,7 @@ $PALANG['pUsersMain_edit_alias'] = 'Modifier vos transferts de courriel.';
 $PALANG['pUsersMain_password'] = 'Changer votre mot de passe.';
 
 $PALANG['pUsersVacation_welcome'] = 'Répondeur Automatique.';
-$PALANG['pUsersVacation_welcome_text'] = 'Le repondeur automatique pour %s est déjà configuré !'; # XXX Text changed to: 'Auto response for %s is active!'
+$PALANG['pUsersVacation_welcome_text'] = 'Le repondeur automatique pour %s est déjà configuré !';
 $PALANG['pUsersVacation_subject_text'] = 'Notification d\'absence';
 $PALANG['message'] = 'Message';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -323,7 +324,7 @@ $PALANG['pBroadcast_title'] = 'Envoyer un message général';
 $PALANG['pBroadcast_name'] = 'Votre nom';
 $PALANG['pBroadcast_success'] = 'Votre message général a été envoyé.';
 $PALANG['pAdminMenu_broadcast_message'] = 'message général';
-$PALANG['pBroadcast_error_empty'] = 'Les champs "Nom", "Sujet" et "Message" ne peuvent pas être vides!';
+$PALANG['pBroadcast_error_empty'] = 'Les champs "Nom", "Sujet" et "Message" ne peuvent pas être vides !';
 $PALANG['pStatus_undeliverable'] = 'Non délivrable ';
 $PALANG['pStatus_custom'] = 'Délivré à ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
@@ -335,8 +336,8 @@ $PALANG['pInvalidDomainDNS'] = 'Le domaine %s est invalide et/ou non resolvable
 $PALANG['pInvalidMailRegex'] = 'L\'adresse courriel %s est invalide, vérification "regexp" impossible';
 $PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
 $PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
-$PALANG['fetchmail_already_exists'] = 'Cette tâche de récupération du courrier existe déjà !'; # XXX
-$PALANG['fetchmail_does_not_exist'] = 'Cette tâche de récupération du courrier n\'existe pas !'; # XXX
+$PALANG['fetchmail_already_exists'] = 'Cette tâche de récupération du courrier existe déjà !';
+$PALANG['fetchmail_does_not_exist'] = 'Cette tâche de récupération du courrier n\'existe pas !';
 $PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base !';
 $PALANG['pFetchmail_database_save_success'] = 'Entrée correctement enregistrée dans la base.';
 $PALANG['pFetchmail_error_invalid_id'] = 'Aucune entrée trouvée avec l\'ID %s !';
@@ -379,8 +380,8 @@ $PALANG['pFetchmail_desc_extra_options'] = 'Options supplémentaires de Fetchmai
 $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
 $PALANG['pFetchmail_desc_date'] = 'Date de la dernière vérification/changement de la configuration';
 $PALANG['pFetchmail_desc_returned_text'] = 'Message de la dernière vérification';
-$PALANG['dateformat_pgsql'] = 'dd-mm-YYYY'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format
-$PALANG['dateformat_mysql'] = '%d-%m-%Y';   # translators: rearrange to your local date format, but make sure it's a valid MySQL date format
+$PALANG['dateformat_pgsql'] = 'dd-mm-YYYY';
+$PALANG['dateformat_mysql'] = '%d-%m-%Y';
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

From a3e08dd2f8af5aa35a38e5be6d301decf1d9eabf Mon Sep 17 00:00:00 2001
From: Stephen Ostrow <stephen@ostrow.pw>
Date: Fri, 17 Mar 2017 12:39:42 -0400
Subject: [PATCH 13/23] Adding a .gitignore file which follows the svn:ignore
 for now

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..2f9180c3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/templates_c/*.tpl.php
+/templates_c/*menu.conf.config.php
+

From 0b82dec825ce308a05a66e25a90cc94f1ad61d0a Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Fri, 17 Mar 2017 20:24:31 +0100
Subject: [PATCH 14/23] Fix filename for *.menu.conf.php in gitignore

Looks like svn:ignore was wrong or outdated ;-)
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2f9180c3..95330abc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /templates_c/*.tpl.php
-/templates_c/*menu.conf.config.php
+/templates_c/*menu.conf.php
 

From 2dea9fadd439dcff6940072e79f2316fb7d82f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Schr=C3=B6tter?= <cs@fnx.li>
Date: Tue, 21 Mar 2017 17:43:27 +0100
Subject: [PATCH 15/23] Remove whitespace

---
 functions.inc.php | 107 +++++++++++++++++++++++-----------------------
 1 file changed, 53 insertions(+), 54 deletions(-)

diff --git a/functions.inc.php b/functions.inc.php
index 3f3a9772..7d72f60b 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -1,16 +1,16 @@
 <?php
-/** 
- * Postfix Admin 
- * 
- * LICENSE 
- * This source file is subject to the GPL license that is bundled with  
- * this package in the file LICENSE.TXT. 
- * 
- * Further details on the project are available at http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
+/**
+ * Postfix Admin
+ *
+ * LICENSE
+ * This source file is subject to the GPL license that is bundled with
+ * this package in the file LICENSE.TXT.
+ *
+ * Further details on the project are available at http://postfixadmin.sf.net
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
  * File: functions.inc.php
  * Contains re-usable code.
  */
@@ -42,7 +42,7 @@ function authentication_get_username() {
 }
 
 /**
- * Returns the type of user - either 'user' or 'admin' 
+ * Returns the type of user - either 'user' or 'admin'
  * Returns false if neither (E.g. if not logged in)
  * @return String admin or user or (boolean) false.
  */
@@ -73,7 +73,7 @@ function authentication_has_role($role) {
 }
 
 /**
- * Used to enforce that $user has a particular role when 
+ * Used to enforce that $user has a particular role when
  * viewing a page.
  * If they are lacking a role, redirect them to login.php
  *
@@ -92,7 +92,7 @@ function authentication_require_role($role) {
 
 /**
  * Add an error message for display on the next page that is rendered.
- * @param String/Array message(s) to show. 
+ * @param String/Array message(s) to show.
  *
  * Stores string in session. Flushed through header template.
  * @see _flash_string()
@@ -103,7 +103,7 @@ function flash_error($string) {
 
 /**
  * Used to display an info message on successful update.
- * @param String/Array message(s) to show. 
+ * @param String/Array message(s) to show.
  * Stores data in session.
  * @see _flash_string()
  */
@@ -191,7 +191,7 @@ function language_selector() {
 
 
 /**
- * Checks if a domain is valid 
+ * Checks if a domain is valid
  * @param string $domain
  * @return empty string if the domain is valid, otherwise string with the errormessage
  *
@@ -249,7 +249,7 @@ function check_email ($email) {
 
     //strip the vacation domain out if we are using it
     //and change from blah#foo.com@autoreply.foo.com to blah@foo.com
-    if (Config::bool('vacation')) { 
+    if (Config::bool('vacation')) {
         $vacation_domain = Config::read('vacation_domain');
         $ce_email = preg_replace("/@$vacation_domain\$/", '', $ce_email);
         $ce_email = preg_replace("/#/", '@', $ce_email);
@@ -337,7 +337,7 @@ function escape_string ($string, $db_conn = null) {
  *
  *  @param String parameter name.
  *  @param String (optional) - default value if key is not set.
- *  @return String 
+ *  @return String
  */
 function safeget ($param, $default="") {
     $retval=$default;
@@ -362,7 +362,7 @@ function safepost ($param, $default="") {
 /**
  * safeserver
  * @see safeget()
- * @param String $param 
+ * @param String $param
  * @param String $default (optional)
  * @return String value from $_SERVER[$param] or $default
  */
@@ -375,7 +375,7 @@ function safeserver ($param, $default="") {
 /**
  * safecookie
  * @see safeget()
- * @param String $param 
+ * @param String $param
  * @param String $default (optional)
  * @return String value from $_COOKIE[$param] or $default
  */
@@ -388,7 +388,7 @@ function safecookie ($param, $default="") {
 /**
  * safesession
  * @see safeget()
- * @param String $param 
+ * @param String $param
  * @param String $default (optional)
  * @return String value from $_SESSION[$param] or $default
  */
@@ -471,7 +471,7 @@ function get_domain_properties ($domain) {
  *
  *  @param String idxfield - database field name to use as title
  *  @param String query - core part of the query (starting at "FROM")
- *  @return String 
+ *  @return String
  */
 function create_page_browser($idxfield, $querypart) {
     global $CONF;
@@ -509,16 +509,16 @@ function create_page_browser($idxfield, $querypart) {
     $page_size_zerobase = $page_size - 1;
     $query = "
         SELECT * FROM (
-            SELECT $idxfield AS label, @row := @row + 1 AS row $querypart 
+            SELECT $idxfield AS label, @row := @row + 1 AS row $querypart
         ) idx WHERE MOD(idx.row, $page_size) IN (0,$page_size_zerobase) OR idx.row = $count_results
-    "; 
+    ";
 
     if (db_pgsql()) {
         $query = "
             SELECT * FROM (
-                SELECT $idxfield AS label, nextval('rowcount') AS row $querypart 
+                SELECT $idxfield AS label, nextval('rowcount') AS row $querypart
             ) idx WHERE MOD(idx.row, $page_size) IN (0,$page_size_zerobase) OR idx.row = $count_results
-        "; 
+        ";
     }
 
     if (db_sqlite()) {
@@ -533,7 +533,7 @@ function create_page_browser($idxfield, $querypart) {
 
 # TODO: $query is MySQL-specific
 
-# PostgreSQL: 
+# PostgreSQL:
 # http://www.postgresql.org/docs/8.1/static/sql-createsequence.html
 # http://www.postgresonline.com/journal/archives/79-Simulating-Row-Number-in-PostgreSQL-Pre-8.4.html
 # http://www.pg-forum.de/sql/1518-nummerierung-der-abfrageergebnisse.html
@@ -604,7 +604,7 @@ function check_owner ($username, $domain) {
 
 
 /**
- * List domains for an admin user. 
+ * List domains for an admin user.
  * @param String $username
  * @return array of domain names.
  */
@@ -863,8 +863,8 @@ function validate_password($password) {
 
 
 /**
- * Encrypt a password, using the apparopriate hashing mechanism as defined in 
- * config.inc.php ($CONF['encrypt']). 
+ * Encrypt a password, using the apparopriate hashing mechanism as defined in
+ * config.inc.php ($CONF['encrypt']).
  * When wanting to compare one pw to another, it's necessary to provide the salt used - hence
  * the second parameter ($pw_db), which is the existing hash from the DB.
  *
@@ -914,17 +914,17 @@ function pacrypt ($pw, $pw_db="") {
         $l = db_row($res["result"]);
         $password = $l[0];
     }
-    
+
     elseif ($CONF['encrypt'] == 'authlib') {
         $flavor = $CONF['authlib_default_flavor'];
         $salt = substr(create_salt(), 0, 2); # courier-authlib supports only two-character salts
         if(preg_match('/^{.*}/', $pw_db)) {
             // we have a flavor in the db -> use it instead of default flavor
             $result = preg_split('/[{}]/', $pw_db, 3); # split at { and/or }
-            $flavor = $result[1];  
+            $flavor = $result[1];
             $salt = substr($result[2], 0, 2);
         }
- 
+
         if(stripos($flavor, 'md5raw') === 0) {
             $password = '{' . $flavor . '}' . md5($pw);
         } elseif(stripos($flavor, 'md5') === 0) {
@@ -937,14 +937,14 @@ function pacrypt ($pw, $pw_db="") {
             die("authlib_default_flavor '" . $flavor . "' unknown. Valid flavors are 'md5raw', 'md5', 'SHA' and 'crypt'");
         }
     }
-    
+
     elseif (preg_match("/^dovecot:/", $CONF['encrypt'])) {
         $split_method = preg_split ('/:/', $CONF['encrypt']);
         $method       = strtoupper($split_method[1]);
         # If $pw_db starts with {method}, change $method accordingly
         if (!empty($pw_db) && preg_match('/^\{([A-Z0-9.-]+)\}.+/', $pw_db, $method_matches)) { $method = $method_matches[1]; }
         if (! preg_match("/^[A-Z0-9.-]+$/", $method)) { die("invalid dovecot encryption method"); }  # TODO: check against a fixed list?
-        # if (strtolower($method) == 'md5-crypt') die("\$CONF['encrypt'] = 'dovecot:md5-crypt' will not work because dovecotpw generates a random salt each time. Please use \$CONF['encrypt'] = 'md5crypt' instead."); 
+        # if (strtolower($method) == 'md5-crypt') die("\$CONF['encrypt'] = 'dovecot:md5-crypt' will not work because dovecotpw generates a random salt each time. Please use \$CONF['encrypt'] = 'md5crypt' instead.");
         # $crypt_method = preg_match ("/.*-CRYPT$/", $method);
 
         # digest-md5 and SCRAM-SHA-1 hashes include the username - until someone implements it, let's declare it as unsupported
@@ -1154,7 +1154,7 @@ function smtp_mail ($to, $from, $data, $body = "") {
     $timeout = "30";
 
     if ($body != "") {
-        $maildata = 
+        $maildata =
             "To: " . $to . "\n"
             . "From: " . $from . "\n"
             . "Subject: " . encode_header ($data) . "\n"
@@ -1253,7 +1253,6 @@ function db_connect ($ignore_errors = false) {
     global $DEBUG_TEXT;
     if ($ignore_errors != 0) $DEBUG_TEXT = '';
     $error_text = '';
-    $link = 0;
 
     if ($CONF['database_type'] == "mysql") {
         if (function_exists ("mysql_connect")) {
@@ -1336,12 +1335,12 @@ function db_get_boolean($bool) {
         // return either true or false (unquoted strings)
         if($bool) {
             return 't';
-        }  
+        }
         return 'f';
     } elseif(Config::Read('database_type') == 'mysql' || Config::Read('database_type') == 'mysqli' || db_sqlite()) {
         if($bool) {
-            return 1;  
-        } 
+            return 1;
+        }
         return 0;
     } else {
         die('Unknown value in $CONF[database_type]');
@@ -1428,14 +1427,14 @@ function db_query ($query, $ignore_errors = 0) {
     # mysql and pgsql $link are resources, mysqli $link is an object
     if (! (is_resource($link) || is_object($link) ) ) $link = db_connect ();
 
-    if ($CONF['database_type'] == "mysql") $result = @mysql_query ($query, $link) 
+    if ($CONF['database_type'] == "mysql") $result = @mysql_query ($query, $link)
         or $error_text = "Invalid query: " . mysql_error($link);
-    if ($CONF['database_type'] == "mysqli") $result = @mysqli_query ($link, $query) 
+    if ($CONF['database_type'] == "mysqli") $result = @mysqli_query ($link, $query)
         or $error_text = "Invalid query: " . mysqli_error($link);
     if (db_sqlite()) $result = @$link->query($query)
         or $error_text = "Invalid query: " . $link->lastErrorMsg();
     if (db_pgsql()) {
-        $result = @pg_query ($link, $query) 
+        $result = @pg_query ($link, $query)
             or $error_text = "Invalid query: " . pg_last_error();
     }
     if ($error_text != "" && $ignore_errors == 0) {
@@ -1700,7 +1699,7 @@ function db_in_clause($field, $values) {
  * param array $condition: array('field' => 'value', 'field2' => 'value2, ...)
  * param array $struct - field structure, used for automatic bool conversion
  * param string $additional_raw_where - raw sniplet to include in the WHERE part - typically needs to start with AND
- * param array $searchmode - operators to use (=, <, > etc.) - defaults to = if not specified for a field (see 
+ * param array $searchmode - operators to use (=, <, > etc.) - defaults to = if not specified for a field (see
  *                           $allowed_operators for available operators)
  *                           Note: the $searchmode operator will only be used if a $condition for that field is set.
  *                                 This also means you'll need to set a (dummy) condition for NULL and NOTNULL.
@@ -1711,7 +1710,7 @@ function db_where_clause($condition, $struct, $additional_raw_where = '', $searc
     } elseif(!is_array($searchmode)) {
         die('db_where_cond: parameter $searchmode is not an array!');
     } elseif (count($condition) == 0 && trim($additional_raw_where) == '') {
-        die("db_where_cond: parameter is an empty array!"); # die() might sound harsh, but can prevent information leaks 
+        die("db_where_cond: parameter is an empty array!"); # die() might sound harsh, but can prevent information leaks
     } elseif(!is_array($struct)) {
         die('db_where_cond: parameter $struct is not an array!');
     }
@@ -1840,9 +1839,9 @@ function alias_domain_postdeletion($alias_domain) {
 
 //
 // gen_show_status
-// Action: Return a string of colored &nbsp;'s that indicate 
+// Action: Return a string of colored &nbsp;'s that indicate
 //         the if an alias goto has an error or is sent to
-//         addresses list in show_custom_domains 
+//         addresses list in show_custom_domains
 // Call: gen_show_status (string alias_address)
 //
 function gen_show_status ($show_alias) {
@@ -1893,7 +1892,7 @@ function gen_show_status ($show_alias) {
                 "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
         } else {
             $stat_string .= $CONF['show_status_text'] . "&nbsp;";
-        } 
+        }
     }
 
     // POP/IMAP CHECK
@@ -1910,7 +1909,7 @@ function gen_show_status ($show_alias) {
                 "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
         } else {
             $stat_string .= $CONF['show_status_text'] . "&nbsp;";
-        } 
+        }
     }
 
     // CUSTOM DESTINATION CHECK
@@ -1921,11 +1920,11 @@ function gen_show_status ($show_alias) {
                     "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
             } else {
                 $stat_string .= $CONF['show_status_text'] . "&nbsp;";
-            } 
-        } 
+            }
+        }
     } else {
         $stat_string .= ";&nbsp;";
-    } 
+    }
 
     //   $stat_string .= "<span style='background-color:green'> &nbsp; </span> &nbsp;" .
     //                  "<span style='background-color:blue'> &nbsp; </span> &nbsp;";
@@ -1934,7 +1933,7 @@ function gen_show_status ($show_alias) {
 
 function getRemoteAddr() {
     $REMOTE_ADDR = 'localhost';
-    if (isset($_SERVER['REMOTE_ADDR'])) 
+    if (isset($_SERVER['REMOTE_ADDR']))
         $REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
     return $REMOTE_ADDR;
 }

From e28f3f5959e67cb0be04ff0dd36c71fc8331ebed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Schr=C3=B6tter?= <cs@fnx.li>
Date: Tue, 21 Mar 2017 17:44:26 +0100
Subject: [PATCH 16/23] Fix for mysqli_connect()

---
 functions.inc.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/functions.inc.php b/functions.inc.php
index 7d72f60b..e167486e 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -1254,6 +1254,15 @@ function db_connect ($ignore_errors = false) {
     if ($ignore_errors != 0) $DEBUG_TEXT = '';
     $error_text = '';
 
+    static $link;
+    if (isset($link) && $link) {
+        if ($ignore_errors) {
+            return array($link, $error_text);
+        }
+        return $link;
+    }
+    $link = 0;
+
     if ($CONF['database_type'] == "mysql") {
         if (function_exists ("mysql_connect")) {
             $link = @mysql_connect ($CONF['database_host'], $CONF['database_user'], $CONF['database_password']) or $error_text .= ("<p />DEBUG INFORMATION:<br />Connect: " .  mysql_error () . "$DEBUG_TEXT");

From f7f378177082481bd9eb41dae702c9d0aa61acb7 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Wed, 22 Mar 2017 22:08:53 +0100
Subject: [PATCH 17/23] Fix default for
 $CONF[create_mailbox_subdirs_hostoptions]

array('') means to include an empty item, and that results in an invalid
remote specification with a trailing "/"

Using an empty array() fixes this.

Reported by oftc_ftw on IRC.
---
 config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.inc.php b/config.inc.php
index 263654e9..1100bb10 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -561,7 +561,7 @@ $CONF['new_quota_table'] = 'YES';
 // $CONF['create_mailbox_subdirs_hostoptions']=array('novalidate-cert','norsh');
 // See also the "Optional flags for names" table at
 // http://www.php.net/manual/en/function.imap-open.php
-$CONF['create_mailbox_subdirs_hostoptions'] = array('');
+$CONF['create_mailbox_subdirs_hostoptions'] = array();
 
 
 // Theme Config

From 846dcb756cf22d325180c5d885dbf700ae316cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Schr=C3=B6tter?= <cs@fnx.li>
Date: Mon, 27 Mar 2017 18:15:11 +0200
Subject: [PATCH 18/23] Remove unnecessary code

---
 functions.inc.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/functions.inc.php b/functions.inc.php
index e167486e..fc94f8b6 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -1429,13 +1429,10 @@ function db_query ($query, $ignore_errors = 0) {
     global $DEBUG_TEXT;
     $result = "";
     $number_rows = "";
-    static $link;
+    $link = db_connect ();
     $error_text = "";
     if ($ignore_errors) $DEBUG_TEXT = "";
 
-    # mysql and pgsql $link are resources, mysqli $link is an object
-    if (! (is_resource($link) || is_object($link) ) ) $link = db_connect ();
-
     if ($CONF['database_type'] == "mysql") $result = @mysql_query ($query, $link)
         or $error_text = "Invalid query: " . mysql_error($link);
     if ($CONF['database_type'] == "mysqli") $result = @mysqli_query ($link, $query)

From b3b87385e0c5a1cd40860714ef6841ffa90eab71 Mon Sep 17 00:00:00 2001
From: Tjebbe Westendorp <github@tswestendorp.nl>
Date: Mon, 10 Apr 2017 14:15:41 +0200
Subject: [PATCH 19/23] Fix for PHP 7+ (#43)

Removed $fDomains as it's not used anymore and produced a PHP 7+ warning
---
 variables.inc.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/variables.inc.php b/variables.inc.php
index 9257a4f9..592a626a 100644
--- a/variables.inc.php
+++ b/variables.inc.php
@@ -27,8 +27,6 @@ $fBackupmx = "";
 $fDelete = "";
 $fDescription = "";
 $fDomain = "";
-$fDomains = "";
-$fDomains[0] = "";
 $fFrom = "";
 $fGoto = "";
 $fHeaders = "";

From f4f2d1b0f451f240c31d9e56bb82004dea5c53cf Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 10 Apr 2017 20:32:11 +0200
Subject: [PATCH 20/23] Get rid of most variable definitions in
 variables.inc.php

variables.inc.php is an old hack to save having to declare variables
before using them in pages.

Lots of the variables there are unused (leftovers from the old
create-*.php or edit-*.php scripts) or properly initialized in the file
using them, so there's no need to keep them in variables.inc.php.

The remaining variables in this file should also be dropped after
further investigation.
---
 variables.inc.php | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/variables.inc.php b/variables.inc.php
index 592a626a..8107e5a8 100644
--- a/variables.inc.php
+++ b/variables.inc.php
@@ -15,55 +15,17 @@
  * Contains varoius pre-defined variables. 
  *
  * XXX Probably a hack to save having to declare variables before using them in pages.
+ *
+ * TODO: get rid of the remaining variables declared here!
  */
 
 $error = "";
-$quota = "";
-$vacation = "";
-$fActive = "";
-$fAddress = "";
-$fAliases = "";
-$fBackupmx = "";
-$fDelete = "";
-$fDescription = "";
 $fDomain = "";
-$fFrom = "";
-$fGoto = "";
-$fHeaders = "";
-$fMail = "";
-$fMailboxes = "";
-$fMaxquota = "";
-$fName = "";
 $fPassword = "";
-$fPassword2 = "";
-$fQuota = "";
-$fSearch = "";
-$fTable = "";
-$fTransport = "";
-$fTo = "";
-$fUsername = "";
-$fVacation = "";
 $fWhere = "";
-$tActive = "";
-$tActive = "";
-$tAddress = "";
 $tAlias = "";
-$tAliases = "";
-$tBody = "";
 $tDescription = "";
-$tDomain = "";
-$tDomains = "";
-$tFrom = "";
-$tGoto = "";
-$tLog = "";
 $tMailbox = "";
-$tMailboxes = "";
-$tMaxquota = "";
-$tName = "";
-$tQuota = "";
-$tSubject = "";
-$tUsername = "";
-$tTransport = "";
 
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
 ?>

From 1ec2ec119938c6ccb65e7bec0c734bb706e10346 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 10 Apr 2017 20:39:30 +0200
Subject: [PATCH 21/23] Move initialization of $fDomain to viewlog.php

The other files using this variable (vacation.php and list-virtual.php)
initialize it properly.
---
 variables.inc.php | 1 -
 viewlog.php       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.inc.php b/variables.inc.php
index 8107e5a8..a04671bc 100644
--- a/variables.inc.php
+++ b/variables.inc.php
@@ -20,7 +20,6 @@
  */
 
 $error = "";
-$fDomain = "";
 $fPassword = "";
 $fWhere = "";
 $tAlias = "";
diff --git a/viewlog.php b/viewlog.php
index b5175336..50be3b56 100644
--- a/viewlog.php
+++ b/viewlog.php
@@ -36,6 +36,7 @@ else {
    $list_domains = list_domains_for_admin ($SESSID_USERNAME);
 }
 
+$fDomain = '';
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
    if ((is_array ($list_domains) and sizeof ($list_domains) > 0)) $fDomain = $list_domains[0];

From 9df6de65af4449fb7edea5e266c5df1f38aa282f Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 10 Apr 2017 20:54:34 +0200
Subject: [PATCH 22/23] Finally get rid of variables.inc.php

Initialize $error and $tMailbox where needed.

The other variables in variables.inc.php are already initialized
everywhere.
---
 broadcast-message.php |  2 ++
 common.php            |  2 --
 list-virtual.php      |  5 +++--
 sendmail.php          |  1 +
 vacation.php          |  2 ++
 variables.inc.php     | 30 ------------------------------
 viewlog.php           |  2 ++
 7 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 variables.inc.php

diff --git a/broadcast-message.php b/broadcast-message.php
index 5b10e918..0c6bf7ef 100644
--- a/broadcast-message.php
+++ b/broadcast-message.php
@@ -34,6 +34,8 @@ if ($CONF['sendmail'] != 'YES') {
    exit;
 }
 
+$error = 0;
+
 $smtp_from_email = smtp_get_admin_email();
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
diff --git a/common.php b/common.php
index 28bea047..6425d377 100644
--- a/common.php
+++ b/common.php
@@ -60,8 +60,6 @@ function postfixadmin_autoload($class) {
 }
 spl_autoload_register('postfixadmin_autoload');
 
-require_once("$incpath/variables.inc.php");
-
 if(!is_file("$incpath/config.inc.php")) {
     die("config.inc.php is missing!");
 }
diff --git a/list-virtual.php b/list-virtual.php
index e1028576..0e41c4d8 100644
--- a/list-virtual.php
+++ b/list-virtual.php
@@ -212,17 +212,18 @@ $query = "$sql_select\n$mailbox_pagebrowser_query\n$sql_limit";
 
 $result = db_query ($query);
 
+$tMailbox = array();
+
 if ($result['rows'] > 0) {
     $delimiter = preg_quote($CONF['recipient_delimiter'], "/");
     $goto_single_rec_del = "";
 
-    $tMailbox = array();
     while ($row = db_array ($result['result'])) {
         if ($display_mailbox_aliases) {
             $goto_split = explode(",", $row['goto']);
             $row['goto_mailbox'] = 0;
             $row['goto_other'] = array();
-            
+
             foreach ($goto_split as $goto_single) {
                 if (!empty($CONF['recipient_delimiter'])) {
                     $goto_single_rec_del = preg_replace('/' .$delimiter. '[^' .$delimiter. '@]*@/', "@", $goto_single);
diff --git a/sendmail.php b/sendmail.php
index bb5e3e7c..c4b1a1db 100644
--- a/sendmail.php
+++ b/sendmail.php
@@ -51,6 +51,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
       $tBody = stripslashes($tBody); # TODO: check for get_magic_quotes_gpc inside safepost/safeget
    }
 
+   $error = 0;
    $email_check = check_email ($fTo);
    if (empty ($fTo) or ($email_check != ''))
    {
diff --git a/vacation.php b/vacation.php
index a4212d3c..0aaaf900 100644
--- a/vacation.php
+++ b/vacation.php
@@ -67,6 +67,8 @@ if($CONF['vacation'] == 'NO') {
 
 date_default_timezone_set(@date_default_timezone_get()); # Suppress date.timezone warnings
 
+$error = 0;
+
 $vh = new VacationHandler($fUsername);
 
 $choice_of_reply = Config::read('vacation_choice_of_reply');
diff --git a/variables.inc.php b/variables.inc.php
deleted file mode 100644
index a04671bc..00000000
--- a/variables.inc.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/** 
- * Postfix Admin 
- * 
- * LICENSE 
- * This source file is subject to the GPL license that is bundled with  
- * this package in the file LICENSE.TXT. 
- * 
- * Further details on the project are available at http://postfixadmin.sf.net 
- * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
- * File: variables.inc.php
- * Contains varoius pre-defined variables. 
- *
- * XXX Probably a hack to save having to declare variables before using them in pages.
- *
- * TODO: get rid of the remaining variables declared here!
- */
-
-$error = "";
-$fPassword = "";
-$fWhere = "";
-$tAlias = "";
-$tDescription = "";
-$tMailbox = "";
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
diff --git a/viewlog.php b/viewlog.php
index 50be3b56..287baa25 100644
--- a/viewlog.php
+++ b/viewlog.php
@@ -37,6 +37,8 @@ else {
 }
 
 $fDomain = '';
+$error = 0;
+
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
    if ((is_array ($list_domains) and sizeof ($list_domains) > 0)) $fDomain = $list_domains[0];

From 88bd9bfd19360cea3c165edae5b98908f791a03d Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Mon, 17 Apr 2017 12:39:04 +0200
Subject: [PATCH 23/23] drop $db_conn parameter from escape_string()

Connection caching is now done in db_connect() which is a much better
place.

This reverts most of c253ef7dbdc2a92ff1c4193c587acfe1539d617e
---
 functions.inc.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/functions.inc.php b/functions.inc.php
index fc94f8b6..73ea74fa 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -278,23 +278,17 @@ function check_email ($email) {
  * used to disrupt an SQL string. i.e. "'" => "\'" etc.
  *
  * @param mixed string|array
- * @param resource $db_conn optional (default null)
  * @return String (or Array) of cleaned data, suitable for use within an SQL
  *    statement.
  */
-function escape_string ($string, $db_conn = null) {
+function escape_string ($string) {
     global $CONF;
-
-    if($db_conn == null) {
-        $db_conn = db_connect();
-    }
-
     // if the string is actually an array, do a recursive cleaning.
     // Note, the array keys are not cleaned.
     if(is_array($string)) {
         $clean = array();
         foreach(array_keys($string) as $row) {
-            $clean[$row] = escape_string($string[$row], $db_conn);
+            $clean[$row] = escape_string($string[$row]);
         }
         return $clean;
     }
@@ -303,12 +297,13 @@ function escape_string ($string, $db_conn = null) {
     }
     if (!is_numeric($string)) {
 
+        $link = db_connect();
 
         if ($CONF['database_type'] == "mysql") {
-            $escaped_string = mysql_real_escape_string($string, $db_conn);
+            $escaped_string = mysql_real_escape_string($string, $link);
         }
         if ($CONF['database_type'] == "mysqli") {
-            $escaped_string = mysqli_real_escape_string($db_conn, $string);
+            $escaped_string = mysqli_real_escape_string($link, $string);
         }
         if (db_sqlite()) {
             $escaped_string = SQLite3::escapeString($string);
@@ -316,7 +311,7 @@ function escape_string ($string, $db_conn = null) {
         if (db_pgsql()) {
             // php 5.2+ allows for $link to be specified.
             if (version_compare(phpversion(), "5.2.0", ">=")) {
-                $escaped_string = pg_escape_string($db_conn, $string);
+                $escaped_string = pg_escape_string($link, $string);
             } else {
                 $escaped_string = pg_escape_string($string);
             }