Build-Depends: debhelper (>= 7), po-debconf, dh-apache2
Standards-Version: 3.9.6
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/postfixadmin.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/postfixadmin.git
+Vcs-Browser: https://salsa.debian.org/debian/postfixadmin
+Vcs-Git: https://salsa.debian.org/debian/postfixadmin.git
Homepage: http://postfixadmin.sourceforge.net
Package: postfixadmin
diff -pruN 3.0.2-2/debian/patches/0001-db_credentials.patch 3.2-2/debian/patches/0001-db_credentials.patch
--- 3.0.2-2/debian/patches/0001-db_credentials.patch 2017-04-27 10:43:15.000000000 +0000
+++ 3.2-2/debian/patches/0001-db_credentials.patch 2018-09-10 09:40:37.000000000 +0000
@@ -8,9 +8,9 @@ Subject: db_credentials
--- a/config.inc.php
+++ b/config.inc.php
-@@ -15,6 +15,14 @@
- * Contains configuration options.
- */
+@@ -32,6 +32,14 @@
+
+
+
+// Debian: This loads the automatic generated DB credentials from
@@ -23,7 +23,7 @@ Subject: db_credentials
/*****************************************************************
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* You have to set $CONF['configured'] = true; before the
-@@ -22,7 +30,7 @@
+@@ -39,7 +47,7 @@
* Doing this implies you have changed this file as required.
* i.e. configuring database etc; specifying setup.php password etc.
*/
@@ -32,7 +32,7 @@ Subject: db_credentials
// In order to setup Postfixadmin, you MUST specify a hashed password here.
// To create the hash, visit setup.php in a browser and type a password into the field,
-@@ -81,11 +89,11 @@
+@@ -98,11 +106,11 @@ function language_hook($PALANG, $languag
// mysqli = MySQL 4.1+ or MariaDB
// pgsql = PostgreSQL
// sqlite = SQLite 3
@@ -46,8 +46,6 @@ Subject: db_credentials
+$CONF['database_user'] = $dbuser;
+$CONF['database_password'] = $dbpass;
+$CONF['database_name'] = $dbname;
- // If you need to specify a different port for a MYSQL database connection, use e.g.
- // $CONF['database_host'] = '172.30.33.66:3308';
- // If you need to specify a different port for POSTGRESQL database connection
-
-
+
+ // Database SSL Config
+ $CONF['database_use_ssl'] = false;
diff -pruN 3.0.2-2/debian/patches/0002-dovecotpw.patch 3.2-2/debian/patches/0002-dovecotpw.patch
--- 3.0.2-2/debian/patches/0002-dovecotpw.patch 2017-04-27 10:43:15.000000000 +0000
+++ 3.2-2/debian/patches/0002-dovecotpw.patch 2018-09-10 09:40:37.000000000 +0000
@@ -8,12 +8,12 @@ Last-Update: 2014-10-03
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/config.inc.php
+++ b/config.inc.php
-@@ -165,7 +165,7 @@ $CONF['authlib_default_flavor'] = 'md5ra
+@@ -200,7 +200,7 @@ $CONF['authlib_default_flavor'] = 'md5ra
// for dovecot 1.x
// $CONF['dovecotpw'] = "/usr/sbin/dovecotpw";
// for dovecot 2.x (dovecot 2.0.0 - 2.0.7 is not supported!)
-$CONF['dovecotpw'] = "/usr/sbin/doveadm pw";
+$CONF['dovecotpw'] = "/usr/bin/doveadm pw";
-
- // Password validation
- // New/changed passwords will be validated using all regular expressions in the array.
+ if(@file_exists('/usr/bin/doveadm')) { // @ to silence openbase_dir stuff; see https://github.com/postfixadmin/postfixadmin/issues/171
+ $CONF['dovecotpw'] = "/usr/bin/doveadm pw"; # debian
+ }
diff -pruN 3.0.2-2/debian/patches/0003-mysql-connection.patch 3.2-2/debian/patches/0003-mysql-connection.patch
--- 3.0.2-2/debian/patches/0003-mysql-connection.patch 2017-04-27 10:43:15.000000000 +0000
+++ 3.2-2/debian/patches/0003-mysql-connection.patch 2018-09-10 09:40:37.000000000 +0000
@@ -1,35 +0,0 @@
---- a/functions.inc.php
-+++ b/functions.inc.php
-@@ -1244,7 +1244,14 @@ function db_connect ($ignore_errors = 0)
- global $DEBUG_TEXT;
- if ($ignore_errors != 0) $DEBUG_TEXT = '';
- $error_text = '';
-- $link = 0;
-+
-+ 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")) {
-@@ -1412,14 +1419,11 @@ function db_query ($query, $ignore_error
- 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)
-+ 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)
- or $error_text = "Invalid query: " . mysqli_error($link);
diff -pruN 3.0.2-2/debian/patches/series 3.2-2/debian/patches/series
--- 3.0.2-2/debian/patches/series 2017-04-27 10:43:15.000000000 +0000
+++ 3.2-2/debian/patches/series 2018-09-10 09:40:37.000000000 +0000
@@ -1,3 +1,2 @@
0001-db_credentials.patch
0002-dovecotpw.patch
-0003-mysql-connection.patch
diff -pruN 3.0.2-2/debian/postfixadmin.dirs 3.2-2/debian/postfixadmin.dirs
--- 3.0.2-2/debian/postfixadmin.dirs 2017-04-27 10:43:15.000000000 +0000
+++ 3.2-2/debian/postfixadmin.dirs 2018-09-10 09:40:37.000000000 +0000
@@ -1,5 +1,5 @@
usr/share/postfixadmin
-usr/share/postfixadmin/css
+#usr/share/postfixadmin/css
usr/share/doc/postfixadmin
etc/postfixadmin
etc/apache2/conf-available
diff -pruN 3.0.2-2/debian/postfixadmin.install 3.2-2/debian/postfixadmin.install
--- 3.0.2-2/debian/postfixadmin.install 2017-04-27 10:43:15.000000000 +0000
+++ 3.2-2/debian/postfixadmin.install 2018-09-10 09:40:37.000000000 +0000
@@ -1,16 +1,10 @@
*.php usr/share/postfixadmin
-*.js usr/share/postfixadmin
+public usr/share/postfixadmin
configs usr/share/postfixadmin
-css usr/share/postfixadmin
-images usr/share/postfixadmin
languages usr/share/postfixadmin
model usr/share/postfixadmin
scripts usr/share/postfixadmin
-smarty usr/share/postfixadmin
templates usr/share/postfixadmin
-templates_c usr/share/postfixadmin
-users usr/share/postfixadmin
-smarty usr/share/postfixadmin
configs usr/share/postfixadmin
debian/lighttpd/90-postfixadmin.conf etc/lighttpd/conf-available
debian/apache/postfixadmin.conf etc/apache2/conf-available
diff -pruN 3.0.2-2/debian/watch 3.2-2/debian/watch
--- 3.0.2-2/debian/watch 2017-04-27 10:43:15.000000000 +0000
+++ 3.2-2/debian/watch 2018-09-10 09:40:37.000000000 +0000
@@ -1,2 +1,2 @@
version=3
-http://sf.net/postfixadmin/postfixadmin-([\d\.]+)\.tar\.gz
+https://github.com/postfixadmin/postfixadmin/releases .*/archive/postfixadmin-(\d[\d.]*)\.tar\.gz
diff -pruN 3.0.2-2/delete.php 3.2-2/delete.php
--- 3.0.2-2/delete.php 2014-11-02 23:06:13.000000000 +0000
+++ 3.2-2/delete.php 1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-webformConfig();
-
-if ($is_admin) {
- authentication_require_role($formconf['required_role']);
-} else {
- if (empty($formconf['user_hardcoded_field'])) {
- die($handlerclass . ' is not available for users');
- }
-}
-
-if ($handler->init($id)) { # errors will be displayed as last step anyway, no need for duplicated code ;-)
- $handler->delete();
-}
-
-flash_error($handler->errormsg);
-flash_info($handler->infomsg);
-
-header ("Location: " . $formconf['listview']);
-exit;
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
diff -pruN 3.0.2-2/DOCUMENTS/DOVECOT.txt 3.2-2/DOCUMENTS/DOVECOT.txt
--- 3.0.2-2/DOCUMENTS/DOVECOT.txt 2014-01-21 15:38:11.000000000 +0000
+++ 3.2-2/DOCUMENTS/DOVECOT.txt 2018-05-02 20:37:27.000000000 +0000
@@ -29,7 +29,7 @@ changing to talk to a PostgreSQL or MySQ
# BEGIN /etc/dovecot/dovecot.conf:
# Change this to where your mail root is, this needs to match whatever structure postfix expects....
-
+# See also: https://wiki.dovecot.org/MailLocation - %d domain, %u full username, %n user part (%u with no domain)
mail_location = maildir:/var/mail/vmail/%u/
namespace inbox {
@@ -85,8 +85,6 @@ passdb {
# user = postfix
# group = postfix
# }
-# user = postfix
-# group = postfix
#}
# Needs to match Postfix virtual_uid_maps
@@ -132,7 +130,7 @@ user_query = SELECT maildir, 1001 AS uid
# MYSQL :
-user_query = SELECT CONCAT('/var/vmail/mail/', maildir) AS home, 1001 AS uid, 1001 AS gid,
+user_query = SELECT CONCAT('/var/mail/vmail/', maildir) AS home, 1001 AS uid, 1001 AS gid,
CONCAT('*:bytes=', quota) AS quota_rule FROM mailbox WHERE username = '%u' AND active='1'
# PostgreSQL : (no Quota though) :
# user_query = SELECT '/var/vmail/mail/' || maildir AS home, 1001 as uid, 1001 as gid FROM mailbox WHERE username = '%u' AND active = '1'
diff -pruN 3.0.2-2/DOCUMENTS/Postfix-Dovecot-Postgresql-Example.md 3.2-2/DOCUMENTS/Postfix-Dovecot-Postgresql-Example.md
--- 3.0.2-2/DOCUMENTS/Postfix-Dovecot-Postgresql-Example.md 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/DOCUMENTS/Postfix-Dovecot-Postgresql-Example.md 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,221 @@
+# Example configuration
+
+The below covers some default(ish) configuration things for using Postfix, Dovecot with PostgreSQL.
+
+# Postfix
+
+Assumptions :
+
+ * Mail is delivered into /var/mail/vmail/foo@example.com/
+ * The user with id 8 is used for ownership of mail files.
+ * PostgreSQL is running on the local server
+ * Dovecot is running on the local server, and SASL is used to allow authenticated clients to mail out.
+
+
+## /etc/postfix/main.cf
+
+The proxy: bits are optional, you may need to install an additional postfix package on your server to enable them.
+
+i.e. proxy:pgsql:/path/to/file is equivalent to pgsql:/path/to/file. Use of 'proxy:' may lead to a small performance boost.
+
+
+```
+relay_domains = $mydestination, proxy:pgsql:/etc/postfix/pgsql/relay_domains.cf
+virtual_alias_maps = proxy:pgsql:/etc/postfix/pgsql/virtual_alias_maps.cf
+virtual_mailbox_domains = proxy:pgsql:/etc/postfix/pgsql/virtual_domains_maps.cf
+virtual_mailbox_maps = proxy:pgsql:/etc/postfix/pgsql/virtual_mailbox_maps.cf
+virtual_mailbox_base = /var/mail/vmail
+virtual_mailbox_limit = 512000000
+virtual_minimum_uid = 8
+virtual_transport = virtual
+virtual_uid_maps = static:8
+virtual_gid_maps = static:8
+local_transport = virtual
+local_recipient_maps = $virtual_mailbox_maps
+```
+
+and for Postfix SASL support :
+
+```
+# SASL Auth for SMTP relaying
+smtpd_sasl_type = dovecot
+smtpd_sasl_path = private/auth
+smtpd_sasl_authenticated_header = yes
+smtpd_sasl_auth_enable = yes
+smtpd_sasl_security_options = noanonymous
+broken_sasl_auth_clients = yes
+```
+
+## /etc/postfix/pgsql/relay_domains.cf
+
+```
+user = postfix
+password = whatever
+hosts = localhost
+dbname = postfix
+query = SELECT domain FROM domain WHERE domain='%s' and backupmx = true
+```
+
+## /etc/postfix/pgsql/virtual_alias_maps.cf
+
+```
+user = postfix
+password = whatever
+hosts = localhost
+dbname = postfix
+query = SELECT goto FROM alias WHERE address='%s' AND active = true
+```
+
+## /etc/postfix/pgsql/virtual_domains_maps.cf
+
+```
+user = postfix
+password = whatever
+hosts = localhost
+dbname = postfix
+#query = SELECT domain FROM domain WHERE domain='%s'
+#optional query to use when relaying for backup MX
+query = SELECT domain FROM domain WHERE domain='%s' and backupmx = false and active = true
+```
+
+## /etc/postfix/pgsql/virtual_mailbox_limits.cf
+
+```
+# Used for quota
+user = postfix
+password = whatever
+hosts = localhost
+dbname = postfix
+query = SELECT quota FROM mailbox WHERE username='%s'
+```
+
+## /etc/postfix/pgsql/virtual_mailbox_maps.cf
+
+```
+user = postfix
+password = whatever
+hosts = localhost
+dbname = postfix
+query = SELECT maildir FROM mailbox WHERE username='%s' AND active = true
+```
+
+
+# Dovecot
+
+(This is from version 2.2.27, Debian Stretch)
+
+
+## /etc/dovecot/dovecot.conf
+```
+mail_location = maildir:/var/mail/vmail/%u/
+
+namespace inbox {
+ type = private
+ inbox = yes
+ location =
+ mailbox Drafts {
+ special_use = \Drafts
+ }
+ mailbox Junk {
+ special_use = \Junk
+ }
+ mailbox Sent {
+ special_use = \Sent
+ }
+ mailbox "Sent Messages" {
+ special_use = \Sent
+ }
+ mailbox Trash {
+ special_use = \Trash
+ }
+ prefix =
+}
+
+protocols = "imap pop3"
+
+# Requires certificates ...
+#ssl = yes
+#ssl_cert = MD5-CRYPT
+# md5 -> PLAIN-MD5
+# cleartext -> PLAIN
+default_pass_scheme = MD5-CRYPT
+
+# Query to retrieve password. user can be used to retrieve username in other
+# formats also.
+
+password_query = SELECT username AS user,password FROM mailbox WHERE username = '%u' AND active='1'
+
+# Query to retrieve user information, note uid matches dovecot.conf AND Postfix virtual_uid_maps parameter.
+user_query = SELECT '/var/vmail/mail/' || maildir AS home, 8 as uid, 8 as gid FROM mailbox WHERE username = '%u' AND active = '1'
+```
diff -pruN 3.0.2-2/DOCUMENTS/UPGRADE.txt 3.2-2/DOCUMENTS/UPGRADE.txt
--- 3.0.2-2/DOCUMENTS/UPGRADE.txt 2011-01-08 19:53:37.000000000 +0000
+++ 3.2-2/DOCUMENTS/UPGRADE.txt 2018-05-02 20:37:27.000000000 +0000
@@ -33,10 +33,11 @@ When you install from a previous version
first. There are a lot of changes in the database structure since Postfix Admin
1.5.4.
- $ mysqldump -a -u root -p > /tmp/postfixadmin-backup.sql
+ $ mysqldump -u root -p postfixdb > /tmp/postfixadmin-backup.sql
or
- $ pg_dump -ad -u postfix postfix > /tmp/postfixadmin-backup.sql
+ $ pg_dump -ad -u postfix postfixdb > /tmp/postfixadmin-backup.sql
+(Replace postfixdb with your Postfixadmin database's name)
2. Unarchive new Postfix Admin
------------------------------
@@ -53,28 +54,35 @@ to have change the permissions for Postf
$ cd /usr/local/www/postfixadmin
$ find -type f -print0 | xargs -0 chmod 640
- $ find -type f -print0 | xargs -0 chown root:www
+ $ find -type f -print0 | xargs -0 chown root:www-data
-(the last command assumes your Apache is running with group "www")
+(the last command assumes your Apache is running with group "www-data")
-Since version 2.4 we use smarty templates. That means the templates_c directory
+Since version 3.0 we use smarty templates. That means the templates_c directory
needs to be writeable for your webserver.
- $ chown -R www-data templates_c/
+ $ cd /usr/local/www/postfixadmin
+ $ mkdir templates_c && chmod 750 templates_c && chown -R www-data templates_c
(if your Apache runs as user "www-data")
+If you have SELinux enabled, also run (adust the path to match your setup)
+
+ $ sudo semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/utils/pfadmin/public/templates_c(/.*)?"
+ $ sudo restorecon -Rv /var/www/utils/pfadmin/
+
4. Configure
------------
+
Check the config.inc.php file. There you can specify settings that are
relevant to your setup.
Comparing config.inc.php with your previous using "diff" might save you some
time.
-You can use a config.local.php file to contain your local settings. These will override any
-defined in config.inc.php - and save some time when upgrading to a new version of PostfixAdmin ;-)
+You can use a config.local.php file to contain your local settings.
+These will override any defined in config.inc.php - and save some time when upgrading to a new version of PostfixAdmin ;-)
5. Run setup.php
----------------------------------------
diff -pruN 3.0.2-2/editactive.php 3.2-2/editactive.php
--- 3.0.2-2/editactive.php 2015-04-06 23:09:58.000000000 +0000
+++ 3.2-2/editactive.php 1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-webformConfig();
-
-authentication_require_role($formconf['required_role']);
-
-if ($handler->init($id)) { # errors will be displayed as last step anyway, no need for duplicated code ;-)
- if ($active != '0' && $active != '1') {
- die(Config::Lang('invalid_parameter'));
- }
-
- if ( $handler->set(array('active' => $active)) ) {
- $handler->store();
- }
-}
-
-flash_error($handler->errormsg);
-flash_info($handler->infomsg);
-
-header ("Location: " . $formconf['listview']);
-exit;
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
diff -pruN 3.0.2-2/edit.php 3.2-2/edit.php
--- 3.0.2-2/edit.php 2016-05-20 20:42:04.000000000 +0000
+++ 3.2-2/edit.php 1970-01-01 00:00:00.000000000 +0000
@@ -1,229 +0,0 @@
-webformConfig()[prefill] when creating a new item
- */
-
-require_once('common.php');
-
-$username = authentication_get_username(); # enforce login
-
-$table = safepost('table', safeget('table'));
-$handlerclass = ucfirst($table) . 'Handler';
-
-if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table
- die ("Invalid table name given!");
-}
-
-$error = 0;
-
-$edit = safepost('edit', safeget('edit'));
-$new = 0;
-if ($edit == "") $new = 1;
-
-$is_admin = authentication_has_role('admin');
-
-$handler = new $handlerclass($new, $username, $is_admin);
-$formconf = $handler->webformConfig();
-
-if ($is_admin) {
- authentication_require_role($formconf['required_role']);
-} else {
- if (empty($formconf['user_hardcoded_field'])) {
- die($handlerclass . ' is not available for users');
- }
-}
-
-if ($new == 0 || $formconf['early_init']) {
- if (!$handler->init($edit)) {
- if (count($handler->errormsg) == 0) {
- # should never happen and indicates a bug in $handler->init()
- flash_error($handlerclass . "->init() failed, but didn't set any error message");
- }
- flash_error($handler->errormsg);
- header ("Location: " . $formconf['listview']);
- exit;
- }
-}
-
-$form_fields = $handler->getStruct();
-$id_field = $handler->getId_field();
-
-if ($_SERVER['REQUEST_METHOD'] == "GET") {
- if ($new) { # new - prefill fields from URL parameters if allowed in $formconf['prefill']
- if ( isset($formconf['prefill']) ) {
- foreach ($formconf['prefill'] as $field) {
- $prefillvalue = safeget($field, safesession("prefill:$table:$field"));
- if ($prefillvalue != '') {
- $form_fields[$field]['default'] = $prefillvalue;
- $handler->prefill($field, $prefillvalue);
- }
- }
- }
- $form_fields = $handler->getStruct(); # refresh $form_fields - a prefill field might have changed something
- } else { # edit mode - read values from database
- if (!$handler->view()) {
- flash_error($handler->errormsg);
- header ("Location: " . $formconf['listview']);
- exit;
- } else {
- $values = $handler->result;
- $values[$id_field] = $edit;
- }
- }
-}
-
-
-if ($_SERVER['REQUEST_METHOD'] == "POST") {
- if (safepost('token') != $_SESSION['PFA_token']) die('Invalid token!');
- $inp_values = safepost('value', array() );
-
- foreach($form_fields as $key => $field) {
- if ($field['editable'] && $field['display_in_form']) {
- if (!isset($inp_values[$key])) {
- $inp_values[$key] = ''; # newer PHP versions don't include empty fields in $_POST (noticed with PHP 5.6.6)
- }
-
- if($field['type'] == 'bool' && $inp_values[$key] == '') {
- $values[$key] = 0; # isset() for unchecked checkboxes is always false
- } elseif($field['type'] == 'txtl') {
- $values[$key] = $inp_values[$key];
- $values[$key] = preg_replace ('/\\\r\\\n/', ',', $values[$key]);
- $values[$key] = preg_replace ('/\r\n/', ',', $values[$key]);
- $values[$key] = preg_replace ('/,[\s]+/i', ',', $values[$key]);
- $values[$key] = preg_replace ('/[\s]+,/i', ',', $values[$key]);
- $values[$key] = preg_replace ('/,,*/', ',', $values[$key]);
- $values[$key] = preg_replace ('/,*$|^,*/', '', $values[$key]);
- if ($values[$key] == '') {
- $values[$key] = array();
- } else {
- $values[$key] = explode(",", $values[$key]);
- }
- } else {
- $values[$key] = $inp_values[$key];
- }
- }
- }
-
- if (isset($formconf['hardcoded_edit']) && $formconf['hardcoded_edit']) {
- $values[$id_field] = $form_fields[$id_field]['default'];
- } elseif ($new == 0) {
- $values[$id_field] = $edit;
- }
-
- if ($new && ($form_fields[$id_field]['display_in_form'] == 0)) {
- if ($form_fields[$id_field]['editable'] == 1) { # address split to localpart and domain?
- $values[$id_field] = $handler->mergeId($values);
- } else { # probably auto_increment
- $values[$id_field] = '';
- }
- }
-
- if (!$handler->init($values[$id_field])) {
- $error = 1;
- $errormsg = $handler->errormsg;
- }
-
- if (!$handler->set($values)) {
- $error = 1;
- $errormsg = $handler->errormsg;
- }
-
- $form_fields = $handler->getStruct(); # refresh $form_fields - set() might have changed something
-
- if ($error != 1) {
- if (!$handler->store()) {
- $errormsg = $handler->errormsg;
- } else {
- flash_info($handler->infomsg);
-
- if (count($handler->errormsg)) { # might happen if domain_postcreation fails
- flash_error($handler->errormsg);
- }
-
- # remember prefill values for next usage of the form
- if ( isset($formconf['prefill']) ) {
- foreach ($formconf['prefill'] as $field) {
- if (isset($values[$field])) {
- $_SESSION["prefill:$table:$field"] = $values[$field];
- }
- }
- }
-
- if ($new == 0) {
- header ("Location: " . $formconf['listview']);
- exit;
- } else {
- header("Location: edit.php?table=$table");
- exit;
- }
- }
- }
-}
-
-if ($error != 1 && $new) { # no error and not in edit mode - reset fields to default for new item
- $values = array();
- foreach (array_keys($form_fields) as $key) {
- $values[$key] = $form_fields[$key]['default'];
- }
-}
-
-$errormsg = $handler->errormsg;
-$fielderror = array();
-
-foreach($form_fields as $key => $field) {
- if($form_fields[$key]['display_in_form']) {
-
- if (isset($errormsg[$key])) {
- $fielderror[$key] = $errormsg[$key];
- unset ($errormsg[$key]);
- } else {
- $fielderror[$key] = '';
- }
-
- if (isset($values[$key])) {
- $smarty->assign ("value_$key", $values[$key]);
- } else {
- $smarty->assign ("value_$key", $form_fields[$key]['default']);
- }
- }
-}
-
-if (count($errormsg)) flash_error($errormsg); # display the remaining error messages (not related to a field) with flash_error
-
-if ($new) {
- $smarty->assign ('mode', 'create');
- $smarty->assign('formtitle', Config::lang($formconf['formtitle_create']));
- $smarty->assign('submitbutton', Config::lang($formconf['create_button']));
-} else {
- $smarty->assign ('mode', 'edit');
- $smarty->assign('formtitle', Config::lang($formconf['formtitle_edit']));
- $smarty->assign('submitbutton', Config::lang('save'));
-}
-
-$smarty->assign ('struct', $form_fields);
-$smarty->assign ('fielderror', $fielderror);
-$smarty->assign ('table', $table);
-$smarty->assign ('smarty_template', 'editform');
-$smarty->display ('index.tpl');
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
diff -pruN 3.0.2-2/functions.inc.php 3.2-2/functions.inc.php
--- 3.0.2-2/functions.inc.php 2017-02-08 20:45:26.000000000 +0000
+++ 3.2-2/functions.inc.php 2018-05-02 20:37:27.000000000 +0000
@@ -1,22 +1,22 @@
';
- foreach($supported_languages as $lang => $lang_name) {
+ foreach ($supported_languages as $lang => $lang_name) {
if ($lang == $current_lang) {
$selected = ' selected="selected"';
} else {
@@ -191,15 +208,15 @@ 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
*
* TODO: make check_domain able to handle as example .local domains
* TODO: skip DNS check if the domain exists in PostfixAdmin?
*/
-function check_domain ($domain) {
- if (!preg_match ('/^([-0-9A-Z]+\.)+' . '([-0-9A-Z]){2,13}$/i', ($domain))) {
+function check_domain($domain) {
+ if (!preg_match('/^([-0-9A-Z]+\.)+' . '([-0-9A-Z]){2,13}$/i', ($domain))) {
return sprintf(Config::lang('pInvalidDomainRegex'), htmlentities($domain));
}
@@ -207,15 +224,15 @@ function check_domain ($domain) {
// Look for an AAAA, A, or MX record for the domain
- if(function_exists('checkdnsrr')) {
+ if (function_exists('checkdnsrr')) {
$start = microtime(true); # check for slow nameservers, part 1
// AAAA (IPv6) is only available in PHP v. >= 5
- if (version_compare(phpversion(), "5.0.0", ">=") && checkdnsrr($domain,'AAAA')) {
+ if (version_compare(phpversion(), "5.0.0", ">=") && checkdnsrr($domain, 'AAAA')) {
$retval = '';
- } elseif (checkdnsrr($domain,'A')) {
+ } elseif (checkdnsrr($domain, 'A')) {
$retval = '';
- } elseif (checkdnsrr($domain,'MX')) {
+ } elseif (checkdnsrr($domain, 'MX')) {
$retval = '';
} else {
$retval = sprintf(Config::lang('pInvalidDomainDNS'), htmlentities($domain));
@@ -244,25 +261,31 @@ function check_domain ($domain) {
* @return empty string if it's a valid email address, otherwise string with the errormessage
* TODO: make check_email able to handle already added domains
*/
-function check_email ($email) {
+function check_email($email) {
$ce_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);
}
// Perform non-domain-part sanity checks
- if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', $ce_email)) {
+ if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', $ce_email)) {
return Config::lang_f('pInvalidMailRegex', $email);
}
+ if (function_exists('filter_var')) {
+ $check = filter_var($email, FILTER_VALIDATE_EMAIL);
+ if (!$check) {
+ return Config::lang_f('pInvalidMailRegex', $email);
+ }
+ }
// Determine domain name
$matches=array();
- if (!preg_match('|@(.+)$|',$ce_email,$matches)) {
+ if (!preg_match('|@(.+)$|', $ce_email, $matches)) {
return Config::lang_f('pInvalidMailRegex', $email);
}
$domain=$matches[1];
@@ -277,26 +300,26 @@ 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)
- * @return String (or Array) of cleaned data, suitable for use within an SQL
- * statement.
+ * @param string|array parameters to escape
+ * @return string|array of cleaned data, suitable for use within an SQL statement.
*/
-function escape_string ($string) {
+function escape_string($string) {
global $CONF;
// if the string is actually an array, do a recursive cleaning.
// Note, the array keys are not cleaned.
- if(is_array($string)) {
+ if (is_array($string)) {
$clean = array();
- foreach(array_keys($string) as $row) {
- $clean[$row] = escape_string($string[$row]);
+ foreach ($string as $k => $v) {
+ $clean[$k] = escape_string($v);
}
return $clean;
}
- if (get_magic_quotes_gpc ()) {
+ if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
$string = stripslashes($string);
}
if (!is_numeric($string)) {
$link = db_connect();
+
if ($CONF['database_type'] == "mysql") {
$escaped_string = mysql_real_escape_string($string, $link);
}
@@ -328,66 +351,75 @@ function escape_string ($string) {
* - or -
* $param = safeget('param', 'default')
*
- * @param String parameter name.
- * @param String (optional) - default value if key is not set.
- * @return String
+ * @param string $param parameter name.
+ * @param string $default (optional) - default value if key is not set.
+ * @return string
*/
-function safeget ($param, $default="") {
+function safeget($param, $default="") {
$retval=$default;
- if (isset($_GET[$param])) $retval=$_GET[$param];
+ if (isset($_GET[$param])) {
+ $retval=$_GET[$param];
+ }
return $retval;
}
/**
- * safepost - similar to safeget()
+ * safepost - similar to safeget() but for $_POST
* @see safeget()
- * @param String parameter name
- * @param String (optional) default value (defaults to "")
- * @return String - value in $_POST[$param] or $default
- * same as safeget, but for $_POST
+ * @param string $param parameter name
+ * @param string $default (optional) default value (defaults to "")
+ * @return string - value in $_POST[$param] or $default
*/
-function safepost ($param, $default="") {
+function safepost($param, $default="") {
$retval=$default;
- if (isset($_POST[$param])) $retval=$_POST[$param];
+ if (isset($_POST[$param])) {
+ $retval=$_POST[$param];
+ }
return $retval;
}
/**
* safeserver
* @see safeget()
- * @param String $param
- * @param String $default (optional)
- * @return String value from $_SERVER[$param] or $default
+ * @param string $param
+ * @param string $default (optional)
+ * @return string value from $_SERVER[$param] or $default
*/
-function safeserver ($param, $default="") {
+function safeserver($param, $default="") {
$retval=$default;
- if (isset($_SERVER[$param])) $retval=$_SERVER[$param];
+ if (isset($_SERVER[$param])) {
+ $retval=$_SERVER[$param];
+ }
return $retval;
}
/**
* safecookie
* @see safeget()
- * @param String $param
- * @param String $default (optional)
- * @return String value from $_COOKIE[$param] or $default
+ * @param string $param
+ * @param string $default (optional)
+ * @return string value from $_COOKIE[$param] or $default
*/
-function safecookie ($param, $default="") {
+function safecookie($param, $default="") {
$retval=$default;
- if (isset($_COOKIE[$param])) $retval=$_COOKIE[$param];
+ if (isset($_COOKIE[$param])) {
+ $retval=$_COOKIE[$param];
+ }
return $retval;
}
/**
* safesession
* @see safeget()
- * @param String $param
- * @param String $default (optional)
- * @return String value from $_SESSION[$param] or $default
+ * @param string $param
+ * @param string $default (optional)
+ * @return string value from $_SESSION[$param] or $default
*/
-function safesession ($param, $default="") {
+function safesession($param, $default="") {
$retval=$default;
- if (isset($_SESSION[$param])) $retval=$_SESSION[$param];
+ if (isset($_SESSION[$param])) {
+ $retval=$_SESSION[$param];
+ }
return $retval;
}
@@ -397,18 +429,22 @@ function safesession ($param, $default="
* @param int $allow_editing
* @param int $display_in_form
* @param int display_in_list
- * @param String $type
- * @param String PALANG_label
- * @param String PALANG_desc
+ * @param string $type
+ * @param string PALANG_label
+ * @param string PALANG_desc
* @param any optional $default
- * @param array optional $options
- * @param int or $not_in_db - if array, can contain the remaining parameters as associated array
+ * @param array $options optional options
+ * @param int or $not_in_db - if array, can contain the remaining parameters as associated array. Otherwise counts as $not_in_db
* @param ...
* @return array for $struct
*/
function pacol($allow_editing, $display_in_form, $display_in_list, $type, $PALANG_label, $PALANG_desc, $default = "", $options = array(), $multiopt=0, $dont_write_to_db=0, $select="", $extrafrom="", $linkto="") {
- if ($PALANG_label != '') $PALANG_label = Config::lang($PALANG_label);
- if ($PALANG_desc != '') $PALANG_desc = Config::lang($PALANG_desc );
+ if ($PALANG_label != '') {
+ $PALANG_label = Config::lang($PALANG_label);
+ }
+ if ($PALANG_desc != '') {
+ $PALANG_desc = Config::lang($PALANG_desc);
+ }
if (is_array($multiopt)) { # remaining parameters provided in named array
$not_in_db = 0; # keep default value
@@ -441,8 +477,7 @@ function pacol($allow_editing, $display_
// Action: Get all the properties of a domain.
// Call: get_domain_properties (string domain)
//
-function get_domain_properties ($domain) {
-
+function get_domain_properties($domain) {
$handler = new DomainHandler();
if (!$handler->init($domain)) {
die("Error: " . join("\n", $handler->errormsg));
@@ -464,7 +499,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;
@@ -478,12 +513,12 @@ function create_page_browser($idxfield,
# get number of rows
$query = "SELECT count(*) as counter FROM (SELECT $idxfield $querypart) AS tmp";
- $result = db_query ($query);
+ $result = db_query($query);
if ($result['rows'] > 0) {
- $row = db_array ($result['result']);
+ $row = db_assoc($result['result']);
$count_results = $row['counter'] -1; # we start counting at 0, not 1
}
-# echo "rows: " . ($count_results +1) . " --- $query";
+ # echo "
rows: " . ($count_results +1) . " --- $query";
if ($count_results < $page_size) {
return array(); # only one page - no pagebrowser required
@@ -502,16 +537,16 @@ function create_page_browser($idxfield,
$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()) {
@@ -522,32 +557,30 @@ function create_page_browser($idxfield,
WHERE (row % $page_size) IN (0,$page_size_zerobase) OR row = $count_results";
}
-# echo "
$query";
-
-# TODO: $query is MySQL-specific
+ # TODO: $query is MySQL-specific
-# 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
-# CREATE TEMPORARY SEQUENCE foo MINVALUE 0 MAXVALUE $page_size_zerobase CYCLE
-# afterwards: DROP SEQUENCE foo
+ # 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
+ # CREATE TEMPORARY SEQUENCE foo MINVALUE 0 MAXVALUE $page_size_zerobase CYCLE
+ # afterwards: DROP SEQUENCE foo
- $result = db_query ($query);
+ $result = db_query($query);
if ($result['rows'] > 0) {
- while ($row = db_array ($result['result'])) {
- if ($row2 = db_array ($result['result'])) {
- $label = substr($row['label'],0,$label_len) . '-' . substr($row2['label'],0,$label_len);
+ while ($row = db_assoc($result['result'])) {
+ if ($row2 = db_assoc($result['result'])) {
+ $label = substr($row['label'], 0, $label_len) . '-' . substr($row2['label'], 0, $label_len);
$pagebrowser[] = $label;
} else { # only one row remaining
- $label = substr($row['label'],0,$label_len);
+ $label = substr($row['label'], 0, $label_len);
$pagebrowser[] = $label;
}
}
}
if (db_pgsql()) {
- db_query ("DROP SEQUENCE rowcount");
+ db_query("DROP SEQUENCE rowcount");
}
return $pagebrowser;
@@ -563,9 +596,11 @@ function create_page_browser($idxfield,
// Action: Recalculates the quota from MBs to bytes (divide, /)
// Call: divide_quota (string $quota)
//
-function divide_quota ($quota) {
- if ($quota == -1) return $quota;
- $value = round($quota / Config::read('quota_multiplier'),2);
+function divide_quota($quota) {
+ if ($quota == -1) {
+ return $quota;
+ }
+ $value = round($quota / Config::read('quota_multiplier'), 2);
return $value;
}
@@ -576,11 +611,11 @@ function divide_quota ($quota) {
// Action: Checks if the admin is the owner of the domain (or global-admin)
// Call: check_owner (string admin, string domain)
//
-function check_owner ($username, $domain) {
+function check_owner($username, $domain) {
$table_domain_admins = table_by_key('domain_admins');
$E_username = escape_string($username);
$E_domain = escape_string($domain);
- $result = db_query ("SELECT 1 FROM $table_domain_admins WHERE username='$E_username' AND (domain='$E_domain' OR domain='ALL') AND active='1'");
+ $result = db_query("SELECT 1 FROM $table_domain_admins WHERE username='$E_username' AND (domain='$E_domain' OR domain='ALL') AND active='1'");
if ($result['rows'] == 1 || $result['rows'] == 2) { # "ALL" + specific domain permissions is possible
# TODO: if superadmin, check if given domain exists in the database
@@ -597,11 +632,11 @@ 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.
*/
-function list_domains_for_admin ($username) {
+function list_domains_for_admin($username) {
$table_domain = table_by_key('domain');
$table_domain_admins = table_by_key('domain_admins');
@@ -610,22 +645,22 @@ function list_domains_for_admin ($userna
$query = "SELECT $table_domain.domain FROM $table_domain ";
$condition[] = "$table_domain.domain != 'ALL'";
- $result = db_query ("SELECT username FROM $table_domain_admins WHERE username='$E_username' AND domain='ALL'");
+ $result = db_query("SELECT username FROM $table_domain_admins WHERE username='$E_username' AND domain='ALL'");
if ($result['rows'] < 1) { # not a superadmin
$query .= " LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain ";
$condition[] = "$table_domain_admins.username='$E_username' ";
$condition[] = "$table_domain.active='" . db_get_boolean(true) . "'"; # TODO: does it really make sense to exclude inactive...
- $condition[] = "$table_domain.backupmx='" . db_get_boolean(False) . "'"; # TODO: ... and backupmx domains for non-superadmins?
+ $condition[] = "$table_domain.backupmx='" . db_get_boolean(false) . "'"; # TODO: ... and backupmx domains for non-superadmins?
}
$query .= " WHERE " . join(' AND ', $condition);
$query .= " ORDER BY $table_domain.domain";
- $list = array ();
- $result = db_query ($query);
+ $list = array();
+ $result = db_query($query);
if ($result['rows'] > 0) {
$i = 0;
- while ($row = db_array ($result['result'])) {
+ while ($row = db_assoc($result['result'])) {
$list[$i] = $row['domain'];
$i++;
}
@@ -640,14 +675,14 @@ function list_domains_for_admin ($userna
// Action: List all available domains.
// Call: list_domains ()
//
-function list_domains () {
+function list_domains() {
$list = array();
$table_domain = table_by_key('domain');
- $result = db_query ("SELECT domain FROM $table_domain WHERE domain!='ALL' ORDER BY domain");
+ $result = db_query("SELECT domain FROM $table_domain WHERE domain!='ALL' ORDER BY domain");
if ($result['rows'] > 0) {
$i = 0;
- while ($row = db_array ($result['result'])) {
+ while ($row = db_assoc($result['result'])) {
$list[$i] = $row['domain'];
$i++;
}
@@ -665,7 +700,7 @@ function list_domains () {
//
// was admin_list_admins
//
-function list_admins () {
+function list_admins() {
$handler = new AdminHandler();
$handler->getList('');
@@ -679,14 +714,14 @@ function list_admins () {
// Action: Encode a string according to RFC 1522 for use in headers if it contains 8-bit characters.
// Call: encode_header (string header, string charset)
//
-function encode_header ($string, $default_charset = "utf-8") {
- if (strtolower ($default_charset) == 'iso-8859-1') {
- $string = str_replace ("\240",' ',$string);
+function encode_header($string, $default_charset = "utf-8") {
+ if (strtolower($default_charset) == 'iso-8859-1') {
+ $string = str_replace("\240", ' ', $string);
}
- $j = strlen ($string);
- $max_l = 75 - strlen ($default_charset) - 7;
- $aRet = array ();
+ $j = strlen($string);
+ $max_l = 75 - strlen($default_charset) - 7;
+ $aRet = array();
$ret = '';
$iEncStart = $enc_init = false;
$cur_l = $iOffset = 0;
@@ -704,20 +739,20 @@ function encode_header ($string, $defaul
}
$cur_l+=3;
if ($cur_l > ($max_l-2)) {
- $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset);
+ $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset);
$aRet[] = "=?$default_charset?Q?$ret?=";
$iOffset = $i;
$cur_l = 0;
$ret = '';
$iEncStart = false;
} else {
- $ret .= sprintf ("=%02X",ord($string{$i}));
+ $ret .= sprintf("=%02X", ord($string{$i}));
}
break;
case '(':
case ')':
if ($iEncStart !== false) {
- $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset);
+ $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset);
$aRet[] = "=?$default_charset?Q?$ret?=";
$iOffset = $i;
$cur_l = 0;
@@ -729,7 +764,7 @@ function encode_header ($string, $defaul
if ($iEncStart !== false) {
$cur_l++;
if ($cur_l > $max_l) {
- $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset);
+ $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset);
$aRet[] = "=?$default_charset?Q?$ret?=";
$iOffset = $i;
$cur_l = 0;
@@ -741,21 +776,21 @@ function encode_header ($string, $defaul
}
break;
default:
- $k = ord ($string{$i});
+ $k = ord($string{$i});
if ($k > 126) {
if ($iEncStart === false) {
// do not start encoding in the middle of a string, also take the rest of the word.
- $sLeadString = substr ($string,0,$i);
- $aLeadString = explode (' ',$sLeadString);
- $sToBeEncoded = array_pop ($aLeadString);
- $iEncStart = $i - strlen ($sToBeEncoded);
+ $sLeadString = substr($string, 0, $i);
+ $aLeadString = explode(' ', $sLeadString);
+ $sToBeEncoded = array_pop($aLeadString);
+ $iEncStart = $i - strlen($sToBeEncoded);
$ret .= $sToBeEncoded;
- $cur_l += strlen ($sToBeEncoded);
+ $cur_l += strlen($sToBeEncoded);
}
$cur_l += 3;
// first we add the encoded string that reached it's max size
if ($cur_l > ($max_l-2)) {
- $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset);
+ $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset);
$aRet[] = "=?$default_charset?Q?$ret?= ";
$cur_l = 3;
$ret = '';
@@ -763,12 +798,12 @@ function encode_header ($string, $defaul
$iEncStart = $i;
}
$enc_init = true;
- $ret .= sprintf ("=%02X", $k);
+ $ret .= sprintf("=%02X", $k);
} else {
if ($iEncStart !== false) {
$cur_l++;
if ($cur_l > $max_l) {
- $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset);
+ $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset);
$aRet[] = "=?$default_charset?Q?$ret?=";
$iEncStart = false;
$iOffset = $i;
@@ -785,26 +820,25 @@ function encode_header ($string, $defaul
}
if ($enc_init) {
if ($iEncStart !== false) {
- $aRet[] = substr ($string,$iOffset,$iEncStart-$iOffset);
+ $aRet[] = substr($string, $iOffset, $iEncStart-$iOffset);
$aRet[] = "=?$default_charset?Q?$ret?=";
} else {
- $aRet[] = substr ($string,$iOffset);
+ $aRet[] = substr($string, $iOffset);
}
- $string = implode ('',$aRet);
+ $string = implode('', $aRet);
}
return $string;
}
-//
-// generate_password
-// Action: Generates a random password
-// Call: generate_password ()
-//
-function generate_password () {
- // length of the generated password
- $length = 8;
+/**
+ * Generate a random password of $length characters.
+ * @param int $length (optional, default: 12)
+ * @return string
+ *
+ */
+function generate_password($length = 12) {
// define possible characters
$possible = "2345678923456789abcdefghijkmnpqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ"; # skip 0 and 1 to avoid confusion with O and l
@@ -812,8 +846,12 @@ function generate_password () {
// add random characters to $password until $length is reached
$password = "";
while (strlen($password) < $length) {
- // pick a random character from the possible ones
- $char = substr($possible, mt_rand(0, strlen($possible)-1), 1);
+ if (function_exists('random_int')) {
+ $random = random_int(0, strlen($possible) -1);
+ } else {
+ $random = mt_rand(0, strlen($possible) - 1);
+ }
+ $char = substr($possible, $random, 1);
// we don't want this character if it's already in the password
if (!strstr($password, $char)) {
@@ -828,7 +866,7 @@ function generate_password () {
/**
* Check if a password is strong enough based on the conditions in $CONF['password_validation']
- * @param String $password
+ * @param string $password
* @return array of error messages, or empty array if the password is ok
*/
function validate_password($password) {
@@ -854,164 +892,305 @@ function validate_password($password) {
return $result;
}
+function _pacrypt_md5crypt($pw, $pw_db) {
+ $split_salt = preg_split('/\$/', $pw_db);
+ if (isset($split_salt[2])) {
+ $salt = $split_salt[2];
+ return md5crypt($pw, $salt);
+ }
+
+ return md5crypt($pw);
+}
+
+function _pacrypt_crypt($pw, $pw_db) {
+ if ($pw_db) {
+ return crypt($pw, $pw_db);
+ }
+ return crypt($pw);
+}
+
+function _pacrypt_mysql_encrypt($pw, $pw_db) {
+ // See https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583
+ // this is apparently useful for pam_mysql etc.
+ $pw = escape_string($pw);
+ if ($pw_db!="") {
+ $salt=escape_string(substr($pw_db, 0, 2));
+ $res=db_query("SELECT ENCRYPT('".$pw."','".$salt."');");
+ } else {
+ $res=db_query("SELECT ENCRYPT('".$pw."');");
+ }
+ $l = db_row($res["result"]);
+ $password = $l[0];
+ return $password;
+}
+
+function _pacrypt_authlib($pw, $pw_db) {
+ global $CONF;
+ $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];
+ $salt = substr($result[2], 0, 2);
+ }
+
+ if (stripos($flavor, 'md5raw') === 0) {
+ $password = '{' . $flavor . '}' . md5($pw);
+ } elseif (stripos($flavor, 'md5') === 0) {
+ $password = '{' . $flavor . '}' . base64_encode(md5($pw, true));
+ } elseif (stripos($flavor, 'crypt') === 0) {
+ $password = '{' . $flavor . '}' . crypt($pw, $salt);
+ } elseif (stripos($flavor, 'SHA') === 0) {
+ $password = '{' . $flavor . '}' . base64_encode(sha1($pw, true));
+ } else {
+ die("authlib_default_flavor '" . $flavor . "' unknown. Valid flavors are 'md5raw', 'md5', 'SHA' and 'crypt'");
+ }
+ return $password;
+}
/**
- * 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.
- *
- * @param string $pw
- * @param string $encrypted password
- * @return string encrypted password.
+ * @param string $pw - plain text password
+ * @param string $pw_db - encrypted password, or '' for generation.
+ * @return string
*/
-function pacrypt ($pw, $pw_db="") {
+function _pacrypt_dovecot($pw, $pw_db) {
global $CONF;
- $password = "";
- $salt = "";
- if ($CONF['encrypt'] == 'md5crypt') {
- $split_salt = preg_split ('/\$/', $pw_db);
- if (isset ($split_salt[2])) {
- $salt = $split_salt[2];
- }
- $password = md5crypt ($pw, $salt);
+ $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.");
+ # $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
+ if (strtolower($method) == 'digest-md5') {
+ die("Sorry, \$CONF['encrypt'] = 'dovecot:digest-md5' is not supported by PostfixAdmin.");
+ }
+ if (strtoupper($method) == 'SCRAM-SHA-1') {
+ die("Sorry, \$CONF['encrypt'] = 'dovecot:scram-sha-1' is not supported by PostfixAdmin.");
+ }
+ # TODO: add -u option for those hashes, or for everything that is salted (-u was available before dovecot 2.1 -> no problem with backward compability)
+
+ $dovecotpw = "doveadm pw";
+ if (!empty($CONF['dovecotpw'])) {
+ $dovecotpw = $CONF['dovecotpw'];
}
- elseif ($CONF['encrypt'] == 'md5') {
- $password = md5($pw);
+ # Use proc_open call to avoid safe_mode problems and to prevent showing plain password in process table
+ $spec = array(
+ 0 => array("pipe", "r"), // stdin
+ 1 => array("pipe", "w"), // stdout
+ 2 => array("pipe", "w"), // stderr
+ );
+
+ $nonsaltedtypes = "SHA|SHA1|SHA256|SHA512|CLEAR|CLEARTEXT|PLAIN|PLAIN-TRUNC|CRAM-MD5|HMAC-MD5|PLAIN-MD4|PLAIN-MD5|LDAP-MD5|LANMAN|NTLM|RPA";
+ $salted = ! preg_match("/^($nonsaltedtypes)(\.B64|\.BASE64|\.HEX)?$/", strtoupper($method));
+
+ $dovepasstest = '';
+ if ($salted && (!empty($pw_db))) {
+ # only use -t for salted passwords to be backward compatible with dovecot < 2.1
+ $dovepasstest = " -t " . escapeshellarg($pw_db);
}
+ $pipe = proc_open("$dovecotpw '-s' $method$dovepasstest", $spec, $pipes);
+
+ if (!$pipe) {
+ die("can't proc_open $dovecotpw");
+ }
+
+ // use dovecot's stdin, it uses getpass() twice (except when using -t)
+ // Write pass in pipe stdin
+ if (empty($dovepasstest)) {
+ fwrite($pipes[0], $pw . "\n", 1+strlen($pw));
+ usleep(1000);
+ }
+ fwrite($pipes[0], $pw . "\n", 1+strlen($pw));
+ fclose($pipes[0]);
+
+ // Read hash from pipe stdout
+ $password = fread($pipes[1], "200");
- elseif ($CONF['encrypt'] == 'system') {
- if ($pw_db) {
- $password = crypt($pw, $pw_db);
+ if (empty($dovepasstest)) {
+ if (!preg_match('/^\{' . $method . '\}/', $password)) {
+ $stderr_output = stream_get_contents($pipes[2]);
+ error_log('dovecotpw password encryption failed. STDERR output: '. $stderr_output);
+ die("can't encrypt password with dovecotpw, see error log for details");
+ }
+ } else {
+ if (!preg_match('(verified)', $password)) {
+ $password="Thepasswordcannotbeverified";
} else {
- $password = crypt($pw);
+ $password = rtrim(str_replace('(verified)', '', $password));
}
}
- elseif ($CONF['encrypt'] == 'cleartext') {
- $password = $pw;
+ fclose($pipes[1]);
+ fclose($pipes[2]);
+ proc_close($pipe);
+
+ if ((!empty($pw_db)) && (substr($pw_db, 0, 1) != '{')) {
+ # for backward compability with "old" dovecot passwords that don't have the {method} prefix
+ $password = str_replace('{' . $method . '}', '', $password);
}
- // See https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583
- // this is apparently useful for pam_mysql etc.
- elseif ($CONF['encrypt'] == 'mysql_encrypt') {
- $pw = escape_string($pw);
- if ($pw_db!="") {
- $salt=escape_string(substr($pw_db,0,2));
- $res=db_query("SELECT ENCRYPT('".$pw."','".$salt."');");
- } else {
- $res=db_query("SELECT ENCRYPT('".$pw."');");
- }
- $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];
- $salt = substr($result[2], 0, 2);
- }
-
- if(stripos($flavor, 'md5raw') === 0) {
- $password = '{' . $flavor . '}' . md5($pw);
- } elseif(stripos($flavor, 'md5') === 0) {
- $password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE));
- } elseif(stripos($flavor, 'crypt') === 0) {
- $password = '{' . $flavor . '}' . crypt($pw, $salt);
- } elseif(stripos($flavor, 'SHA') === 0) {
- $password = '{' . $flavor . '}' . base64_encode(sha1($pw, TRUE));
- } else {
- 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.");
- # $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
- if (strtolower($method) == 'digest-md5') die("Sorry, \$CONF['encrypt'] = 'dovecot:digest-md5' is not supported by PostfixAdmin.");
- if (strtoupper($method) == 'SCRAM-SHA-1') die("Sorry, \$CONF['encrypt'] = 'dovecot:scram-sha-1' is not supported by PostfixAdmin.");
- # TODO: add -u option for those hashes, or for everything that is salted (-u was available before dovecot 2.1 -> no problem with backward compability)
-
- $dovecotpw = "doveadm pw";
- if (!empty($CONF['dovecotpw'])) $dovecotpw = $CONF['dovecotpw'];
-
- # Use proc_open call to avoid safe_mode problems and to prevent showing plain password in process table
- $spec = array(
- 0 => array("pipe", "r"), // stdin
- 1 => array("pipe", "w"), // stdout
- 2 => array("pipe", "w"), // stderr
- );
-
- $nonsaltedtypes = "SHA|SHA1|SHA256|SHA512|CLEAR|CLEARTEXT|PLAIN|PLAIN-TRUNC|CRAM-MD5|HMAC-MD5|PLAIN-MD4|PLAIN-MD5|LDAP-MD5|LANMAN|NTLM|RPA";
- $salted = ! preg_match("/^($nonsaltedtypes)(\.B64|\.BASE64|\.HEX)?$/", strtoupper($method) );
-
- $dovepasstest = '';
- if ( $salted && (!empty($pw_db)) ) {
- # only use -t for salted passwords to be backward compatible with dovecot < 2.1
- $dovepasstest = " -t " . escapeshellarg($pw_db);
- }
- $pipe = proc_open("$dovecotpw '-s' $method$dovepasstest", $spec, $pipes);
-
- if (!$pipe) {
- die("can't proc_open $dovecotpw");
- } else {
- // use dovecot's stdin, it uses getpass() twice (except when using -t)
- // Write pass in pipe stdin
- if (empty($dovepasstest)) {
- fwrite($pipes[0], $pw . "\n", 1+strlen($pw)); usleep(1000);
- }
- fwrite($pipes[0], $pw . "\n", 1+strlen($pw));
- fclose($pipes[0]);
-
- // Read hash from pipe stdout
- $password = fread($pipes[1], "200");
-
- if (empty($dovepasstest)) {
- if ( !preg_match('/^\{' . $method . '\}/', $password)) {
- $stderr_output = stream_get_contents($pipes[2]);
- error_log('dovecotpw password encryption failed.');
- error_log('STDERR output: ' . $stderr_output);
- die("can't encrypt password with dovecotpw, see error log for details");
- }
- } else {
- if ( !preg_match('(verified)', $password)) {
- $password="Thepasswordcannotbeverified";
- } else {
- $password = rtrim(str_replace('(verified)', '', $password));
- }
- }
+ return rtrim($password);
+}
- fclose($pipes[1]);
- fclose($pipes[2]);
- proc_close($pipe);
+/**
+ * @param string $pw
+ * @param string $pw_db (can be empty if setting a new password)
+ * @return string
+ */
+function _pacrypt_php_crypt($pw, $pw_db) {
+ global $CONF;
- if ( (!empty($pw_db)) && (substr($pw_db,0,1) != '{') ) {
- # for backward compability with "old" dovecot passwords that don't have the {method} prefix
- $password = str_replace('{' . $method . '}', '', $password);
- }
+ // use PHPs crypt(), which uses the system's crypt()
+ // same algorithms as used in /etc/shadow
+ // you can have mixed hash types in the database for authentication, changed passwords get specified hash type
+ // the algorithm for a new hash is chosen by feeding a salt with correct magic to crypt()
+ // set $CONF['encrypt'] to 'php_crypt' to use the default SHA512 crypt method
+ // set $CONF['encrypt'] to 'php_crypt:METHOD' to use another method; methods supported: DES, MD5, BLOWFISH, SHA256, SHA512
+ // tested on linux
+
+ if (strlen($pw_db) > 0) {
+ // existing pw provided. send entire password hash as salt for crypt() to figure out
+ $salt = $pw_db;
+ } else {
+ $salt_method = 'SHA512'; // hopefully a reasonable default (better than MD5)
+ // no pw provided. create new password hash
+ if (strpos($CONF['encrypt'], ':') !== false) {
+ // use specified hash method
+ $split_method = explode(':', $CONF['encrypt']);
+ $salt_method = $split_method[1];
+ }
+ // create appropriate salt for selected hash method
+ $salt = _php_crypt_generate_crypt_salt($salt_method);
+ }
+ // send it to PHPs crypt()
+ $password = crypt($pw, $salt);
+ return $password;
+}
+
+/**
+ * @param string $hash_type must be one of: MD5, DES, BLOWFISH, SHA256 or SHA512 (default)
+ * @return string
+ */
+function _php_crypt_generate_crypt_salt($hash_type='SHA512') {
+ // generate a salt (with magic matching chosen hash algorithm) for the PHP crypt() function
+
+ // most commonly used alphabet
+ $alphabet = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
- $password = rtrim($password);
+ switch ($hash_type) {
+ case 'DES':
+ $alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+ $length = 2;
+ $salt = _php_crypt_random_string($alphabet, $length);
+ return $salt;
+
+ case 'MD5':
+ $length = 12;
+ $algorithm = '1';
+ $salt = _php_crypt_random_string($alphabet, $length);
+ return sprintf('$%s$%s', $algorithm, $salt);
+
+ case 'BLOWFISH':
+ $length = 22;
+ $cost = 10;
+ if (version_compare(PHP_VERSION, '5.3.7') >= 0) {
+ $algorithm = '2y'; // bcrypt, with fixed unicode problem
+ } else {
+ $algorithm = '2a'; // bcrypt
+ }
+ $salt = _php_crypt_random_string($alphabet, $length);
+ return sprintf('$%s$%02d$%s', $algorithm, $cost, $salt);
+
+ case 'SHA256':
+ $length = 16;
+ $algorithm = '5';
+ $salt = _php_crypt_random_string($alphabet, $length);
+ return sprintf('$%s$%s', $algorithm, $salt);
+
+ case 'SHA512':
+ $length = 16;
+ $algorithm = '6';
+ $salt = _php_crypt_random_string($alphabet, $length);
+ return sprintf('$%s$%s', $algorithm, $salt);
+
+ default:
+ die("unknown hash type: '$hash_type'");
+ }
+}
+
+/**
+ * Generates a random string of specified $length from $characters.
+ * @param string $characters
+ * @param int $length
+ * @return string of given $length
+ */
+function _php_crypt_random_string($characters, $length) {
+ $random_int_exists = true;
+ if (!function_exists('random_int')) {
+ $random_int_exists = false;
+ }
+ $string = '';
+ for ($p = 0; $p < $length; $p++) {
+ if ($random_int_exists) {
+ $string .= $characters[random_int(0, strlen($characters) -1)];
+ } else {
+ // should really use a stronger randomness source
+ $string .= $characters[mt_rand(0, strlen($characters) - 1)];
}
}
+ return $string;
+}
+
- else {
- die ('unknown/invalid $CONF["encrypt"] setting: ' . $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.
+ *
+ * @param string $pw
+ * @param string $pw_db optional encrypted password
+ * @return string encrypted password.
+ */
+function pacrypt($pw, $pw_db="") {
+ global $CONF;
+
+ switch ($CONF['encrypt']) {
+ case 'md5crypt':
+ return _pacrypt_md5crypt($pw, $pw_db);
+ case 'md5':
+ return md5($pw);
+ case 'system':
+ return _pacrypt_crypt($pw, $pw_db);
+ case 'cleartext':
+ return $pw;
+ case 'mysql_encrypt':
+ return _pacrypt_mysql_encrypt($pw, $pw_db);
+ case 'authlib':
+ return _pacrypt_authlib($pw, $pw_db);
+ }
+
+ if (preg_match("/^dovecot:/", $CONF['encrypt'])) {
+ return _pacrypt_dovecot($pw, $pw_db);
}
- return $password;
+ if (substr($CONF['encrypt'], 0, 9) === 'php_crypt') {
+ return _pacrypt_php_crypt($pw, $pw_db);
+ }
+
+ die('unknown/invalid $CONF["encrypt"] setting: ' . $CONF['encrypt']);
}
//
@@ -1020,77 +1199,91 @@ function pacrypt ($pw, $pw_db="") {
// Call: md5crypt (string cleartextpassword)
//
-function md5crypt ($pw, $salt="", $magic="") {
+function md5crypt($pw, $salt="", $magic="") {
$MAGIC = "$1$";
- if ($magic == "") $magic = $MAGIC;
- if ($salt == "") $salt = create_salt ();
- $slist = explode ("$", $salt);
- if ($slist[0] == "1") $salt = $slist[1];
+ if ($magic == "") {
+ $magic = $MAGIC;
+ }
+ if ($salt == "") {
+ $salt = create_salt();
+ }
+ $slist = explode("$", $salt);
+ if ($slist[0] == "1") {
+ $salt = $slist[1];
+ }
- $salt = substr ($salt, 0, 8);
+ $salt = substr($salt, 0, 8);
$ctx = $pw . $magic . $salt;
- $final = hex2bin (md5 ($pw . $salt . $pw));
+ $final = hex2bin(md5($pw . $salt . $pw));
- for ($i=strlen ($pw); $i>0; $i-=16) {
+ for ($i=strlen($pw); $i>0; $i-=16) {
if ($i > 16) {
- $ctx .= substr ($final,0,16);
+ $ctx .= substr($final, 0, 16);
} else {
- $ctx .= substr ($final,0,$i);
+ $ctx .= substr($final, 0, $i);
}
}
- $i = strlen ($pw);
+ $i = strlen($pw);
while ($i > 0) {
- if ($i & 1) $ctx .= chr (0);
- else $ctx .= $pw[0];
+ if ($i & 1) {
+ $ctx .= chr(0);
+ } else {
+ $ctx .= $pw[0];
+ }
$i = $i >> 1;
}
- $final = hex2bin (md5 ($ctx));
+ $final = hex2bin(md5($ctx));
for ($i=0;$i<1000;$i++) {
$ctx1 = "";
if ($i & 1) {
$ctx1 .= $pw;
} else {
- $ctx1 .= substr ($final,0,16);
+ $ctx1 .= substr($final, 0, 16);
+ }
+ if ($i % 3) {
+ $ctx1 .= $salt;
+ }
+ if ($i % 7) {
+ $ctx1 .= $pw;
}
- if ($i % 3) $ctx1 .= $salt;
- if ($i % 7) $ctx1 .= $pw;
if ($i & 1) {
- $ctx1 .= substr ($final,0,16);
+ $ctx1 .= substr($final, 0, 16);
} else {
$ctx1 .= $pw;
}
- $final = hex2bin (md5 ($ctx1));
+ $final = hex2bin(md5($ctx1));
}
$passwd = "";
- $passwd .= to64 (((ord ($final[0]) << 16) | (ord ($final[6]) << 8) | (ord ($final[12]))), 4);
- $passwd .= to64 (((ord ($final[1]) << 16) | (ord ($final[7]) << 8) | (ord ($final[13]))), 4);
- $passwd .= to64 (((ord ($final[2]) << 16) | (ord ($final[8]) << 8) | (ord ($final[14]))), 4);
- $passwd .= to64 (((ord ($final[3]) << 16) | (ord ($final[9]) << 8) | (ord ($final[15]))), 4);
- $passwd .= to64 (((ord ($final[4]) << 16) | (ord ($final[10]) << 8) | (ord ($final[5]))), 4);
- $passwd .= to64 (ord ($final[11]), 2);
+ $passwd .= to64(((ord($final[0]) << 16) | (ord($final[6]) << 8) | (ord($final[12]))), 4);
+ $passwd .= to64(((ord($final[1]) << 16) | (ord($final[7]) << 8) | (ord($final[13]))), 4);
+ $passwd .= to64(((ord($final[2]) << 16) | (ord($final[8]) << 8) | (ord($final[14]))), 4);
+ $passwd .= to64(((ord($final[3]) << 16) | (ord($final[9]) << 8) | (ord($final[15]))), 4);
+ $passwd .= to64(((ord($final[4]) << 16) | (ord($final[10]) << 8) | (ord($final[5]))), 4);
+ $passwd .= to64(ord($final[11]), 2);
return "$magic$salt\$$passwd";
}
-function create_salt () {
- srand ((double) microtime ()*1000000);
- $salt = substr (md5 (rand (0,9999999)), 0, 8);
+function create_salt() {
+ srand((double) microtime()*1000000);
+ $salt = substr(md5(rand(0, 9999999)), 0, 8);
return $salt;
}
/**/ if (!function_exists('hex2bin')) { # PHP around 5.3.8 includes hex2bin as native function - http://php.net/hex2bin
-function hex2bin ($str) {
- $len = strlen ($str);
- $nstr = "";
- for ($i=0;$i<$len;$i+=2) {
- $num = sscanf (substr ($str,$i,2), "%x");
- $nstr.=chr ($num[0]);
+ function hex2bin($str) {
+ $len = strlen($str);
+ $nstr = "";
+ for ($i=0;$i<$len;$i+=2) {
+ $num = sscanf(substr($str, $i, 2), "%x");
+ $nstr.=chr($num[0]);
+ }
+ return $nstr;
}
- return $nstr;
+ /**/
}
-/**/ }
/*
* remove item $item from array $array
@@ -1103,12 +1296,12 @@ function remove_from_array($array, $item
$found = 0;
} else {
$found = 1;
- unset ($array[$ret]);
+ unset($array[$ret]);
}
return array($found, $array);
}
-function to64 ($v, $n) {
+function to64($v, $n) {
$ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
$ret = "";
while (($n - 1) >= 0) {
@@ -1133,13 +1326,13 @@ function to64 ($v, $n) {
* @return bool - true on success, otherwise false
* TODO: Replace this with something decent like PEAR::Mail or Zend_Mail.
*/
-function smtp_mail ($to, $from, $data, $body = "") {
+function smtp_mail($to, $from, $data, $body = "") {
global $CONF;
$smtpd_server = $CONF['smtp_server'];
$smtpd_port = $CONF['smtp_port'];
//$smtp_server = $_SERVER["SERVER_NAME"];
$smtp_server = php_uname('n');
- if(!empty($CONF['smtp_client'])) {
+ if (!empty($CONF['smtp_client'])) {
$smtp_server = $CONF['smtp_client'];
}
$errno = "0";
@@ -1147,10 +1340,10 @@ function smtp_mail ($to, $from, $data, $
$timeout = "30";
if ($body != "") {
- $maildata =
+ $maildata =
"To: " . $to . "\n"
. "From: " . $from . "\n"
- . "Subject: " . encode_header ($data) . "\n"
+ . "Subject: " . encode_header($data) . "\n"
. "MIME-Version: 1.0\n"
. "Content-Type: text/plain; charset=utf-8\n"
. "Content-Transfer-Encoding: 8bit\n"
@@ -1161,26 +1354,26 @@ function smtp_mail ($to, $from, $data, $
$maildata = $data;
}
- $fh = @fsockopen ($smtpd_server, $smtpd_port, $errno, $errstr, $timeout);
+ $fh = @fsockopen($smtpd_server, $smtpd_port, $errno, $errstr, $timeout);
if (!$fh) {
error_log("fsockopen failed - errno: $errno - errstr: $errstr");
return false;
} else {
$res = smtp_get_response($fh);
- fputs ($fh, "EHLO $smtp_server\r\n");
+ fputs($fh, "EHLO $smtp_server\r\n");
$res = smtp_get_response($fh);
- fputs ($fh, "MAIL FROM:<$from>\r\n");
+ fputs($fh, "MAIL FROM:<$from>\r\n");
$res = smtp_get_response($fh);
- fputs ($fh, "RCPT TO:<$to>\r\n");
+ fputs($fh, "RCPT TO:<$to>\r\n");
$res = smtp_get_response($fh);
- fputs ($fh, "DATA\r\n");
+ fputs($fh, "DATA\r\n");
$res = smtp_get_response($fh);
- fputs ($fh, "$maildata\r\n.\r\n");
+ fputs($fh, "$maildata\r\n.\r\n");
$res = smtp_get_response($fh);
- fputs ($fh, "QUIT\r\n");
+ fputs($fh, "QUIT\r\n");
$res = smtp_get_response($fh);
- fclose ($fh);
+ fclose($fh);
}
return true;
}
@@ -1193,10 +1386,11 @@ function smtp_mail ($to, $from, $data, $
*/
function smtp_get_admin_email() {
$admin_email = Config::read('admin_email');
- if(!empty($admin_email))
- return $admin_email;
- else
- return authentication_get_username();
+ if (!empty($admin_email)) {
+ return $admin_email;
+ } else {
+ return authentication_get_username();
+ }
}
@@ -1205,13 +1399,12 @@ function smtp_get_admin_email() {
// Action: Get response from mail server
// Call: smtp_get_response (string FileHandle)
//
-function smtp_get_response ($fh) {
+function smtp_get_response($fh) {
$res ='';
do {
$line = fgets($fh, 256);
$res .= $line;
- }
- while (preg_match("/^\d\d\d\-/", $line));
+ } while (preg_match("/^\d\d\d\-/", $line));
return $res;
}
@@ -1238,38 +1431,62 @@ $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 = '';
+ 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 .= ("
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:
DEBUG INFORMATION:Warning: empty alias_domain parameter.
';
- return false;
- }
-
- $cmdarg1=escapeshellarg($alias_domain);
- $command=$CONF[$confpar]." $cmdarg1";
- $retval=0;
- $output=array();
- $firstline='';
- $firstline=exec($command,$output,$retval);
- if (0!=$retval) {
- error_log("Running $command yielded return value=$retval, first line of output=$firstline");
- print 'WARNING: Problems running alias_domain postdeletion script!
';
- return FALSE;
- }
-
- return TRUE;
-}
-
//
// gen_show_status
-// Action: Return a string of colored 's that indicate
+// Action: Return a string of colored '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) {
+function gen_show_status($show_alias) {
global $CONF;
$table_alias = table_by_key('alias');
$stat_string = "";
@@ -1844,9 +2088,9 @@ function gen_show_status ($show_alias) {
$show_alias = escape_string($show_alias);
$stat_goto = "";
- $stat_result = db_query ("SELECT goto FROM $table_alias WHERE address='$show_alias'");
+ $stat_result = db_query("SELECT goto FROM $table_alias WHERE address='$show_alias'");
if ($stat_result['rows'] > 0) {
- $row = db_row ($stat_result['result']);
+ $row = db_row($stat_result['result']);
$stat_goto = $row[0];
}
@@ -1856,77 +2100,89 @@ function gen_show_status ($show_alias) {
}
// UNDELIVERABLE CHECK
- if ( $CONF['show_undeliverable'] == 'YES' ) {
+ if ($CONF['show_undeliverable'] == 'YES') {
$gotos=array();
- $gotos=explode(',',$stat_goto);
+ $gotos=explode(',', $stat_goto);
$undel_string="";
//make sure this alias goes somewhere known
$stat_ok = 1;
- while ( ($g=array_pop($gotos)) && $stat_ok ) {
- list(/*NULL*/,$stat_domain) = explode('@',$g);
+ foreach ($gotos as $g) {
+ if (!$stat_ok) {
+ break;
+ }
+ if (strpos($g, '@') === false) {
+ continue;
+ }
+
+ list($local_part, $stat_domain) = explode('@', $g);
+
$stat_delimiter = "";
- if (!empty($CONF['recipient_delimiter'])) {
- $stat_delimiter = "OR address = '" . escape_string(preg_replace($delimiter_regex, "@", $g)) . "'";
- }
- $stat_result = db_query ("SELECT address FROM $table_alias WHERE address = '" . escape_string($g) . "' OR address = '@" . escape_string($stat_domain) . "' $stat_delimiter");
+ if (!empty($CONF['recipient_delimiter'])) {
+ $stat_delimiter = "OR address = '" . escape_string(preg_replace($delimiter_regex, "@", $g)) . "'";
+ }
+ $stat_result = db_query("SELECT address FROM $table_alias WHERE address = '" . escape_string($g) . "' OR address = '@" . escape_string($stat_domain) . "' $stat_delimiter");
if ($stat_result['rows'] == 0) {
$stat_ok = 0;
}
- if ( $stat_ok == 0 ) {
- if ( $stat_domain == $CONF['vacation_domain'] || in_array($stat_domain, $CONF['show_undeliverable_exceptions']) ) {
+ if ($stat_ok == 0) {
+ if ($stat_domain == $CONF['vacation_domain'] || in_array($stat_domain, $CONF['show_undeliverable_exceptions'])) {
$stat_ok = 1;
}
}
} // while
- if ( $stat_ok == 0 ) {
- $stat_string .= "" . $CONF['show_status_text'] . " ";
+ if ($stat_ok == 0) {
+ $stat_string .= "" . $CONF['show_status_text'] . " ";
} else {
$stat_string .= $CONF['show_status_text'] . " ";
- }
+ }
}
// POP/IMAP CHECK
- if ( $CONF['show_popimap'] == 'YES' ) {
- $stat_delimiter = "";
- if (!empty($CONF['recipient_delimiter'])) {
- $stat_delimiter = ',' . preg_replace($delimiter_regex, "@", $stat_goto);
- }
+ if ($CONF['show_popimap'] == 'YES') {
+ $stat_delimiter = "";
+ if (!empty($CONF['recipient_delimiter'])) {
+ $stat_delimiter = ',' . preg_replace($delimiter_regex, "@", $stat_goto);
+ }
//if the address passed in appears in its own goto field, its POP/IMAP
# TODO: or not (might also be an alias loop) -> check mailbox table!
- if ( preg_match ('/,' . $show_alias . ',/', ',' . $stat_goto . $stat_delimiter . ',') ) {
+ if (preg_match('/,' . $show_alias . ',/', ',' . $stat_goto . $stat_delimiter . ',')) {
$stat_string .= "" . $CONF['show_status_text'] . " ";
} else {
$stat_string .= $CONF['show_status_text'] . " ";
- }
+ }
}
// CUSTOM DESTINATION CHECK
- if ( count($CONF['show_custom_domains']) > 0 ) {
- for ($i = 0; $i < sizeof ($CONF['show_custom_domains']); $i++) {
- if (preg_match ('/^.*' . $CONF['show_custom_domains'][$i] . '.*$/', $stat_goto)) {
+ if (count($CONF['show_custom_domains']) > 0) {
+ for ($i = 0; $i < sizeof($CONF['show_custom_domains']); $i++) {
+ if (preg_match('/^.*' . $CONF['show_custom_domains'][$i] . '.*$/', $stat_goto)) {
$stat_string .= "" . $CONF['show_status_text'] . " ";
} else {
$stat_string .= $CONF['show_status_text'] . " ";
- }
- }
+ }
+ }
} else {
$stat_string .= "; ";
- }
+ }
// $stat_string .= " " .
// " ";
return $stat_string;
}
+/**
+ * @return string
+ */
function getRemoteAddr() {
$REMOTE_ADDR = 'localhost';
- if (isset($_SERVER['REMOTE_ADDR']))
+ if (isset($_SERVER['REMOTE_ADDR'])) {
$REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
+ }
+
return $REMOTE_ADDR;
}
diff -pruN 3.0.2-2/.gitignore 3.2-2/.gitignore
--- 3.0.2-2/.gitignore 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/.gitignore 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,5 @@
+/config.local.php
+/templates_c/*.tpl.php
+/templates_c/*menu.conf.php
+/vendor/
+/.php_cs.cache
Binary files 3.0.2-2/images/arrow-l.png and 3.2-2/images/arrow-l.png differ
Binary files 3.0.2-2/images/arrow-r.png and 3.2-2/images/arrow-r.png differ
Binary files 3.0.2-2/images/arrow-u.png and 3.2-2/images/arrow-u.png differ
Binary files 3.0.2-2/images/calendar/cal.gif and 3.2-2/images/calendar/cal.gif differ
Binary files 3.0.2-2/images/calendar/next_mon.gif and 3.2-2/images/calendar/next_mon.gif differ
Binary files 3.0.2-2/images/calendar/next_year.gif and 3.2-2/images/calendar/next_year.gif differ
Binary files 3.0.2-2/images/calendar/no_cal.gif and 3.2-2/images/calendar/no_cal.gif differ
Binary files 3.0.2-2/images/calendar/pixel.gif and 3.2-2/images/calendar/pixel.gif differ
Binary files 3.0.2-2/images/calendar/prev_mon.gif and 3.2-2/images/calendar/prev_mon.gif differ
Binary files 3.0.2-2/images/calendar/prev_year.gif and 3.2-2/images/calendar/prev_year.gif differ
Binary files 3.0.2-2/images/calendar/shade_bl.png and 3.2-2/images/calendar/shade_bl.png differ
Binary files 3.0.2-2/images/calendar/shade_bm.png and 3.2-2/images/calendar/shade_bm.png differ
Binary files 3.0.2-2/images/calendar/shade_br.png and 3.2-2/images/calendar/shade_br.png differ
Binary files 3.0.2-2/images/calendar/shade_mr.png and 3.2-2/images/calendar/shade_mr.png differ
Binary files 3.0.2-2/images/calendar/shade_tr.png and 3.2-2/images/calendar/shade_tr.png differ
diff -pruN 3.0.2-2/images/index.php 3.2-2/images/index.php
--- 3.0.2-2/images/index.php 2007-11-11 23:36:46.000000000 +0000
+++ 3.2-2/images/index.php 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-
Binary files 3.0.2-2/images/logo-default.png and 3.2-2/images/logo-default.png differ
Binary files 3.0.2-2/images/mail_bg.gif and 3.2-2/images/mail_bg.gif differ
Binary files 3.0.2-2/images/postbox.png and 3.2-2/images/postbox.png differ
Binary files 3.0.2-2/images/postfixadmin2.png and 3.2-2/images/postfixadmin2.png differ
Binary files 3.0.2-2/images/postfixadmin2.xcf and 3.2-2/images/postfixadmin2.xcf differ
Binary files 3.0.2-2/images/postfixadmin.png and 3.2-2/images/postfixadmin.png differ
Binary files 3.0.2-2/images/quota-colors.png and 3.2-2/images/quota-colors.png differ
diff -pruN 3.0.2-2/index.php 3.2-2/index.php
--- 3.0.2-2/index.php 2013-11-10 15:57:32.000000000 +0000
+++ 3.2-2/index.php 2018-05-02 20:37:27.000000000 +0000
@@ -1,89 +1,9 @@
-
-
-
- Welcome to Postfix Admin
-
-
-
- Welcome to Postfix Admin
- What is it?
- Postfix Admin is a web based interface to configure and manage a Postfix based email server for many users.
- Postfix Admin can also be used to
-
- Forward email to other addresses
- Configure vacation/out-of-office auto responses
- Add/edit/remove mail accounts
- Add/edit/remove domains
- Broadcast emails to all users of the system
- Set quota on mailboxes
- And more...
-
-
- Licensing
- Postfix admin is released under the following license :
-
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License 2 as published by
- the Free Software Foundation.
-
-
- See the following FSF GPL2 page for further information on the license.
-
- What now?
-
-
- Read the INSTALL.txt file
- Configure Postfix to use your chosen database - see (for example) the following pages :
-
- Use it
-
-
- When you have configured Postfixadmin, this page will be replaced with a login page.
- You can now run setup to make sure that all the PHP functions are available for Postfix Admin to run.
If you still encounter any problems, please check the documentation and website for more information.
- Postfix Admin Web sites
- For further help, or documentation please check out -
- Postfix Admin web siteKnowledge Base
-
-
-
+
+ Postfix Admin
+
+
+ The Postfix Admin directory layout changed.
+ Please update your webserver config so that the DocumentRoot or Alias points to the directory "public".
+
-
diff -pruN 3.0.2-2/INSTALL.TXT 3.2-2/INSTALL.TXT
--- 3.0.2-2/INSTALL.TXT 2016-10-20 21:26:13.000000000 +0000
+++ 3.2-2/INSTALL.TXT 2018-05-02 20:37:27.000000000 +0000
@@ -5,12 +5,16 @@
# Licensed under GPL for more info check GPL-LICENSE.TXT
#
-REQUIRED!!
-----------
-- You are using Postfix 2.0 or higher.
-- You are using Apache 1.3.27 / Lighttpd 1.3.15 or higher.
-- You are using PHP 5.1.2 or higher.
-- You are using MySQL 3.23 or higher (5.x recommended) OR PostgreSQL 7.4 (or higher)
+REQUIREMENTS
+------------
+- Postfix 2.0 or higher.
+- Apache 1.3.27 / Lighttpd 1.3.15 or higher.
+- PHP 5.1.2 or higher.
+- one of the following databases:
+ - MySQL 3.23 or higher (5.x recommended)
+ - MariaDB (counts as MySQL ;-)
+ - PostgreSQL 7.4 (or higher)
+ - SQLite 3.12 (or higher)
READ THIS FIRST!
@@ -36,13 +40,26 @@ DOCUMENTS/ folder.
1. Unarchive new Postfix Admin
------------------------------
-Make sure that you are in your WWW directory and then unarchive the
-Postfix Admin archive (whatever the filename is):
- $ tar -zxvf postfixadmin-$version.tgz
+(if you installed PostfixAdmin as RPM or DEB package, you can obviously skip this step.)
+Assuming we are installing Postfixadmin into /srv/postfixadmin, then something like this should work :
-2. Setup a Database
+ $ mkdir -p /srv/postfixadmin
+ $ cd /srv/postfixadmin
+ $ wget -O https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-3.1.tar.gz postfixadmin-3.1.tar.gz
+ $ tar -zxvf postfixadmin-version.tgz
+
+
+2. Setup Web Server
+-------------------
+
+Assuming /var/www/html is where your webserver reads from :
+
+ $ ln -s /srv/postfixadmin/public /var/www/html/postfixadmin
+
+
+3. Setup a Database
-------------------
With your chosen/preferred database server (i.e. MySQL or PostgreSQL),
@@ -66,10 +83,10 @@ For PostgreSQL:
CREATE DATABASE postfix OWNER postfix ENCODING 'unicode';
-3. Configure PostfixAdmin so it can find the database
+4. Configure PostfixAdmin so it can find the database
-----------------------------------------------------
-Create a config.local.php file for your local configuration:
+Create /srv/postfixadmin/config.local.php file for your local configuration:
@@ -143,6 +143,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = '邮箱地å€å·²ç»è¾¾åˆ°ä¸Šé™!';
$PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密ç ';
$PALANG['pCreate_mailbox_name_text'] = 'å…¨å';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = '新建邮箱'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'ä¸èƒ½å°†é‚®ç®±å¢žåŠ 到邮箱表ä¸! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'å¢žåŠ é‚®ç®±æˆåŠŸ! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
@@ -170,6 +174,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = '更改密ç '; # XXX check text - should be 'Change Password'
$PALANG['pPassword_result_error'] = '更改密ç 失败! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = '更改密ç æˆåŠŸ! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
$PALANG['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -185,7 +196,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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'] = '内容';
@@ -291,6 +302,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = '邮件用户从这里登录管ç†ä½ 的密ç 和别å.';
$PALANG['pUsersLogin_username_incorrect'] = '登录失败. è¯·ç¡®è®¤ä½ æ˜¯ä½¿ç”¨ä½ çš„é‚®ç®±åœ°å€ç™»å½•!';
$PALANG['pUsersLogin_password_incorrect'] = '登录密ç ä¸æ£ç¡®!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = '自动回å¤';
$PALANG['pUsersMenu_edit_alias'] = '修改转å‘';
@@ -322,6 +334,8 @@ $PALANG['pBroadcast_name'] = 'Your name'
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
diff -pruN 3.0.2-2/languages/cs.lang 3.2-2/languages/cs.lang
--- 3.0.2-2/languages/cs.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/cs.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
doména použijte *@domain.tld jako cÃl.';
$PALANG['mailbox_alias_cant_be_deleted'] = 'Toto přesměrovánà je svázáno s emailem a nemůže být proto vymazáno!';
-$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'] = 'Tento alias %s je chráněný a může být odstraněn pouze superadministrátorem';
$PALANG['pEdit_alias_welcome'] = 'Upravit nastavenà pÅ™esmÄ›rovánÃ.';
$PALANG['pEdit_alias_help'] = 'Je možné zadat vÃce cÃlových adres, jeden záznam na řádek.';
$PALANG['alias'] = 'PÅ™esmÄ›rovánÃ';
$PALANG['to'] = 'CÃl';
$PALANG['pEdit_alias_goto_text_error1'] = 'Nezadali jste cÃl';
-$PALANG['pEdit_alias_goto_text_error2'] = 'Emailová adresa kterou jste zadali nenà platná: ';
+$PALANG['pEdit_alias_goto_text_error2'] = 'Emailová adresa, kterou jste zadali nenà platná: ';
$PALANG['pEdit_alias_domain_result_error'] = 'Nepodařilo se upravit přesměrovánà domény!';
$PALANG['pEdit_alias_forward_and_store'] = 'DoruÄovat i do schránky.';
$PALANG['pEdit_alias_forward_only'] = 'Přesměrovat pouze na dané adresy.';
$PALANG['pEdit_alias_result_error'] = 'NepodaÅ™ilo se upravit pÅ™esmÄ›rovánÃ! (%s)';
$PALANG['pCreate_mailbox_welcome'] = 'Vytvořit novou lokálnà schránku v doméně.';
-$PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa neni platná!';
+$PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa nenà platná!';
$PALANG['pCreate_mailbox_username_text_error3'] = 'Dosáhli jste limitu, nemů¸ete vytvářet dalÅ¡Ã schránky!';
$PALANG['pCreate_mailbox_password_text'] = 'Heslo pro POP3/IMAP/SMTP';
$PALANG['pCreate_mailbox_name_text'] = 'Celé jméno';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Odeslat uvÃtacà email';
$PALANG['pCreate_mailbox_result_error'] = 'Vytvořenà schránky %s selhalo!';
$PALANG['pCreate_mailbox_result_success'] = 'Schránka %s byla přidána do tabulky schránek!';
@@ -156,7 +162,7 @@ $PALANG['pCreate_mailbox_result_succes_n
$PALANG['mailbox_updated'] = "Schránka %s byla aktualizována.";
$PALANG['mailbox_update_failed'] = "Aktualizace schránky %s selhala!";
-$PALANG['pEdit_mailbox_welcome'] = 'Upravit lokálnà chránku v doméně.';
+$PALANG['pEdit_mailbox_welcome'] = 'Upravit lokálnà schránku v doméně.';
$PALANG['pEdit_mailbox_username'] = 'Uživatelské jméno';
$PALANG['pEdit_mailbox_password_text_error'] = 'Zadaná hesla se neshodujÃ!';
$PALANG['pEdit_mailbox_quota'] = 'MÃsto';
@@ -176,9 +182,16 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Změna hesla';
$PALANG['pPassword_result_error'] = 'Nepodařilo se změnit heslo! (%s)';
$PALANG['pPassword_result_success'] = 'Heslo bylo změněno! (%s)';
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
-$PALANG['pEdit_vacation_set'] = 'ZmÄ›nit / Nastavit zprávu o nepÅ™Ãtomnosti';
-$PALANG['pEdit_vacation_remove'] = 'Ostranit zprávu o nepÅ™Ãtomnosti';
+$PALANG['pEdit_vacation_set'] = 'ZmÄ›nit / nastavit zprávu o nepÅ™Ãtomnosti';
+$PALANG['pEdit_vacation_remove'] = 'Odstranit zprávu o nepÅ™Ãtomnosti';
$PALANG['pVacation_result_error'] = 'Nebylo možné aktualizovat nastavenà automatické odpovědi pro %s!';
$PALANG['pVacation_result_removed'] = 'Automatická odpovÄ›Ä pro %s byla odstranÄ›na!';
@@ -193,7 +206,7 @@ $PALANG['reply_every_mail'] = 'OdpovÄ›dÄ
$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';
@@ -217,7 +230,7 @@ $PALANG['pViewlog_action_edit_password']
$PALANG['pViewlog_action_create_admin'] = 'vytvořenà administrátora';
$PALANG['pViewlog_action_edit_admin'] = 'změna administrátora';
$PALANG['pViewlog_action_delete_admin'] = 'smazat administrátora';
-$PALANG['pViewlog_action_edit_vacation'] = 'zmÄ›na zprávy o nepÅ™Ãtovmnosti';
+$PALANG['pViewlog_action_edit_vacation'] = 'zmÄ›na zprávy o nepÅ™Ãtomnosti';
$PALANG['pViewlog_action_create_fetchmail'] = 'vytvořit úlohu pro staženà pošty';
$PALANG['pViewlog_action_edit_fetchmail'] = 'upravit úlohu pro staženà pošty';
$PALANG['pViewlog_action_delete_fetchmail'] = 'smazat úlohu pro staženà pošty';
@@ -240,8 +253,8 @@ $PALANG['pAdminMenu_list_domain'] = 'Dom
$PALANG['pAdminMenu_list_virtual'] = 'Schránky';
$PALANG['pAdminMenu_backup'] = 'Vytvořit zálohu';
$PALANG['pAdminMenu_create_domain_admins'] = 'Administrátoři'; // unused
-$PALANG['pAdminMenu_create_admin'] = 'Nový Administrátor';
-$PALANG['pAdminMenu_create_domain'] = 'Nová Doména';
+$PALANG['pAdminMenu_create_admin'] = 'Nový administrátor';
+$PALANG['pAdminMenu_create_domain'] = 'Nová doména';
$PALANG['pAdminList_admin_count'] = 'Domény';
@@ -249,10 +262,10 @@ $PALANG['description'] = 'Popis';
$PALANG['aliases'] = 'PÅ™esmÄ›rovánÃ';
$PALANG['pAdminList_domain_quota'] = 'Kvóta domény (MB)';
$PALANG['pAdminList_domain_backupmx'] = 'Záložnà MX';
-$PALANG['last_modified'] = 'Naposledy Změněno';
+$PALANG['last_modified'] = 'Naposledy změněno';
-$PALANG['pAdminCreate_domain_welcome'] = 'Přidat Novou Doménu';
+$PALANG['pAdminCreate_domain_welcome'] = 'Přidat novou doménu';
$PALANG['pAdminCreate_domain_domain_text_error'] = 'Taková doména už existuje!';
$PALANG['domain_does_not_exist'] = 'Tato doména neexistuje!';
$PALANG['pAdminCreate_domain_domain_text_error2'] = 'Taková doména nenà platná!';
@@ -260,7 +273,7 @@ $PALANG['pAdminCreate_domain_defaultalia
$PALANG['pAdminCreate_domain_button'] = 'Přidat doménu';
$PALANG['pAdminCreate_domain_result_error'] = 'Nepodařilo se přidat doménu! (%s)';
$PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána! (%s)';
-$PALANG['domain_updated'] = 'Doména %s byla aktualizovaná.';
+$PALANG['domain_updated'] = 'Doména %s byla aktualizována.';
$PALANG['pAdminDelete_admin_error'] = 'Nepodařilo se odstranit admin uživatele!';
$PALANG['domain_postdel_failed'] = 'Spuštěnà skriptu po smazánà domény selhalo, zkontrolujte log soubor!';
@@ -269,7 +282,7 @@ $PALANG['mailbox_postdel_failed'] = 'Spu
$PALANG['mailbox_postedit_failed'] = 'Spuštenà skriptu po úpravě schránky selhalo, zkontrolujte log soubor!';
$PALANG['mailbox_postcreate_failed'] = 'Spuštenà skriptu po vytvořenà schránky selhalo, zkontrolujte log soubor!';
$PALANG['pAdminDelete_alias_domain_error'] = 'Nepodařilo se odstranit přesměrovánà domény!';
-$PALANG['domain_conflict_vacation_domain'] = 'Doménu využitou pro správy o nepÅ™Ãtomnosti nelze použÃt jako mailovou doménu!';
+$PALANG['domain_conflict_vacation_domain'] = 'Doménu využitou pro zprávy o nepÅ™Ãtomnosti nelze použÃt jako mailovou doménu!';
$PALANG['pAdminEdit_domain_welcome'] = 'Upravit doménu';
$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = znepÅ™Ãstupnit | 0 = neomezenÄ›';
@@ -294,20 +307,21 @@ $PALANG['pAdminEdit_admin_welcome'] = 'U
$PALANG['admin'] = 'Administrátor';
$PALANG['password_again'] = 'Heslo (znovu)';
$PALANG['super_admin'] = 'Superuživatel';
-$PALANG['super_admin_desc'] = 'Super administrátori majà pÅ™Ãstup ke vÅ¡em doménám, zprávÄ› domén a úÄtů administrátorů.';
+$PALANG['super_admin_desc'] = 'Super administrátoÅ™i majà pÅ™Ãstup ke vÅ¡em doménám, správÄ› domén a úÄtů administrátorů.';
$PALANG['pAdminEdit_admin_result_error'] = 'Nepodařilo se upravit administrátora! (%s)';
$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor %s byl upraven!';
$PALANG['pUsersLogin_welcome'] = 'Zde se přihlašujà uživatelé pro změnu hesla, přesměrovánà nebo automatické odpovědi.';
$PALANG['pUsersLogin_username_incorrect'] = 'Nesprávné uživatelské jmeno. Přihlašujte se svojà emailovou adresou!';
$PALANG['pUsersLogin_password_incorrect'] = 'Nesprávné heslo!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
-$PALANG['pUsersMenu_vacation'] = 'Automatická OdpovÄ›Ä';
-$PALANG['pUsersMenu_edit_alias'] = 'ZmÄ›na PÅ™esmÄ›rovánÃ';
+$PALANG['pUsersMenu_vacation'] = 'Automatická odpovÄ›Ä';
+$PALANG['pUsersMenu_edit_alias'] = 'ZmÄ›na pÅ™esmÄ›rovánÃ';
-$PALANG['pUsersMain_vacation'] = 'Nastavit ,,jsem pryÄ`` nebo podobnou automatickou odpovÄ›Ä.';
+$PALANG['pUsersMain_vacation'] = 'Nastavit "jsem pryÄ" nebo podobnou automatickou odpovÄ›Ä.';
$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' je NASTAVENA, klikněte na \'' . $PALANG['pUsersMenu_vacation'] . '\' pro odstraněnà nebo změnu';
-$PALANG['pUsersMain_edit_alias'] = 'Nastavit / zmÄ›nÃt pÅ™esmÄ›rovánÃ';
+$PALANG['pUsersMain_edit_alias'] = 'Nastavit / zmÄ›nit pÅ™esmÄ›rovánÃ';
$PALANG['pUsersMain_password'] = 'Změnit heslo';
$PALANG['pUsersVacation_welcome'] = 'Automatická odpovÄ›Ä';
@@ -333,15 +347,16 @@ $PALANG['pBroadcast_title'] = 'Odeslat z
$PALANG['pBroadcast_name'] = 'Vaše jméno';
$PALANG['pBroadcast_success'] = 'Zpráva pro všechny schránky byla odeslána.';
$PALANG['pAdminMenu_broadcast_message'] = 'Poslat email všem';
-$PALANG['pBroadcast_error_empty'] = 'Pole Od, Předmět a Zpráva by neměly být prázdné !';
-
+$PALANG['pBroadcast_error_empty'] = 'Pole Od, Předmět a Zpráva by neměly být prázdné!';
+$PALANG['broadcast_mailboxes_only'] = 'Pouze poslat do schránek';
+$PALANG['broadcast_to_domains'] = 'Poslat na domény:';
$PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ ';
$PALANG['pStatus_custom'] = 'DoruÄeno do ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['password_too_short'] = "Heslo je pÅ™ÃliÅ¡ krátké - je vyžadováno minimálnÄ› %s znaků";
$PALANG['password_no_characters'] = "Heslo musà obsahovat alespoň %s znak(-y).";
$PALANG['password_no_digits'] = "Heslo musà obsahovat alespoň %s ÄÃslici(-ce).";
-$PALANG['pInvalidDomainRegex'] = "Neplatné doménové jméno %s, nevyhovÄ›lo regulárnÃmu výrazu";
+$PALANG['pInvalidDomainRegex'] = "Neplatné doménové jméno %s, nevyhovÄ›lo regulárnÃmu výrazu";
$PALANG['pInvalidDomainDNS'] = "Neplatná doména %s, a/nebo nezjištěn DNS záznam.";
$PALANG['pInvalidMailRegex'] = "Neplatná emailová adresa %s, nevyhovÄ›la regulárnÃmu výrazu.";
$PALANG['pFetchmail_welcome'] = 'Stahovat poštu pro:';
@@ -368,19 +383,19 @@ $PALANG['pFetchmail_field_keep']
$PALANG['pFetchmail_field_protocol'] = 'Protokol';
$PALANG['pFetchmail_field_usessl'] = 'SSL aktivnÃ';
$PALANG['pFetchmail_field_sslcertck'] = 'Oveřenà SSL certifikátu';
-$PALANG['pFetchmail_field_sslcertpath'] = 'Cesta ku SSL certifikátům';
-$PALANG['pFetchmail_field_sslfingerprint'] = 'Otisk SSL certifikátu (md5)';
-$PALANG['pFetchmail_field_extra_options'] = 'Extra Parametry';
+$PALANG['pFetchmail_field_sslcertpath'] = 'Cesta k SSL certifikátům';
+$PALANG['pFetchmail_field_sslfingerprint'] = 'Otisk SSL certifikátu (MD5)';
+$PALANG['pFetchmail_field_extra_options'] = 'Extra parametry';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
-$PALANG['pFetchmail_field_returned_text'] = 'Výstupnà Text';
+$PALANG['pFetchmail_field_returned_text'] = 'Výstupnà text';
$PALANG['pFetchmail_desc_id'] = 'ID záznamu';
$PALANG['pFetchmail_desc_mailbox'] = 'MÃstnà schránka';
-$PALANG['pFetchmail_desc_src_server'] = 'Vzdálený Server';
+$PALANG['pFetchmail_desc_src_server'] = 'Vzdálený server';
$PALANG['pFetchmail_desc_src_auth'] = 'Většinou \'password\''; # Translators: Please do NOT translate 'password' here
-$PALANG['pFetchmail_desc_src_user'] = 'Vzdálený Uživatel';
-$PALANG['pFetchmail_desc_src_password'] = 'Heslo Vzdáleného Uživatele';
-$PALANG['pFetchmail_desc_src_folder'] = 'Vzdálená Složka';
+$PALANG['pFetchmail_desc_src_user'] = 'Vzdálený uživatel';
+$PALANG['pFetchmail_desc_src_password'] = 'Heslo vzdáleného uživatele';
+$PALANG['pFetchmail_desc_src_folder'] = 'Vzdálená složka';
$PALANG['pFetchmail_desc_poll_time'] = 'Stahovat každých ... minut';
$PALANG['pFetchmail_desc_fetchall'] = 'ZÃskávat vÅ¡echny staré (pÅ™eÄtené) i nové zprávy';
$PALANG['pFetchmail_desc_keep'] = 'Ponechávat stažené zprávy na vzdáleném mailserveru';
@@ -391,7 +406,7 @@ $PALANG['pFetchmail_desc_mda']
$PALANG['pFetchmail_desc_date'] = 'Datum poslednÃho staženà poÅ¡ty/zmÄ›ny konfigurace';
$PALANG['pFetchmail_desc_returned_text'] = 'Výstupnà textový záznam poslednÃho stahovánà poÅ¡ty';
$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_mysql'] = '%d.%m.%Y'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
diff -pruN 3.0.2-2/languages/da.lang 3.2-2/languages/da.lang
--- 3.0.2-2/languages/da.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/da.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
@@ -44,7 +44,7 @@ $PALANG['pLogin_username'] = 'Login (ema
$PALANG['password'] = 'Password';
$PALANG['pLogin_language'] = 'Language';
$PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_failed'] = 'Your email address or password are not correct.';
+$PALANG['pLogin_failed'] = 'Your email address or password is not correct.';
$PALANG['pLogin_login_users'] = 'Users click here to login to the user section.';
$PALANG['pMenu_main'] = 'Main';
@@ -146,11 +146,15 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes!';
$PALANG['pCreate_mailbox_password_text'] = 'Password for POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Full name';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone';
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten";
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail';
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten";
$PALANG['pCreate_mailbox_mail'] = 'Send Welcome mail';
$PALANG['pCreate_mailbox_result_error'] = 'Creating the mailbox %s failed!';
$PALANG['pCreate_mailbox_result_success'] = 'The mailbox %s has been added to the mailbox table.';
$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.';
-$PALANG['mailbox_updated'] = "The mailbox %s has been updated.";
+$PALANG['mailbox_updated'] = "The mailbox %s has been updated.";
$PALANG['mailbox_update_failed'] = "Updating the mailbox %s failed!";
$PALANG['pEdit_mailbox_welcome'] = 'Edit a mailbox for your domain.';
@@ -174,6 +178,14 @@ $PALANG['change_password'] = 'Change Pas
$PALANG['pPassword_result_error'] = 'Changing the password for %s failed!';
$PALANG['pPassword_result_success'] = 'The password for %s has been changed.';
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.';
+$PALANG['pPassword_recovery_button'] = 'Send me the code';
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name'];
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name'];
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code.";
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS';
+$PALANG['pPassword_code_text_error'] = 'Invalid code';
+
$PALANG['pEdit_vacation_set'] = 'Change / Set away message';
$PALANG['pEdit_vacation_remove'] = 'Remove away message';
@@ -190,7 +202,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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';
@@ -298,6 +310,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'Mailbox users login to change your password and aliases.';
$PALANG['pUsersLogin_username_incorrect'] = 'Your login is not correct. Make sure that you login with your email address!';
$PALANG['pUsersLogin_password_incorrect'] = 'Your password is not correct!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password';
$PALANG['pUsersMenu_vacation'] = 'Auto Response';
$PALANG['pUsersMenu_edit_alias'] = 'Change your forward';
@@ -331,6 +344,8 @@ $PALANG['pBroadcast_name'] = 'Your name'
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.';
$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message';
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes';
+$PALANG['broadcast_to_domains'] = 'Send to domains:';
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE ';
$PALANG['pStatus_custom'] = 'Delivers to ';
diff -pruN 3.0.2-2/languages/es.lang 3.2-2/languages/es.lang
--- 3.0.2-2/languages/es.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/es.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
@@ -143,6 +143,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'Oled kasutanud kogu postkastide arvu!';
$PALANG['pCreate_mailbox_password_text'] = 'Parool POP3/IMAP\'le';
$PALANG['pCreate_mailbox_name_text'] = 'Täielik nimi';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Loo postkast'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Postkasti lisamine tabelisse ebaõnnestus! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'Postkast lisati postkastide tabelisse! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
@@ -170,6 +174,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Muuda parool';
$PALANG['pPassword_result_error'] = 'Parooli muutmine ebaõnnestus! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'Parool on muudetud! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
$PALANG['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -185,7 +196,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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';
@@ -291,6 +302,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'Postkasti kasutaja sisse logimine muutmaks parooli ja aliast.';
$PALANG['pUsersLogin_username_incorrect'] = 'Kasutajanimi pole õige. Veendu, et sisestatud kasutajanimi on e-posti aadress!';
$PALANG['pUsersLogin_password_incorrect'] = 'Parool pole õige!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = 'Automaatne vastus';
$PALANG['pUsersMenu_edit_alias'] = 'Muuda edasisaatmist';
@@ -326,6 +338,8 @@ $PALANG['pBroadcast_success'] = 'Your br
$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
diff -pruN 3.0.2-2/languages/eu.lang 3.2-2/languages/eu.lang
--- 3.0.2-2/languages/eu.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/eu.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
@@ -142,6 +142,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'Dostigli ste vaš limit poštanskih ormarića!';
$PALANG['pCreate_mailbox_password_text'] = 'Lozinka za POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Puno ime';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Stvori poštanski ormarić'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Poštanski ormarić nije moguÄe stvoriti! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'Poštanski ormarić je uspješno stvoren! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
@@ -169,6 +173,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Promijeni lozinku';
$PALANG['pPassword_result_error'] = 'Lozinku nije bilo moguÄe promijeniti! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'Lozinka je uspješno promijenjena! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
$PALANG['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -184,7 +195,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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';
@@ -290,6 +301,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'Korisnici poštanskih ormarića ukoliko želite promjeniti lozinku ili aliase.';
$PALANG['pUsersLogin_username_incorrect'] = 'KorisniÄko ime nije pravilno! Morate upotrijebiti adresu vaše e-pošte!';
$PALANG['pUsersLogin_password_incorrect'] = 'Lozinka nije pravilna!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = 'Obavijest o odsutnosti';
$PALANG['pUsersMenu_edit_alias'] = 'Promijeni preusmjerenje';
@@ -320,6 +332,8 @@ $PALANG['pBroadcast_name'] = 'Your name'
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
diff -pruN 3.0.2-2/languages/hu.lang 3.2-2/languages/hu.lang
--- 3.0.2-2/languages/hu.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/hu.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
and Levente Farkas
@@ -145,6 +145,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'Elérted a maximális postafiók számot!';
$PALANG['pCreate_mailbox_password_text'] = 'Jelszó a POP3/IMAP -hoz';
$PALANG['pCreate_mailbox_name_text'] = 'Teljes név';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Postafiók létrehozása'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Nemsikerült a postafiókot felvenni a mailbox adatbázis táblába! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'A postafiókot sikeresen felvettük a mailbox adatbázis táblába! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
@@ -172,6 +176,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Jelszó megváltoztatása';
$PALANG['pPassword_result_error'] = 'Nemsikerült megváltoztatni a jelszavad! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'A jelszavad megváltozott! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Nem vagyok elérhatÅ‘ üzenet módosÃtás / beállÃtás';
$PALANG['pEdit_vacation_remove'] = 'Nem vagyok elérhatő üzenet törlése';
@@ -189,7 +200,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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';
@@ -297,6 +308,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'A felhasználók ezen a felületen tudnak bejelentkezni a levelezõ rendszerbe a saját felhasználó nevükkel (azaz email cÃmükkel) és itt tudják megváltoztatni az aliasokat, stb..'; # XXX check/beautify - was split in two lines before
$PALANG['pUsersLogin_username_incorrect'] = 'Nem megfelelõ a Login (email) cÃm! Kérlek pontosÃtsd!';
$PALANG['pUsersLogin_password_incorrect'] = 'Nem megfelelõ a jelszavad!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = 'Automatikus Válasz';
$PALANG['pUsersMenu_edit_alias'] = 'ÃtirányÃtás beállÃtása';
@@ -332,6 +344,8 @@ $PALANG['pBroadcast_name'] = 'Neved';
$PALANG['pBroadcast_success'] = 'Broadcast üzeneted elküldve.';
$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast üzenet'; # XXX partly translated
$PALANG['pBroadcast_error_empty'] = 'A név, téma és üzenet mezők nem lehetnek üresek !';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'lehet hogy nem kézbesÃthetÅ‘ ';
$PALANG['pStatus_custom'] = 'Ide kézbesÃtÅ‘dik ';
diff -pruN 3.0.2-2/languages/index.php 3.2-2/languages/index.php
--- 3.0.2-2/languages/index.php 2007-11-11 23:36:46.000000000 +0000
+++ 3.2-2/languages/index.php 2018-05-02 20:37:27.000000000 +0000
@@ -1,6 +1,6 @@
// Copyright (c) 2002 - 2005 High5!
// Licensed under GPL for more info check GPL-LICENSE.TXT
@@ -17,6 +17,5 @@
//
// -none-
//
-header ("Location: ../login.php");
+header("Location: ../login.php");
exit;
-?>
diff -pruN 3.0.2-2/languages/is.lang 3.2-2/languages/is.lang
--- 3.0.2-2/languages/is.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/is.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
@@ -144,6 +144,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'Hai raggiunto il limite per creare caselle di posta!';
$PALANG['pCreate_mailbox_password_text'] = 'Password per POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Nome completo';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Crea casella di posta'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Impossibile aggiungere la casella di posta alla tabella delle caselle di posta! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'La casella di posta è stata aggiunta alla tabella! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
@@ -171,6 +175,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Cambia Password'; # XXX check text - should be 'Change Password'
$PALANG['pPassword_result_error'] = 'Impossibile cambiare password! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'La tua password è stata modificata! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Cambia / inserisci messaggio';
$PALANG['pEdit_vacation_remove'] = 'Rimuovi messaggio';
$PALANG['pVacation_result_error'] = 'Impossibile registrare le modifiche! (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
@@ -186,7 +197,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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';
@@ -292,6 +303,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'Gli utenti di caselle di posta devono entrare qui per modificare le proprie opzioni.';
$PALANG['pUsersLogin_username_incorrect'] = 'Il tuo nome utente non è corretto. Assicurati di avere inserito il tuo indirizzo email!';
$PALANG['pUsersLogin_password_incorrect'] = 'La tua password non è corretta!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = 'Risposta automatica';
$PALANG['pUsersMenu_edit_alias'] = 'Cambia il tuo inoltro';
@@ -323,6 +335,8 @@ $PALANG['pBroadcast_name'] = 'Il tuo nom
$PALANG['pBroadcast_success'] = 'Il tuo messaggio è stato inoltrato a tutto il gruppo.';
$PALANG['pAdminMenu_broadcast_message'] = 'Invio di gruppo';
$PALANG['pBroadcast_error_empty'] = 'Nome, oggetto e testo del messaggio non possono restare vuoti!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'presumibilmente NON CONSEGNABILE ';
$PALANG['pStatus_custom'] = 'In consegna a ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
diff -pruN 3.0.2-2/languages/ja.lang 3.2-2/languages/ja.lang
--- 3.0.2-2/languages/ja.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/ja.lang 2018-05-02 20:37:27.000000000 +0000
@@ -14,28 +14,28 @@ $PALANG['exit'] = '終了';
$PALANG['cancel'] = 'ã‚ャンセル';
$PALANG['save'] = '変更をä¿å˜';
$PALANG['confirm'] = '本当ã«å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ\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'] = '本当ã«ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã®ã™ã¹ã¦ã®æƒ…å ±ã‚’å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿã“れを元ã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。\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_delete_admin'] = '本当ã«ç®¡ç†è€… %s を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹?';
+$PALANG['confirm_delete_alias'] = '本当ã«ã‚¨ã‚¤ãƒªã‚¢ã‚¹ %s を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹?';
+$PALANG['confirm_delete_aliasdomain'] = '本当ã«ã‚¨ã‚¤ãƒªã‚¢ã‚¹ãƒ‰ãƒ¡ã‚¤ãƒ³ %s を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹?';
+$PALANG['confirm_delete_domain'] = '本当ã«ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã®ã™ã¹ã¦ã®æƒ…å ±ã‚’å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿã“れを元ã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。\n (%s)';
+$PALANG['confirm_delete_fetchmail'] = '本当㫠fetchmail ジョブ %s を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹?';
+$PALANG['confirm_delete_mailbox'] = '本当ã«ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ %s を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹?';
+$PALANG['confirm_delete_vacation'] = '本当ã«ã€%s ã®è‡ªå‹•å¿œç”メッセージを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹?';
+$PALANG['no_delete_permissions'] = 'ã‚ãªãŸã«ã¯ã€%s を削除ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“!';
$PALANG['check_update'] = 'æ›´æ–°ã®ç¢ºèª';
$PALANG['invalid_parameter'] = '無効ãªãƒ‘ラメータã§ã™ã€‚';
$PALANG['show'] = '閲覧:';
$PALANG['all'] = 'å…¨ã¦';
-$PALANG['created'] = 'Created'; # XXX
-$PALANG['unknown'] = 'unknown'; # XXX
-$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX
-$PALANG['missing_field'] = 'Field %s is missing'; # XXX
-$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
-$PALANG['must_be_numeric_bigger_than_null'] = '%s must be numeric and bigger than 0'; # XXX
-$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
-$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
-$PALANG['edit_not_allowed'] = 'You are not allowed to edit %s'; # XXX
-$PALANG['searchparams'] = 'Search parameters:'; # XXX
+$PALANG['created'] = '作æˆæ—¥æ™‚';
+$PALANG['unknown'] = 'ä¸æ˜Ž';
+$PALANG['download_csv'] = 'ã“ã®ãƒªã‚¹ãƒˆã‚’ CSV ファイルã¨ã—ã¦ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰';
+$PALANG['missing_field'] = 'フィールド %s ãŒã‚ã‚Šã¾ã›ã‚“';
+$PALANG['must_be_numeric'] = '%s ã¯æ•°å—ã§ãªãã¦ã¯ãªã‚Šã¾ã›ã‚“';
+$PALANG['must_be_numeric_bigger_than_null'] = '%s ã¯ã€æ•°å—ã‹ã¤ 0 より大ãããªãã¦ã¯ãªã‚Šã¾ã›ã‚“';
+$PALANG['must_be_boolean'] = '%s ã¯çœŸå½å€¤ã§ãªãã¦ã¯ãªã‚Šã¾ã›ã‚“';
+$PALANG['invalid_value_given'] = '%s ã«ä¸Žãˆã‚‰ã‚ŒãŸå€¤ãŒä¸æ£ã§ã™';
+$PALANG['edit_not_allowed'] = 'ã‚ãªãŸã«ã¯ã€%s を編集ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“';
+$PALANG['searchparams'] = '検索パラメータ:';
$PALANG['pFooter_logged_as'] = 'ãƒã‚°ã‚¤ãƒ³å %s';
@@ -49,9 +49,9 @@ $PALANG['pLogin_login_users'] = '一般ã
$PALANG['pMenu_main'] = 'メイン';
$PALANG['pMenu_overview'] = '概è¦';
-$PALANG['add_alias'] = '転é€å…ˆã®è¿½åŠ '; # XXX check text - should be 'Add Alias'
+$PALANG['add_alias'] = '転é€å…ˆã®è¿½åŠ ';
$PALANG['add_alias_domain'] = 'エイリアスドメインã®è¿½åŠ ';
-$PALANG['add_mailbox'] = 'アドレスã®è¿½åŠ '; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_mailbox'] = 'メールアドレスã®è¿½åŠ ';
$PALANG['pMenu_fetchmail'] = 'メールå–å¾—';
$PALANG['pMenu_sendmail'] = 'メールé€ä¿¡';
$PALANG['pMenu_password'] = 'パスワード';
@@ -60,7 +60,7 @@ $PALANG['pMenu_logout'] = 'ãƒã‚°ã‚¢ã‚¦ã
$PALANG['pMain_welcome'] = 'Postfix Admin ã¸ã‚ˆã†ã“ãï¼';
$PALANG['pMain_overview'] = '転é€ã‚¢ãƒ‰ãƒ¬ã‚¹ã¨ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ä¸€è¦§ã‚’表示ã—ã¾ã™ã€‚ã“ã“ã‹ã‚‰ç·¨é›†ã¨å‰Šé™¤ãŒã§ãã¾ã™ã€‚';
-$PALANG['pMain_create_alias'] = 'æ–°ã—ã„転é€ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’作æˆã—ã¾ã™ã€‚'; # XXX check text - should be 'Create a new alias for your domain.'
+$PALANG['pMain_create_alias'] = 'æ–°ã—ã„転é€ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’作æˆã—ã¾ã™ã€‚';
$PALANG['pMain_create_mailbox'] = 'æ–°ã—ã„メールアドレスを作æˆã—ã¾ã™ã€‚';
$PALANG['pMain_sendmail'] = 'æ–°ã—ã„メールアドレスã«ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã™ã€‚';
$PALANG['pMain_password'] = 'パスワードを変更ã—ã¾ã™ã€‚';
@@ -87,12 +87,12 @@ $PALANG['name'] = 'åå‰';
$PALANG['pOverview_mailbox_quota'] = '容é‡åˆ¶é™ (MB)';
$PALANG['pOverview_vacation_edit'] = 'è‡ªå‹•å¿œç” åˆ©ç”¨ä¸';
$PALANG['pOverview_vacation_option'] = '自動応ç”';
-$PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
-$PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX
+$PALANG['no_domains_for_this_admin'] = 'ã‚ãªãŸã«ã¯ãƒ‰ãƒ¡ã‚¤ãƒ³ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。';
+$PALANG['no_domains_exist'] = 'アドレス一覧を使ãˆã‚‹ã‚ˆã†ã«ã™ã‚‹å‰ã«ã€å°‘ãªãã¨ã‚‚ã²ã¨ã¤ã¯ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’作æˆã—ãªãã¦ã¯ãªã‚Šã¾ã›ã‚“。'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual']
$PALANG['domain'] = 'ドメイン';
-$PALANG['pOverview_get_alias_domains'] = 'ドメインエイリアス';
+$PALANG['pOverview_get_alias_domains'] = '別åドメイン';
$PALANG['mailboxes'] = 'アドレス数';
$PALANG['pOverview_get_quota'] = '容é‡åˆ¶é™ (MB)';
$PALANG['pDelete_delete_error'] = 'エントリを削除ã§ãã¾ã›ã‚“。 ';
@@ -104,63 +104,67 @@ $PALANG['pCreate_alias_domain_alias'] =
$PALANG['pCreate_alias_domain_alias_text'] = 'メールãŒã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³å®›ã«æ¥ã¾ã™ã€‚';
$PALANG['pCreate_alias_domain_target'] = '宛先ドメイン';
$PALANG['pCreate_alias_domain_target_text'] = 'メールをã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³å®›ã«å±Šã‘ã¾ã™ã€‚';
-$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
-$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
-$PALANG['alias_domain_already_exists'] = 'This domain is already an alias domain!'; # XXX
-$PALANG['alias_domain_does_not_exist'] = 'This domain isn\'t an alias domain!'; # XXX
-$PALANG['alias_domain_create_failed'] = 'Creating the alias domain %s failed!'; # XXX
-$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'ã‚ãªãŸã«ã¯ã€é¸æŠžã—ãŸæ§‹æˆã‚’作æˆã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“';
+$PALANG['pCreate_alias_domain_error2'] = 'é¸æŠžã—ãŸæ§‹æˆã¯ä¸æ£ã§ã™ã€‚別ã®æ§‹æˆã‚’é¸æŠžã—ã¦ä¸‹ã•ã„!';
+$PALANG['alias_domain_already_exists'] = 'ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã¯æ—¢ã«åˆ¥åドメインã§ã™!';
+$PALANG['alias_domain_does_not_exist'] = 'ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã¯ã€åˆ¥åドメインã§ã¯ã‚ã‚Šã¾ã›ã‚“!';
+$PALANG['alias_domain_create_failed'] = '別åドメイン %s を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚!';
+$PALANG['alias_domain_change_failed'] = '別åドメイン %s を変更ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
$PALANG['pCreate_alias_domain_error4'] = 'å…¨ã¦ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ãŒã‚¨ã‚¤ãƒªã‚¢ã‚¹ã•ã‚Œã¦ã„ã¾ã™ã€‚';
-$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
-$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX
-$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
-$PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
+$PALANG['pCreate_alias_domain_success'] = '別åドメイン %s を作æˆã—ã¾ã—ãŸã€‚';
+$PALANG['alias_domain_changed'] = '別åドメイン %s を変更ã—ã¾ã—ãŸã€‚';
+$PALANG['alias_domain_to_itsself'] = 'ドメインã¯ãれ自身ãŒåˆ¥åドメインã§ã‚ã£ã¦ã¯ãªã‚Šã¾ã›ã‚“!';
+$PALANG['delete_domain_aliasdomain_target'] = 'ドメイン %s ã¯ã²ã¨ã¤ã‚‚ã—ãã¯è¤‡æ•°ã®åˆ¥åドメインã«ç´ä»˜ã„ã¦ã„ã¾ã™ã®ã§ã€å‰Šé™¤ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“! (ã¾ãšã€åˆ¥åドメインを削除ã—ã¦ä¸‹ã•ã„。)';
$PALANG['pCreate_alias_address_text_error1'] = 'メールアドレスãŒç„¡åŠ¹ã§ã™ã€‚';
-$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
-$PALANG['email_address_already_exists'] = 'ã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æ—¢ã«å˜åœ¨ã™ã‚‹ã®ã§ã€ 別ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’é¸æŠžã—ã¦ãã ã•ã„。'; # XXX check/beautify - was split in two lines before
+$PALANG['alias_does_not_exist'] = 'ã“ã®è»¢é€å…ˆã¯ã€å˜åœ¨ã—ã¾ã›ã‚“!';
+$PALANG['email_address_already_exists'] = 'ã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æ—¢ã«å˜åœ¨ã™ã‚‹ã®ã§ã€ 別ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’é¸æŠžã—ã¦ãã ã•ã„。';
$PALANG['pCreate_alias_address_text_error3'] = '転é€ã‚¢ãƒ‰ãƒ¬ã‚¹ã®åˆ¶é™æ•°ã«é”ã—ã¾ã—ãŸã€‚';
$PALANG['pCreate_alias_goto_text'] = 'メールを転é€ã™ã‚‹ã‚¢ãƒ‰ãƒ¬ã‚¹';
$PALANG['pCreate_alias_goto_text_error'] = '転é€å…ˆãŒç„¡åŠ¹ã§ã™ã€‚';
-$PALANG['pCreate_alias_result_error'] = '転é€å…ˆã‚’è¿½åŠ ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX Text changed to: Creating the alias %s failed!
-$PALANG['pCreate_alias_result_success'] = '転é€å…ˆã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚'; # XXX text change: 'The alias %s has been created!'
-$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
-$PALANG['pCreate_alias_catchall_text'] = 'ã™ã¹ã¦ã®ãƒ¡ãƒ¼ãƒ«ã‚’å—ã‘å–ã‚‹ã«ã¯ã€è»¢é€å…ƒã« "*" を使ã„ã¾ã™ã€‚ 別ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã«ã™ã¹ã¦è»¢é€ã™ã‚‹ã«ã¯ã€è»¢é€å…ˆã« "*.domain.tld" を使ã„ã¾ã™ã€‚'; # XXX check/beautify - was split in two lines before
-$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
-$PALANG['protected_alias_cant_be_deleted'] = 'The alias %s is protected and can only be deleted by a superadmin'; # XXX
-
-$PALANG['pEdit_alias_welcome'] = '転é€å…ˆã‚¢ãƒ‰ãƒ¬ã‚¹ã®ç·¨é›†'; # XXX Text change to: 'Edit forwarding settings'
-$PALANG['pEdit_alias_help'] = '1è¡Œã«1エントリã§ã™ã€‚'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
-$PALANG['alias'] = '転é€å…ƒ'; # XXX check text - should be 'Alias'
-$PALANG['to'] = '転é€å…ˆ'; # XXX check text - should be 'To'
+$PALANG['pCreate_alias_result_error'] = '転é€å…ˆ %s ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
+$PALANG['pCreate_alias_result_success'] = '転é€å…ˆ %s ã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚';
+$PALANG['alias_updated'] = '転é€å…ˆ %s ã‚’æ›´æ–°ã—ã¾ã—ãŸ!';
+$PALANG['pCreate_alias_catchall_text'] = 'ã™ã¹ã¦ã®ãƒ¡ãƒ¼ãƒ«ã‚’å—ã‘å–ã‚‹ã«ã¯ã€è»¢é€å…ƒã« "*" を使ã„ã¾ã™ã€‚ 別ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã«ã™ã¹ã¦è»¢é€ã™ã‚‹ã«ã¯ã€è»¢é€å…ˆã« "*.domain.tld" を使ã„ã¾ã™ã€‚';
+$PALANG['mailbox_alias_cant_be_deleted'] = 'ã“ã®è»¢é€å…ˆã¯ã€ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã«ç´ä»˜ã„ã¦ã„ã‚‹ã®ã§ã€å‰Šé™¤ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“!';
+$PALANG['protected_alias_cant_be_deleted'] = '転é€å…ˆ %s ã¯ä¿è·ã•ã‚Œã¦ãŠã‚Šã€ç‰¹æ¨©ç®¡ç†è€…ã ã‘ãŒå‰Šé™¤ã§ãã¾ã™';
+
+$PALANG['pEdit_alias_welcome'] = '転é€å…ˆè¨å®šã®ç·¨é›†';
+$PALANG['pEdit_alias_help'] = '複数ã®è»¢é€å…ˆã‚’è¨å®šã§ãã¾ã™ã€‚1è¡Œã«1エントリã§ã™ã€‚';
+$PALANG['alias'] = '転é€å…ƒ';
+$PALANG['to'] = '転é€å…ˆ';
$PALANG['pEdit_alias_goto_text_error1'] = '転é€å…ˆãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“。';
$PALANG['pEdit_alias_goto_text_error2'] = 'ã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ç„¡åŠ¹ã§ã™: ';
-$PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
+$PALANG['pEdit_alias_domain_result_error'] = '別åドメインを修æ£ã§ãã¾ã›ã‚“!';
$PALANG['pEdit_alias_forward_and_store'] = 'ãƒãƒ¼ã‚«ãƒ«ã®ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã«æ®‹ã™';
$PALANG['pEdit_alias_forward_only'] = '指定ã•ã‚ŒãŸè»¢é€ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ã¿';
-$PALANG['pEdit_alias_result_error'] = 'ä¿®æ£ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX Text changed to: Modifying the alias %s failed!
+$PALANG['pEdit_alias_result_error'] = '別å %s ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
$PALANG['pCreate_mailbox_welcome'] = 'æ–°ã—ã„メールアドレスã®ä½œæˆ';
$PALANG['pCreate_mailbox_username_text_error1'] = 'メールアドレスãŒç„¡åŠ¹ã§ã™ã€‚';
$PALANG['pCreate_mailbox_username_text_error3'] = 'メールアドレスã®åˆ¶é™æ•°ã«é”ã—ã¾ã—ãŸã€‚';
$PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAPã®ãƒ‘スワード';
$PALANG['pCreate_mailbox_name_text'] = 'フルãƒãƒ¼ãƒ ';
-$PALANG['pCreate_mailbox_mail'] = 'よã†ã“ãメールã®é€ä¿¡'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_result_error'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
-$PALANG['pCreate_mailbox_result_success'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚ (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚ã—ã‹ã—ã€ã„ãã¤ã‹ã®ã‚µãƒ–フォルダã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.
-$PALANG['mailbox_updated'] = "The mailbox %s has been updated."; # XXX
-$PALANG['mailbox_update_failed'] = "Updating the mailbox %s failed!"; # XXX
+$PALANG['pCreate_mailbox_phone'] = 'æºå¸¯é›»è©±';
+$PALANG['pCreate_mailbox_phone_desc'] = "パスワードを忘れãŸæ™‚ã« SMS ã‚’é€ä¿¡ã™ã‚‹ã®ã«ä½¿ç”¨ã•ã‚Œã¾ã™";
+$PALANG['pCreate_mailbox_email'] = 'ãã®ä»–ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹';
+$PALANG['pCreate_mailbox_email_desc'] = "パスワードを忘れãŸæ™‚ã®ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã¾ã™";
+$PALANG['pCreate_mailbox_mail'] = 'よã†ã“ãメールã®é€ä¿¡';
+$PALANG['pCreate_mailbox_result_error'] = 'メールアドレス %s ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
+$PALANG['pCreate_mailbox_result_success'] = 'メールアドレス %s をテーブルã«è¿½åŠ ã—ã¾ã—ãŸã€‚';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'メールアドレス %s をテーブルã«è¿½åŠ ã—ã¾ã—ãŸãŒã€è¦å®šã®ã‚µãƒ–フォルダをã„ãã¤ã‹ã€ã‚‚ã—ãã¯å…¨éƒ¨ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ';
+$PALANG['mailbox_updated'] = "メールアドレス %s ã‚’æ›´æ–°ã—ã¾ã—ãŸã€‚";
+$PALANG['mailbox_update_failed'] = "メールアドレス %s ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸ!";
$PALANG['pEdit_mailbox_welcome'] = 'メールアドレスã®ç·¨é›†';
-$PALANG['pEdit_mailbox_username'] = 'メールアドレス'; # XXX check / compare with pCreate_mailbox_username - should be "Username"
+$PALANG['pEdit_mailbox_username'] = 'メールアドレス';
$PALANG['pEdit_mailbox_password_text_error'] = 'パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“。';
$PALANG['pEdit_mailbox_quota'] = '容é‡åˆ¶é™';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
-$PALANG['mb_max'] = 'MB (max: %s)'; # XXX
+$PALANG['mb_max'] = 'MB (最大: %s)';
$PALANG['pEdit_mailbox_quota_text_error'] = '指定ã•ã‚ŒãŸå®¹é‡åˆ¶é™ãŒå¤§ãã™ãŽã¾ã™ã€‚';
$PALANG['pEdit_mailbox_domain_error'] = 'ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã¯ç®¡ç†å¤–ã§ã™: ';
-$PALANG['pEdit_mailbox_result_error'] = 'ä¿®æ£ã§ãã¾ã›ã‚“ï¼';
+$PALANG['pEdit_mailbox_result_error'] = 'æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸï¼';
$PALANG['pPassword_welcome'] = 'パスワードã®å¤‰æ›´';
$PALANG['pPassword_admin'] = 'ãƒã‚°ã‚¤ãƒ³';
@@ -168,55 +172,62 @@ $PALANG['pPassword_password_current'] =
$PALANG['pPassword_password_current_text_error'] = 'ç¾åœ¨ã®ãƒ‘スワードãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“。';
$PALANG['pPassword_password'] = 'æ–°è¦ãƒ‘スワード';
$PALANG['pPassword_password2'] = 'æ–°è¦ãƒ‘スワード (確èª)';
-$PALANG['pPassword_password_text_error'] = 'パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“。 ã¾ãŸã¯ç©ºã§ã™ã€‚'; # XXX check/beautify - was split in two lines before
-$PALANG['change_password'] = 'パスワード変更';
-$PALANG['pPassword_result_error'] = 'パスワードを変更ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'パスワードを変更ã—ã¾ã—ãŸã€‚ (%s)'; # XXX Text changed to: The password for %s has been changed.
-
-$PALANG['pEdit_vacation_set'] = 'メッセージ変更ï¼è¨å®š';
-$PALANG['pEdit_vacation_remove'] = 'メッセージ解除';
-
-$PALANG['pVacation_result_error'] = '自動応ç”ã®è¨å®šã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸï¼ (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
-$PALANG['pVacation_result_removed'] = '自動応ç”を解除ã—ã¾ã—ãŸã€‚ (%s)'; # XXX Text changed to "Auto response for %s has been disabled!"
-$PALANG['pVacation_result_added'] = '自動応ç”ã‚’è¨å®šã—ã¾ã—ãŸã€‚ (%s)'; # XXX Text changed to "Auto response for %s has been enabled!"
-$PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX
-$PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX
-$PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX
-$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['reply_once'] = 'Reply once'; # XXX
-$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['pPassword_password_text_error'] = 'パスワードãŒä¸€è‡´ã—ãªã„ã‹ã€ç©ºã§ã™ã€‚';
+$PALANG['change_password'] = 'パスワードを変更';
+$PALANG['pPassword_result_error'] = '%s ã®ãƒ‘スワードを変更ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
+$PALANG['pPassword_result_success'] = '%s ã®ãƒ‘スワードを変更ã—ã¾ã—ãŸã€‚';
+$PALANG['pPassword_recovery_title'] = '次ã®æ‰‹é †ã«å¾“ã£ã¦ã€ãƒ‘スワードをリセットã—ã¦ä¸‹ã•ã„。';
+$PALANG['pPassword_recovery_button'] = 'コードをé€ä¿¡';
+$PALANG['pPassword_recovery_email_body'] = "å‰ç•¥\n\nメールパスワードを変更ã™ã‚‹ã«ã¯ã€æ¬¡ã®ãƒªãƒ³ã‚¯ã‚’クリックã—ã¦ä¸‹ã•ã„ :\n%s\n\n敬具\n\n" . $CONF['admin_name'];
+$PALANG['pPassword_recovery_sms_body'] = "å‰ç•¥\nパスワードを変更ã™ã‚‹ãŸã‚ã®ã‚³ãƒ¼ãƒ‰: %s\n" . $CONF['admin_name'];
+$PALANG['pPassword_recovery_processed'] = "リクエストをå—ã‘付ã‘ã¾ã—ãŸã€‚æ£ã—ã„メールアドレスãŒå…¥åŠ›ã•ã‚Œã¦ã„ã‚Œã°ã€ãƒ‘スワードコードをメール/SMS ã§å—ä¿¡ã§ãã¾ã™ã€‚";
+$PALANG['pPassword_password_code'] = 'メール/SMS ã§é€ä¿¡ã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰';
+$PALANG['pPassword_code_text_error'] = 'ä¸æ£ãªã‚³ãƒ¼ãƒ‰';
+
+$PALANG['pEdit_vacation_set'] = 'メッセージを変更ï¼è¨å®š';
+$PALANG['pEdit_vacation_remove'] = 'メッセージを解除';
+
+$PALANG['pVacation_result_error'] = '%s ã®è‡ªå‹•å¿œç”ã®è¨å®šã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
+$PALANG['pVacation_result_removed'] = '%s ã®è‡ªå‹•å¿œç”を解除ã—ã¾ã—ãŸã€‚';
+$PALANG['pVacation_result_added'] = '%s ã®è‡ªå‹•å¿œç”ã‚’è¨å®šã—ã¾ã—ãŸã€‚';
+$PALANG['pVacation_reply_type'] = '返信をé¸æŠž';
+$PALANG['pVacation_reply_delay_time'] = '返信ã™ã‚‹ã¾ã§ã®é–“éš”';
+$PALANG['pVacation_reply_delay_time_text'] = '時間ã¯ç§’ã§æŒ‡å®š';
+$PALANG['pVacation_until_before_today'] = '[å³ã®æ—¥æ™‚ã‹ã‚‰æœ‰åŠ¹] ã®æ—¥ä»˜ãŒã€æœ¬æ—¥ã‚ˆã‚Šå‰ã«æŒ‡å®šã•ã‚Œã¦ã„ã¾ã™';
+$PALANG['pVacation_until_before_from'] = '[å³ã®æ—¥æ™‚ã¾ã§æœ‰åŠ¹] ã®æ—¥ä»˜ãŒã€[å³ã®æ—¥æ™‚ã‹ã‚‰æœ‰åŠ¹] よりå‰ã«æŒ‡å®šã•ã‚Œã¦ã„ã¾ã™';
+$PALANG['reply_once'] = '一度ã ã‘返信';
+$PALANG['reply_every_mail'] = 'メールã”ã¨ã«è¿”ä¿¡';
+$PALANG['reply_once_per_day'] = '毎日返信';
+$PALANG['reply_once_per_week'] = '週ã«ä¸€åº¦è¿”ä¿¡';
-$PALANG['pViewlog_welcome'] = 'éŽåŽ»10個ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ ';
+$PALANG['pViewlog_welcome'] = 'éŽåŽ» %s 個ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ ';
$PALANG['pViewlog_timestamp'] = 'タイムスタンプ';
$PALANG['pViewlog_action'] = 'アクション';
$PALANG['pViewlog_data'] = 'データ';
-$PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
-$PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX
-$PALANG['pViewlog_action_edit_domain'] = 'edit domain'; # XXX
-
-$PALANG['pViewlog_action_create_mailbox'] = 'アドレス作æˆ';
-$PALANG['pViewlog_action_delete_mailbox'] = 'アドレス削除';
-$PALANG['pViewlog_action_edit_mailbox'] = 'アドレス編集';
-$PALANG['pViewlog_action_edit_mailbox_state'] = 'アドレス状態編集';
-$PALANG['pViewlog_action_create_alias'] = '転é€å…ˆä½œæˆ';
-$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
-$PALANG['pViewlog_action_edit_alias_domain'] = 'edit alias domain'; # XXX
-$PALANG['pViewlog_action_delete_alias'] = '転é€å…ˆå‰Šé™¤';
-$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
-$PALANG['pViewlog_action_edit_alias'] = '転é€å…ˆç·¨é›†';
-$PALANG['pViewlog_action_edit_alias_state'] = '転é€å…ˆçŠ¶æ…‹ç·¨é›†';
-$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
-$PALANG['pViewlog_action_edit_password'] = 'パスワード変更';
-$PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
-$PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
-$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX
-$PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX
-$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_domain'] = 'ドメインを作æˆ';
+$PALANG['pViewlog_action_delete_domain'] = 'ドメインを削除';
+$PALANG['pViewlog_action_edit_domain'] = 'ドメインを編集';
+
+$PALANG['pViewlog_action_create_mailbox'] = 'アドレスを作æˆ';
+$PALANG['pViewlog_action_delete_mailbox'] = 'アドレスを削除';
+$PALANG['pViewlog_action_edit_mailbox'] = 'アドレスを編集';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'アドレスã®æœ‰åŠ¹ï¼ç„¡åŠ¹ã‚’編集';
+$PALANG['pViewlog_action_create_alias'] = '転é€å…ˆã‚’作æˆ';
+$PALANG['pViewlog_action_create_alias_domain'] = '別åドメインを作æˆ';
+$PALANG['pViewlog_action_edit_alias_domain'] = '別åドメインを編集';
+$PALANG['pViewlog_action_delete_alias'] = '転é€å…ˆã‚’削除';
+$PALANG['pViewlog_action_delete_alias_domain'] = '別åドメインを削除';
+$PALANG['pViewlog_action_edit_alias'] = '転é€å…ˆã‚’編集';
+$PALANG['pViewlog_action_edit_alias_state'] = '転é€å…ˆã®æœ‰åŠ¹ï¼ç„¡åŠ¹ã‚’編集';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = '別åドメインã®æœ‰åŠ¹ï¼ç„¡åŠ¹ã‚’変更';
+$PALANG['pViewlog_action_edit_password'] = 'パスワードを変更';
+$PALANG['pViewlog_action_create_admin'] = '管ç†è€…を作æˆ';
+$PALANG['pViewlog_action_edit_admin'] = '管ç†è€…を編集';
+$PALANG['pViewlog_action_delete_admin'] = '管ç†è€…を削除';
+$PALANG['pViewlog_action_edit_vacation'] = '自動応ç”を編集';
+$PALANG['pViewlog_action_create_fetchmail'] = 'fetchmail ã‚¸ãƒ§ãƒ–ã‚’è¿½åŠ ';
+$PALANG['pViewlog_action_edit_fetchmail'] = 'fetchmail ジョブを編集';
+$PALANG['pViewlog_action_delete_fetchmail'] = 'fetchmail ジョブを削除';
$PALANG['pViewlog_result_error'] = 'ãƒã‚°ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼';
@@ -228,8 +239,8 @@ $PALANG['subject'] = '件å';
$PALANG['pSendmail_subject_text'] = 'よã†ã“ã';
$PALANG['pSendmail_body'] = '本文';
$PALANG['pSendmail_button'] = 'メッセージé€ä¿¡';
-$PALANG['pSendmail_result_error'] = 'メールãŒé€ä¿¡ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX text change - new: Unable to send email to %s!
-$PALANG['pSendmail_result_success'] = 'メールãŒé€ä¿¡ã•ã‚Œã¾ã—ãŸã€‚ (%s)'; # XXX text change - new: Email sent to %s.
+$PALANG['pSendmail_result_error'] = '%s ã¸ãƒ¡ãƒ¼ãƒ«ãŒé€ä¿¡ã§ãã¾ã›ã‚“ï¼';
+$PALANG['pSendmail_result_success'] = '%s ã¸ãƒ¡ãƒ¼ãƒ«ãŒé€ä¿¡ã•ã‚Œã¾ã—ãŸã€‚';
$PALANG['pAdminMenu_list_admin'] = '管ç†è€…一覧';
$PALANG['pAdminMenu_list_domain'] = 'ドメイン一覧';
@@ -242,64 +253,65 @@ $PALANG['pAdminMenu_create_domain'] = 'æ
$PALANG['pAdminList_admin_count'] = 'ドメイン数';
$PALANG['description'] = '説明';
-$PALANG['aliases'] = '転é€æ•°'; # XXX check text - should be 'Aliases'
-$PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
+$PALANG['aliases'] = '転é€æ•°';
+$PALANG['pAdminList_domain_quota'] = 'ドメインクオータ (MB)';
$PALANG['pAdminList_domain_backupmx'] = 'ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— MX';
$PALANG['last_modified'] = '最終更新日';
$PALANG['pAdminCreate_domain_welcome'] = 'æ–°ã—ã„ドメインã®è¿½åŠ ';
$PALANG['pAdminCreate_domain_domain_text_error'] = 'ドメインãŒæ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚';
-$PALANG['domain_does_not_exist'] = 'This domain does not exist!'; # XXX
+$PALANG['domain_does_not_exist'] = 'ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã¯å˜åœ¨ã—ã¾ã›ã‚“!';
$PALANG['pAdminCreate_domain_domain_text_error2'] = 'ドメインãŒç„¡åŠ¹ã§ã™ã€‚';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'デフォルト転é€å…ˆã®è¿½åŠ ';
-$PALANG['pAdminCreate_domain_button'] = 'ãƒ‰ãƒ¡ã‚¤ãƒ³è¿½åŠ ';
-$PALANG['pAdminCreate_domain_result_error'] = 'ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚ (%s)'; # XXX Text changed to: The domain %s has been added.
-$PALANG['domain_updated'] = 'The domain %s has been updated.'; # XXX
-$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-
-$PALANG['domain_postdel_failed'] = 'ドメインãŒå‰Šé™¤ã§ãã¾ã›ã‚“ï¼'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
-$PALANG['domain_postcreate_failed'] = 'The domain postcreate script failed, check the error log for details!'; # XXX
-$PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, check the error log for details!'; # XXX
-$PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX
-$PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX
-$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
-$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX
+$PALANG['pAdminCreate_domain_button'] = 'ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ ';
+$PALANG['pAdminCreate_domain_result_error'] = 'ドメイン %s ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸï¼';
+$PALANG['pAdminCreate_domain_result_success'] = 'ドメイン %s ã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚';
+$PALANG['domain_updated'] = 'ドメイン %s ã‚’æ›´æ–°ã—ã¾ã—ãŸã€‚';
+$PALANG['pAdminDelete_admin_error'] = '管ç†è€…を削除ã§ãã¾ã›ã‚“ã§ã—ãŸ';
+
+$PALANG['domain_postdel_failed'] = 'ドメインã®å‰Šé™¤å¾Œã«ã€ã‚¹ã‚¯ãƒªãƒ—トã®å®Ÿè¡ŒãŒå¤±æ•—ã—ã¾ã—ãŸï¼ 詳ã—ãã¯ã‚¨ãƒ©ãƒ¼ãƒã‚°ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„。';
+$PALANG['domain_postcreate_failed'] = 'ドメインã®ä½œæˆå¾Œã«ã€ã‚¹ã‚¯ãƒªãƒ—トã®å®Ÿè¡ŒãŒå¤±æ•—ã—ã¾ã—ãŸ! 詳ã—ãã¯ã‚¨ãƒ©ãƒ¼ãƒã‚°ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„。';
+$PALANG['mailbox_postdel_failed'] = 'メールアドレスã®å‰Šé™¤å¾Œã«ã€ã‚¹ã‚¯ãƒªãƒ—トã®å®Ÿè¡ŒãŒå¤±æ•—ã—ã¾ã—ãŸ! 詳ã—ãã¯ã‚¨ãƒ©ãƒ¼ãƒã‚°ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„。';
+$PALANG['mailbox_postedit_failed'] = 'メールアドレスã®ç·¨é›†å¾Œã«ã€ã‚¹ã‚¯ãƒªãƒ—トã®å®Ÿè¡ŒãŒå¤±æ•—ã—ã¾ã—ãŸ! 詳ã—ãã¯ã‚¨ãƒ©ãƒ¼ãƒã‚°ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„。';
+$PALANG['mailbox_postcreate_failed'] = 'メールアドレスã®ä½œæˆå¾Œã«ã€ã‚¹ã‚¯ãƒªãƒ—トã®å®Ÿè¡ŒãŒå¤±æ•—ã—ã¾ã—ãŸ! 詳ã—ãã¯ã‚¨ãƒ©ãƒ¼ãƒã‚°ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„。';
+$PALANG['pAdminDelete_alias_domain_error'] = '管ç†è€…ã®åˆ¥åを削除ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
+$PALANG['domain_conflict_vacation_domain'] = 'メールドメインã¨ã—ã¦ã€è‡ªå‹•å¿œç”ドメインを使用ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“!';
$PALANG['pAdminEdit_domain_welcome'] = 'ドメインã®ä¿®æ£';
$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = 無効 | 0 = 無制é™';
$PALANG['pAdminEdit_domain_maxquota'] = '最大容é‡åˆ¶é™';
$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = 無効 | 0 = 無制é™';
-$PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
+$PALANG['pAdminEdit_domain_quota'] = 'ドメインクオータ';
$PALANG['transport'] = 'é…é€æ–¹æ³•';
$PALANG['pAdminEdit_domain_transport_text'] = 'é…é€æ–¹æ³•ã®å®šç¾©';
$PALANG['pAdminEdit_domain_backupmx'] = 'ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— MXサーãƒ';
-$PALANG['pAdminEdit_domain_result_error'] = 'ドメインãŒä¿®æ£ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX Text changed to: Modifying the domain %s failed!
+$PALANG['pAdminEdit_domain_result_error'] = 'ドメイン %s ã‚’ä¿®æ£ã§ãã¾ã›ã‚“!';
$PALANG['pAdminCreate_admin_welcome'] = 'æ–°ã—ã„ドメイン管ç†è€…ã®è¿½åŠ ';
$PALANG['email_address'] = 'メールアドレス';
$PALANG['pAdminCreate_admin_username_text_error1'] = '管ç†è€…ã¯æœ‰åŠ¹ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。';
-$PALANG['admin_already_exists'] = '管ç†è€…ã¯å˜åœ¨ã™ã‚‹ã‹ç„¡åŠ¹ã§ã™ã€‚'; # XXX Text changed to: The admin already exists!
-$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
+$PALANG['admin_already_exists'] = '管ç†è€…ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™!';
+$PALANG['admin_does_not_exist'] = '管ç†è€…ãŒå˜åœ¨ã—ã¾ã›ã‚“!';
$PALANG['pAdminCreate_admin_button'] = '管ç†è€…è¿½åŠ ';
-$PALANG['pAdminCreate_admin_result_error'] = '管ç†è€…ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = '管ç†è€…ã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚ (%s)'; # XXX Text changed to: The admin %s has been added.
+$PALANG['pAdminCreate_admin_result_error'] = '管ç†è€… %s ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
+$PALANG['pAdminCreate_admin_result_success'] = '管ç†è€… %s ã‚’è¿½åŠ ã—ã¾ã—ãŸã€‚';
$PALANG['pAdminEdit_admin_welcome'] = 'ドメイン管ç†è€…ã®ç·¨é›†';
-$PALANG['admin'] = '管ç†è€…'; # XXX check / compare with pAdminCreate_admin_username - should be "admin"
+$PALANG['admin'] = '管ç†è€…';
$PALANG['password_again'] = 'パスワード (確èª)';
$PALANG['super_admin'] = '特権管ç†è€…';
-$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
-$PALANG['pAdminEdit_admin_result_error'] = '管ç†è€…ã‚’ä¿®æ£ã§ãã¾ã›ã‚“ï¼ (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = '管ç†è€…ã‚’ä¿®æ£ã—ã¾ã—ãŸã€‚ (%s)'; # XXX Text changed to: The admin %s has been modified.
+$PALANG['super_admin_desc'] = '特権管ç†è€…ã¯ã™ã¹ã¦ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã«ã‚¢ã‚¯ã‚»ã‚¹ãŒå¯èƒ½ã§ã€ãƒ‰ãƒ¡ã‚¤ãƒ³ã¨ç®¡ç†è€…アカウントを管ç†ã§ãã¾ã™ã€‚';
+$PALANG['pAdminEdit_admin_result_error'] = '管ç†è€… %s ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸ!';
+$PALANG['pAdminEdit_admin_result_success'] = '管ç†è€… %s ã‚’æ›´æ–°ã—ã¾ã—ãŸã€‚';
$PALANG['pUsersLogin_welcome'] = 'ã‚ãªãŸã®ãƒ‘スワードã¨è»¢é€å…ˆãŒå¤‰æ›´ã§ãã¾ã™ã€‚';
$PALANG['pUsersLogin_username_incorrect'] = 'ãƒã‚°ã‚¤ãƒ³ãŒé•ã„ã¾ã™ã€‚æ£ã—ã„メールアドレスを入力ã—ã¦ãã ã•ã„。';
$PALANG['pUsersLogin_password_incorrect'] = 'パスワードãŒé•ã„ã¾ã™ã€‚';
+$PALANG['pUsersLogin_password_recover'] = 'パスワードを忘れã¾ã—ãŸ';
$PALANG['pUsersMenu_vacation'] = '自動応ç”';
-$PALANG['pUsersMenu_edit_alias'] = '転é€å…ˆå¤‰æ›´';
+$PALANG['pUsersMenu_edit_alias'] = '転é€å…ˆã‚’変更';
$PALANG['pUsersMain_vacation'] = 'ä¸åœ¨ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¾ãŸã¯è‡ªå‹•å¿œç”ã‚’è¨å®šã—ã¾ã™';
$PALANG['pUsersMain_vacationSet'] = '自動応ç”を利用ä¸ã§ã™ã€‚「自動応ç”ã€ã‚’クリックã—ã¦ç·¨é›†ï¼è§£é™¤ã§ãã¾ã™ã€‚';
@@ -307,18 +319,18 @@ $PALANG['pUsersMain_edit_alias'] = '転é
$PALANG['pUsersMain_password'] = 'パスワードを変更ã—ã¾ã™ã€‚';
$PALANG['pUsersVacation_welcome'] = '自動応ç”';
-$PALANG['pUsersVacation_welcome_text'] = 'æ—¢ã«è‡ªå‹•å¿œç”を構æˆã—ã¦ã‚ã‚Šã¾ã™ã€‚ (%s)'; # XXX Text changed to: 'Auto response for %s is active!'
+$PALANG['pUsersVacation_welcome_text'] = '%s ã®è‡ªå‹•å¿œç”ã¯æœ‰åŠ¹ã§ã™!';
$PALANG['pUsersVacation_subject_text'] = 'ä¸åœ¨';
-$PALANG['message'] = '本文'; # XXX text changed to 'Message'
+$PALANG['message'] = '本文';
$PALANG['pUsersVacation_body_text'] = << ã‹ã‚‰ ã¾ã§ä¸åœ¨ã§ã™ã€‚
ç·Šæ€¥äº‹é …ã¯ ã¾ã§é€£çµ¡ã—ã¦ãã ã•ã„。
EOM;
-$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX
-$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX
+$PALANG['pUsersVacation_activefrom'] = 'å³ã®æ—¥æ™‚ã‹ã‚‰æœ‰åŠ¹';
+$PALANG['pUsersVacation_activeuntil'] = 'å³ã®æ—¥æ™‚ã¾ã§æœ‰åŠ¹';
-$PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX
+$PALANG['pEdit_dbLog_editactive'] = '有効ï¼ç„¡åŠ¹ã‚’変更';
$PALANG['pSearch'] = '検索';
$PALANG['pSearch_welcome'] = '検索文å—列: ';
@@ -330,31 +342,33 @@ $PALANG['pBroadcast_name'] = 'åå‰';
$PALANG['pBroadcast_success'] = 'ブãƒãƒ¼ãƒ‰ã‚ャストメッセージã¯é€ä¿¡ã•ã‚Œã¾ã—ãŸã€‚';
$PALANG['pAdminMenu_broadcast_message'] = 'ブãƒãƒ¼ãƒ‰ã‚ャスト';
$PALANG['pBroadcast_error_empty'] = 'åå‰ã€ä»¶åã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯å…¥åŠ›ãŒå¿…è¦ã§ã™ã€‚';
+$PALANG['broadcast_mailboxes_only'] = 'メールアドレスã ã‘ã«é€ä¿¡';
+$PALANG['broadcast_to_domains'] = 'é€ä¿¡å…ˆã®ãƒ‰ãƒ¡ã‚¤ãƒ³:';
$PALANG['pStatus_undeliverable'] = 'ãŠãらãé…é€ä¸å¯èƒ½ ';
$PALANG['pStatus_custom'] = 'é…é€å…ˆ ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['password_too_short'] = "パスワードãŒçŸã™ãŽã¾ã™ã€‚最低 %s æ–‡å—å¿…è¦ã§ã™ã€‚";
-$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
-$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
-$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
-$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
+$PALANG['password_no_characters'] = "パスワードã«ã¯ã€å°‘ãªãã¨ã‚‚ %s 個ã®è‹±å—ãŒãªãã¦ã¯ãªã‚Šã¾ã›ã‚“。";
+$PALANG['password_no_digits'] = "パスワードã«ã¯ã€å°‘ãªãã¨ã‚‚ %s 個ã®æ•°å—ãŒãªãã¦ã¯ãªã‚Šã¾ã›ã‚“。";
+$PALANG['pInvalidDomainRegex'] = "ä¸æ£ãªãƒ‰ãƒ¡ã‚¤ãƒ³åã§ã™[%s]。æ£è¦è¡¨ç¾ãƒã‚§ãƒƒã‚¯ã§å¤±æ•—";
+$PALANG['pInvalidDomainDNS'] = "ä¸æ£ãªãƒ‰ãƒ¡ã‚¤ãƒ³[%s]ã§ã‚ã‚‹ã‹ã€ã‚‚ã—ã㯠DNS ã«è¦‹å½“ãŸã‚Šã¾ã›ã‚“";
+$PALANG['pInvalidMailRegex'] = "ä¸æ£ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™[%s]。æ£è¦è¡¨ç¾ãƒã‚§ãƒƒã‚¯ã§å¤±æ•—";
$PALANG['pFetchmail_welcome'] = 'メールå–å¾—:';
$PALANG['pFetchmail_new_entry'] = 'æ–°ã—ã„エントリ';
-$PALANG['fetchmail_already_exists'] = 'This fetchmail job already exists!'; # XXX
-$PALANG['fetchmail_does_not_exist'] = 'This fetchmail job does not exist!'; # XXX
+$PALANG['fetchmail_already_exists'] = 'ã“ã® fetchmail ジョブã¯æ—¢ã«å˜åœ¨ã—ã¾ã™!';
+$PALANG['fetchmail_does_not_exist'] = 'ã“ã® fetchmail ジョブã¯å˜åœ¨ã—ã¾ã›ã‚“!';
$PALANG['pFetchmail_database_save_error'] = 'ã“ã®ã‚¨ãƒ³ãƒˆãƒªã‚’データベースã«ä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚';
$PALANG['pFetchmail_database_save_success'] = 'エントリをデータベースã«ä¿å˜ã—ã¾ã—ãŸã€‚';
$PALANG['pFetchmail_error_invalid_id'] = 'ID %s ã®ã‚¨ãƒ³ãƒˆãƒªãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。';
-$PALANG['pFetchmail_invalid_mailbox'] = 'メールボックスãŒç„¡åŠ¹ã§ã™ï¼';
+$PALANG['pFetchmail_invalid_mailbox'] = 'メールアドレスãŒç„¡åŠ¹ã§ã™ï¼';
$PALANG['pFetchmail_server_missing'] = 'リモートサーãƒåを入力ã—ã¦ãã ã•ã„。';
$PALANG['pFetchmail_user_missing'] = 'リモートユーザåを入力ã—ã¦ãã ã•ã„。';
$PALANG['pFetchmail_password_missing'] = 'リモートパスワードを入力ã—ã¦ãã ã•ã„。';
$PALANG['pFetchmail_field_id'] = 'ID';
-$PALANG['pFetchmail_field_mailbox'] = 'メールボックス';
+$PALANG['pFetchmail_field_mailbox'] = 'メールアドレス';
$PALANG['pFetchmail_field_src_server'] = 'サーãƒ';
$PALANG['pFetchmail_field_src_auth'] = 'èªè¨¼ã‚¿ã‚¤ãƒ—';
$PALANG['pFetchmail_field_src_user'] = 'ユーザ';
@@ -364,10 +378,10 @@ $PALANG['pFetchmail_field_poll_time']
$PALANG['pFetchmail_field_fetchall'] = 'ã™ã¹ã¦å–å¾—';
$PALANG['pFetchmail_field_keep'] = '残ã™';
$PALANG['pFetchmail_field_protocol'] = 'プãƒãƒˆã‚³ãƒ«';
-$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
-$PALANG['pFetchmail_field_sslcertck'] = 'SSL certificate check'; # XXX
-$PALANG['pFetchmail_field_sslcertpath'] = 'SSL path to certificates'; # XXX
-$PALANG['pFetchmail_field_sslfingerprint'] = 'SSL fingerprint (md5)'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL 有効';
+$PALANG['pFetchmail_field_sslcertck'] = 'SSL 証明書ãƒã‚§ãƒƒã‚¯';
+$PALANG['pFetchmail_field_sslcertpath'] = 'SSL 証明書ã¸ã®ãƒ‘ス';
+$PALANG['pFetchmail_field_sslfingerprint'] = 'SSL フィンガープリント (md5)';
$PALANG['pFetchmail_field_extra_options'] = 'è¿½åŠ ã‚ªãƒ—ã‚·ãƒ§ãƒ³';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = '日付';
@@ -383,13 +397,13 @@ $PALANG['pFetchmail_desc_poll_time']
$PALANG['pFetchmail_desc_fetchall'] = 'æ—¢èªã¨æ–°ç€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å–å¾—ã™ã‚‹ã‹';
$PALANG['pFetchmail_desc_keep'] = 'リモートサーãƒã«å–得済メッセージを残ã™ã‹';
$PALANG['pFetchmail_desc_protocol'] = '利用ã™ã‚‹ãƒ—ãƒãƒˆã‚³ãƒ«';
-$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL æš—å·åŒ–';
$PALANG['pFetchmail_desc_extra_options'] = 'è¿½åŠ ã® fetchmail オプション';
$PALANG['pFetchmail_desc_mda'] = 'メールé…é€ã‚¨ãƒ¼ã‚¸ã‚§ãƒ³ãƒˆ (Mail Delivery Agent)';
$PALANG['pFetchmail_desc_date'] = '最終å–得確èªï¼è¨å®šå¤‰æ›´æ—¥æ™‚';
$PALANG['pFetchmail_desc_returned_text'] = 'æ–°ç€ç¢ºèªã®æˆ»ã‚Šãƒ†ã‚ストメッセージ';
-$PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX
-$PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX
+$PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format
+$PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
diff -pruN 3.0.2-2/languages/language.php 3.2-2/languages/language.php
--- 3.0.2-2/languages/language.php 2016-09-09 20:08:57.000000000 +0000
+++ 3.2-2/languages/language.php 2018-05-02 20:37:27.000000000 +0000
@@ -1,4 +1,6 @@
-
+
@@ -144,6 +144,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'IÅ¡naudota srities paÅ¡to dėžuÄių kvota!';
$PALANG['pCreate_mailbox_password_text'] = 'Slaptažodis jungtis prie POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Vardas PavardÄ—';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Siųsti pasveikinimo žinutę';
$PALANG['pCreate_mailbox_result_error'] = 'Pašto dėžutės užregistruoti nepavyko! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'Pašto dėžutė užregistruota! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
@@ -171,6 +175,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Keisti slaptažodį';
$PALANG['pPassword_result_error'] = 'Slaptažodžio pakeisti nepavyko! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'Slaptažodis pakeistas! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Pakeisti / nustatyti atostogų pranešimą';
$PALANG['pEdit_vacation_remove'] = 'Išjungti atostogų pranešimą';
$PALANG['pVacation_result_error'] = 'Nepavyko pakeisti atostogų nustatymų! (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
@@ -186,7 +197,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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';
@@ -292,6 +303,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'PaÅ¡to vartotojai prisijungia ir keiÄia slaptažodžius ir sinonimus.';
$PALANG['pUsersLogin_username_incorrect'] = 'Prisijungti nepavyko. Įsitikinkite, kad gerai įvedėte savo el.pašto adresą!';
$PALANG['pUsersLogin_password_incorrect'] = 'Slaptažodis neteisingas!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = 'Automatinis (atostogų) atsakymas';
$PALANG['pUsersMenu_edit_alias'] = 'Keisti laiškų peradresaciją';
@@ -328,6 +340,8 @@ $PALANG['pBroadcast_name'] = 'Your name'
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
diff -pruN 3.0.2-2/languages/mk.lang 3.2-2/languages/mk.lang
--- 3.0.2-2/languages/mk.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/mk.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
@@ -143,6 +143,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'ДоÑтигнат е лимитот на поштенÑки Ñандачиња!';
$PALANG['pCreate_mailbox_password_text'] = 'Лозинка за POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Цело име';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Креирање на поштенÑко Ñандаче'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Ðе можам да додадам ново Ñандаче на табелата! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'ПоштенÑкото Ñандаче е додадено на табелата! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
@@ -170,6 +174,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Промена на лозинка';
$PALANG['pPassword_result_error'] = 'Ðе можам да ја променам вашата лозинка! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'Вашата лозинка е Ñменета! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
$PALANG['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -185,7 +196,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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'] = 'Датум';
@@ -292,6 +303,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'Логин за кориÑници на поштенÑки Ñандачиња.Промена на логин и лозинка';
$PALANG['pUsersLogin_username_incorrect'] = 'Погрешно кориÑничко име. Логирајте Ñе Ñо вашата email адреÑа!';
$PALANG['pUsersLogin_password_incorrect'] = 'Погрешна лозинка!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = 'ÐвтоматÑки одговор';
$PALANG['pUsersMenu_edit_alias'] = 'Промена на препраќање (forward)';
@@ -323,6 +335,8 @@ $PALANG['pBroadcast_name'] = 'Your name'
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
diff -pruN 3.0.2-2/languages/nb.lang 3.2-2/languages/nb.lang
--- 3.0.2-2/languages/nb.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/nb.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
tot .
+Ik zal afwezig zijn van %vandatum tot %totdatum.
Voor belangrijke punten kunt u contact opnemen met .
EOM;
-$PALANG['pUsersVacation_activefrom'] = 'Actief vanaf'; # -> NOT OBSOLETE <-
-$PALANG['pUsersVacation_activeuntil'] = 'Actief t/m'; # -> NOT OBSOLETE <-
+$PALANG['pUsersVacation_activefrom'] = 'Actief vanaf';
+$PALANG['pUsersVacation_activeuntil'] = 'Actief t/m';
$PALANG['pEdit_dbLog_editactive'] = 'status verandert';
@@ -323,19 +336,21 @@ $PALANG['pBroadcast_name'] = 'Uw naam';
$PALANG['pBroadcast_success'] = 'Uw algemene bericht is verzonden.';
$PALANG['pAdminMenu_broadcast_message'] = 'Algemeen bericht';
$PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen niet leeg zijn !';
+$PALANG['broadcast_mailboxes_only'] = 'Verstuur alleen aan mailboxen';
+$PALANG['broadcast_to_domains'] = 'Verstuur aan de domeinen:';
$PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren ';
$PALANG['pStatus_custom'] = 'Bezorgen op ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['password_too_short'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten";
-$PALANG['password_no_characters'] = "Je wachtwoord moet minimaal %s karakter(s) bevatten."; # XXX
-$PALANG['password_no_digits'] = "Je wachtwoord moet minimaal %s getal(len) bevatten."; # XXX
+$PALANG['password_no_characters'] = "Je wachtwoord moet minimaal %s karakter(s) bevatten.";
+$PALANG['password_no_digits'] = "Je wachtwoord moet minimaal %s getal(len) bevatten.";
$PALANG['pInvalidDomainRegex'] = "Ongeldig domein naam %s";
$PALANG['pInvalidDomainDNS'] = "Ongeldig domein %s";
$PALANG['pInvalidMailRegex'] = "Ongeldig email adres %s komt niet door de limietcheck"; # XXX text change to: "Invalid email address %s, fails regexp check"
$PALANG['pFetchmail_welcome'] = 'Haal mail op voor:';
$PALANG['pFetchmail_new_entry'] = 'Nieuw item';
-$PALANG['fetchmail_already_exists'] = 'This fetchmail job already exists!'; # XXX
-$PALANG['fetchmail_does_not_exist'] = 'This fetchmail job does not exist!'; # XXX
+$PALANG['fetchmail_already_exists'] = 'Deze "fetchmail job" bestaat al!';
+$PALANG['fetchmail_does_not_exist'] = 'Deze "fetchmail job" bestaat niet!';
$PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!';
$PALANG['pFetchmail_database_save_success'] = 'Item opgeslagen in database.';
$PALANG['pFetchmail_error_invalid_id'] = 'Geen item met ID %s gevonden!';
diff -pruN 3.0.2-2/languages/nn.lang 3.2-2/languages/nn.lang
--- 3.0.2-2/languages/nn.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/nn.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
"Save changes"
+$PALANG['save'] = 'Uložiť zmeny';
$PALANG['confirm'] = 'Ste si istÃ?\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'] = 'Naozaj chcete zmazať všetky záznamy v tejto doméne? Toto nie je možné vrátiť!\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_delete_admin'] = 'Naozaj chcete zmazať administrátora %s?';
+$PALANG['confirm_delete_alias'] = 'Naozaj chcete zmazať alias %s?';
+$PALANG['confirm_delete_aliasdomain'] = 'Naozaj chcete zmazať alias domény %s?';
+$PALANG['confirm_delete_domain'] = 'Naozaj chcete zmazať všetky záznamy v doméne %s? Toto nie je možné vrátiť!';
+$PALANG['confirm_delete_fetchmail'] = 'Naozaj chcete zmazať sťahovanie emailu %s?';
+$PALANG['confirm_delete_mailbox'] = 'Naozaj chcete zmazať schránku %s?';
+$PALANG['confirm_delete_vacation'] = 'Naozaj chcete zmazaÅ¥ automatickú odpoveÄ pre %s?';
+$PALANG['no_delete_permissions'] = 'Nemáte oprávnenie zmazať %s!';
$PALANG['check_update'] = 'Skontrolovať aktualizácie';
$PALANG['invalid_parameter'] = 'Neplatný parameter!';
-$PALANG['show'] = 'Show:'; # XXX
-$PALANG['all'] = 'All'; # XXX
-$PALANG['created'] = 'Created'; # XXX
-$PALANG['unknown'] = 'unknown'; # XXX
-$PALANG['download_csv'] = 'Download this list as CSV file'; # XXX
-$PALANG['missing_field'] = 'Field %s is missing'; # XXX
-$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
-$PALANG['must_be_numeric_bigger_than_null'] = '%s must be numeric and bigger than 0'; # XXX
-$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
-$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
-$PALANG['edit_not_allowed'] = 'You are not allowed to edit %s'; # XXX
-$PALANG['searchparams'] = 'Search parameters:'; # XXX
-$PALANG['pFooter_logged_as'] = 'Prihlásený ako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
+$PALANG['show'] = 'Zobraz:';
+$PALANG['all'] = 'VÅ¡etko';
+$PALANG['created'] = 'Vytvorené';
+$PALANG['unknown'] = 'neznáme';
+$PALANG['download_csv'] = 'Stiahnuť ako CSV súbor';
+$PALANG['missing_field'] = 'Pole %s chýba';
+$PALANG['must_be_numeric'] = '%s musà byÅ¥ ÄÃslo';
+$PALANG['must_be_numeric_bigger_than_null'] = '%s musà byÅ¥ ÄÃslo väÄÅ¡ie ako 0';
+$PALANG['must_be_boolean'] = '%s musà byť typu boolean';
+$PALANG['invalid_value_given'] = 'Neplatná hodnota zadaná pre %s';
+$PALANG['edit_not_allowed'] = 'Nemáte oprávnenie upravovať %s';
+$PALANG['searchparams'] = 'Parametre hľadania:';
+$PALANG['pFooter_logged_as'] = 'Prihlásený ako %s';
$PALANG['pLogin_welcome'] = 'Prihlásenie administrátorov pre správu domén';
$PALANG['pLogin_username'] = 'UžÃvateľské meno (email)';
$PALANG['password'] = 'Heslo';
-$PALANG['pLogin_language'] = 'Language'; # XXX
+$PALANG['pLogin_language'] = 'Jazyk';
$PALANG['pLogin_button'] = 'Prihlásiť';
$PALANG['pLogin_failed'] = 'Váš email alebo heslo nie je správne.';
$PALANG['pLogin_login_users'] = 'Vstup do užÃvateľskej sekcie';
$PALANG['pMenu_main'] = 'Hlavné';
$PALANG['pMenu_overview'] = 'Prehľad';
-$PALANG['add_alias'] = 'Nový alias'; # XXX check text - should be 'Add Alias'
-$PALANG['add_alias_domain'] = 'Nový alias domény'; # XXX check text - should be 'Add Alias Domain'
-$PALANG['add_mailbox'] = 'Nová schránka'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = 'Pridať alias';
+$PALANG['add_alias_domain'] = 'Pridať alias domény';
+$PALANG['add_mailbox'] = 'Pridať schránku';
$PALANG['pMenu_fetchmail'] = 'SÅ¥ahovanie emailu';
$PALANG['pMenu_sendmail'] = 'Poslať email';
$PALANG['pMenu_password'] = 'Zmeniť heslo';
@@ -59,7 +59,7 @@ $PALANG['pMenu_logout'] = 'Odhlásiť';
$PALANG['pMain_welcome'] = 'Vitajte v Postfix Admine!';
$PALANG['pMain_overview'] = 'Výpis aliasov a schránok. Môžete ich tu upravovať a mazať.';
-$PALANG['pMain_create_alias'] = 'Vytvoriť alias v tejto doméne.'; # XXX check text - should be 'Create a new alias for your domain.'
+$PALANG['pMain_create_alias'] = 'Vytvoriť alias v tejto doméne.';
$PALANG['pMain_create_mailbox'] = 'Vytvoriť schránku v tejto doméne.';
$PALANG['pMain_sendmail'] = 'Poslať email do jednej zo schránok.';
$PALANG['pMain_password'] = 'ZmeniÅ¥ heslo administrátorského úÄtu.';
@@ -79,15 +79,15 @@ $PALANG['go'] = 'Prejsť';
$PALANG['pOverview_welcome'] = 'Prehľad pre doménu ';
$PALANG['pOverview_alias_domain_aliases'] = 'Aliasy domén';
$PALANG['pOverview_alias_address'] = 'Od';
-$PALANG['active'] = 'AktÃvny'; # XXX check text - should be 'Active'
+$PALANG['active'] = 'AktÃvny';
$PALANG['and_x_more'] = '[a %s ÄalÅ¡Ãch...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['name'] = 'Meno';
$PALANG['pOverview_mailbox_quota'] = 'Kvóta (MB)';
$PALANG['pOverview_vacation_edit'] = 'AUT. ODPOVEÄŽ';
$PALANG['pOverview_vacation_option'] = 'aut. odpoveÄ';
-$PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
-$PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX
+$PALANG['no_domains_for_this_admin'] = 'Nemáte oprávnenie pre žiadne domény.';
+$PALANG['no_domains_exist'] = 'MusÃte vytvoriÅ¥ aspoň jednu doménu.';
$PALANG['domain'] = 'Doména';
$PALANG['pOverview_get_alias_domains'] = 'Aliasy domén';
@@ -105,58 +105,62 @@ $PALANG['pCreate_alias_domain_target'] =
$PALANG['pCreate_alias_domain_target_text'] = 'Kam sa email presmeruje';
$PALANG['pCreate_alias_domain_error1'] = 'Nie ste oprávnenà vytvoriť zvolenú konfiguráciu.';
$PALANG['pCreate_alias_domain_error2'] = 'Zvolená konfigurácia nie je platná, zvoľte inú!';
-$PALANG['alias_domain_already_exists'] = 'This domain is already an alias domain!'; # XXX
-$PALANG['alias_domain_does_not_exist'] = 'This domain isn\'t an alias domain!'; # XXX
-$PALANG['alias_domain_create_failed'] = 'Chyba pri vkladanà do databázy. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
-$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
+$PALANG['alias_domain_already_exists'] = 'Tento alias domény už existuje!';
+$PALANG['alias_domain_does_not_exist'] = 'Tento alias domény neexistuje!';
+$PALANG['alias_domain_create_failed'] = 'Nepodarilo sa vytvoriť alias domény %s!';
+$PALANG['alias_domain_change_failed'] = 'Nepodarilo sa upraviť alias domény %s!';
$PALANG['pCreate_alias_domain_error4'] = 'Všetky domény už majú aliasy.';
-$PALANG['pCreate_alias_domain_success'] = 'Alias domény bol pridaný do tabuľky! (%s)'; # XXX Text changed to: The alias domain %s has been created.
-$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX
-$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
-$PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'Alias domény %s bol vytvorený.';
+$PALANG['alias_domain_changed'] = 'Alias domény %s bol zmenený.';
+$PALANG['alias_domain_to_itsself'] = 'Doména nemôže byť alias na seba!';
+$PALANG['delete_domain_aliasdomain_target'] = 'Doména %s je cieľom najmenej jedného aliasu domény a nemôže byť zmazaná! (Najprv zmažte aliasy domén.)';
$PALANG['pCreate_alias_address_text_error1'] = 'Adresa nie je platná!';
-$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
-$PALANG['email_address_already_exists'] = 'Takáto emailová adresa už existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['alias_does_not_exist'] = 'Tento alias neexistuje!';
+$PALANG['email_address_already_exists'] = 'Takáto emailová adresa už existuje!';
$PALANG['pCreate_alias_address_text_error3'] = 'Dosiahli ste limit, nemôžete vytváraÅ¥ ÄalÅ¡ie aliasy!';
$PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodiť';
$PALANG['pCreate_alias_goto_text_error'] = 'Cieľ nie je platný!';
-$PALANG['pCreate_alias_result_error'] = 'Nepodarilo sa pridať alias do tabuľky! (%s)'; # XXX Text changed to: Creating the alias %s failed!
-$PALANG['pCreate_alias_result_success'] = 'Alias bol pridaný do tabuľky!'; # XXX text change: 'The alias %s has been created!'
-$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
-$PALANG['pCreate_alias_catchall_text'] = 'Pre vytvorenie doménového koša použite * ako alias. Pre alias doména-doména použite *@domain.tld ako cieľ.'; # XXX check/beautify - was split in two lines before
-$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
-$PALANG['protected_alias_cant_be_deleted'] = 'The alias %s is protected and can only be deleted by a superadmin'; # XXX
-
-$PALANG['pEdit_alias_welcome'] = 'Upraviť aliasy'; # XXX Text change to: 'Edit forwarding settings'
-$PALANG['pEdit_alias_help'] = 'Jeden záznam na riadku'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
-$PALANG['alias'] = 'Alias'; # XXX
-$PALANG['to'] = 'Cieľ'; # XXX check text - should be 'To'
+$PALANG['pCreate_alias_result_error'] = 'Nepodarilo sa vytvoriť alias %s!';
+$PALANG['pCreate_alias_result_success'] = 'Alias %s bol vytvorený.';
+$PALANG['alias_updated'] = 'Alias %s bol aktualizovaný.';
+$PALANG['pCreate_alias_catchall_text'] = 'Pre vytvorenie doménového koša použite * ako alias. Pre alias doména-doména použite *@domain.tld ako cieľ.';
+$PALANG['mailbox_alias_cant_be_deleted'] = 'Tento alias patrà k schránke a nemôže byť zmazaný!';
+$PALANG['protected_alias_cant_be_deleted'] = 'Alias %s je chránený a môže ho zmazať len superadmin';
+
+$PALANG['pEdit_alias_welcome'] = 'Upraviť alias';
+$PALANG['pEdit_alias_help'] = 'Jeden záznam na riadok.';
+$PALANG['alias'] = 'Alias';
+$PALANG['to'] = 'Cieľ';
$PALANG['pEdit_alias_goto_text_error1'] = 'Nezadali ste cieľ';
$PALANG['pEdit_alias_goto_text_error2'] = 'Zadaná emailová adresa nie je platná: ';
$PALANG['pEdit_alias_domain_result_error'] = 'Nepodarilo sa zmeniť alias domény!';
$PALANG['pEdit_alias_forward_and_store'] = 'DoruÄiÅ¥ aj do lokálnej schránky';
$PALANG['pEdit_alias_forward_only'] = 'Len presmerovať na zadané emailové adresy';
-$PALANG['pEdit_alias_result_error'] = 'Nepodarilo se upraviť alias! (%s)'; # XXX Text changed to: Modifying the alias %s failed!
+$PALANG['pEdit_alias_result_error'] = 'Nepodarilo se upraviť alias %s!';
$PALANG['pCreate_mailbox_welcome'] = 'Vytvoriť novú schránku v doméne';
$PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa nie je platná!';
$PALANG['pCreate_mailbox_username_text_error3'] = 'Dosiahli ste limit, nemôžete vytváraÅ¥ ÄalÅ¡ie schránky!';
$PALANG['pCreate_mailbox_password_text'] = 'Heslo pre POP3/IMAP/SMTP';
$PALANG['pCreate_mailbox_name_text'] = 'Celé meno';
-$PALANG['pCreate_mailbox_mail'] = 'PoslaÅ¥ uvÃtacà email'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_result_error'] = 'Nepodarilo sa pridať schránku do tabuľky! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
-$PALANG['pCreate_mailbox_result_success'] = 'Schránka bola pridaná do tabuľky! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka bola pridaná do tabuľky, ale nepodarilo sa vytvoriť (niektoré) definované adresáre (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.
-$PALANG['mailbox_updated'] = "The mailbox %s has been updated."; # XXX
-$PALANG['mailbox_update_failed'] = "Updating the mailbox %s failed!"; # XXX
+$PALANG['pCreate_mailbox_phone'] = 'Mobilný telefón';
+$PALANG['pCreate_mailbox_phone_desc'] = "Na odoslanie SMS v prÃpade zabudnutého hesla";
+$PALANG['pCreate_mailbox_email'] = 'Iný e-mail';
+$PALANG['pCreate_mailbox_email_desc'] = "Pre prÃpad zabudnutého hesla";
+$PALANG['pCreate_mailbox_mail'] = 'PoslaÅ¥ uvÃtacà email';
+$PALANG['pCreate_mailbox_result_error'] = 'Nepodarilo sa vytvoriť schránku %s!';
+$PALANG['pCreate_mailbox_result_success'] = 'Schránka %s bola vytvorená.';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka %s bola vytvorená, ale nepodarilo sa vytvoriť (niektoré) definované adresáre!';
+$PALANG['mailbox_updated'] = "Schránka %s bola upravená.";
+$PALANG['mailbox_update_failed'] = "Nepodarilo sa upraviť schránku %s!";
$PALANG['pEdit_mailbox_welcome'] = 'Upraviť schránku v doméne';
$PALANG['pEdit_mailbox_username'] = 'UžÃvateľské meno';
$PALANG['pEdit_mailbox_password_text_error'] = 'Zadaná heslá se nezhodujú!';
$PALANG['pEdit_mailbox_quota'] = 'Kvóta';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
-$PALANG['mb_max'] = 'MB (max: %s)'; # XXX
+$PALANG['mb_max'] = 'MB (max: %s)';
$PALANG['pEdit_mailbox_quota_text_error'] = 'Zadané miesto je prÃliÅ¡ veľké!';
$PALANG['pEdit_mailbox_domain_error'] = 'Táto doména nie je vaša: ';
$PALANG['pEdit_mailbox_result_error'] = 'Nepodarilo sa upraviť schránku!';
@@ -167,52 +171,59 @@ $PALANG['pPassword_password_current'] =
$PALANG['pPassword_password_current_text_error'] = 'Nezadali ste súÄasné heslo!';
$PALANG['pPassword_password'] = 'Nové heslo';
$PALANG['pPassword_password2'] = 'Nové heslo (znovu)';
-$PALANG['pPassword_password_text_error'] = 'Zadané heslá sú rozdielne alebo prázdne!'; # XXX check/beautify - was split in two lines before
-$PALANG['change_password'] = 'Zmeniť heslo'; # XXX check text - should be 'Change Password'
-$PALANG['pPassword_result_error'] = 'Nepodarilo sa zmeniť heslo! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'Heslo bolo zmenené! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_password_text_error'] = 'Zadané heslá sú rozdielne alebo prázdne!';
+$PALANG['change_password'] = 'Zmeniť heslo';
+$PALANG['pPassword_result_error'] = 'Nepodarilo sa zmeniť heslo pre %s';
+$PALANG['pPassword_result_success'] = 'Heslo bolo zmenené pre %s';
+$PALANG['pPassword_recovery_title'] = 'Postup pre zmenu hesla.';
+$PALANG['pPassword_recovery_button'] = 'Odoslať kód';
+$PALANG['pPassword_recovery_email_body'] = "Použite tento link na zmenu hesla pre email:\n%s\n\n" . $CONF['admin_name'];
+$PALANG['pPassword_recovery_sms_body'] = "Kód na zmenu vašeho hesla je: %s\n" . $CONF['admin_name'];
+$PALANG['pPassword_recovery_processed'] = "We processed your request. Ak ste zadali správne meno, dostanete email/SMS s kódom na zmenu hesla.";
+$PALANG['pPassword_password_code'] = 'Kód odoslaný cez email/SMS';
+$PALANG['pPassword_code_text_error'] = 'Neplatný kód';
$PALANG['pEdit_vacation_set'] = 'ZmeniÅ¥/nastaviÅ¥ aut. odpoveÄ';
$PALANG['pEdit_vacation_remove'] = 'OdstrániÅ¥ aut. odpoveÄ';
-$PALANG['pVacation_result_error'] = 'Neopdarilo sa zmeniÅ¥ automatickú odpoveÄ! (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
-$PALANG['pVacation_result_removed'] = 'Automatická odpoveÄ bola odstránená! (%s)'; # XXX Text changed to "Auto response for %s has been disabled!"
-$PALANG['pVacation_result_added'] = 'Automatická odpoveÄ bola nastavená! (%s)'; # XXX Text changed to "Auto response for %s has been enabled!"
-$PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX
-$PALANG['pVacation_reply_delay_time'] = 'Interval time'; # XXX
-$PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX
-$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['reply_once'] = 'Reply once'; # XXX
-$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['pVacation_result_error'] = 'Neopdarilo sa zmeniÅ¥ automatickú odpoveÄ pre %s!';
+$PALANG['pVacation_result_removed'] = 'Automatická odpoveÄ pre %s bola odstránená!';
+$PALANG['pVacation_result_added'] = 'Automatická odpoveÄ pre %s bola nastavená!';
+$PALANG['pVacation_reply_type'] = 'Ako odpovedať';
+$PALANG['pVacation_reply_delay_time'] = 'Časový interval';
+$PALANG['pVacation_reply_delay_time_text'] = 'Čas v sekundách';
+$PALANG['pVacation_until_before_today'] = 'Dátum [AktÃvna do] je v minulosti!';
+$PALANG['pVacation_until_before_from'] = 'Dátum [AktÃvna do] je starÅ¡Ã ako [AktÃvna od]!';
+$PALANG['reply_once'] = 'Odpovedať raz';
+$PALANG['reply_every_mail'] = 'Odpovedať na každú správu';
+$PALANG['reply_once_per_day'] = 'Odpovedať raz za deň';
+$PALANG['reply_once_per_week'] = 'Odpovedať raz za týždeň';
-$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';
-$PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
-$PALANG['pViewlog_action_delete_domain'] = 'delete domain'; # XXX
-$PALANG['pViewlog_action_edit_domain'] = 'edit domain'; # XXX
+$PALANG['pViewlog_action_create_domain'] = 'vytvorenie domény';
+$PALANG['pViewlog_action_delete_domain'] = 'zrušenie domény';
+$PALANG['pViewlog_action_edit_domain'] = 'zmena domény';
$PALANG['pViewlog_action_create_mailbox'] = 'vytvorenie schránky';
$PALANG['pViewlog_action_delete_mailbox'] = 'zrušenie schránky';
$PALANG['pViewlog_action_edit_mailbox'] = 'zmena schránky';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'zmena aktivity schránky';
$PALANG['pViewlog_action_create_alias'] = 'vytvorenie aliasu';
$PALANG['pViewlog_action_create_alias_domain'] = 'vytvorenie aliasu domény';
-$PALANG['pViewlog_action_edit_alias_domain'] = 'edit alias domain'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain'] = 'zmena aliasu domény';
$PALANG['pViewlog_action_delete_alias'] = 'zrušenie aliasu';
$PALANG['pViewlog_action_delete_alias_domain'] = 'zrušenie aliasu domény';
$PALANG['pViewlog_action_edit_alias'] = 'zmena aliasu';
$PALANG['pViewlog_action_edit_alias_state'] = 'zmena aktivity aliasu';
$PALANG['pViewlog_action_edit_alias_domain_state'] = 'zmena aktivity aliasu domény';
$PALANG['pViewlog_action_edit_password'] = 'zmena hesla';
-$PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
-$PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
-$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX
-$PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX
-$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_admin'] = 'vytvorenie administrátora';
+$PALANG['pViewlog_action_edit_admin'] = 'zmena administrátora';
+$PALANG['pViewlog_action_delete_admin'] = 'zrušenie administrátora';
+$PALANG['pViewlog_action_edit_vacation'] = 'zmena aut. odpovede';
+$PALANG['pViewlog_action_create_fetchmail'] = 'vytvorenie sťahovania';
+$PALANG['pViewlog_action_edit_fetchmail'] = 'zmena sťahovania';
+$PALANG['pViewlog_action_delete_fetchmail'] = 'zrušenie sťahovania';
$PALANG['pViewlog_result_error'] = 'Nepodarilo sa nájsť záznamy!';
@@ -224,74 +235,75 @@ $PALANG['subject'] = 'Predmet';
$PALANG['pSendmail_subject_text'] = 'Vitajte';
$PALANG['pSendmail_body'] = 'Obsah';
$PALANG['pSendmail_button'] = 'Poslať email';
-$PALANG['pSendmail_result_error'] = 'Nepodarilo sa poslať email! (%s)'; # XXX text change - new: Unable to send email to %s!
-$PALANG['pSendmail_result_success'] = 'Email odoslaný! (%s)'; # XXX text change - new: Email sent to %s.
+$PALANG['pSendmail_result_error'] = 'Nepodarilo sa poslať email na adresu %s!';
+$PALANG['pSendmail_result_success'] = 'Email odoslaný na adresu %s.';
$PALANG['pAdminMenu_list_admin'] = 'Administrátori';
$PALANG['pAdminMenu_list_domain'] = 'Domény';
$PALANG['pAdminMenu_list_virtual'] = 'Aliasy';
$PALANG['pAdminMenu_backup'] = 'Zálohovať';
$PALANG['pAdminMenu_create_domain_admins'] = 'Doménovà administrátori';
-$PALANG['pAdminMenu_create_admin'] = 'Nový admin';
+$PALANG['pAdminMenu_create_admin'] = 'Nový administrátor';
$PALANG['pAdminMenu_create_domain'] = 'Nová doména';
$PALANG['pAdminList_admin_count'] = 'Domény';
$PALANG['description'] = 'Popis';
-$PALANG['aliases'] = 'Aliasov'; # XXX check text - should be 'Aliases'
-$PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
+$PALANG['aliases'] = 'Aliasov';
+$PALANG['pAdminList_domain_quota'] = 'Doménová kvóta (MB)';
$PALANG['pAdminList_domain_backupmx'] = 'Záložný MX';
$PALANG['last_modified'] = 'Posledná zmena';
$PALANG['pAdminCreate_domain_welcome'] = 'Pridať novú doménu';
$PALANG['pAdminCreate_domain_domain_text_error'] = 'Takáto doména už existuje!';
-$PALANG['domain_does_not_exist'] = 'This domain does not exist!'; # XXX
+$PALANG['domain_does_not_exist'] = 'Táto doména neexistuje!';
$PALANG['pAdminCreate_domain_domain_text_error2'] = 'Doména nie je platná!';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Vytvoriť implicitné aliasy';
$PALANG['pAdminCreate_domain_button'] = 'Vytvoriť doménu';
-$PALANG['pAdminCreate_domain_result_error'] = 'Nepodarilo sa pridať doménu! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Doména bola pridaná! (%s)'; # XXX Text changed to: The domain %s has been added.
-$PALANG['domain_updated'] = 'The domain %s has been updated.'; # XXX
-$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['domain_postdel_failed'] = 'Nepodarilo sa odstrániť doménu!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
-$PALANG['domain_postcreate_failed'] = 'The domain postcreate script failed, check the error log for details!'; # XXX
-$PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, check the error log for details!'; # XXX
-$PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX
-$PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX
+$PALANG['pAdminCreate_domain_result_error'] = 'Nepodarilo sa pridať doménu %s!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Doména %s bola pridaná.';
+$PALANG['domain_updated'] = 'Doména %s bola zmenená.';
+$PALANG['pAdminDelete_admin_error'] = 'Nepodarilo sa zmazať administrátora!';
+$PALANG['domain_postdel_failed'] = 'Skript postdeletion pre doménu zlyhal, preverte log!';
+$PALANG['domain_postcreate_failed'] = 'Skript postcreate pre doménu zlyhal, preverte log!';
+$PALANG['mailbox_postdel_failed'] = 'Skript postdeletion pre schránku zlyhal, preverte log!';
+$PALANG['mailbox_postedit_failed'] = 'Skript postedit pre schránku zlyhal, preverte log!';
+$PALANG['mailbox_postcreate_failed'] = 'Skript postcreate pre schránku zlyhal, preverte log!';
$PALANG['pAdminDelete_alias_domain_error'] = 'Nepodario sa odstrániť alias domény!';
-$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX
+$PALANG['domain_conflict_vacation_domain'] = 'Nemôžete použiť doménu automatickej odpovede pre poštu!';
$PALANG['pAdminEdit_domain_welcome'] = 'Upraviť doménu';
$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = zakázať | 0 = neobmedzene';
$PALANG['pAdminEdit_domain_maxquota'] = 'Maximálna kvóta';
-$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = vypnúť | 0 = neobmedzene'; # XXX check - should be "MB | -1 = disable | 0 = unlimited"
-$PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
+$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = vypnúť | 0 = neobmedzene';
+$PALANG['pAdminEdit_domain_quota'] = 'Doménová kvóta';
$PALANG['transport'] = 'Transport';
$PALANG['pAdminEdit_domain_transport_text'] = 'Použiť transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server je záložný MX';
-$PALANG['pAdminEdit_domain_result_error'] = 'Nepodarilo sa upraviť doménu! (%s)'; # XXX Text changed to: Modifying the domain %s failed!
+$PALANG['pAdminEdit_domain_result_error'] = 'Nepodarilo sa upraviť doménu %s!';
$PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora';
$PALANG['email_address'] = 'Emailová adresa';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Táto adresa nie je platná!';
-$PALANG['admin_already_exists'] = 'Takáto adresa už existuje!'; # XXX Text changed to: The admin already exists!
-$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
+$PALANG['admin_already_exists'] = 'Administrátor už existuje!';
+$PALANG['admin_does_not_exist'] = 'Administrátor neexistuje!';
$PALANG['pAdminCreate_admin_button'] = 'Vytvoriť administrátora';
-$PALANG['pAdminCreate_admin_result_error'] = 'Nepodarilo sa pridať administrátora! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Administrátor bol pridaný! (%s)'; # XXX Text changed to: The admin %s has been added.
+$PALANG['pAdminCreate_admin_result_error'] = 'Nepodarilo sa pridať administrátora %s!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Administrátor %s bol pridaný.';
$PALANG['pAdminEdit_admin_welcome'] = 'Upraviť doménového administrátora';
-$PALANG['admin'] = 'UžÃvateľské meno'; # XXX check text - should be 'Admin'
+$PALANG['admin'] = 'UžÃvateľské meno';
$PALANG['password_again'] = 'Heslo (znovu)';
$PALANG['super_admin'] = 'Super admin';
-$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
-$PALANG['pAdminEdit_admin_result_error'] = 'Nepodarilo sa upraviť administrátora! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor bol upravený! (%s)'; # XXX Text changed to: The admin %s has been modified.
+$PALANG['super_admin_desc'] = 'Super admin má prÃstup k vÅ¡etkým doménam a spravuje administrátorské úÄty.';
+$PALANG['pAdminEdit_admin_result_error'] = 'Nepodarilo sa upraviť administrátora %s!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor %s bol upravený.';
$PALANG['pUsersLogin_welcome'] = 'Prihlásenie užÃvateľov pre zmenu hesla alebo presmerovanie';
$PALANG['pUsersLogin_username_incorrect'] = 'Nesprávné užÃvateľské meno. Prihlasujte sa svojou emailovou adresou!';
$PALANG['pUsersLogin_password_incorrect'] = 'Nesprávne heslo!';
+$PALANG['pUsersLogin_password_recover'] = 'Zabudol som heslo';
$PALANG['pUsersMenu_vacation'] = 'Automatická odpoveÄ';
$PALANG['pUsersMenu_edit_alias'] = 'Presmerovanie';
@@ -302,9 +314,9 @@ $PALANG['pUsersMain_edit_alias'] = 'Nast
$PALANG['pUsersMain_password'] = 'Zmeniť heslo';
$PALANG['pUsersVacation_welcome'] = 'Automatická odpoveÄ';
-$PALANG['pUsersVacation_welcome_text'] = 'Automatická odpoveÄ je zapnutá! (%s)'; # XXX Text changed to: 'Auto response for %s is active!'
+$PALANG['pUsersVacation_welcome_text'] = 'Automatická odpoveÄ pre %s je zapnutá!';
$PALANG['pUsersVacation_subject_text'] = 'Dovolenka';
-$PALANG['message'] = 'Správa'; # XXX check text - should be 'Message'
+$PALANG['message'] = 'Správa';
$PALANG['pUsersVacation_body_text'] = << od .
S neodkladnými vecami kontaktujte .
@@ -322,20 +334,22 @@ $PALANG['pBroadcast_title'] = 'Poslať h
$PALANG['pBroadcast_name'] = 'Vaše meno';
$PALANG['pBroadcast_success'] = 'Hromadná správa bola odoslaná.';
$PALANG['pAdminMenu_broadcast_message'] = 'Hromadná správa';
-$PALANG['pBroadcast_error_empty'] = 'Polie Vaše meno, Predmet a Obsah nemôžu byť prázdne!';
+$PALANG['pBroadcast_error_empty'] = 'Polia Vaše meno, Predmet a Obsah nemôžu byť prázdne!';
+$PALANG['broadcast_mailboxes_only'] = 'Posielať len do schránok';
+$PALANG['broadcast_to_domains'] = 'Posielať na domény:';
$PALANG['pStatus_undeliverable'] = 'možno NEDORUČITEĽNÉ ';
$PALANG['pStatus_custom'] = 'DoruÄuje sa na ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['password_too_short'] = "Heslo je prÃliÅ¡ krátke - musà maÅ¥ aspoň %s znakov";
-$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
-$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
+$PALANG['password_no_characters'] = "Heslo musà obsahovaÅ¥ aspoň %s pÃsmen.";
+$PALANG['password_no_digits'] = "Heslo musà obsahovaÅ¥ aspoň %s ÄÃslic.";
$PALANG['pInvalidDomainRegex'] = "Neplatný názov domény %s";
$PALANG['pInvalidDomainDNS'] = "Neplatná doména %s alebo neexistuje jej DNS záznam";
$PALANG['pInvalidMailRegex'] = "Neplatná emailová adresa %s"; # text change to "Invalid email address %s, fails regexp check"
$PALANG['pFetchmail_welcome'] = 'SÅ¥ahovanie emailu pre:';
$PALANG['pFetchmail_new_entry'] = 'Nová položka';
-$PALANG['fetchmail_already_exists'] = 'This fetchmail job already exists!'; # XXX
-$PALANG['fetchmail_does_not_exist'] = 'This fetchmail job does not exist!'; # XXX
+$PALANG['fetchmail_already_exists'] = 'Sťahovanie už existuje!';
+$PALANG['fetchmail_does_not_exist'] = 'SÅ¥ahovanie neexistuje!';
$PALANG['pFetchmail_database_save_error'] = 'Nepodarilo sa uložiť položku do databázy!';
$PALANG['pFetchmail_database_save_success'] = 'Položka uložená do databázy.';
$PALANG['pFetchmail_error_invalid_id'] = 'Položka s ID %s neexistuje!';
@@ -355,9 +369,9 @@ $PALANG['pFetchmail_field_fetchall']
$PALANG['pFetchmail_field_keep'] = 'Ponechať';
$PALANG['pFetchmail_field_protocol'] = 'Protokol';
$PALANG['pFetchmail_field_usessl'] = 'SSL';
-$PALANG['pFetchmail_field_sslcertck'] = 'SSL certificate check'; # XXX
-$PALANG['pFetchmail_field_sslcertpath'] = 'SSL path to certificates'; # XXX
-$PALANG['pFetchmail_field_sslfingerprint'] = 'SSL fingerprint (md5)'; # XXX
+$PALANG['pFetchmail_field_sslcertck'] = 'SSL kontrola certifikátov';
+$PALANG['pFetchmail_field_sslcertpath'] = 'SSL cesta k certifikátom';
+$PALANG['pFetchmail_field_sslfingerprint'] = 'SSL odtlaÄok (md5)';
$PALANG['pFetchmail_field_extra_options'] = 'Parametre';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Dátum';
@@ -378,8 +392,8 @@ $PALANG['pFetchmail_desc_extra_options']
$PALANG['pFetchmail_desc_mda'] = 'DoruÄovacà program (Mail Delivery Agent)';
$PALANG['pFetchmail_desc_date'] = 'Dátum poslednej zmeny konfigurácie';
$PALANG['pFetchmail_desc_returned_text'] = 'Správa z posledného sťahovania';
-$PALANG['dateformat_pgsql'] = 'YYYY-mm-dd'; # translators: rearrange to your local date format, but make sure it's a valid PostgreSQL date format # XXX
-$PALANG['dateformat_mysql'] = '%Y-%m-%d'; # translators: rearrange to your local date format, but make sure it's a valid MySQL date format # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
diff -pruN 3.0.2-2/languages/sl.lang 3.2-2/languages/sl.lang
--- 3.0.2-2/languages/sl.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/sl.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
@@ -143,6 +143,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'Maksimalno število predalov je preseženo!';
$PALANG['pCreate_mailbox_password_text'] = 'Geslo za POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Polno ime';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Ustvari predal'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Predala ni bilo mogoÄe ustvariti! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'Predal je bil uspešno ustvarjen! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
@@ -170,6 +174,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Spremeni geslo';
$PALANG['pPassword_result_error'] = 'Gesla ni bilo mogoÄe spremeniti! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'Geslo je bilo uspešno spremenjeno! (%s)'; # XXX Text changed to: The password for %s has been changed.
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
$PALANG['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -185,7 +196,7 @@ $PALANG['reply_every_mail'] = 'Reply on
$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';
@@ -291,6 +302,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'ÄŒe želite spremeniti gesli ali nastaviti sporoÄilo o odsotnosti, se prijavite.';
$PALANG['pUsersLogin_username_incorrect'] = 'Uporabniško ime ni pravilno! Uporabiti morate svoj e-poštni naslov!';
$PALANG['pUsersLogin_password_incorrect'] = 'Geslo ni pravilno!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = 'Obvestilo o odsotnosti';
$PALANG['pUsersMenu_edit_alias'] = 'Nastavi preusmeritev';
@@ -322,6 +334,8 @@ $PALANG['pBroadcast_name'] = 'Your name'
$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
diff -pruN 3.0.2-2/languages/sv.lang 3.2-2/languages/sv.lang
--- 3.0.2-2/languages/sv.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/sv.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
@@ -146,6 +146,10 @@ $PALANG['pCreate_mailbox_username_text_e
$PALANG['pCreate_mailbox_username_text_error3'] = 'Du har redan skapat max tillåtet antal brevlådor!';
$PALANG['pCreate_mailbox_password_text'] = 'Lösenord för POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Fullständigt namn';
+$PALANG['pCreate_mailbox_phone'] = 'Mobile phone'; # XXX
+$PALANG['pCreate_mailbox_phone_desc'] = "Used to send a SMS if the password is forgotten"; # XXX
+$PALANG['pCreate_mailbox_email'] = 'Other e-mail'; # XXX
+$PALANG['pCreate_mailbox_email_desc'] = "Used if the password is forgotten"; # XXX
$PALANG['pCreate_mailbox_mail'] = 'Skicka välkomstmeddelande'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Misslyckades att skapa brevlådan %s!';
$PALANG['pCreate_mailbox_result_success'] = 'Brevlådan %s har skapats!';
@@ -173,6 +177,13 @@ $PALANG['pPassword_password_text_error']
$PALANG['change_password'] = 'Ändra lösenord';
$PALANG['pPassword_result_error'] = 'Misslyckades att ändra lösenordet för %s!';
$PALANG['pPassword_result_success'] = 'Lösenord för %s har ändrats!';
+$PALANG['pPassword_recovery_title'] = 'Follow the instructions to reset your password.'; # XXX
+$PALANG['pPassword_recovery_button'] = 'Send me the code'; # XXX
+$PALANG['pPassword_recovery_email_body'] = "Hello,\n\nUse the following link to change your email password :\n%s\n\nRegards,\n\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_sms_body'] = "Hello,\nThe code to change your password is: %s\n" . $CONF['admin_name']; # XXX
+$PALANG['pPassword_recovery_processed'] = "We processed your request. If you entered a valid username, you'll receive an email/SMS with a password code."; # XXX
+$PALANG['pPassword_password_code'] = 'Code sent by email/SMS'; # XXX
+$PALANG['pPassword_code_text_error'] = 'Invalid code'; # XXX
$PALANG['pEdit_vacation_set'] = 'Ändra / Aktivera meddelande för ledighet';
$PALANG['pEdit_vacation_remove'] = 'Ta bort meddelande för ledighet';
@@ -190,7 +201,7 @@ $PALANG['reply_every_mail'] = 'Svara på
$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';
@@ -298,6 +309,7 @@ $PALANG['pAdminEdit_admin_result_success
$PALANG['pUsersLogin_welcome'] = 'Användare måste logga in här för att ändra lösenord och alias.';
$PALANG['pUsersLogin_username_incorrect'] = 'Inloggningsnamnet är felaktigt. Logga in med din e-postadress!';
$PALANG['pUsersLogin_password_incorrect'] = 'Lösenord är felaktigt!';
+$PALANG['pUsersLogin_password_recover'] = 'I forgot my password'; # XXX
$PALANG['pUsersMenu_vacation'] = 'Autosvar';
$PALANG['pUsersMenu_edit_alias'] = 'Ändra din vidarebefordringsadress';
@@ -331,6 +343,8 @@ $PALANG['pBroadcast_name'] = 'Ditt namn'
$PALANG['pBroadcast_success'] = 'Ditt grupputskick har sänts.';
$PALANG['pAdminMenu_broadcast_message'] = 'Grupputskick';
$PALANG['pBroadcast_error_empty'] = 'Fälten namn, ämne och meddelande ska inte vara tomma!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
$PALANG['pStatus_undeliverable'] = 'kan eventuellt ej levereras ';
$PALANG['pStatus_custom'] = 'Levereras till ';
diff -pruN 3.0.2-2/languages/tr.lang 3.2-2/languages/tr.lang
--- 3.0.2-2/languages/tr.lang 2017-02-08 17:53:13.000000000 +0000
+++ 3.2-2/languages/tr.lang 2018-05-02 20:37:27.000000000 +0000
@@ -1,5 +1,5 @@
2,
+'c' => 'text/plain',
+'cc' => 'text/plain',
+'cpp' => 'text/plain',
+'c++' => 'text/plain',
+'dtd' => 'text/plain',
+'h' => 'text/plain',
+'log' => 'text/plain',
+'rng' => 'text/plain',
+'txt' => 'text/plain',
+'xsd' => 'text/plain',
+'php' => 1,
+'inc' => 1,
+'avi' => 'video/avi',
+'bmp' => 'image/bmp',
+'css' => 'text/css',
+'gif' => 'image/gif',
+'htm' => 'text/html',
+'html' => 'text/html',
+'htmls' => 'text/html',
+'ico' => 'image/x-ico',
+'jpe' => 'image/jpeg',
+'jpg' => 'image/jpeg',
+'jpeg' => 'image/jpeg',
+'js' => 'application/x-javascript',
+'midi' => 'audio/midi',
+'mid' => 'audio/midi',
+'mod' => 'audio/mod',
+'mov' => 'movie/quicktime',
+'mp3' => 'audio/mp3',
+'mpg' => 'video/mpeg',
+'mpeg' => 'video/mpeg',
+'pdf' => 'application/pdf',
+'png' => 'image/png',
+'swf' => 'application/shockwave-flash',
+'tif' => 'image/tiff',
+'tiff' => 'image/tiff',
+'wav' => 'audio/wav',
+'xbm' => 'image/xbm',
+'xml' => 'text/xml',
+);
+
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
+
+$basename = basename(__FILE__);
+if (!strpos($_SERVER['REQUEST_URI'], $basename)) {
+chdir(Extract_Phar::$temp);
+include $web;
+return;
+}
+$pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename));
+if (!$pt || $pt == '/') {
+$pt = $web;
+header('HTTP/1.1 301 Moved Permanently');
+header('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt);
+exit;
+}
+$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
+if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
+header('HTTP/1.0 404 Not Found');
+echo "\n \n File Not Found<title>\n </head>\n <body>\n <h1>404 - File Not Found</h1>\n </body>\n</html>";
+exit;
+}
+$b = pathinfo($a);
+if (!isset($b['extension'])) {
+header('Content-Type: text/plain');
+header('Content-Length: ' . filesize($a));
+readfile($a);
+exit;
+}
+if (isset($mimes[$b['extension']])) {
+if ($mimes[$b['extension']] === 1) {
+include $a;
+exit;
+}
+if ($mimes[$b['extension']] === 2) {
+highlight_file($a);
+exit;
+}
+header('Content-Type: ' .$mimes[$b['extension']]);
+header('Content-Length: ' . filesize($a));
+readfile($a);
+exit;
+}
+}
+
+class Extract_Phar
+{
+static $temp;
+static $origdir;
+const GZ = 0x1000;
+const BZ2 = 0x2000;
+const MASK = 0x3000;
+const START = 'index.php';
+const LEN = 6643;
+
+static function go($return = false)
+{
+$fp = fopen(__FILE__, 'rb');
+fseek($fp, self::LEN);
+$L = unpack('V', $a = fread($fp, 4));
+$m = '';
+
+do {
+$read = 8192;
+if ($L[1] - strlen($m) < 8192) {
+$read = $L[1] - strlen($m);
+}
+$last = fread($fp, $read);
+$m .= $last;
+} while (strlen($last) && strlen($m) < $L[1]);
+
+if (strlen($m) < $L[1]) {
+die('ERROR: manifest length read was "' .
+strlen($m) .'" should be "' .
+$L[1] . '"');
+}
+
+$info = self::_unpack($m);
+$f = $info['c'];
+
+if ($f & self::GZ) {
+if (!function_exists('gzinflate')) {
+die('Error: zlib extension is not enabled -' .
+' gzinflate() function needed for zlib-compressed .phars');
+}
+}
+
+if ($f & self::BZ2) {
+if (!function_exists('bzdecompress')) {
+die('Error: bzip2 extension is not enabled -' .
+' bzdecompress() function needed for bz2-compressed .phars');
+}
+}
+
+$temp = self::tmpdir();
+
+if (!$temp || !is_writable($temp)) {
+$sessionpath = session_save_path();
+if (strpos ($sessionpath, ";") !== false)
+$sessionpath = substr ($sessionpath, strpos ($sessionpath, ";")+1);
+if (!file_exists($sessionpath) || !is_dir($sessionpath)) {
+die('Could not locate temporary directory to extract phar');
+}
+$temp = $sessionpath;
+}
+
+$temp .= '/pharextract/'.basename(__FILE__, '.phar');
+self::$temp = $temp;
+self::$origdir = getcwd();
+@mkdir($temp, 0777, true);
+$temp = realpath($temp);
+
+if (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) {
+self::_removeTmpFiles($temp, getcwd());
+@mkdir($temp, 0777, true);
+@file_put_contents($temp . '/' . md5_file(__FILE__), '');
+
+foreach ($info['m'] as $path => $file) {
+$a = !file_exists(dirname($temp . '/' . $path));
+@mkdir(dirname($temp . '/' . $path), 0777, true);
+clearstatcache();
+
+if ($path[strlen($path) - 1] == '/') {
+@mkdir($temp . '/' . $path, 0777);
+} else {
+file_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp));
+@chmod($temp . '/' . $path, 0666);
+}
+}
+}
+
+chdir($temp);
+
+if (!$return) {
+include self::START;
+}
+}
+
+static function tmpdir()
+{
+if (strpos(PHP_OS, 'WIN') !== false) {
+if ($var = getenv('TMP') ? getenv('TMP') : getenv('TEMP')) {
+return $var;
+}
+if (is_dir('/temp') || mkdir('/temp')) {
+return realpath('/temp');
+}
+return false;
+}
+if ($var = getenv('TMPDIR')) {
+return $var;
+}
+return realpath('/tmp');
+}
+
+static function _unpack($m)
+{
+$info = unpack('V', substr($m, 0, 4));
+ $l = unpack('V', substr($m, 10, 4));
+$m = substr($m, 14 + $l[1]);
+$s = unpack('V', substr($m, 0, 4));
+$o = 0;
+$start = 4 + $s[1];
+$ret['c'] = 0;
+
+for ($i = 0; $i < $info[1]; $i++) {
+ $len = unpack('V', substr($m, $start, 4));
+$start += 4;
+ $savepath = substr($m, $start, $len[1]);
+$start += $len[1];
+ $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24)));
+$ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3]
+& 0xffffffff);
+$ret['m'][$savepath][7] = $o;
+$o += $ret['m'][$savepath][2];
+$start += 24 + $ret['m'][$savepath][5];
+$ret['c'] |= $ret['m'][$savepath][4] & self::MASK;
+}
+return $ret;
+}
+
+static function extractFile($path, $entry, $fp)
+{
+$data = '';
+$c = $entry[2];
+
+while ($c) {
+if ($c < 8192) {
+$data .= @fread($fp, $c);
+$c = 0;
+} else {
+$c -= 8192;
+$data .= @fread($fp, 8192);
+}
+}
+
+if ($entry[4] & self::GZ) {
+$data = gzinflate($data);
+} elseif ($entry[4] & self::BZ2) {
+$data = bzdecompress($data);
+}
+
+if (strlen($data) != $entry[0]) {
+die("Invalid internal .phar file (size error " . strlen($data) . " != " .
+$stat[7] . ")");
+}
+
+if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) {
+die("Invalid internal .phar file (checksum error)");
+}
+
+return $data;
+}
+
+static function _removeTmpFiles($temp, $origdir)
+{
+chdir($temp);
+
+foreach (glob('*') as $f) {
+if (file_exists($f)) {
+is_dir($f) ? @rmdir($f) : @unlink($f);
+if (file_exists($f) && is_dir($f)) {
+self::_removeTmpFiles($f, getcwd());
+}
+}
+}
+
+@rmdir($temp);
+clearstatcache();
+chdir($origdir);
+}
+}
+
+Extract_Phar::go();
+__HALT_COMPILER(); ?>
+ random_compat.phar byte_safe_strings.phpU ´BÅZU
+ãƶ cast_to_int.phpF
+ ´BÅZF
+ :)û%¶ error_polyfill.php¡ ´BÅZ¡ "]¶ index.phpM ´BÅZM t:•Ä¶ random_bytes_com_dotnet.phpW ´BÅZW ¡@¶ random_bytes_dev_urandom.php@ ´BÅZ@ Ù*‘㶠random_bytes_libsodium.php ´BÅZ Ñ;[c¶ ! random_bytes_libsodium_legacy.phpN ´BÅZN ƒ^L¶ random_bytes_mcrypt.phpÙ ´BÅZÙ ¯BS7¶ random_int.phpv ´BÅZv ôÍⶠ<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('RandomCompat_strlen')) {
+ if (
+ defined('MB_OVERLOAD_STRING') &&
+ ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+ ) {
+ /**
+ * strlen() implementation that isn't brittle to mbstring.func_overload
+ *
+ * This version uses mb_strlen() in '8bit' mode to treat strings as raw
+ * binary rather than UTF-8, ISO-8859-1, etc
+ *
+ * @param string $binary_string
+ *
+ * @throws TypeError
+ *
+ * @return int
+ */
+ function RandomCompat_strlen($binary_string)
+ {
+ if (!is_string($binary_string)) {
+ throw new TypeError(
+ 'RandomCompat_strlen() expects a string'
+ );
+ }
+
+ return (int) mb_strlen($binary_string, '8bit');
+ }
+
+ } else {
+ /**
+ * strlen() implementation that isn't brittle to mbstring.func_overload
+ *
+ * This version just used the default strlen()
+ *
+ * @param string $binary_string
+ *
+ * @throws TypeError
+ *
+ * @return int
+ */
+ function RandomCompat_strlen($binary_string)
+ {
+ if (!is_string($binary_string)) {
+ throw new TypeError(
+ 'RandomCompat_strlen() expects a string'
+ );
+ }
+ return (int) strlen($binary_string);
+ }
+ }
+}
+
+if (!is_callable('RandomCompat_substr')) {
+
+ if (
+ defined('MB_OVERLOAD_STRING')
+ &&
+ ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+ ) {
+ /**
+ * substr() implementation that isn't brittle to mbstring.func_overload
+ *
+ * This version uses mb_substr() in '8bit' mode to treat strings as raw
+ * binary rather than UTF-8, ISO-8859-1, etc
+ *
+ * @param string $binary_string
+ * @param int $start
+ * @param int $length (optional)
+ *
+ * @throws TypeError
+ *
+ * @return string
+ */
+ function RandomCompat_substr($binary_string, $start, $length = null)
+ {
+ if (!is_string($binary_string)) {
+ throw new TypeError(
+ 'RandomCompat_substr(): First argument should be a string'
+ );
+ }
+
+ if (!is_int($start)) {
+ throw new TypeError(
+ 'RandomCompat_substr(): Second argument should be an integer'
+ );
+ }
+
+ if ($length === null) {
+ /**
+ * mb_substr($str, 0, NULL, '8bit') returns an empty string on
+ * PHP 5.3, so we have to find the length ourselves.
+ */
+ $length = RandomCompat_strlen($binary_string) - $start;
+ } elseif (!is_int($length)) {
+ throw new TypeError(
+ 'RandomCompat_substr(): Third argument should be an integer, or omitted'
+ );
+ }
+
+ // Consistency with PHP's behavior
+ if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
+ return '';
+ }
+ if ($start > RandomCompat_strlen($binary_string)) {
+ return '';
+ }
+
+ return (string) mb_substr($binary_string, $start, $length, '8bit');
+ }
+
+ } else {
+
+ /**
+ * substr() implementation that isn't brittle to mbstring.func_overload
+ *
+ * This version just uses the default substr()
+ *
+ * @param string $binary_string
+ * @param int $start
+ * @param int $length (optional)
+ *
+ * @throws TypeError
+ *
+ * @return string
+ */
+ function RandomCompat_substr($binary_string, $start, $length = null)
+ {
+ if (!is_string($binary_string)) {
+ throw new TypeError(
+ 'RandomCompat_substr(): First argument should be a string'
+ );
+ }
+
+ if (!is_int($start)) {
+ throw new TypeError(
+ 'RandomCompat_substr(): Second argument should be an integer'
+ );
+ }
+
+ if ($length !== null) {
+ if (!is_int($length)) {
+ throw new TypeError(
+ 'RandomCompat_substr(): Third argument should be an integer, or omitted'
+ );
+ }
+
+ return (string) substr($binary_string, $start, $length);
+ }
+
+ return (string) substr($binary_string, $start);
+ }
+ }
+}
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('RandomCompat_intval')) {
+
+ /**
+ * Cast to an integer if we can, safely.
+ *
+ * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+ * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+ * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
+ * lose precision, so the <= and => operators might accidentally let a float
+ * through.
+ *
+ * @param int|float $number The number we want to convert to an int
+ * @param bool $fail_open Set to true to not throw an exception
+ *
+ * @return float|int
+ * @psalm-suppress InvalidReturnType
+ *
+ * @throws TypeError
+ */
+ function RandomCompat_intval($number, $fail_open = false)
+ {
+ if (is_int($number) || is_float($number)) {
+ $number += 0;
+ } elseif (is_numeric($number)) {
+ $number += 0;
+ }
+
+ if (
+ is_float($number)
+ &&
+ $number > ~PHP_INT_MAX
+ &&
+ $number < PHP_INT_MAX
+ ) {
+ $number = (int) $number;
+ }
+
+ if (is_int($number)) {
+ return (int) $number;
+ } elseif (!$fail_open) {
+ throw new TypeError(
+ 'Expected an integer.'
+ );
+ }
+ return $number;
+ }
+}
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!class_exists('Error', false)) {
+ // We can't really avoid making this extend Exception in PHP 5.
+ class Error extends Exception
+ {
+
+ }
+}
+
+if (!class_exists('TypeError', false)) {
+ if (is_subclass_of('Error', 'Exception')) {
+ class TypeError extends Error
+ {
+
+ }
+ } else {
+ class TypeError extends Exception
+ {
+
+ }
+ }
+}
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * @version 2.0.10
+ * @released 2017-03-13
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!defined('PHP_VERSION_ID')) {
+ // This constant was introduced in PHP 5.2.7
+ $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
+ define(
+ 'PHP_VERSION_ID',
+ $RandomCompatversion[0] * 10000
+ + $RandomCompatversion[1] * 100
+ + $RandomCompatversion[2]
+ );
+ $RandomCompatversion = null;
+}
+
+/**
+ * PHP 7.0.0 and newer have these functions natively.
+ */
+if (PHP_VERSION_ID >= 70000) {
+ return;
+}
+
+if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+ define('RANDOM_COMPAT_READ_BUFFER', 8);
+}
+
+$RandomCompatDIR = dirname(__FILE__);
+
+require_once $RandomCompatDIR . '/byte_safe_strings.php';
+require_once $RandomCompatDIR . '/cast_to_int.php';
+require_once $RandomCompatDIR . '/error_polyfill.php';
+
+if (!is_callable('random_bytes')) {
+ /**
+ * PHP 5.2.0 - 5.6.x way to implement random_bytes()
+ *
+ * We use conditional statements here to define the function in accordance
+ * to the operating environment. It's a micro-optimization.
+ *
+ * In order of preference:
+ * 1. Use libsodium if available.
+ * 2. fread() /dev/urandom if available (never on Windows)
+ * 3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
+ * 4. COM('CAPICOM.Utilities.1')->GetRandom()
+ *
+ * See RATIONALE.md for our reasoning behind this particular order
+ */
+ if (extension_loaded('libsodium')) {
+ // See random_bytes_libsodium.php
+ if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
+ require_once $RandomCompatDIR . '/random_bytes_libsodium.php';
+ } elseif (method_exists('Sodium', 'randombytes_buf')) {
+ require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.php';
+ }
+ }
+
+ /**
+ * Reading directly from /dev/urandom:
+ */
+ if (DIRECTORY_SEPARATOR === '/') {
+ // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
+ // way to exclude Windows.
+ $RandomCompatUrandom = true;
+ $RandomCompat_basedir = ini_get('open_basedir');
+
+ if (!empty($RandomCompat_basedir)) {
+ $RandomCompat_open_basedir = explode(
+ PATH_SEPARATOR,
+ strtolower($RandomCompat_basedir)
+ );
+ $RandomCompatUrandom = (array() !== array_intersect(
+ array('/dev', '/dev/', '/dev/urandom'),
+ $RandomCompat_open_basedir
+ ));
+ $RandomCompat_open_basedir = null;
+ }
+
+ if (
+ !is_callable('random_bytes')
+ &&
+ $RandomCompatUrandom
+ &&
+ @is_readable('/dev/urandom')
+ ) {
+ // Error suppression on is_readable() in case of an open_basedir
+ // or safe_mode failure. All we care about is whether or not we
+ // can read it at this point. If the PHP environment is going to
+ // panic over trying to see if the file can be read in the first
+ // place, that is not helpful to us here.
+
+ // See random_bytes_dev_urandom.php
+ require_once $RandomCompatDIR . '/random_bytes_dev_urandom.php';
+ }
+ // Unset variables after use
+ $RandomCompat_basedir = null;
+ } else {
+ $RandomCompatUrandom = false;
+ }
+
+ /**
+ * mcrypt_create_iv()
+ *
+ * We only want to use mcypt_create_iv() if:
+ *
+ * - random_bytes() hasn't already been defined
+ * - the mcrypt extensions is loaded
+ * - One of these two conditions is true:
+ * - We're on Windows (DIRECTORY_SEPARATOR !== '/')
+ * - We're not on Windows and /dev/urandom is readabale
+ * (i.e. we're not in a chroot jail)
+ * - Special case:
+ * - If we're not on Windows, but the PHP version is between
+ * 5.6.10 and 5.6.12, we don't want to use mcrypt. It will
+ * hang indefinitely. This is bad.
+ * - If we're on Windows, we want to use PHP >= 5.3.7 or else
+ * we get insufficient entropy errors.
+ */
+ if (
+ !is_callable('random_bytes')
+ &&
+ // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
+ (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
+ &&
+ // Prevent this code from hanging indefinitely on non-Windows;
+ // see https://bugs.php.net/bug.php?id=69833
+ (
+ DIRECTORY_SEPARATOR !== '/' ||
+ (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
+ )
+ &&
+ extension_loaded('mcrypt')
+ ) {
+ // See random_bytes_mcrypt.php
+ require_once $RandomCompatDIR . '/random_bytes_mcrypt.php';
+ }
+ $RandomCompatUrandom = null;
+
+ /**
+ * This is a Windows-specific fallback, for when the mcrypt extension
+ * isn't loaded.
+ */
+ if (
+ !is_callable('random_bytes')
+ &&
+ extension_loaded('com_dotnet')
+ &&
+ class_exists('COM')
+ ) {
+ $RandomCompat_disabled_classes = preg_split(
+ '#\s*,\s*#',
+ strtolower(ini_get('disable_classes'))
+ );
+
+ if (!in_array('com', $RandomCompat_disabled_classes)) {
+ try {
+ $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
+ if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+ // See random_bytes_com_dotnet.php
+ require_once $RandomCompatDIR . '/random_bytes_com_dotnet.php';
+ }
+ } catch (com_exception $e) {
+ // Don't try to use it.
+ }
+ }
+ $RandomCompat_disabled_classes = null;
+ $RandomCompatCOMtest = null;
+ }
+
+ /**
+ * throw new Exception
+ */
+ if (!is_callable('random_bytes')) {
+ /**
+ * We don't have any more options, so let's throw an exception right now
+ * and hope the developer won't let it fail silently.
+ *
+ * @param mixed $length
+ * @psalm-suppress MissingReturnType
+ * @throws Exception
+ * @return string
+ */
+ function random_bytes($length)
+ {
+ unset($length); // Suppress "variable not used" warnings.
+ throw new Exception(
+ 'There is no suitable CSPRNG installed on your system'
+ );
+ return '';
+ }
+ }
+}
+
+if (!is_callable('random_int')) {
+ require_once $RandomCompatDIR . '/random_int.php';
+}
+
+$RandomCompatDIR = null;
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+ /**
+ * Windows with PHP < 5.3.0 will not have the function
+ * openssl_random_pseudo_bytes() available, so let's use
+ * CAPICOM to work around this deficiency.
+ *
+ * @param int $bytes
+ *
+ * @throws Exception
+ *
+ * @return string
+ */
+ function random_bytes($bytes)
+ {
+ try {
+ $bytes = RandomCompat_intval($bytes);
+ } catch (TypeError $ex) {
+ throw new TypeError(
+ 'random_bytes(): $bytes must be an integer'
+ );
+ }
+
+ if ($bytes < 1) {
+ throw new Error(
+ 'Length must be greater than 0'
+ );
+ }
+
+ $buf = '';
+ if (!class_exists('COM')) {
+ throw new Error(
+ 'COM does not exist'
+ );
+ }
+ $util = new COM('CAPICOM.Utilities.1');
+ $execCount = 0;
+
+ /**
+ * Let's not let it loop forever. If we run N times and fail to
+ * get N bytes of random data, then CAPICOM has failed us.
+ */
+ do {
+ $buf .= base64_decode($util->GetRandom($bytes, 0));
+ if (RandomCompat_strlen($buf) >= $bytes) {
+ /**
+ * Return our random entropy buffer here:
+ */
+ return RandomCompat_substr($buf, 0, $bytes);
+ }
+ ++$execCount;
+ } while ($execCount < $bytes);
+
+ /**
+ * If we reach here, PHP has failed us.
+ */
+ throw new Exception(
+ 'Could not gather sufficient random data'
+ );
+ }
+}<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+ define('RANDOM_COMPAT_READ_BUFFER', 8);
+}
+
+if (!is_callable('random_bytes')) {
+ /**
+ * Unless open_basedir is enabled, use /dev/urandom for
+ * random numbers in accordance with best practices
+ *
+ * Why we use /dev/urandom and not /dev/random
+ * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
+ *
+ * @param int $bytes
+ *
+ * @throws Exception
+ *
+ * @return string
+ */
+ function random_bytes($bytes)
+ {
+ static $fp = null;
+ /**
+ * This block should only be run once
+ */
+ if (empty($fp)) {
+ /**
+ * We use /dev/urandom if it is a char device.
+ * We never fall back to /dev/random
+ */
+ $fp = fopen('/dev/urandom', 'rb');
+ if (!empty($fp)) {
+ $st = fstat($fp);
+ if (($st['mode'] & 0170000) !== 020000) {
+ fclose($fp);
+ $fp = false;
+ }
+ }
+
+ if (!empty($fp)) {
+ /**
+ * stream_set_read_buffer() does not exist in HHVM
+ *
+ * If we don't set the stream's read buffer to 0, PHP will
+ * internally buffer 8192 bytes, which can waste entropy
+ *
+ * stream_set_read_buffer returns 0 on success
+ */
+ if (is_callable('stream_set_read_buffer')) {
+ stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+ }
+ if (is_callable('stream_set_chunk_size')) {
+ stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+ }
+ }
+ }
+
+ try {
+ $bytes = RandomCompat_intval($bytes);
+ } catch (TypeError $ex) {
+ throw new TypeError(
+ 'random_bytes(): $bytes must be an integer'
+ );
+ }
+
+ if ($bytes < 1) {
+ throw new Error(
+ 'Length must be greater than 0'
+ );
+ }
+
+ /**
+ * This if() block only runs if we managed to open a file handle
+ *
+ * It does not belong in an else {} block, because the above
+ * if (empty($fp)) line is logic that should only be run once per
+ * page load.
+ */
+ if (!empty($fp)) {
+ /**
+ * @var int
+ */
+ $remaining = $bytes;
+
+ /**
+ * @var string|bool
+ */
+ $buf = '';
+
+ /**
+ * We use fread() in a loop to protect against partial reads
+ */
+ do {
+ /**
+ * @var string|bool
+ */
+ $read = fread($fp, $remaining);
+ if (!is_string($read)) {
+ if ($read === false) {
+ /**
+ * We cannot safely read from the file. Exit the
+ * do-while loop and trigger the exception condition
+ *
+ * @var string|bool
+ */
+ $buf = false;
+ break;
+ }
+ }
+ /**
+ * Decrease the number of bytes returned from remaining
+ */
+ $remaining -= RandomCompat_strlen($read);
+ /**
+ * @var string|bool
+ */
+ $buf = $buf . $read;
+ } while ($remaining > 0);
+
+ /**
+ * Is our result valid?
+ */
+ if (is_string($buf)) {
+ if (RandomCompat_strlen($buf) === $bytes) {
+ /**
+ * Return our random entropy buffer here:
+ */
+ return $buf;
+ }
+ }
+ }
+
+ /**
+ * If we reach here, PHP has failed us.
+ */
+ throw new Exception(
+ 'Error reading from source device'
+ );
+ }
+}
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+ /**
+ * If the libsodium PHP extension is loaded, we'll use it above any other
+ * solution.
+ *
+ * libsodium-php project:
+ * @ref https://github.com/jedisct1/libsodium-php
+ *
+ * @param int $bytes
+ *
+ * @throws Exception
+ *
+ * @return string
+ */
+ function random_bytes($bytes)
+ {
+ try {
+ $bytes = RandomCompat_intval($bytes);
+ } catch (TypeError $ex) {
+ throw new TypeError(
+ 'random_bytes(): $bytes must be an integer'
+ );
+ }
+
+ if ($bytes < 1) {
+ throw new Error(
+ 'Length must be greater than 0'
+ );
+ }
+
+ /**
+ * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+ * generated in one invocation.
+ */
+ if ($bytes > 2147483647) {
+ $buf = '';
+ for ($i = 0; $i < $bytes; $i += 1073741824) {
+ $n = ($bytes - $i) > 1073741824
+ ? 1073741824
+ : $bytes - $i;
+ $buf .= \Sodium\randombytes_buf($n);
+ }
+ } else {
+ $buf = \Sodium\randombytes_buf($bytes);
+ }
+
+ if ($buf !== false) {
+ if (RandomCompat_strlen($buf) === $bytes) {
+ return $buf;
+ }
+ }
+
+ /**
+ * If we reach here, PHP has failed us.
+ */
+ throw new Exception(
+ 'Could not gather sufficient random data'
+ );
+ }
+}
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+ /**
+ * If the libsodium PHP extension is loaded, we'll use it above any other
+ * solution.
+ *
+ * libsodium-php project:
+ * @ref https://github.com/jedisct1/libsodium-php
+ *
+ * @param int $bytes
+ *
+ * @throws Exception
+ *
+ * @return string
+ */
+ function random_bytes($bytes)
+ {
+ try {
+ $bytes = RandomCompat_intval($bytes);
+ } catch (TypeError $ex) {
+ throw new TypeError(
+ 'random_bytes(): $bytes must be an integer'
+ );
+ }
+
+ if ($bytes < 1) {
+ throw new Error(
+ 'Length must be greater than 0'
+ );
+ }
+
+ /**
+ * @var string
+ */
+ $buf = '';
+
+ /**
+ * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+ * generated in one invocation.
+ */
+ if ($bytes > 2147483647) {
+ for ($i = 0; $i < $bytes; $i += 1073741824) {
+ $n = ($bytes - $i) > 1073741824
+ ? 1073741824
+ : $bytes - $i;
+ $buf .= Sodium::randombytes_buf((int) $n);
+ }
+ } else {
+ $buf .= Sodium::randombytes_buf((int) $bytes);
+ }
+
+ if (is_string($buf)) {
+ if (RandomCompat_strlen($buf) === $bytes) {
+ return $buf;
+ }
+ }
+
+ /**
+ * If we reach here, PHP has failed us.
+ */
+ throw new Exception(
+ 'Could not gather sufficient random data'
+ );
+ }
+}
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+ /**
+ * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
+ *
+ * @ref https://bugs.php.net/bug.php?id=55169
+ * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
+ *
+ * @param int $bytes
+ *
+ * @throws Exception
+ *
+ * @return string
+ */
+ function random_bytes($bytes)
+ {
+ try {
+ $bytes = RandomCompat_intval($bytes);
+ } catch (TypeError $ex) {
+ throw new TypeError(
+ 'random_bytes(): $bytes must be an integer'
+ );
+ }
+
+ if ($bytes < 1) {
+ throw new Error(
+ 'Length must be greater than 0'
+ );
+ }
+
+ $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
+ if (
+ $buf !== false
+ &&
+ RandomCompat_strlen($buf) === $bytes
+ ) {
+ /**
+ * Return our random entropy buffer here:
+ */
+ return $buf;
+ }
+
+ /**
+ * If we reach here, PHP has failed us.
+ */
+ throw new Exception(
+ 'Could not gather sufficient random data'
+ );
+ }
+}
+<?php
+
+if (!is_callable('random_int')) {
+ /**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+ /**
+ * Fetch a random integer between $min and $max inclusive
+ *
+ * @param int $min
+ * @param int $max
+ *
+ * @throws Exception
+ *
+ * @return int
+ */
+ function random_int($min, $max)
+ {
+ /**
+ * Type and input logic checks
+ *
+ * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+ * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+ * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
+ * lose precision, so the <= and => operators might accidentally let a float
+ * through.
+ */
+
+ try {
+ $min = RandomCompat_intval($min);
+ } catch (TypeError $ex) {
+ throw new TypeError(
+ 'random_int(): $min must be an integer'
+ );
+ }
+
+ try {
+ $max = RandomCompat_intval($max);
+ } catch (TypeError $ex) {
+ throw new TypeError(
+ 'random_int(): $max must be an integer'
+ );
+ }
+
+ /**
+ * Now that we've verified our weak typing system has given us an integer,
+ * let's validate the logic then we can move forward with generating random
+ * integers along a given range.
+ */
+ if ($min > $max) {
+ throw new Error(
+ 'Minimum value must be less than or equal to the maximum value'
+ );
+ }
+
+ if ($max === $min) {
+ return (int) $min;
+ }
+
+ /**
+ * Initialize variables to 0
+ *
+ * We want to store:
+ * $bytes => the number of random bytes we need
+ * $mask => an integer bitmask (for use with the &) operator
+ * so we can minimize the number of discards
+ */
+ $attempts = $bits = $bytes = $mask = $valueShift = 0;
+
+ /**
+ * At this point, $range is a positive number greater than 0. It might
+ * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
+ * a float and we will lose some precision.
+ */
+ $range = $max - $min;
+
+ /**
+ * Test for integer overflow:
+ */
+ if (!is_int($range)) {
+
+ /**
+ * Still safely calculate wider ranges.
+ * Provided by @CodesInChaos, @oittaa
+ *
+ * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
+ *
+ * We use ~0 as a mask in this case because it generates all 1s
+ *
+ * @ref https://eval.in/400356 (32-bit)
+ * @ref http://3v4l.org/XX9r5 (64-bit)
+ */
+ $bytes = PHP_INT_SIZE;
+ $mask = ~0;
+
+ } else {
+
+ /**
+ * $bits is effectively ceil(log($range, 2)) without dealing with
+ * type juggling
+ */
+ while ($range > 0) {
+ if ($bits % 8 === 0) {
+ ++$bytes;
+ }
+ ++$bits;
+ $range >>= 1;
+ $mask = $mask << 1 | 1;
+ }
+ $valueShift = $min;
+ }
+
+ $val = 0;
+ /**
+ * Now that we have our parameters set up, let's begin generating
+ * random integers until one falls between $min and $max
+ */
+ do {
+ /**
+ * The rejection probability is at most 0.5, so this corresponds
+ * to a failure probability of 2^-128 for a working RNG
+ */
+ if ($attempts > 128) {
+ throw new Exception(
+ 'random_int: RNG is broken - too many rejections'
+ );
+ }
+
+ /**
+ * Let's grab the necessary number of random bytes
+ */
+ $randomByteString = random_bytes($bytes);
+
+ /**
+ * Let's turn $randomByteString into an integer
+ *
+ * This uses bitwise operators (<< and |) to build an integer
+ * out of the values extracted from ord()
+ *
+ * Example: [9F] | [6D] | [32] | [0C] =>
+ * 159 + 27904 + 3276800 + 201326592 =>
+ * 204631455
+ */
+ $val &= 0;
+ for ($i = 0; $i < $bytes; ++$i) {
+ $val |= ord($randomByteString[$i]) << ($i * 8);
+ }
+
+ /**
+ * Apply mask
+ */
+ $val &= $mask;
+ $val += $valueShift;
+
+ ++$attempts;
+ /**
+ * If $val overflows to a floating point number,
+ * ... or is larger than $max,
+ * ... or smaller than $min,
+ * then try again.
+ */
+ } while (!is_int($val) || $val > $max || $val < $min);
+
+ return (int) $val;
+ }
+}
+0e1 é¶hìUúc\H7€ÉlOS‘=𘠩áÊ2ìE³!¼ù ÈS$5¿øåË#Œ Åà4‡”0!”Ôf‹O‡¥ ©ËZG©ÕáŒy>(ê$Òwšº¾Û(\ÔH°Z-”íݬ‡ ¯-vÖg GBMB
\ No newline at end of file
diff -pruN 3.0.2-2/lib/random_compat.phar.pubkey 3.2-2/lib/random_compat.phar.pubkey
--- 3.0.2-2/lib/random_compat.phar.pubkey 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/random_compat.phar.pubkey 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,5 @@
+-----BEGIN PUBLIC KEY-----
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEEd+wCqJDrx5B4OldM0dQE0ZMX+lx1ZWm
+pui0SUqD4G29L3NGsz9UhJ/0HjBdbnkhIK5xviT0X5vtjacF6ajgcCArbTB+ds+p
++h7Q084NuSuIpNb6YPfoUFgC/CL9kAoc
+-----END PUBLIC KEY-----
diff -pruN 3.0.2-2/lib/random_compat.txt 3.2-2/lib/random_compat.txt
--- 3.0.2-2/lib/random_compat.txt 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/random_compat.txt 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,4 @@
+Downloaded on 2018/04/29.
+
+https://github.com/paragonie/random_compat/releases/download/v2.0.12/random_compat.phar.pubkey
+https://github.com/paragonie/random_compat/releases/download/v2.0.12/random_compat.phar
diff -pruN 3.0.2-2/lib/smarty/COPYING.lib 3.2-2/lib/smarty/COPYING.lib
--- 3.0.2-2/lib/smarty/COPYING.lib 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/COPYING.lib 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
\ No newline at end of file
diff -pruN 3.0.2-2/lib/smarty/libs/Autoloader.php 3.2-2/lib/smarty/libs/Autoloader.php
--- 3.0.2-2/lib/smarty/libs/Autoloader.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/Autoloader.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ */
+
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ * @author Uwe Tews
+ * Usage:
+ * require_once '...path/Autoloader.php';
+ * Smarty_Autoloader::register();
+ * or
+ * include '...path/bootstrap.php';
+ *
+ * $smarty = new Smarty();
+ */
+class Smarty_Autoloader
+{
+ /**
+ * Filepath to Smarty root
+ *
+ * @var string
+ */
+ public static $SMARTY_DIR = null;
+
+ /**
+ * Filepath to Smarty internal plugins
+ *
+ * @var string
+ */
+ public static $SMARTY_SYSPLUGINS_DIR = null;
+
+ /**
+ * Array with Smarty core classes and their filename
+ *
+ * @var array
+ */
+ public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
+
+ /**
+ * Registers Smarty_Autoloader backward compatible to older installations.
+ *
+ * @param bool $prepend Whether to prepend the autoloader or not.
+ */
+ public static function registerBC($prepend = false)
+ {
+ /**
+ * register the class autoloader
+ */
+ if (!defined('SMARTY_SPL_AUTOLOAD')) {
+ define('SMARTY_SPL_AUTOLOAD', 0);
+ }
+ if (SMARTY_SPL_AUTOLOAD &&
+ set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
+ ) {
+ $registeredAutoLoadFunctions = spl_autoload_functions();
+ if (!isset($registeredAutoLoadFunctions[ 'spl_autoload' ])) {
+ spl_autoload_register();
+ }
+ } else {
+ self::register($prepend);
+ }
+ }
+
+ /**
+ * Registers Smarty_Autoloader as an SPL autoloader.
+ *
+ * @param bool $prepend Whether to prepend the autoloader or not.
+ */
+ public static function register($prepend = false)
+ {
+ self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
+ self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
+ self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
+ if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+ spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+ } else {
+ spl_autoload_register(array(__CLASS__, 'autoload'));
+ }
+ }
+
+ /**
+ * Handles auto loading of classes.
+ *
+ * @param string $class A class name.
+ */
+ public static function autoload($class)
+ {
+ if ($class[ 0 ] !== 'S' && strpos($class, 'Smarty') !== 0) {
+ return;
+ }
+ $_class = strtolower($class);
+ if (isset(self::$rootClasses[ $_class ])) {
+ $file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
+ if (is_file($file)) {
+ include $file;
+ }
+ } else {
+ $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+ if (is_file($file)) {
+ include $file;
+ }
+ }
+ return;
+ }
+}
diff -pruN 3.0.2-2/lib/smarty/libs/bootstrap.php 3.2-2/lib/smarty/libs/bootstrap.php
--- 3.0.2-2/lib/smarty/libs/bootstrap.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/bootstrap.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,17 @@
+<?php
+/*
+ * This file is part of the Smarty package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * Load and register Smarty Autoloader
+ */
+if (!class_exists('Smarty_Autoloader')) {
+ require dirname(__FILE__) . '/Autoloader.php';
+}
+Smarty_Autoloader::register(true);
diff -pruN 3.0.2-2/lib/smarty/libs/debug.tpl 3.2-2/lib/smarty/libs/debug.tpl
--- 3.0.2-2/lib/smarty/libs/debug.tpl 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/debug.tpl 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,160 @@
+{capture name='_smarty_debug' assign=debug_output}
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+ <head>
+ <title>Smarty Debug Console
+
+
+
+
+ Smarty {Smarty::SMARTY_VERSION} Debug Console
+ - {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}
+
+ {if !empty($template_data)}
+ included templates & config files (load time in seconds)
+
+ {foreach $template_data as $template}
+ {$template.name}
+
+ (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+
+
+ {/if}
+
+ assigned template variables
+
+
+ {foreach $assigned_vars as $vars}
+
+ ${$vars@key} Nocache {/if}
+ {if isset($vars['scope'])}Origin: {$vars['scope']|debug_print_var nofilter}{/if}
+ Value {$vars['value']|debug_print_var:10:80 nofilter}{if isset($vars['attributes'])}Attributes {$vars['attributes']|debug_print_var nofilter} {/if}
+ {/foreach}
+
+
+ assigned config file variables
+
+
+ {foreach $config_vars as $vars}
+
+ #{$vars@key}# Origin: {$vars['scope']|debug_print_var nofilter}{/if}
+ {$vars['value']|debug_print_var:10:80 nofilter}
+
+ {/foreach}
+
+
+
+
+{/capture}
+
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/block.textformat.php 3.2-2/lib/smarty/libs/plugins/block.textformat.php
--- 3.0.2-2/lib/smarty/libs/plugins/block.textformat.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/block.textformat.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,117 @@
+
+ * @throws \SmartyException
+ */
+function smarty_block_textformat($params, $content, Smarty_Internal_Template $template, &$repeat)
+{
+ if (is_null($content)) {
+ return;
+ }
+ if (Smarty::$_MBSTRING) {
+ $template->_checkPlugins(array(array('function' => 'smarty_modifier_mb_wordwrap',
+ 'file' => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php')));
+ }
+
+ $style = null;
+ $indent = 0;
+ $indent_first = 0;
+ $indent_char = ' ';
+ $wrap = 80;
+ $wrap_char = "\n";
+ $wrap_cut = false;
+ $assign = null;
+
+ foreach ($params as $_key => $_val) {
+ switch ($_key) {
+ case 'style':
+ case 'indent_char':
+ case 'wrap_char':
+ case 'assign':
+ $$_key = (string) $_val;
+ break;
+
+ case 'indent':
+ case 'indent_first':
+ case 'wrap':
+ $$_key = (int) $_val;
+ break;
+
+ case 'wrap_cut':
+ $$_key = (bool) $_val;
+ break;
+
+ default:
+ trigger_error("textformat: unknown attribute '{$_key}'");
+ }
+ }
+
+ if ($style === 'email') {
+ $wrap = 72;
+ }
+ // split into paragraphs
+ $_paragraphs = preg_split('![\r\n]{2}!', $content);
+
+ foreach ($_paragraphs as &$_paragraph) {
+ if (!$_paragraph) {
+ continue;
+ }
+ // convert mult. spaces & special chars to single space
+ $_paragraph =
+ preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER,
+ '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER),
+ array(' ',
+ ''), $_paragraph);
+ // indent first line
+ if ($indent_first > 0) {
+ $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
+ }
+ // wordwrap sentences
+ if (Smarty::$_MBSTRING) {
+ $_paragraph = smarty_modifier_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+ } else {
+ $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+ }
+ // indent lines
+ if ($indent > 0) {
+ $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
+ }
+ }
+ $_output = implode($wrap_char . $wrap_char, $_paragraphs);
+
+ if ($assign) {
+ $template->assign($assign, $_output);
+ } else {
+ return $_output;
+ }
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.counter.php 3.2-2/lib/smarty/libs/plugins/function.counter.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.counter.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.counter.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,73 @@
+
+ * @link http://www.smarty.net/manual/en/language.function.counter.php {counter}
+ * (Smarty online manual)
+ *
+ * @param array $params parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string|null
+ */
+function smarty_function_counter($params, $template)
+{
+ static $counters = array();
+
+ $name = (isset($params[ 'name' ])) ? $params[ 'name' ] : 'default';
+ if (!isset($counters[ $name ])) {
+ $counters[ $name ] = array('start' => 1, 'skip' => 1, 'direction' => 'up', 'count' => 1);
+ }
+ $counter =& $counters[ $name ];
+
+ if (isset($params[ 'start' ])) {
+ $counter[ 'start' ] = $counter[ 'count' ] = (int) $params[ 'start' ];
+ }
+
+ if (!empty($params[ 'assign' ])) {
+ $counter[ 'assign' ] = $params[ 'assign' ];
+ }
+
+ if (isset($counter[ 'assign' ])) {
+ $template->assign($counter[ 'assign' ], $counter[ 'count' ]);
+ }
+
+ if (isset($params[ 'print' ])) {
+ $print = (bool) $params[ 'print' ];
+ } else {
+ $print = empty($counter[ 'assign' ]);
+ }
+
+ if ($print) {
+ $retval = $counter[ 'count' ];
+ } else {
+ $retval = null;
+ }
+
+ if (isset($params[ 'skip' ])) {
+ $counter[ 'skip' ] = $params[ 'skip' ];
+ }
+
+ if (isset($params[ 'direction' ])) {
+ $counter[ 'direction' ] = $params[ 'direction' ];
+ }
+
+ if ($counter[ 'direction' ] === 'down') {
+ $counter[ 'count' ] -= $counter[ 'skip' ];
+ } else {
+ $counter[ 'count' ] += $counter[ 'skip' ];
+ }
+
+ return $retval;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.cycle.php 3.2-2/lib/smarty/libs/plugins/function.cycle.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.cycle.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.cycle.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,105 @@
+
+ * @author credit to Mark Priatel
+ * @author credit to Gerard
+ * @author credit to Jason Sweat
+ * @version 1.3
+ *
+ * @param array $params parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string|null
+ */
+
+function smarty_function_cycle($params, $template)
+{
+ static $cycle_vars;
+
+ $name = (empty($params[ 'name' ])) ? 'default' : $params[ 'name' ];
+ $print = (isset($params[ 'print' ])) ? (bool) $params[ 'print' ] : true;
+ $advance = (isset($params[ 'advance' ])) ? (bool) $params[ 'advance' ] : true;
+ $reset = (isset($params[ 'reset' ])) ? (bool) $params[ 'reset' ] : false;
+
+ if (!isset($params[ 'values' ])) {
+ if (!isset($cycle_vars[ $name ][ 'values' ])) {
+ trigger_error('cycle: missing \'values\' parameter');
+
+ return;
+ }
+ } else {
+ if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] !== $params[ 'values' ]) {
+ $cycle_vars[ $name ][ 'index' ] = 0;
+ }
+ $cycle_vars[ $name ][ 'values' ] = $params[ 'values' ];
+ }
+
+ if (isset($params[ 'delimiter' ])) {
+ $cycle_vars[ $name ][ 'delimiter' ] = $params[ 'delimiter' ];
+ } elseif (!isset($cycle_vars[ $name ][ 'delimiter' ])) {
+ $cycle_vars[ $name ][ 'delimiter' ] = ',';
+ }
+
+ if (is_array($cycle_vars[ $name ][ 'values' ])) {
+ $cycle_array = $cycle_vars[ $name ][ 'values' ];
+ } else {
+ $cycle_array = explode($cycle_vars[ $name ][ 'delimiter' ], $cycle_vars[ $name ][ 'values' ]);
+ }
+
+ if (!isset($cycle_vars[ $name ][ 'index' ]) || $reset) {
+ $cycle_vars[ $name ][ 'index' ] = 0;
+ }
+
+ if (isset($params[ 'assign' ])) {
+ $print = false;
+ $template->assign($params[ 'assign' ], $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]);
+ }
+
+ if ($print) {
+ $retval = $cycle_array[ $cycle_vars[ $name ][ 'index' ] ];
+ } else {
+ $retval = null;
+ }
+
+ if ($advance) {
+ if ($cycle_vars[ $name ][ 'index' ] >= count($cycle_array) - 1) {
+ $cycle_vars[ $name ][ 'index' ] = 0;
+ } else {
+ $cycle_vars[ $name ][ 'index' ] ++;
+ }
+ }
+
+ return $retval;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.fetch.php 3.2-2/lib/smarty/libs/plugins/function.fetch.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.fetch.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.fetch.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,221 @@
+
+ *
+ * @param array $params parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
+ * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
+ */
+function smarty_function_fetch($params, $template)
+{
+ if (empty($params[ 'file' ])) {
+ trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
+
+ return;
+ }
+
+ // strip file protocol
+ if (stripos($params[ 'file' ], 'file://') === 0) {
+ $params[ 'file' ] = substr($params[ 'file' ], 7);
+ }
+
+ $protocol = strpos($params[ 'file' ], '://');
+ if ($protocol !== false) {
+ $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
+ }
+
+ if (isset($template->smarty->security_policy)) {
+ if ($protocol) {
+ // remote resource (or php stream, …)
+ if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+ return;
+ }
+ } else {
+ // local file
+ if (!$template->smarty->security_policy->isTrustedResourceDir($params[ 'file' ])) {
+ return;
+ }
+ }
+ }
+
+ $content = '';
+ if ($protocol === 'http') {
+ // http fetch
+ if ($uri_parts = parse_url($params[ 'file' ])) {
+ // set defaults
+ $host = $server_name = $uri_parts[ 'host' ];
+ $timeout = 30;
+ $accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
+ $agent = 'Smarty Template Engine ' . Smarty::SMARTY_VERSION;
+ $referer = '';
+ $uri = !empty($uri_parts[ 'path' ]) ? $uri_parts[ 'path' ] : '/';
+ $uri .= !empty($uri_parts[ 'query' ]) ? '?' . $uri_parts[ 'query' ] : '';
+ $_is_proxy = false;
+ if (empty($uri_parts[ 'port' ])) {
+ $port = 80;
+ } else {
+ $port = $uri_parts[ 'port' ];
+ }
+ if (!empty($uri_parts[ 'user' ])) {
+ $user = $uri_parts[ 'user' ];
+ }
+ if (!empty($uri_parts[ 'pass' ])) {
+ $pass = $uri_parts[ 'pass' ];
+ }
+ // loop through parameters, setup headers
+ foreach ($params as $param_key => $param_value) {
+ switch ($param_key) {
+ case 'file':
+ case 'assign':
+ case 'assign_headers':
+ break;
+ case 'user':
+ if (!empty($param_value)) {
+ $user = $param_value;
+ }
+ break;
+ case 'pass':
+ if (!empty($param_value)) {
+ $pass = $param_value;
+ }
+ break;
+ case 'accept':
+ if (!empty($param_value)) {
+ $accept = $param_value;
+ }
+ break;
+ case 'header':
+ if (!empty($param_value)) {
+ if (!preg_match('![\w\d-]+: .+!', $param_value)) {
+ trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
+
+ return;
+ } else {
+ $extra_headers[] = $param_value;
+ }
+ }
+ break;
+ case 'proxy_host':
+ if (!empty($param_value)) {
+ $proxy_host = $param_value;
+ }
+ break;
+ case 'proxy_port':
+ if (!preg_match('!\D!', $param_value)) {
+ $proxy_port = (int) $param_value;
+ } else {
+ trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
+
+ return;
+ }
+ break;
+ case 'agent':
+ if (!empty($param_value)) {
+ $agent = $param_value;
+ }
+ break;
+ case 'referer':
+ if (!empty($param_value)) {
+ $referer = $param_value;
+ }
+ break;
+ case 'timeout':
+ if (!preg_match('!\D!', $param_value)) {
+ $timeout = (int) $param_value;
+ } else {
+ trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
+
+ return;
+ }
+ break;
+ default:
+ trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
+
+ return;
+ }
+ }
+ if (!empty($proxy_host) && !empty($proxy_port)) {
+ $_is_proxy = true;
+ $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
+ } else {
+ $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
+ }
+
+ if (!$fp) {
+ trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
+
+ return;
+ } else {
+ if ($_is_proxy) {
+ fputs($fp, 'GET ' . $params[ 'file' ] . " HTTP/1.0\r\n");
+ } else {
+ fputs($fp, "GET $uri HTTP/1.0\r\n");
+ }
+ if (!empty($host)) {
+ fputs($fp, "Host: $host\r\n");
+ }
+ if (!empty($accept)) {
+ fputs($fp, "Accept: $accept\r\n");
+ }
+ if (!empty($agent)) {
+ fputs($fp, "User-Agent: $agent\r\n");
+ }
+ if (!empty($referer)) {
+ fputs($fp, "Referer: $referer\r\n");
+ }
+ if (isset($extra_headers) && is_array($extra_headers)) {
+ foreach ($extra_headers as $curr_header) {
+ fputs($fp, $curr_header . "\r\n");
+ }
+ }
+ if (!empty($user) && !empty($pass)) {
+ fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
+ }
+
+ fputs($fp, "\r\n");
+ while (!feof($fp)) {
+ $content .= fgets($fp, 4096);
+ }
+ fclose($fp);
+ $csplit = preg_split("!\r\n\r\n!", $content, 2);
+
+ $content = $csplit[ 1 ];
+
+ if (!empty($params[ 'assign_headers' ])) {
+ $template->assign($params[ 'assign_headers' ], preg_split("!\r\n!", $csplit[ 0 ]));
+ }
+ }
+ } else {
+ trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
+
+ return;
+ }
+ } else {
+ $content = @file_get_contents($params[ 'file' ]);
+ if ($content === false) {
+ throw new SmartyException("{fetch} cannot read resource '" . $params[ 'file' ] . "'");
+ }
+ }
+
+ if (!empty($params[ 'assign' ])) {
+ $template->assign($params[ 'assign' ], $content);
+ } else {
+ return $content;
+ }
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.html_checkboxes.php 3.2-2/lib/smarty/libs/plugins/function.html_checkboxes.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.html_checkboxes.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.html_checkboxes.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,262 @@
+' output=$names}
+ * {html_checkboxes values=$ids checked=$checked separator='
+ * @author credits to Monte Ohrt
+ * @version 1.0
+ *
+ * @param array $params parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string
+ * @uses smarty_function_escape_special_chars()
+ * @throws \SmartyException
+ */
+function smarty_function_html_checkboxes($params, Smarty_Internal_Template $template)
+{
+ $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
+
+ $name = 'checkbox';
+ $values = null;
+ $options = null;
+ $selected = array();
+ $separator = '';
+ $escape = true;
+ $labels = true;
+ $label_ids = false;
+ $output = null;
+
+ $extra = '';
+
+ foreach ($params as $_key => $_val) {
+ switch ($_key) {
+ case 'name':
+ case 'separator':
+ $$_key = (string) $_val;
+ break;
+
+ case 'escape':
+ case 'labels':
+ case 'label_ids':
+ $$_key = (bool) $_val;
+ break;
+
+ case 'options':
+ $$_key = (array) $_val;
+ break;
+
+ case 'values':
+ case 'output':
+ $$_key = array_values((array) $_val);
+ break;
+
+ case 'checked':
+ case 'selected':
+ if (is_array($_val)) {
+ $selected = array();
+ foreach ($_val as $_sel) {
+ if (is_object($_sel)) {
+ if (method_exists($_sel, '__toString')) {
+ $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+ } else {
+ trigger_error('html_checkboxes: selected attribute contains an object of class \'' .
+ get_class($_sel) . '\' without __toString() method', E_USER_NOTICE);
+ continue;
+ }
+ } else {
+ $_sel = smarty_function_escape_special_chars((string) $_sel);
+ }
+ $selected[ $_sel ] = true;
+ }
+ } elseif (is_object($_val)) {
+ if (method_exists($_val, '__toString')) {
+ $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+ } else {
+ trigger_error('html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
+ '\' without __toString() method', E_USER_NOTICE);
+ }
+ } else {
+ $selected = smarty_function_escape_special_chars((string) $_val);
+ }
+ break;
+
+ case 'checkboxes':
+ trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
+ E_USER_WARNING);
+ $options = (array) $_val;
+ break;
+
+ case 'assign':
+ break;
+
+ case 'strict':
+ break;
+
+ case 'disabled':
+ case 'readonly':
+ if (!empty($params[ 'strict' ])) {
+ if (!is_scalar($_val)) {
+ trigger_error("html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+ E_USER_NOTICE);
+ }
+
+ if ($_val === true || $_val === $_key) {
+ $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+ }
+
+ break;
+ }
+ // omit break; to fall through!
+
+ default:
+ if (!is_array($_val)) {
+ $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+ } else {
+ trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+ }
+ break;
+ }
+ }
+
+ if (!isset($options) && !isset($values)) {
+ return '';
+ } /* raise error here? */
+
+ $_html_result = array();
+
+ if (isset($options)) {
+ foreach ($options as $_key => $_val) {
+ $_html_result[] =
+ smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+ $label_ids, $escape);
+ }
+ } else {
+ foreach ($values as $_i => $_key) {
+ $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+ $_html_result[] =
+ smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+ $label_ids, $escape);
+ }
+ }
+
+ if (!empty($params[ 'assign' ])) {
+ $template->assign($params[ 'assign' ], $_html_result);
+ } else {
+ return implode("\n", $_html_result);
+ }
+}
+/**
+ * @param $name
+ * @param $value
+ * @param $output
+ * @param $selected
+ * @param $extra
+ * @param $separator
+ * @param $labels
+ * @param $label_ids
+ * @param bool $escape
+ *
+ * @return string
+ */
+function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels,
+ $label_ids, $escape = true)
+{
+ $_output = '';
+
+ if (is_object($value)) {
+ if (method_exists($value, '__toString')) {
+ $value = (string) $value->__toString();
+ } else {
+ trigger_error('html_options: value is an object of class \'' . get_class($value) .
+ '\' without __toString() method', E_USER_NOTICE);
+
+ return '';
+ }
+ } else {
+ $value = (string) $value;
+ }
+
+ if (is_object($output)) {
+ if (method_exists($output, '__toString')) {
+ $output = (string) $output->__toString();
+ } else {
+ trigger_error('html_options: output is an object of class \'' . get_class($output) .
+ '\' without __toString() method', E_USER_NOTICE);
+
+ return '';
+ }
+ } else {
+ $output = (string) $output;
+ }
+
+ if ($labels) {
+ if ($label_ids) {
+ $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
+ $name . '_' . $value));
+ $_output .= '';
+ } else {
+ $_output .= '';
+ }
+ }
+
+ $name = smarty_function_escape_special_chars($name);
+ $value = smarty_function_escape_special_chars($value);
+ if ($escape) {
+ $output = smarty_function_escape_special_chars($output);
+ }
+
+ $_output .= ' ';
+ }
+
+ $_output .= $separator;
+
+ return $_output;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.html_image.php 3.2-2/lib/smarty/libs/plugins/function.html_image.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.html_image.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.html_image.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,165 @@
+
+ * Params:
+ *
+ * - file - (required) - file (and path) of image
+ * - height - (optional) - image height (default actual height)
+ * - width - (optional) - image width (default actual width)
+ * - basedir - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
+ * - path_prefix - prefix for path output (optional, default empty)
+ *
+ *
+ * @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ * (Smarty online manual)
+ * @author Monte Ohrt
+ * @author credits to Duda
+ * @version 1.0
+ *
+ * @param array $params parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
+ * @return string
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_image($params, Smarty_Internal_Template $template)
+{
+ $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
+
+ $alt = '';
+ $file = '';
+ $height = '';
+ $width = '';
+ $extra = '';
+ $prefix = '';
+ $suffix = '';
+ $path_prefix = '';
+ $basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
+ foreach ($params as $_key => $_val) {
+ switch ($_key) {
+ case 'file':
+ case 'height':
+ case 'width':
+ case 'dpi':
+ case 'path_prefix':
+ case 'basedir':
+ $$_key = $_val;
+ break;
+
+ case 'alt':
+ if (!is_array($_val)) {
+ $$_key = smarty_function_escape_special_chars($_val);
+ } else {
+ throw new SmartyException ("html_image: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+ }
+ break;
+
+ case 'link':
+ case 'href':
+ $prefix = '';
+ $suffix = ' ';
+ break;
+
+ default:
+ if (!is_array($_val)) {
+ $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+ } else {
+ throw new SmartyException ("html_image: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+ }
+ break;
+ }
+ }
+
+ if (empty($file)) {
+ trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
+
+ return;
+ }
+
+ if ($file[ 0 ] === '/') {
+ $_image_path = $basedir . $file;
+ } else {
+ $_image_path = $file;
+ }
+
+ // strip file protocol
+ if (stripos($params[ 'file' ], 'file://') === 0) {
+ $params[ 'file' ] = substr($params[ 'file' ], 7);
+ }
+
+ $protocol = strpos($params[ 'file' ], '://');
+ if ($protocol !== false) {
+ $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
+ }
+
+ if (isset($template->smarty->security_policy)) {
+ if ($protocol) {
+ // remote resource (or php stream, …)
+ if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+ return;
+ }
+ } else {
+ // local file
+ if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
+ return;
+ }
+ }
+ }
+
+ if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
+ // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
+ if (!$_image_data = @getimagesize($_image_path)) {
+ if (!file_exists($_image_path)) {
+ trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
+
+ return;
+ } elseif (!is_readable($_image_path)) {
+ trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
+
+ return;
+ } else {
+ trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
+
+ return;
+ }
+ }
+
+ if (!isset($params[ 'width' ])) {
+ $width = $_image_data[ 0 ];
+ }
+ if (!isset($params[ 'height' ])) {
+ $height = $_image_data[ 1 ];
+ }
+ }
+
+ if (isset($params[ 'dpi' ])) {
+ if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
+ // FIXME: (rodneyrehm) wrong dpi assumption
+ // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
+ $dpi_default = 72;
+ } else {
+ $dpi_default = 96;
+ }
+ $_resize = $dpi_default / $params[ 'dpi' ];
+ $width = round($width * $_resize);
+ $height = round($height * $_resize);
+ }
+
+ return $prefix . '
+ * @author Ralf Strehle (minor optimization)
+ *
+ * @param array $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @uses smarty_function_escape_special_chars()
+ * @throws \SmartyException
+ */
+function smarty_function_html_options($params, Smarty_Internal_Template $template)
+{
+ $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
+
+ $name = null;
+ $values = null;
+ $options = null;
+ $selected = null;
+ $output = null;
+ $id = null;
+ $class = null;
+
+ $extra = '';
+
+ foreach ($params as $_key => $_val) {
+ switch ($_key) {
+ case 'name':
+ case 'class':
+ case 'id':
+ $$_key = (string) $_val;
+ break;
+
+ case 'options':
+ $options = (array) $_val;
+ break;
+
+ case 'values':
+ case 'output':
+ $$_key = array_values((array) $_val);
+ break;
+
+ case 'selected':
+ if (is_array($_val)) {
+ $selected = array();
+ foreach ($_val as $_sel) {
+ if (is_object($_sel)) {
+ if (method_exists($_sel, '__toString')) {
+ $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+ } else {
+ trigger_error('html_options: selected attribute contains an object of class \'' .
+ get_class($_sel) . '\' without __toString() method', E_USER_NOTICE);
+ continue;
+ }
+ } else {
+ $_sel = smarty_function_escape_special_chars((string) $_sel);
+ }
+ $selected[ $_sel ] = true;
+ }
+ } elseif (is_object($_val)) {
+ if (method_exists($_val, '__toString')) {
+ $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+ } else {
+ trigger_error('html_options: selected attribute is an object of class \'' . get_class($_val) .
+ '\' without __toString() method', E_USER_NOTICE);
+ }
+ } else {
+ $selected = smarty_function_escape_special_chars((string) $_val);
+ }
+ break;
+
+ case 'strict':
+ break;
+
+ case 'disabled':
+ case 'readonly':
+ if (!empty($params[ 'strict' ])) {
+ if (!is_scalar($_val)) {
+ trigger_error("html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+ E_USER_NOTICE);
+ }
+
+ if ($_val === true || $_val === $_key) {
+ $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+ }
+
+ break;
+ }
+ // omit break; to fall through!
+
+ default:
+ if (!is_array($_val)) {
+ $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+ } else {
+ trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+ }
+ break;
+ }
+ }
+
+ if (!isset($options) && !isset($values)) {
+ /* raise error here? */
+
+ return '';
+ }
+
+ $_html_result = '';
+ $_idx = 0;
+
+ if (isset($options)) {
+ foreach ($options as $_key => $_val) {
+ $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+ }
+ } else {
+ foreach ($values as $_i => $_key) {
+ $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+ $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+ }
+ }
+
+ if (!empty($name)) {
+ $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+ $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
+ $_html_result =
+ '' . "\n" . $_html_result .
+ ' ' . "\n";
+ }
+
+ return $_html_result;
+}
+/**
+ * @param $key
+ * @param $value
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
+function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
+{
+ if (!is_array($value)) {
+ $_key = smarty_function_escape_special_chars($key);
+ $_html_result = '__toString());
+ } else {
+ trigger_error('html_options: value is an object of class \'' . get_class($value) .
+ '\' without __toString() method', E_USER_NOTICE);
+
+ return '';
+ }
+ } else {
+ $value = smarty_function_escape_special_chars((string) $value);
+ }
+ $_html_result .= $_html_class . $_html_id . '>' . $value . ' ' . "\n";
+ $idx ++;
+ } else {
+ $_idx = 0;
+ $_html_result =
+ smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
+ $class, $_idx);
+ $idx ++;
+ }
+
+ return $_html_result;
+}
+/**
+ * @param $key
+ * @param $values
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
+function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
+{
+ $optgroup_html = '' . "\n";
+ foreach ($values as $key => $value) {
+ $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
+ }
+ $optgroup_html .= " \n";
+
+ return $optgroup_html;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.html_radios.php 3.2-2/lib/smarty/libs/plugins/function.html_radios.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.html_radios.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.html_radios.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,245 @@
+ or
+ * - output (optional) - the output next to each radio button
+ * - assign (optional) - assign the output as an array to this variable
+ * - escape (optional) - escape the content (not value), defaults to true
+ *
+ * Examples:
+ *
+ * {html_radios values=$ids output=$names}
+ * {html_radios values=$ids name='box' separator='
+ * @author credits to Monte Ohrt
+ * @version 1.0
+ *
+ * @param array $params parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string
+ * @uses smarty_function_escape_special_chars()
+ * @throws \SmartyException
+ */
+function smarty_function_html_radios($params, Smarty_Internal_Template $template)
+{
+ $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
+
+ $name = 'radio';
+ $values = null;
+ $options = null;
+ $selected = null;
+ $separator = '';
+ $escape = true;
+ $labels = true;
+ $label_ids = false;
+ $output = null;
+ $extra = '';
+
+ foreach ($params as $_key => $_val) {
+ switch ($_key) {
+ case 'name':
+ case 'separator':
+ $$_key = (string) $_val;
+ break;
+
+ case 'checked':
+ case 'selected':
+ if (is_array($_val)) {
+ trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+ } elseif (is_object($_val)) {
+ if (method_exists($_val, '__toString')) {
+ $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+ } else {
+ trigger_error('html_radios: selected attribute is an object of class \'' . get_class($_val) .
+ '\' without __toString() method', E_USER_NOTICE);
+ }
+ } else {
+ $selected = (string) $_val;
+ }
+ break;
+
+ case 'escape':
+ case 'labels':
+ case 'label_ids':
+ $$_key = (bool) $_val;
+ break;
+
+ case 'options':
+ $$_key = (array) $_val;
+ break;
+
+ case 'values':
+ case 'output':
+ $$_key = array_values((array) $_val);
+ break;
+
+ case 'radios':
+ trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
+ E_USER_WARNING);
+ $options = (array) $_val;
+ break;
+
+ case 'assign':
+ break;
+
+ case 'strict':
+ break;
+
+ case 'disabled':
+ case 'readonly':
+ if (!empty($params[ 'strict' ])) {
+ if (!is_scalar($_val)) {
+ trigger_error("html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+ E_USER_NOTICE);
+ }
+
+ if ($_val === true || $_val === $_key) {
+ $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+ }
+
+ break;
+ }
+ // omit break; to fall through!
+
+ default:
+ if (!is_array($_val)) {
+ $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+ } else {
+ trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+ }
+ break;
+ }
+ }
+
+ if (!isset($options) && !isset($values)) {
+ /* raise error here? */
+
+ return '';
+ }
+
+ $_html_result = array();
+
+ if (isset($options)) {
+ foreach ($options as $_key => $_val) {
+ $_html_result[] =
+ smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+ $label_ids, $escape);
+ }
+ } else {
+ foreach ($values as $_i => $_key) {
+ $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+ $_html_result[] =
+ smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+ $label_ids, $escape);
+ }
+ }
+
+ if (!empty($params[ 'assign' ])) {
+ $template->assign($params[ 'assign' ], $_html_result);
+ } else {
+ return implode("\n", $_html_result);
+ }
+}
+/**
+ * @param $name
+ * @param $value
+ * @param $output
+ * @param $selected
+ * @param $extra
+ * @param $separator
+ * @param $labels
+ * @param $label_ids
+ * @param $escape
+ *
+ * @return string
+ */
+function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids,
+ $escape)
+{
+ $_output = '';
+
+ if (is_object($value)) {
+ if (method_exists($value, '__toString')) {
+ $value = (string) $value->__toString();
+ } else {
+ trigger_error('html_options: value is an object of class \'' . get_class($value) .
+ '\' without __toString() method', E_USER_NOTICE);
+
+ return '';
+ }
+ } else {
+ $value = (string) $value;
+ }
+
+ if (is_object($output)) {
+ if (method_exists($output, '__toString')) {
+ $output = (string) $output->__toString();
+ } else {
+ trigger_error('html_options: output is an object of class \'' . get_class($output) .
+ '\' without __toString() method', E_USER_NOTICE);
+
+ return '';
+ }
+ } else {
+ $output = (string) $output;
+ }
+
+ if ($labels) {
+ if ($label_ids) {
+ $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
+ $name . '_' . $value));
+ $_output .= '';
+ } else {
+ $_output .= '';
+ }
+ }
+
+ $name = smarty_function_escape_special_chars($name);
+ $value = smarty_function_escape_special_chars($value);
+ if ($escape) {
+ $output = smarty_function_escape_special_chars($output);
+ }
+
+ $_output .= ' ';
+ }
+
+ $_output .= $separator;
+
+ return $_output;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.html_select_date.php 3.2-2/lib/smarty/libs/plugins/function.html_select_date.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.html_select_date.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.html_select_date.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,393 @@
+
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @throws \SmartyException
+ */
+function smarty_function_html_select_date($params, Smarty_Internal_Template $template)
+{
+ $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
+ // generate timestamps used for month names only
+ static $_month_timestamps = null;
+ static $_current_year = null;
+ if ($_month_timestamps === null) {
+ $_current_year = date('Y');
+ $_month_timestamps = array();
+ for ($i = 1; $i <= 12; $i ++) {
+ $_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
+ }
+ }
+
+ /* Default values. */
+ $prefix = 'Date_';
+ $start_year = null;
+ $end_year = null;
+ $display_days = true;
+ $display_months = true;
+ $display_years = true;
+ $month_format = '%B';
+ /* Write months as numbers by default GL */
+ $month_value_format = '%m';
+ $day_format = '%02d';
+ /* Write day values using this format MB */
+ $day_value_format = '%d';
+ $year_as_text = false;
+ /* Display years in reverse order? Ie. 2000,1999,.... */
+ $reverse_years = false;
+ /* Should the select boxes be part of an array when returned from PHP?
+ e.g. setting it to "birthday", would create "birthday[Day]",
+ "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
+ $field_array = null;
+ /* 's of the different tags.
+ If not set, uses default dropdown. */
+ $day_size = null;
+ $month_size = null;
+ $year_size = null;
+ /* Unparsed attributes common to *ALL* the / or ' . $option_separator;
+
+ if (isset($year_empty) || isset($all_empty)) {
+ $_html_years .= '' . (isset($year_empty) ? $year_empty : $all_empty) . ' ' .
+ $option_separator;
+ }
+
+ $op = $start_year > $end_year ? - 1 : 1;
+ for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+ $_html_years .= '' . $i .
+ ' ' . $option_separator;
+ }
+
+ $_html_years .= ' ';
+ }
+ }
+
+ // generate month or ' . $option_separator;
+
+ if (isset($month_empty) || isset($all_empty)) {
+ $_html_months .= '' . (isset($month_empty) ? $month_empty : $all_empty) . ' ' .
+ $option_separator;
+ }
+
+ for ($i = 1; $i <= 12; $i ++) {
+ $_val = sprintf('%02d', $i);
+ $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
+ ($month_format === '%m' ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
+ $_value = $month_value_format === '%m' ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
+ $_html_months .= '' . $_text . ' ' . $option_separator;
+ }
+
+ $_html_months .= ' ';
+ }
+
+ // generate day or ' . $option_separator;
+
+ if (isset($day_empty) || isset($all_empty)) {
+ $_html_days .= '' . (isset($day_empty) ? $day_empty : $all_empty) . ' ' .
+ $option_separator;
+ }
+
+ for ($i = 1; $i <= 31; $i ++) {
+ $_val = sprintf('%02d', $i);
+ $_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
+ $_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
+ $_html_days .= '' .
+ $_text . ' ' . $option_separator;
+ }
+
+ $_html_days .= ' ';
+ }
+
+ // order the fields for output
+ $_html = '';
+ for ($i = 0; $i <= 2; $i ++) {
+ switch ($field_order[ $i ]) {
+ case 'Y':
+ case 'y':
+ if (isset($_html_years)) {
+ if ($_html) {
+ $_html .= $field_separator;
+ }
+ $_html .= $_html_years;
+ }
+ break;
+
+ case 'm':
+ case 'M':
+ if (isset($_html_months)) {
+ if ($_html) {
+ $_html .= $field_separator;
+ }
+ $_html .= $_html_months;
+ }
+ break;
+
+ case 'd':
+ case 'D':
+ if (isset($_html_days)) {
+ if ($_html) {
+ $_html .= $field_separator;
+ }
+ $_html .= $_html_days;
+ }
+ break;
+ }
+ }
+
+ return $_html;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.html_select_time.php 3.2-2/lib/smarty/libs/plugins/function.html_select_time.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.html_select_time.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.html_select_time.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,370 @@
+
+ * @author Monte Ohrt
+ *
+ * @param array $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @uses smarty_make_timestamp()
+ * @throws \SmartyException
+ */
+function smarty_function_html_select_time($params, Smarty_Internal_Template $template)
+{
+ $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php')));
+ $prefix = 'Time_';
+ $field_array = null;
+ $field_separator = "\n";
+ $option_separator = "\n";
+ $time = null;
+
+ $display_hours = true;
+ $display_minutes = true;
+ $display_seconds = true;
+ $display_meridian = true;
+
+ $hour_format = '%02d';
+ $hour_value_format = '%02d';
+ $minute_format = '%02d';
+ $minute_value_format = '%02d';
+ $second_format = '%02d';
+ $second_value_format = '%02d';
+
+ $hour_size = null;
+ $minute_size = null;
+ $second_size = null;
+ $meridian_size = null;
+
+ $all_empty = null;
+ $hour_empty = null;
+ $minute_empty = null;
+ $second_empty = null;
+ $meridian_empty = null;
+
+ $all_id = null;
+ $hour_id = null;
+ $minute_id = null;
+ $second_id = null;
+ $meridian_id = null;
+
+ $use_24_hours = true;
+ $minute_interval = 1;
+ $second_interval = 1;
+
+ $extra_attrs = '';
+ $all_extra = null;
+ $hour_extra = null;
+ $minute_extra = null;
+ $second_extra = null;
+ $meridian_extra = null;
+
+ foreach ($params as $_key => $_value) {
+ switch ($_key) {
+ case 'time':
+ if (!is_array($_value) && $_value !== null) {
+ $template->_checkPlugins(array(array('function' => 'smarty_make_timestamp',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php')));
+ $time = smarty_make_timestamp($_value);
+ }
+ break;
+
+ case 'prefix':
+ case 'field_array':
+
+ case 'field_separator':
+ case 'option_separator':
+
+ case 'all_extra':
+ case 'hour_extra':
+ case 'minute_extra':
+ case 'second_extra':
+ case 'meridian_extra':
+
+ case 'all_empty':
+ case 'hour_empty':
+ case 'minute_empty':
+ case 'second_empty':
+ case 'meridian_empty':
+
+ case 'all_id':
+ case 'hour_id':
+ case 'minute_id':
+ case 'second_id':
+ case 'meridian_id':
+
+ case 'hour_format':
+ case 'hour_value_format':
+ case 'minute_format':
+ case 'minute_value_format':
+ case 'second_format':
+ case 'second_value_format':
+ $$_key = (string) $_value;
+ break;
+
+ case 'display_hours':
+ case 'display_minutes':
+ case 'display_seconds':
+ case 'display_meridian':
+ case 'use_24_hours':
+ $$_key = (bool) $_value;
+ break;
+
+ case 'minute_interval':
+ case 'second_interval':
+
+ case 'hour_size':
+ case 'minute_size':
+ case 'second_size':
+ case 'meridian_size':
+ $$_key = (int) $_value;
+ break;
+
+ default:
+ if (!is_array($_value)) {
+ $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+ } else {
+ trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+ }
+ break;
+ }
+ }
+
+ if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
+ if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
+ // $_REQUEST[$field_array] given
+ foreach (array('H' => 'Hour',
+ 'i' => 'Minute',
+ 's' => 'Second') as $_elementKey => $_elementName) {
+ $_variableName = '_' . strtolower($_elementName);
+ $$_variableName =
+ isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+ date($_elementKey);
+ }
+ $_meridian =
+ isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
+ '';
+ $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+ list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+ } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
+ // $_REQUEST given
+ foreach (array('H' => 'Hour',
+ 'i' => 'Minute',
+ 's' => 'Second') as $_elementKey => $_elementName) {
+ $_variableName = '_' . strtolower($_elementName);
+ $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
+ $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+ }
+ $_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
+ (' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
+ $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+ list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+ } else {
+ // no date found, use NOW
+ list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+ }
+ } elseif ($time === null) {
+ if (array_key_exists('time', $params)) {
+ $_hour = $_minute = $_second = $time = null;
+ } else {
+ list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
+ }
+ } else {
+ list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+ }
+
+ // generate hour
+ if ($display_hours) {
+ $_html_hours = '';
+ $_extra = '';
+ $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
+ if ($all_extra) {
+ $_extra .= ' ' . $all_extra;
+ }
+ if ($hour_extra) {
+ $_extra .= ' ' . $hour_extra;
+ }
+
+ $_html_hours = '' . $option_separator;
+
+ if (isset($hour_empty) || isset($all_empty)) {
+ $_html_hours .= '' . (isset($hour_empty) ? $hour_empty : $all_empty) . ' ' .
+ $option_separator;
+ }
+
+ $start = $use_24_hours ? 0 : 1;
+ $end = $use_24_hours ? 23 : 12;
+ for ($i = $start; $i <= $end; $i ++) {
+ $_val = sprintf('%02d', $i);
+ $_text = $hour_format === '%02d' ? $_val : sprintf($hour_format, $i);
+ $_value = $hour_value_format === '%02d' ? $_val : sprintf($hour_value_format, $i);
+
+ if (!$use_24_hours) {
+ $_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
+ }
+
+ $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
+ $_html_hours .= '' .
+ $_text . ' ' . $option_separator;
+ }
+
+ $_html_hours .= ' ';
+ }
+
+ // generate minute
+ if ($display_minutes) {
+ $_html_minutes = '';
+ $_extra = '';
+ $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
+ if ($all_extra) {
+ $_extra .= ' ' . $all_extra;
+ }
+ if ($minute_extra) {
+ $_extra .= ' ' . $minute_extra;
+ }
+
+ $_html_minutes = '' . $option_separator;
+
+ if (isset($minute_empty) || isset($all_empty)) {
+ $_html_minutes .= '' . (isset($minute_empty) ? $minute_empty : $all_empty) . ' ' .
+ $option_separator;
+ }
+
+ $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
+ for ($i = 0; $i <= 59; $i += $minute_interval) {
+ $_val = sprintf('%02d', $i);
+ $_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
+ $_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
+ $_html_minutes .= '' . $_text . ' ' . $option_separator;
+ }
+
+ $_html_minutes .= ' ';
+ }
+
+ // generate second
+ if ($display_seconds) {
+ $_html_seconds = '';
+ $_extra = '';
+ $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
+ if ($all_extra) {
+ $_extra .= ' ' . $all_extra;
+ }
+ if ($second_extra) {
+ $_extra .= ' ' . $second_extra;
+ }
+
+ $_html_seconds = '' . $option_separator;
+
+ if (isset($second_empty) || isset($all_empty)) {
+ $_html_seconds .= '' . (isset($second_empty) ? $second_empty : $all_empty) . ' ' .
+ $option_separator;
+ }
+
+ $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
+ for ($i = 0; $i <= 59; $i += $second_interval) {
+ $_val = sprintf('%02d', $i);
+ $_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
+ $_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
+ $_html_seconds .= '' . $_text . ' ' . $option_separator;
+ }
+
+ $_html_seconds .= ' ';
+ }
+
+ // generate meridian
+ if ($display_meridian && !$use_24_hours) {
+ $_html_meridian = '';
+ $_extra = '';
+ $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
+ if ($all_extra) {
+ $_extra .= ' ' . $all_extra;
+ }
+ if ($meridian_extra) {
+ $_extra .= ' ' . $meridian_extra;
+ }
+
+ $_html_meridian = '' . $option_separator;
+
+ if (isset($meridian_empty) || isset($all_empty)) {
+ $_html_meridian .= '' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
+ ' ' . $option_separator;
+ }
+
+ $_html_meridian .= ' 0 && $_hour < 12 ? ' selected="selected"' : '') .
+ '>AM ' . $option_separator . 'PM ' . $option_separator .
+ ' ';
+ }
+
+ $_html = '';
+ foreach (array('_html_hours',
+ '_html_minutes',
+ '_html_seconds',
+ '_html_meridian') as $k) {
+ if (isset($$k)) {
+ if ($_html) {
+ $_html .= $field_separator;
+ }
+ $_html .= $$k;
+ }
+ }
+
+ return $_html;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.html_table.php 3.2-2/lib/smarty/libs/plugins/function.html_table.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.html_table.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.html_table.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,182 @@
+
+ * @author credit to Messju Mohr
+ * @author credit to boots
+ * @version 1.1
+ * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ * (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ */
+function smarty_function_html_table($params)
+{
+ $table_attr = 'border="1"';
+ $tr_attr = '';
+ $th_attr = '';
+ $td_attr = '';
+ $cols = $cols_count = 3;
+ $rows = 3;
+ $trailpad = ' ';
+ $vdir = 'down';
+ $hdir = 'right';
+ $inner = 'cols';
+ $caption = '';
+ $loop = null;
+
+ if (!isset($params[ 'loop' ])) {
+ trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+
+ return;
+ }
+
+ foreach ($params as $_key => $_value) {
+ switch ($_key) {
+ case 'loop':
+ $$_key = (array) $_value;
+ break;
+
+ case 'cols':
+ if (is_array($_value) && !empty($_value)) {
+ $cols = $_value;
+ $cols_count = count($_value);
+ } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+ $cols = explode(',', $_value);
+ $cols_count = count($cols);
+ } elseif (!empty($_value)) {
+ $cols_count = (int) $_value;
+ } else {
+ $cols_count = $cols;
+ }
+ break;
+
+ case 'rows':
+ $$_key = (int) $_value;
+ break;
+
+ case 'table_attr':
+ case 'trailpad':
+ case 'hdir':
+ case 'vdir':
+ case 'inner':
+ case 'caption':
+ $$_key = (string) $_value;
+ break;
+
+ case 'tr_attr':
+ case 'td_attr':
+ case 'th_attr':
+ $$_key = $_value;
+ break;
+ }
+ }
+
+ $loop_count = count($loop);
+ if (empty($params[ 'rows' ])) {
+ /* no rows specified */
+ $rows = ceil($loop_count / $cols_count);
+ } elseif (empty($params[ 'cols' ])) {
+ if (!empty($params[ 'rows' ])) {
+ /* no cols specified, but rows */
+ $cols_count = ceil($loop_count / $rows);
+ }
+ }
+
+ $output = "\n";
+
+ if (!empty($caption)) {
+ $output .= '' . $caption . " \n";
+ }
+
+ if (is_array($cols)) {
+ $cols = ($hdir === 'right') ? $cols : array_reverse($cols);
+ $output .= "\n";
+
+ for ($r = 0; $r < $cols_count; $r ++) {
+ $output .= '';
+ $output .= $cols[ $r ];
+ $output .= "\n";
+ }
+ $output .= " \n";
+ for ($r = 0; $r < $rows; $r ++) {
+ $output .= "\n";
+ $rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
+
+ for ($c = 0; $c < $cols_count; $c ++) {
+ $x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+ if ($inner !== 'cols') {
+ /* shuffle x to loop over rows*/
+ $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+ }
+
+ if ($x < $loop_count) {
+ $output .= "" . $loop[ $x ] . "\n";
+ } else {
+ $output .= "$trailpad\n";
+ }
+ }
+ $output .= "\n";
+ }
+ $output .= " \n";
+ $output .= "
\n";
+
+ return $output;
+}
+/**
+ * @param $name
+ * @param $var
+ * @param $no
+ *
+ * @return string
+ */
+function smarty_function_html_table_cycle($name, $var, $no)
+{
+ if (!is_array($var)) {
+ $ret = $var;
+ } else {
+ $ret = $var[ $no % count($var) ];
+ }
+
+ return ($ret) ? ' ' . $ret : '';
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.mailto.php 3.2-2/lib/smarty/libs/plugins/function.mailto.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.mailto.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.mailto.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,153 @@
+
+ * @author credits to Jason Sweat (added cc, bcc and subject functionality)
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ */
+function smarty_function_mailto($params)
+{
+ static $_allowed_encoding =
+ array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
+ $extra = '';
+
+ if (empty($params[ 'address' ])) {
+ trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
+
+ return;
+ } else {
+ $address = $params[ 'address' ];
+ }
+
+ $text = $address;
+ // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
+ // so, don't encode it.
+ $search = array('%40', '%2C');
+ $replace = array('@', ',');
+ $mail_parms = array();
+ foreach ($params as $var => $value) {
+ switch ($var) {
+ case 'cc':
+ case 'bcc':
+ case 'followupto':
+ if (!empty($value)) {
+ $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+ }
+ break;
+
+ case 'subject':
+ case 'newsgroups':
+ $mail_parms[] = $var . '=' . rawurlencode($value);
+ break;
+
+ case 'extra':
+ case 'text':
+ $$var = $value;
+
+ default:
+ }
+ }
+
+ if ($mail_parms) {
+ $address .= '?' . join('&', $mail_parms);
+ }
+
+ $encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
+ if (!isset($_allowed_encoding[ $encode ])) {
+ trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
+ E_USER_WARNING);
+
+ return;
+ }
+ // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
+ if ($encode === 'javascript') {
+ $string = 'document.write(\'' . $text . ' \');';
+
+ $js_encode = '';
+ for ($x = 0, $_length = strlen($string); $x < $_length; $x ++) {
+ $js_encode .= '%' . bin2hex($string[ $x ]);
+ }
+
+ return '';
+ } elseif ($encode === 'javascript_charcode') {
+ $string = '' . $text . ' ';
+
+ for ($x = 0, $y = strlen($string); $x < $y; $x ++) {
+ $ord[] = ord($string[ $x ]);
+ }
+
+ $_ret = "\n";
+
+ return $_ret;
+ } elseif ($encode === 'hex') {
+ preg_match('!^(.*)(\?.*)$!', $address, $match);
+ if (!empty($match[ 2 ])) {
+ trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
+
+ return;
+ }
+ $address_encode = '';
+ for ($x = 0, $_length = strlen($address); $x < $_length; $x ++) {
+ if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
+ $address_encode .= '%' . bin2hex($address[ $x ]);
+ } else {
+ $address_encode .= $address[ $x ];
+ }
+ }
+ $text_encode = '';
+ for ($x = 0, $_length = strlen($text); $x < $_length; $x ++) {
+ $text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
+ }
+
+ $mailto = "mailto:";
+
+ return '' . $text_encode . ' ';
+ } else {
+ // no encoding
+ return '' . $text . ' ';
+ }
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/function.math.php 3.2-2/lib/smarty/libs/plugins/function.math.php
--- 3.0.2-2/lib/smarty/libs/plugins/function.math.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/function.math.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,109 @@
+
+ *
+ * @param array $params parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string|null
+ */
+function smarty_function_math($params, $template)
+{
+ static $_allowed_funcs =
+ array('int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
+ 'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true, 'rand' => true,
+ 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true, 'tan' => true);
+ // be sure equation parameter is present
+ if (empty($params[ 'equation' ])) {
+ trigger_error("math: missing equation parameter", E_USER_WARNING);
+
+ return;
+ }
+
+ $equation = $params[ 'equation' ];
+
+ // make sure parenthesis are balanced
+ if (substr_count($equation, '(') !== substr_count($equation, ')')) {
+ trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
+
+ return;
+ }
+
+ // disallow backticks
+ if (strpos($equation, '`') !== false) {
+ trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
+
+ return;
+ }
+
+ // also disallow dollar signs
+ if (strpos($equation, '$') !== false) {
+ trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
+
+ return;
+ }
+
+ foreach ($params as $key => $val) {
+ if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+ // make sure value is not empty
+ if (strlen($val) === 0) {
+ trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
+
+ return;
+ }
+ if (!is_numeric($val)) {
+ trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
+
+ return;
+ }
+ }
+ }
+
+ // match all vars in equation, make sure all are passed
+ preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
+
+ foreach ($match[ 1 ] as $curr_var) {
+ if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) {
+ trigger_error("math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'", E_USER_WARNING);
+
+ return;
+ }
+ }
+
+ foreach ($params as $key => $val) {
+ if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+ $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
+ }
+ }
+ $smarty_math_result = null;
+ eval("\$smarty_math_result = " . $equation . ";");
+
+ if (empty($params[ 'format' ])) {
+ if (empty($params[ 'assign' ])) {
+ return $smarty_math_result;
+ } else {
+ $template->assign($params[ 'assign' ], $smarty_math_result);
+ }
+ } else {
+ if (empty($params[ 'assign' ])) {
+ printf($params[ 'format' ], $smarty_math_result);
+ } else {
+ $template->assign($params[ 'assign' ], sprintf($params[ 'format' ], $smarty_math_result));
+ }
+ }
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.capitalize.php 3.2-2/lib/smarty/libs/plugins/modifier.capitalize.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.capitalize.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.capitalize.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,118 @@
+
+ * @author Rodney Rehm
+ */
+function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
+{
+ if (Smarty::$_MBSTRING) {
+ if ($lc_rest) {
+ // uppercase (including hyphenated words)
+ $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
+ } else {
+ // uppercase word breaks
+ $upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
+ 'smarty_mod_cap_mbconvert_cb', $string);
+ }
+ // check uc_digits case
+ if (!$uc_digits) {
+ if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
+ PREG_OFFSET_CAPTURE)) {
+ foreach ($matches[ 1 ] as $match) {
+ $upper_string =
+ substr_replace($upper_string, mb_strtolower($match[ 0 ], Smarty::$_CHARSET), $match[ 1 ],
+ strlen($match[ 0 ]));
+ }
+ }
+ }
+ $upper_string =
+ preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb',
+ $upper_string);
+ return $upper_string;
+ }
+
+ // lowercase first
+ if ($lc_rest) {
+ $string = strtolower($string);
+ }
+ // uppercase (including hyphenated words)
+ $upper_string =
+ preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb',
+ $string);
+ // check uc_digits case
+ if (!$uc_digits) {
+ if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches,
+ PREG_OFFSET_CAPTURE)) {
+ foreach ($matches[ 1 ] as $match) {
+ $upper_string =
+ substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
+ }
+ }
+ }
+ $upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb',
+ $upper_string);
+ return $upper_string;
+}
+
+/*
+ *
+ * Bug: create_function() use exhausts memory when used in long loops
+ * Fix: use declared functions for callbacks instead of using create_function()
+ * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
+ *
+ * @author Kyle Renfrow
+ */
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_mbconvert_cb($matches)
+{
+ return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_mbconvert2_cb($matches)
+{
+ return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_ucfirst_cb($matches)
+{
+ return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
+}
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_ucfirst2_cb($matches)
+{
+ return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifiercompiler.cat.php 3.2-2/lib/smarty/libs/plugins/modifiercompiler.cat.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifiercompiler.cat.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifiercompiler.cat.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,29 @@
+template->_checkPlugins(array(array('function' => 'smarty_literal_compiler_param',
+ 'file' => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php')));
+ if ($_double_encode === null) {
+ $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
+ }
+
+ try {
+ $esc_type = smarty_literal_compiler_param($params, 1, 'html');
+ $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
+ $double_encode = smarty_literal_compiler_param($params, 3, true);
+
+ if (!$char_set) {
+ $char_set = Smarty::$_CHARSET;
+ }
+
+ switch ($esc_type) {
+ case 'html':
+ if ($_double_encode) {
+ return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+ var_export($double_encode, true) . ')';
+ } elseif ($double_encode) {
+ return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
+ } else {
+ // fall back to modifier.escape.php
+ }
+
+ case 'htmlall':
+ if (Smarty::$_MBSTRING) {
+ if ($_double_encode) {
+ // php >=5.2.3 - go native
+ return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
+ var_export($char_set, true) . ', ' . var_export($double_encode, true) .
+ '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
+ } elseif ($double_encode) {
+ // php <5.2.3 - only handle double encoding
+ return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
+ var_export($char_set, true) . '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
+ } else {
+ // fall back to modifier.escape.php
+ }
+ }
+
+ // no MBString fallback
+ if ($_double_encode) {
+ // php >=5.2.3 - go native
+ return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+ var_export($double_encode, true) . ')';
+ } elseif ($double_encode) {
+ // php <5.2.3 - only handle double encoding
+ return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
+ } else {
+ // fall back to modifier.escape.php
+ }
+
+ case 'url':
+ return 'rawurlencode(' . $params[ 0 ] . ')';
+
+ case 'urlpathinfo':
+ return 'str_replace("%2F", "/", rawurlencode(' . $params[ 0 ] . '))';
+
+ case 'quotes':
+ // escape unescaped single quotes
+ return 'preg_replace("%(? "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", " "<\/" ))';
+ }
+ }
+ catch (SmartyException $e) {
+ // pass through to regular plugin fallback
+ }
+
+ // could not optimize |escape call, so fallback to regular plugin
+ if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
+ $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+ SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+ $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+ 'smarty_modifier_escape';
+ } else {
+ $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+ SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+ $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+ 'smarty_modifier_escape';
+ }
+
+ return 'smarty_modifier_escape(' . join(', ', $params) . ')';
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifiercompiler.from_charset.php 3.2-2/lib/smarty/libs/plugins/modifiercompiler.from_charset.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifiercompiler.from_charset.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifiercompiler.from_charset.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,33 @@
+
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+
+function smarty_modifiercompiler_lower($params)
+{
+ if (Smarty::$_MBSTRING) {
+ return 'mb_strtolower(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+ }
+ // no MBString fallback
+ return 'strtolower(' . $params[ 0 ] . ')';
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifiercompiler.noprint.php 3.2-2/lib/smarty/libs/plugins/modifiercompiler.noprint.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifiercompiler.noprint.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifiercompiler.noprint.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,21 @@
+]*?>!', ' ', {$params[0]})";
+ } else {
+ return 'strip_tags(' . $params[ 0 ] . ')';
+ }
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifiercompiler.to_charset.php 3.2-2/lib/smarty/libs/plugins/modifiercompiler.to_charset.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifiercompiler.to_charset.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifiercompiler.to_charset.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,33 @@
+getPlugin('mb_wordwrap','modifier');
+ }
+ return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.date_format.php 3.2-2/lib/smarty/libs/plugins/modifier.date_format.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.date_format.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.date_format.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,83 @@
+
+ *
+ * @param string $string input date string
+ * @param string $format strftime format for output
+ * @param string $default_date default date if $string is empty
+ * @param string $formatter either 'strftime' or 'auto'
+ *
+ * @return string |void
+ * @uses smarty_make_timestamp()
+ */
+function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
+{
+ if ($format === null) {
+ $format = Smarty::$_DATE_FORMAT;
+ }
+ /**
+ * require_once the {@link shared.make_timestamp.php} plugin
+ */
+ static $is_loaded = false;
+ if (!$is_loaded) {
+ if (!is_callable('smarty_make_timestamp')) {
+ require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+ }
+ $is_loaded = true;
+ }
+ if ($string !== '' && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
+ $timestamp = smarty_make_timestamp($string);
+ } elseif ($default_date !== '') {
+ $timestamp = smarty_make_timestamp($default_date);
+ } else {
+ return;
+ }
+ if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
+ if (Smarty::$_IS_WINDOWS) {
+ $_win_from = array('%D',
+ '%h',
+ '%n',
+ '%r',
+ '%R',
+ '%t',
+ '%T');
+ $_win_to = array('%m/%d/%y',
+ '%b',
+ "\n",
+ '%I:%M:%S %p',
+ '%H:%M',
+ "\t",
+ '%H:%M:%S');
+ if (strpos($format, '%e') !== false) {
+ $_win_from[] = '%e';
+ $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
+ }
+ if (strpos($format, '%l') !== false) {
+ $_win_from[] = '%l';
+ $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
+ }
+ $format = str_replace($_win_from, $_win_to, $format);
+ }
+
+ return strftime($format, $timestamp);
+ } else {
+ return date($format, $timestamp);
+ }
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.debug_print_var.php 3.2-2/lib/smarty/libs/plugins/modifier.debug_print_var.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.debug_print_var.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.debug_print_var.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,112 @@
+
+ *
+ * @param array|object $var variable to be formatted
+ * @param int $max maximum recursion depth if $var is an array or object
+ * @param int $length maximum string length if $var is a string
+ * @param int $depth actual recursion depth
+ * @param array $objects processed objects in actual depth to prevent recursive object processing
+ *
+ * @return string
+ */
+function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
+{
+ $_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
+ switch (gettype($var)) {
+ case 'array' :
+ $results = 'Array (' . count($var) . ') ';
+ if ($depth === $max) {
+ break;
+ }
+ foreach ($var as $curr_key => $curr_val) {
+ $results .= '' . strtr($curr_key, $_replace) .
+ ' => ' .
+ smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
+ $depth --;
+ }
+ break;
+
+ case 'object' :
+ $object_vars = get_object_vars($var);
+ $results = '' . get_class($var) . ' Object (' . count($object_vars) . ') ';
+ if (in_array($var, $objects)) {
+ $results .= ' called recursive';
+ break;
+ }
+ if ($depth === $max) {
+ break;
+ }
+ $objects[] = $var;
+ foreach ($object_vars as $curr_key => $curr_val) {
+ $results .= ' ->' . strtr($curr_key, $_replace) .
+ ' = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
+ $depth --;
+ }
+ break;
+
+ case 'boolean' :
+ case 'NULL' :
+ case 'resource' :
+ if (true === $var) {
+ $results = 'true';
+ } elseif (false === $var) {
+ $results = 'false';
+ } elseif (null === $var) {
+ $results = 'null';
+ } else {
+ $results = htmlspecialchars((string) $var);
+ }
+ $results = '' . $results . ' ';
+ break;
+
+ case 'integer' :
+ case 'float' :
+ $results = htmlspecialchars((string) $var);
+ break;
+
+ case 'string' :
+ $results = strtr($var, $_replace);
+ if (Smarty::$_MBSTRING) {
+ if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
+ $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
+ }
+ } else {
+ if (isset($var[ $length ])) {
+ $results = substr($var, 0, $length - 3) . '...';
+ }
+ }
+
+ $results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET);
+ break;
+
+ case 'unknown type' :
+ default :
+ $results = strtr((string) $var, $_replace);
+ if (Smarty::$_MBSTRING) {
+ if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
+ $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
+ }
+ } else {
+ if (strlen($results) > $length) {
+ $results = substr($results, 0, $length - 3) . '...';
+ }
+ }
+
+ $results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
+ }
+
+ return $results;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.escape.php 3.2-2/lib/smarty/libs/plugins/modifier.escape.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.escape.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.escape.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,235 @@
+
+ *
+ * @param string $string input string
+ * @param string $esc_type escape type
+ * @param string $char_set character set, used for htmlspecialchars() or htmlentities()
+ * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+ *
+ * @return string escaped input string
+ */
+function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
+{
+ static $_double_encode = null;
+ static $is_loaded_1 = false;
+ static $is_loaded_2 = false;
+ if ($_double_encode === null) {
+ $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
+ }
+
+ if (!$char_set) {
+ $char_set = Smarty::$_CHARSET;
+ }
+
+ switch ($esc_type) {
+ case 'html':
+ if ($_double_encode) {
+ // php >=5.3.2 - go native
+ return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+ } else {
+ if ($double_encode) {
+ // php <5.2.3 - only handle double encoding
+ return htmlspecialchars($string, ENT_QUOTES, $char_set);
+ } else {
+ // php <5.2.3 - prevent double encoding
+ $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+ $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
+ $string = str_replace(array('%%%SMARTY_START%%%',
+ '%%%SMARTY_END%%%'), array('&',
+ ';'), $string);
+
+ return $string;
+ }
+ }
+
+ case 'htmlall':
+ if (Smarty::$_MBSTRING) {
+ // mb_convert_encoding ignores htmlspecialchars()
+ if ($_double_encode) {
+ // php >=5.3.2 - go native
+ $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+ } else {
+ if ($double_encode) {
+ // php <5.2.3 - only handle double encoding
+ $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
+ } else {
+ // php <5.2.3 - prevent double encoding
+ $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+ $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
+ $string =
+ str_replace(array('%%%SMARTY_START%%%',
+ '%%%SMARTY_END%%%'), array('&',
+ ';'), $string);
+
+ return $string;
+ }
+ }
+
+ // htmlentities() won't convert everything, so use mb_convert_encoding
+ return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
+ }
+
+ // no MBString fallback
+ if ($_double_encode) {
+ return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
+ } else {
+ if ($double_encode) {
+ return htmlentities($string, ENT_QUOTES, $char_set);
+ } else {
+ $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+ $string = htmlentities($string, ENT_QUOTES, $char_set);
+ $string = str_replace(array('%%%SMARTY_START%%%',
+ '%%%SMARTY_END%%%'), array('&',
+ ';'), $string);
+
+ return $string;
+ }
+ }
+
+ case 'url':
+ return rawurlencode($string);
+
+ case 'urlpathinfo':
+ return str_replace('%2F', '/', rawurlencode($string));
+
+ case 'quotes':
+ // escape unescaped single quotes
+ return preg_replace("%(? '\\\\',
+ "'" => "\\'",
+ '"' => '\\"',
+ "\r" => '\\r',
+ "\n" => '\\n',
+ ' '<\/'));
+
+ case 'mail':
+ if (Smarty::$_MBSTRING) {
+ if (!$is_loaded_2) {
+ if (!is_callable('smarty_mb_str_replace')) {
+ require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+ }
+ $is_loaded_2 = true;
+ }
+ return smarty_mb_str_replace(array('@',
+ '.'), array(' [AT] ',
+ ' [DOT] '), $string);
+ }
+ // no MBString fallback
+ return str_replace(array('@',
+ '.'), array(' [AT] ',
+ ' [DOT] '), $string);
+
+ case 'nonstd':
+ // escape non-standard chars, such as ms document quotes
+ $return = '';
+ if (Smarty::$_MBSTRING) {
+ if (!$is_loaded_1) {
+ if (!is_callable('smarty_mb_to_unicode')) {
+ require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+ }
+ $is_loaded_1 = true;
+ }
+ foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+ if ($unicode >= 126) {
+ $return .= '&#' . $unicode . ';';
+ } else {
+ $return .= chr($unicode);
+ }
+ }
+
+ return $return;
+ }
+
+ $_length = strlen($string);
+ for ($_i = 0; $_i < $_length; $_i ++) {
+ $_ord = ord(substr($string, $_i, 1));
+ // non-standard char, escape it
+ if ($_ord >= 126) {
+ $return .= '&#' . $_ord . ';';
+ } else {
+ $return .= substr($string, $_i, 1);
+ }
+ }
+
+ return $return;
+
+ default:
+ return $string;
+ }
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.mb_wordwrap.php 3.2-2/lib/smarty/libs/plugins/modifier.mb_wordwrap.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.mb_wordwrap.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.mb_wordwrap.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,75 @@
+ $width) {
+ if ($cut) {
+ $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER,
+ $_token,
+ -1,
+ PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+ }
+ }
+
+ foreach ($_tokens as $token) {
+ $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
+ $token_length = mb_strlen($token, Smarty::$_CHARSET);
+ $length += $token_length;
+
+ if ($length > $width) {
+ // remove space before inserted break
+ if ($_previous) {
+ $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+ }
+
+ if (!$_space) {
+ // add the break before the token
+ if (!empty($t)) {
+ $t .= $break;
+ }
+ $length = $token_length;
+ }
+ } else if ($token === "\n") {
+ // hard break must reset counters
+ $length = 0;
+ }
+ $_previous = $_space;
+ // add the token
+ $t .= $token;
+ }
+ }
+
+ return $t;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.regex_replace.php 3.2-2/lib/smarty/libs/plugins/modifier.regex_replace.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.regex_replace.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.regex_replace.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,58 @@
+
+ *
+ * @param string $string input string
+ * @param string|array $search regular expression(s) to search for
+ * @param string|array $replace string(s) that should be replaced
+ * @param int $limit the maximum number of replacements
+ *
+ * @return string
+ */
+function smarty_modifier_regex_replace($string, $search, $replace, $limit = - 1)
+{
+ if (is_array($search)) {
+ foreach ($search as $idx => $s) {
+ $search[ $idx ] = _smarty_regex_replace_check($s);
+ }
+ } else {
+ $search = _smarty_regex_replace_check($search);
+ }
+
+ return preg_replace($search, $replace, $string, $limit);
+}
+
+/**
+ * @param string $search string(s) that should be replaced
+ *
+ * @return string
+ * @ignore
+ */
+function _smarty_regex_replace_check($search)
+{
+ // null-byte injection detection
+ // anything behind the first null-byte is ignored
+ if (($pos = strpos($search, "\0")) !== false) {
+ $search = substr($search, 0, $pos);
+ }
+ // remove eval-modifier from $search
+ if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) {
+ $search = substr($search, 0, - strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
+ }
+
+ return $search;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.replace.php 3.2-2/lib/smarty/libs/plugins/modifier.replace.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.replace.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.replace.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,39 @@
+
+ * @author Uwe Tews
+ *
+ * @param string $string input string
+ * @param string $search text to search for
+ * @param string $replace replacement text
+ *
+ * @return string
+ */
+function smarty_modifier_replace($string, $search, $replace)
+{
+ static $is_loaded = false;
+ if (Smarty::$_MBSTRING) {
+ if (!$is_loaded) {
+ if (!is_callable('smarty_mb_str_replace')) {
+ require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+ }
+ $is_loaded = true;
+ }
+ return smarty_mb_str_replace($search, $replace, $string);
+ }
+
+ return str_replace($search, $replace, $string);
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.spacify.php 3.2-2/lib/smarty/libs/plugins/modifier.spacify.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.spacify.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.spacify.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,27 @@
+
+ *
+ * @param string $string input string
+ * @param string $spacify_char string to insert between characters.
+ *
+ * @return string
+ */
+function smarty_modifier_spacify($string, $spacify_char = ' ')
+{
+ // well… what about charsets besides latin and UTF-8?
+ return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, - 1, PREG_SPLIT_NO_EMPTY));
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/modifier.truncate.php 3.2-2/lib/smarty/libs/plugins/modifier.truncate.php
--- 3.0.2-2/lib/smarty/libs/plugins/modifier.truncate.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/modifier.truncate.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,66 @@
+
+ *
+ * @param string $string input string
+ * @param integer $length length of truncated text
+ * @param string $etc end string
+ * @param boolean $break_words truncate at word boundary
+ * @param boolean $middle truncate in the middle of text
+ *
+ * @return string truncated string
+ */
+function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
+{
+ if ($length === 0) {
+ return '';
+ }
+
+ if (Smarty::$_MBSTRING) {
+ if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
+ $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
+ if (!$break_words && !$middle) {
+ $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '',
+ mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
+ }
+ if (!$middle) {
+ return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
+ }
+
+ return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
+ mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
+ }
+
+ return $string;
+ }
+
+ // no MBString fallback
+ if (isset($string[ $length ])) {
+ $length -= min($length, strlen($etc));
+ if (!$break_words && !$middle) {
+ $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
+ }
+ if (!$middle) {
+ return substr($string, 0, $length) . $etc;
+ }
+
+ return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
+ }
+
+ return $string;
+}
diff -pruN 3.0.2-2/lib/smarty/libs/plugins/outputfilter.trimwhitespace.php 3.2-2/lib/smarty/libs/plugins/outputfilter.trimwhitespace.php
--- 3.0.2-2/lib/smarty/libs/plugins/outputfilter.trimwhitespace.php 1970-01-01 00:00:00.000000000 +0000
+++ 3.2-2/lib/smarty/libs/plugins/outputfilter.trimwhitespace.php 2018-05-02 20:37:27.000000000 +0000
@@ -0,0 +1,89 @@
+.*?#is', $source, $matches,
+ PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+ foreach ($matches as $match) {
+ $store[] = $match[ 0 ][ 0 ];
+ $_length = strlen($match[ 0 ][ 0 ]);
+ $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+ $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+
+ $_offset += $_length - strlen($replace);
+ $_store ++;
+ }
+ }
+
+ // Strip all HTML-Comments
+ // yes, even the ones in 
');
- this.e_icon = f_getElement(this.s_iconId);
- }
- // save received parameters
- this.a_cfg = a_cfg;
- this.a_tpl = a_tpl;
-}
-
-function f_tcalShow (d_date) {
-
- // find input field
- if (!this.a_cfg.controlname)
- throw("TC: control name is not specified");
- if (this.a_cfg.formname) {
- var e_form = document.forms[this.a_cfg.formname];
- if (!e_form)
- throw("TC: form '" + this.a_cfg.formname + "' can not be found");
- this.e_input = e_form.elements[this.a_cfg.controlname];
- }
- else
- this.e_input = f_getElement(this.a_cfg.controlname);
-
- if (!this.e_input || !this.e_input.tagName || this.e_input.tagName != 'INPUT')
- throw("TC: element '" + this.a_cfg.controlname + "' does not exist in "
- + (this.a_cfg.formname ? "form '" + this.a_cfg.controlname + "'" : 'this document'));
-
- // dynamically create HTML elements if needed
- this.e_div = f_getElement('tcal');
- if (!this.e_div) {
- this.e_div = document.createElement("DIV");
- this.e_div.id = 'tcal';
- document.body.appendChild(this.e_div);
- }
- this.e_shade = f_getElement('tcalShade');
- if (!this.e_shade) {
- this.e_shade = document.createElement("DIV");
- this.e_shade.id = 'tcalShade';
- document.body.appendChild(this.e_shade);
- }
- this.e_iframe = f_getElement('tcalIF')
- if (b_ieFix && !this.e_iframe) {
- this.e_iframe = document.createElement("IFRAME");
- this.e_iframe.style.filter = 'alpha(opacity=0)';
- this.e_iframe.id = 'tcalIF';
- this.e_iframe.src = this.a_tpl.imgpath + 'pixel.gif';
- document.body.appendChild(this.e_iframe);
- }
-
- // hide all calendars
- f_tcalHideAll();
-
- // generate HTML and show calendar
- this.e_icon = f_getElement(this.s_iconId);
- if (!this.f_update())
- return;
-
- this.e_div.style.visibility = 'visible';
- this.e_shade.style.visibility = 'visible';
- if (this.e_iframe)
- this.e_iframe.style.visibility = 'visible';
-
- // change icon and status
- this.e_icon.src = this.a_tpl.imgpath + 'no_cal.gif';
- this.e_icon.title = 'Close Calendar';
- this.b_visible = true;
-}
-
-function f_tcalHide (n_date) {
- if (n_date)
- this.e_input.value = this.f_generDate(new Date(n_date));
-
- // no action if not visible
- if (!this.b_visible)
- return;
-
- // hide elements
- if (this.e_iframe)
- this.e_iframe.style.visibility = 'hidden';
- if (this.e_shade)
- this.e_shade.style.visibility = 'hidden';
- this.e_div.style.visibility = 'hidden';
-
- // change icon and status
- this.e_icon = f_getElement(this.s_iconId);
- this.e_icon.src = this.a_tpl.imgpath + 'cal.gif';
- this.e_icon.title = 'Open Calendar';
- this.b_visible = false;
-}
-
-function f_tcalToggle () {
- return this.b_visible ? this.f_hide() : this.f_show();
-}
-
-function f_tcalUpdate (d_date) {
-
- var d_today = this.a_cfg.today ? this.f_parseDate(this.a_cfg.today) : f_tcalResetTime(new Date());
- var d_selected = this.e_input.value == ''
- ? (this.a_cfg.selected ? this.f_parseDate(this.a_cfg.selected) : d_today)
- : this.f_parseDate(this.e_input.value);
-
- // figure out date to display
- if (!d_date)
- // selected by default
- d_date = d_selected;
- else if (typeof(d_date) == 'number')
- // get from number
- d_date = f_tcalResetTime(new Date(d_date));
- else if (typeof(d_date) == 'string')
- // parse from string
- this.f_parseDate(d_date);
-
- if (!d_date) return false;
-
- // first date to display
- var d_firstday = new Date(d_date);
- d_firstday.setDate(1);
- d_firstday.setDate(1 - (7 + d_firstday.getDay() - this.a_tpl.weekstart) % 7);
-
- var a_class, s_html = '
' : '')
- + '
'
- + (this.a_tpl.yearscroll ? '
' : '')
- + '
-