From b261db86c7bdb6edb600be9051539681b8f6d7ab Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 4 Feb 2016 22:30:06 +0000 Subject: [PATCH 1/5] Merge pull request #9 from phyrog/master Add sqlite backend option (thank you @phyrog for doing this) (imported from github) git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1824 a1433add-5e2c-0410-b055-b7f2511e0802 --- config.inc.php | 3 + functions.inc.php | 90 ++++++++++++-- model/FetchmailHandler.php | 2 +- model/PFAHandler.php | 4 + setup.php | 12 +- upgrade.php | 246 ++++++++++++++++++++++++++++++++++--- 6 files changed, 329 insertions(+), 28 deletions(-) diff --git a/config.inc.php b/config.inc.php index b849d9a4..7bb82861 100644 --- a/config.inc.php +++ b/config.inc.php @@ -80,6 +80,7 @@ function language_hook($PALANG, $language) { // mysql = MySQL 3.23 and 4.0, 4.1 or 5 // mysqli = MySQL 4.1+ or MariaDB // pgsql = PostgreSQL +// sqlite = SQLite 3 $CONF['database_type'] = 'mysqli'; $CONF['database_host'] = 'localhost'; $CONF['database_user'] = 'postfix'; @@ -90,6 +91,8 @@ $CONF['database_name'] = 'postfix'; // If you need to specify a different port for POSTGRESQL database connection // uncomment and change the following // $CONF['database_port'] = '5432'; +// If sqlite is used, specify the database file path: +// $CONF['database_name'] = '/etc/postfix/sqlite/postfixadmin.db' // Here, if you need, you can customize table names. $CONF['database_prefix'] = ''; diff --git a/functions.inc.php b/functions.inc.php index f3631526..81414b9a 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -302,6 +302,9 @@ function escape_string ($string) { if ($CONF['database_type'] == "mysqli") { $escaped_string = mysqli_real_escape_string($link, $string); } + if (db_sqlite()) { + $escaped_string = SQLite3::escapeString($string); + } if (db_pgsql()) { // php 5.2+ allows for $link to be specified. if (version_compare(phpversion(), "5.2.0", ">=")) { @@ -490,7 +493,9 @@ function create_page_browser($idxfield, $querypart) { if (db_pgsql()) { $initcount = "CREATE TEMPORARY SEQUENCE rowcount MINVALUE 0"; } - $result = db_query($initcount); + if (!db_sqlite()) { + $result = db_query($initcount); + } # get labels for relevant rows (first and last of each page) $page_size_zerobase = $page_size - 1; @@ -507,6 +512,15 @@ function create_page_browser($idxfield, $querypart) { ) idx WHERE MOD(idx.row, $page_size) IN (0,$page_size_zerobase) OR idx.row = $count_results "; } + + if (db_sqlite()) { + $query = " + WITH idx AS (SELECT * $querypart) + SELECT $idxfield AS label, (SELECT (COUNT(*) - 1) FROM idx t1 WHERE t1.$idxfield <= t2.$idxfield) AS row + FROM idx t2 + WHERE (row % $page_size) IN (0,$page_size_zerobase) OR row = $count_results"; + } + # echo "

$query"; # TODO: $query is MySQL-specific @@ -1249,6 +1263,17 @@ function db_connect ($ignore_errors = 0) { } else { $error_text .= "

DEBUG INFORMATION:
MySQL 4.1 functions not available! (php5-mysqli installed?)
database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT"; } + } elseif (db_sqlite()) { + if (class_exists ("SQLite3")) { + if ($CONF['database_name'] == '' || !is_dir(dirname($CONF['database_name'])) || !is_writable(dirname($CONF['database_name']))) { + $error_text .= ("

DEBUG INFORMATION
Connect: given database path does not exist, is not writable, or \$CONF['database_name'] is empty."); + } else { + $link = new SQLite3($CONF['database_name']) or $error_text .= ("

DEBUG INFORMATION
Connect: failed to connect to database. $DEBUG_TEXT"); + $link->createFunction('base64_decode', 'base64_decode'); + } + } else { + $error_text .= "

DEBUG INFORMATION:
SQLite functions not available! (php5-sqlite installed?)
database_type = 'sqlite' in config.inc.php, are you using a different database? $DEBUG_TEXT"; + } } elseif (db_pgsql()) { if (function_exists ("pg_pconnect")) { if(!isset($CONF['database_port'])) { @@ -1299,7 +1324,7 @@ function db_get_boolean($bool) { return 't'; } return 'f'; - } elseif(Config::Read('database_type') == 'mysql' || Config::Read('database_type') == 'mysqli') { + } elseif(Config::Read('database_type') == 'mysql' || Config::Read('database_type') == 'mysqli' || db_sqlite()) { if($bool) { return 1; } @@ -1317,11 +1342,21 @@ function db_get_boolean($bool) { * @return string */ function db_quota_text($count, $quota, $fieldname) { - return " CASE $quota - WHEN '-1' THEN CONCAT(coalesce($count,0), ' / -') - WHEN '0' THEN CONCAT(coalesce($count,0), ' / ', '" . escape_string(html_entity_decode('∞')) . "') - ELSE CONCAT(coalesce($count,0), ' / ', $quota) - END AS $fieldname"; + if (db_sqlite()) { + // SQLite uses || to concatenate strings + return " CASE $quota + WHEN '-1' THEN (coalesce($count,0) || ' / -') + WHEN '0' THEN (coalesce($count,0) || ' / " . escape_string(html_entity_decode('∞')) . "') + ELSE (coalesce($count,0) || ' / ' || $quota) + END AS $fieldname"; + } + else { + return " CASE $quota + WHEN '-1' THEN CONCAT(coalesce($count,0), ' / -') + WHEN '0' THEN CONCAT(coalesce($count,0), ' / ', '" . escape_string(html_entity_decode('∞')) . "') + ELSE CONCAT(coalesce($count,0), ' / ', $quota) + END AS $fieldname"; + } } /** @@ -1350,6 +1385,17 @@ function db_pgsql() { } } +/** + * returns true if SQLite is used, false otherwise + */ +function db_sqlite() { + if(Config::Read('database_type')=='sqlite') { + return true; + } else { + return false; + } +} + // // db_query // Action: Sends a query to the database and returns query result and number of rows @@ -1372,6 +1418,8 @@ function db_query ($query, $ignore_errors = 0) { 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); + if (db_sqlite()) $result = @$link->query($query) + or $error_text = "Invalid query: " . $link->lastErrorMsg(); if (db_pgsql()) { $result = @pg_query ($link, $query) or $error_text = "Invalid query: " . pg_last_error(); @@ -1383,7 +1431,18 @@ function db_query ($query, $ignore_errors = 0) { } if ($error_text == "") { - if (preg_match("/^SELECT/i", trim($query))) { + if (db_sqlite()) { + if($result->numColumns()) { + // Query returned something + $num_rows = 0; + while(@$result->fetchArray(SQLITE3_ASSOC)) $num_rows++; + $result->reset(); + $number_rows = $num_rows; + } else { + // Query was UPDATE, DELETE or INSERT + $number_rows = $link->changes(); + } + } elseif (preg_match("/^SELECT/i", trim($query))) { // if $query was a SELECT statement check the number of rows with [database_type]_num_rows (). if ($CONF['database_type'] == "mysql") $number_rows = mysql_num_rows ($result); if ($CONF['database_type'] == "mysqli") $number_rows = mysqli_num_rows ($result); @@ -1416,6 +1475,7 @@ function db_row ($result) { $row = ""; if ($CONF['database_type'] == "mysql") $row = mysql_fetch_row ($result); if ($CONF['database_type'] == "mysqli") $row = mysqli_fetch_row ($result); + if (db_sqlite() ) $row = $result->fetchArray(SQLITE3_NUM); if (db_pgsql() ) $row = pg_fetch_row ($result); return $row; } @@ -1431,6 +1491,7 @@ function db_array ($result) { $row = ""; if ($CONF['database_type'] == "mysql") $row = mysql_fetch_array ($result); if ($CONF['database_type'] == "mysqli") $row = mysqli_fetch_array ($result); + if (db_sqlite() ) $row = $result->fetchArray(); if (db_pgsql() ) $row = pg_fetch_array ($result); return $row; } @@ -1446,6 +1507,7 @@ function db_assoc ($result) { $row = ""; if ($CONF['database_type'] == "mysql") $row = mysql_fetch_assoc ($result); if ($CONF['database_type'] == "mysqli") $row = mysqli_fetch_assoc ($result); + if (db_sqlite() ) $row = $result->fetchArray(SQLITE3_ASSOC); if (db_pgsql() ) $row = pg_fetch_assoc ($result); return $row; } @@ -1487,7 +1549,11 @@ function db_insert ($table, $values, $timestamp = array('created', 'modified') ) } foreach($timestamp as $key) { - $values[$key] = "now()"; + if (db_sqlite()) { + $values[$key] = "datetime('now')"; + } else { + $values[$key] = "now()"; + } } $sql_values = "(" . implode(",",escape_string(array_keys($values))).") VALUES (".implode(",",$values).")"; @@ -1531,7 +1597,11 @@ function db_update_q ($table, $where, $values, $timestamp = array('modified') ) } foreach($timestamp as $key) { - $sql_values[$key] = escape_string($key) . "=now()"; + if (db_sqlite()) { + $sql_values[$key] = escape_string($key) . "=datetime('now')"; + } else { + $sql_values[$key] = escape_string($key) . "=now()"; + } } $sql="UPDATE $table SET ".implode(",",$sql_values)." WHERE $where"; diff --git a/model/FetchmailHandler.php b/model/FetchmailHandler.php index 447cd3ba..e14157c6 100644 --- a/model/FetchmailHandler.php +++ b/model/FetchmailHandler.php @@ -21,7 +21,7 @@ class FetchmailHandler extends PFAHandler { $this->struct=array( # field name allow display in... type $PALANG label $PALANG description default / options / ... # editing? form list - 'id' => pacol( 0, 0, 1, 'num' , '' , '' ), + 'id' => pacol( 0, 0, 1, 'num' , '' , '' , '', array(), 0, 1), 'domain' => pacol( 0, 0, 1, 'text', '' , '' ), 'mailbox' => pacol( 1, 1, 1, 'enum', 'pFetchmail_field_mailbox' , 'pFetchmail_desc_mailbox' ), # mailbox list 'src_server' => pacol( 1, 1, 1, 'text', 'pFetchmail_field_src_server' , 'pFetchmail_desc_src_server' ), diff --git a/model/PFAHandler.php b/model/PFAHandler.php index 096ce03d..61c91c87 100644 --- a/model/PFAHandler.php +++ b/model/PFAHandler.php @@ -567,6 +567,10 @@ abstract class PFAHandler { if (db_pgsql()) { $formatted_date = "TO_DATE(text(###KEY###), '" . escape_string(Config::Lang('dateformat_pgsql')) . "')"; $base64_decode = "DECODE(###KEY###, 'base64')"; + } elseif (db_sqlite()) { + $formatted_date = "strftime(###KEY###, '" . escape_string(Config::Lang('dateformat_mysql')) . "')"; + $base64_decode = "base64_decode(###KEY###)"; + } else { $formatted_date = "DATE_FORMAT(###KEY###, '" . escape_string(Config::Lang('dateformat_mysql')) . "')"; $base64_decode = "FROM_BASE64(###KEY###)"; diff --git a/setup.php b/setup.php index 4e104ac3..da1fb5dc 100644 --- a/setup.php +++ b/setup.php @@ -47,6 +47,7 @@ $f_get_magic_quotes_gpc = function_exists ("get_magic_quotes_gpc"); $f_mysql_connect = function_exists ("mysql_connect"); $f_mysqli_connect = function_exists ("mysqli_connect"); $f_pg_connect = function_exists ("pg_connect"); +$f_sqlite_open = class_exists("SQLite3"); $f_session_start = function_exists ("session_start"); $f_preg_match = function_exists ("preg_match"); $f_mb_encode_mimeheader = function_exists ("mb_encode_mimeheader"); @@ -162,7 +163,7 @@ if (!is_writeable($incpath.'/templates_c')) // // Check if there is support for at least 1 database // -if (($f_mysql_connect == 0) and ($f_mysqli_connect == 0) and ($f_pg_connect == 0)) +if (($f_mysql_connect == 0) and ($f_mysqli_connect == 0) and ($f_pg_connect == 0) and ($f_sqlite_open == 0)) { print "

  • Error: There is no database support in your PHP setup
    \n"; print "To install MySQL 3.23 or 4.0 support on FreeBSD:
    \n"; @@ -220,6 +221,15 @@ if ($f_pg_connect == 1) print "
  • "; } +if ($f_sqlite_open == 1) +{ + print "
  • Depends on: SQLite - OK \n"; + if ( !($config_loaded && db_sqlite()) ) { + print "
    (change the database_type to 'sqlite' in config.inc.php if you want to use SQLite)\n"; + } + print "
  • "; +} + // // Database connection // diff --git a/upgrade.php b/upgrade.php index a071ce20..741e24f6 100644 --- a/upgrade.php +++ b/upgrade.php @@ -72,7 +72,7 @@ function _db_field_exists($table, $field) { } } function _upgrade_filter_function($name) { - return preg_match('/upgrade_[\d]+(_mysql|_pgsql)?$/', $name) == 1; + return preg_match('/upgrade_[\d]+(_mysql|_pgsql|_sqlite|_mysql_pgsql)?$/', $name) == 1; } function _db_add_field($table, $field, $fieldtype, $after) { @@ -108,8 +108,18 @@ if($CONF['database_type'] == 'pgsql') { )"; db_query_parsed($pgsql); } -} -else { +} elseif(db_sqlite()) { + $enc = 'PRAGMA encoding = "UTF-8"'; + db_query_parsed($enc); + $sql = " + CREATE TABLE {IF_NOT_EXISTS} $table ( + `id` {AUTOINCREMENT}, + `name` TEXT NOT NULL UNIQUE DEFAULT '', + `value` TEXT NOT NULL DEFAULT '' + ) + "; + db_query_parsed($sql); +} else { $mysql = " CREATE TABLE {IF_NOT_EXISTS} $table ( `id` {AUTOINCREMENT} {PRIMARY}, @@ -163,21 +173,42 @@ function _do_upgrade($current_version) { echo "

    Updating database:

    - old version: $current_version; target version: $target_version

    \n"; echo "
      (If the update doesn't work, run setup.php?debug=1 to see the detailed error messages and SQL queries.)
    "; + if (db_sqlite() && $current_version < 1824) { + // Fast forward to the first revision supporting SQLite + $current_version = 1823; + } + for ($i = $current_version +1; $i <= $target_version; $i++) { $function = "upgrade_$i"; + $function_mysql_pgsql = $function . "_mysql_pgsql"; $function_mysql = $function . "_mysql"; $function_pgsql = $function . "_pgsql"; + $function_sqlite = $function . "_sqlite"; + if (function_exists($function)) { echo "

    updating to version $i (all databases)..."; $function(); echo "   done"; } + if ($CONF['database_type'] == 'mysql' || $CONF['database_type'] == 'mysqli' || $CONF['database_type'] == 'pgsql') { + if (function_exists($function_mysql_pgsql)) { + echo "

    updating to version $i (MySQL and PgSQL)..."; + $function_mysql_pgsql(); + echo "   done"; + } + } if ($CONF['database_type'] == 'mysql' || $CONF['database_type'] == 'mysqli' ) { if (function_exists($function_mysql)) { echo "

    updating to version $i (MySQL)..."; $function_mysql(); echo "   done"; } + } elseif(db_sqlite()) { + if (function_exists($function_sqlite)) { + echo "

    updating to version $i (SQLite)..."; + $function_sqlite(); + echo "   done"; + } } elseif($CONF['database_type'] == 'pgsql') { if (function_exists($function_pgsql)) { echo "

    updating to version $i (PgSQL)..."; @@ -225,6 +256,25 @@ function db_query_parsed($sql, $ignore_errors = 0, $attach_mysql = "") { ); $sql = "$sql $attach_mysql"; + } elseif(db_sqlite()) { + $replace = array( + '{AUTOINCREMENT}' => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL', + '{PRIMARY}' => 'PRIMARY KEY', + '{UNSIGNED}' => 'unsigned', + '{FULLTEXT}' => 'text', + '{BOOLEAN}' => "tinyint(1) NOT NULL DEFAULT '" . db_get_boolean(False) . "'", + '{BOOLEAN_TRUE}' => "tinyint(1) NOT NULL DEFAULT '" . db_get_boolean(True) . "'", + '{UTF-8}' => '', + '{LATIN1}' => '', + '{IF_NOT_EXISTS}' => 'IF NOT EXISTS', + '{RENAME_COLUMN}' => 'CHANGE COLUMN', + '{MYISAM}' => '', + '{INNODB}' => '', + '{INT}' => 'int(11) NOT NULL DEFAULT 0', + '{BIGINT}' => 'bigint(20) NOT NULL DEFAULT 0', + '{DATE}' => "datetime NOT NULL default '2000-01-01'", + '{DATECURRENT}' => 'datetime NOT NULL default CURRENT_TIMESTAMP', + ); } elseif($CONF['database_type'] == 'pgsql') { $replace = array( '{AUTOINCREMENT}' => 'SERIAL', @@ -274,7 +324,7 @@ function _drop_index ($table, $index) { if ($CONF['database_type'] == 'mysql' || $CONF['database_type'] == 'mysqli' ) { return "ALTER TABLE $table DROP INDEX $index"; - } elseif($CONF['database_type'] == 'pgsql') { + } elseif($CONF['database_type'] == 'pgsql' || db_sqlite()) { return "DROP INDEX $index"; # Index names are unique with a DB for PostgreSQL } else { echo "Sorry, unsupported database type " . $conf['database_type']; @@ -837,7 +887,7 @@ function upgrade_81_mysql() { # MySQL only /** * Make logging translatable - i.e. create alias => create_alias */ -function upgrade_90() { +function upgrade_90_mysql_pgsql() { $result = db_query_parsed("UPDATE " . table_by_key ('log') . " SET action = REPLACE(action,' ','_')", TRUE); # change edit_alias_state to edit_alias_active $result = db_query_parsed("UPDATE " . table_by_key ('log') . " SET action = 'edit_alias_state' WHERE action = 'edit_alias_active'", TRUE); @@ -1139,7 +1189,7 @@ function upgrade_504_mysql() { db_query_parsed("ALTER TABLE `$table_mailbox` CHANGE `local_part` `local_part` VARCHAR( 255 ) {LATIN1} NOT NULL"); } -function upgrade_655() { +function upgrade_655_mysql_pgsql() { db_query_parsed(_add_index('mailbox', 'domain', 'domain')); db_query_parsed(_add_index('alias', 'domain', 'domain')); } @@ -1206,7 +1256,7 @@ function upgrade_727_mysql() { } */ -function upgrade_729() { +function upgrade_729_mysql_pgsql() { $table_quota = table_by_key('quota'); $table_quota2 = table_by_key('quota2'); @@ -1302,11 +1352,11 @@ function upgrade_730_pgsql() { "); } -function upgrade_945() { +function upgrade_945_mysql_pgsql() { _db_add_field('vacation', 'modified', '{DATECURRENT}', 'created'); } -function upgrade_946() { +function upgrade_946_mysql_pgsql() { # taken from upgrade_727_mysql, needs to be done for all databases _db_add_field('vacation', 'activefrom', '{DATE}', 'body'); _db_add_field('vacation', 'activeuntil', '{DATE}', 'activefrom'); @@ -1320,15 +1370,15 @@ function upgrade_968_pgsql() { db_query_parsed("ALTER TABLE $table_mailbox ALTER COLUMN quota type bigint"); } -function upgrade_1050() { +function upgrade_1050_mysql_pgsql() { db_query_parsed(_add_index('log', 'domain_timestamp', 'domain,timestamp')); } -function upgrade_1283() { +function upgrade_1283_mysql_pgsql() { _db_add_field('admin', 'superadmin', '{BOOLEAN}', 'password'); } -function upgrade_1284() { +function upgrade_1284_mysql_pgsql() { # migrate the ALL domain to the superadmin column # Note: The ALL domain is not (yet) deleted to stay backwards-compatible for now (will be done in a later upgrade function) @@ -1350,13 +1400,13 @@ function upgrade_1345_mysql() { # db_query_parsed("ALTER TABLE `$table_vacation` ADD `interval_time` INT NOT NULL DEFAULT '0' AFTER `reply_type` "); } -function upgrade_1519() { +function upgrade_1519_mysql_pgsql() { _db_add_field('fetchmail', 'sslcertck', '{BOOLEAN}', 'usessl' ); _db_add_field('fetchmail', 'sslcertpath', "VARCHAR(255) {UTF-8} DEFAULT ''", 'sslcertck' ); _db_add_field('fetchmail', 'sslfingerprint', "VARCHAR(255) {LATIN1} DEFAULT ''", 'sslcertpath'); } -function upgrade_1610() { +function upgrade_1610_mysql_pgsql() { # obsoletes upgrade_1345_mysql() - which means debug mode could print "field already exists" _db_add_field('vacation', 'interval_time', '{INT}', 'domain'); } @@ -1380,7 +1430,7 @@ function upgrade_1761_mysql() { db_query_parsed("ALTER TABLE `$table_fetchmail` CHANGE `date` `date` {DATE}"); } -function upgrade_1762() { +function upgrade_1762_mysql_pgsql() { _db_add_field('fetchmail', 'domain', "VARCHAR(255) {LATIN1} DEFAULT ''", 'id'); _db_add_field('fetchmail', 'active', '{BOOLEAN}', 'date'); _db_add_field('fetchmail', 'created', '{DATE}', 'date'); @@ -1400,7 +1450,7 @@ function upgrade_1763_pgsql() { db_query_parsed("UPDATE $table SET domain=SPLIT_PART(mailbox, '@', 2) WHERE domain='';"); } -function upgrade_1767() { +function upgrade_1767_mysql_pgsql() { # 'active' was just added, so make sure all existing jobs stay active $table = table_by_key('fetchmail'); db_query_parsed("UPDATE $table SET active='{BOOL_TRUE}'"); @@ -1412,6 +1462,170 @@ function upgrade_1795_mysql() { upgrade_1761_mysql(); } +function upgrade_1824_sqlite() { + $admin_table = table_by_key('admin'); + $alias_table = table_by_key('alias'); + $alias_domain_table = table_by_key('alias_domain'); + $domain_table = table_by_key('domain'); + $domain_admins_table = table_by_key('domain_admins'); + $fetchmail_table = table_by_key('fetchmail'); + $log_table = table_by_key('log'); + $mailbox_table = table_by_key('mailbox'); + $quota_table = table_by_key('quota'); + $quota2_table = table_by_key('quota2'); + $vacation_table = table_by_key('vacation'); + $vacation_notification_table = table_by_key('vacation_notification'); + + db_query_parsed(" + CREATE TABLE $admin_table ( + `username` varchar(255) NOT NULL, + `password` varchar(255) NOT NULL, + `superadmin` {BOOLEAN}, + `created` {DATE}, + `modified` {DATE}, + `active` {BOOLEAN_TRUE}, + {PRIMARY} (`username`)); + "); + + db_query_parsed(" + CREATE TABLE $alias_table ( + `address` varchar(255) NOT NULL, + `goto` {FULLTEXT} NOT NULL, + `domain` varchar(255) NOT NULL, + `created` {DATE}, + `modified` {DATE}, + `active` {BOOLEAN_TRUE}, + {PRIMARY} (`address`)); + "); + + db_query_parsed(" + CREATE TABLE $alias_domain_table ( + `alias_domain` varchar(255) NOT NULL, + `target_domain` varchar(255) NOT NULL, + `created` {DATE}, + `modified` {DATE}, + `active` {BOOLEAN_TRUE}, + {PRIMARY} (`alias_domain`)); + "); + + db_query_parsed(" + CREATE TABLE $domain_table ( + `domain` varchar(255) NOT NULL, + `description` varchar(255) NOT NULL, + `aliases` {INT}, + `mailboxes` {INT}, + `maxquota` {BIGINT}, + `quota` {BIGINT}, + `transport` varchar(255) NOT NULL, + `backupmx` {BOOLEAN}, + `created` {DATE}, + `modified` {DATE}, + `active` {BOOLEAN_TRUE}, + {PRIMARY} (`domain`)); + "); + + db_query_parsed(" + CREATE TABLE $domain_admins_table ( + `username` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL, + `created` {DATE}, + `active` {BOOLEAN_TRUE}); + "); + + db_query_parsed(" + CREATE TABLE $fetchmail_table ( + `id` {AUTOINCREMENT}, + `domain` varchar(255) DEFAULT '', + `mailbox` varchar(255) NOT NULL, + `src_server` varchar(255) NOT NULL, + `src_auth` varchar(255) DEFAULT NULL, + `src_user` varchar(255) NOT NULL, + `src_password` varchar(255) NOT NULL, + `src_folder` varchar(255) NOT NULL, + `poll_time` int(11) NOT NULL DEFAULT '10', + `fetchall` {BOOLEAN}, + `keep` {BOOLEAN}, + `protocol` {FULLTEXT} DEFAULT NULL, + `usessl` {BOOLEAN}, + `sslcertck` {BOOLEAN}, + `sslcertpath` varchar(255) DEFAULT '', + `sslfingerprint` varchar(255) DEFAULT '', + `extra_options` {FULLTEXT}, + `returned_text` {FULLTEXT}, + `mda` varchar(255) NOT NULL, + `date` {DATE}, + `created` {DATE}, + `modified` {DATECURRENT}, + `active` {BOOLEAN}); + "); + + db_query_parsed(" + CREATE TABLE $log_table ( + `timestamp` {DATE}, + `username` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL, + `action` varchar(255) NOT NULL, + `data` {FULLTEXT} NOT NULL); + "); + + db_query_parsed(" + CREATE TABLE $mailbox_table ( + `username` varchar(255) NOT NULL, + `password` varchar(255) NOT NULL, + `name` varchar(255) NOT NULL, + `maildir` varchar(255) NOT NULL, + `quota` {BIGINT}, + `local_part` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL, + `created` {DATE}, + `modified` {DATE}, + `active` {BOOLEAN_TRUE}, + {PRIMARY} (`username`)); + "); + + db_query_parsed(" + CREATE TABLE $quota_table ( + `username` varchar(255) NOT NULL, + `path` varchar(100) NOT NULL, + `current` {BIGINT}, + {PRIMARY} (`username`,`path`)); + "); + + db_query_parsed(" + CREATE TABLE $quota2_table ( + `username` varchar(255) NOT NULL, + `bytes` {BIGINT}, + `messages` {INT}, + {PRIMARY} (`username`)); + "); + + db_query_parsed(" + CREATE TABLE $vacation_table ( + `email` varchar(255) NOT NULL, + `subject` varchar(255) NOT NULL, + `body` {FULLTEXT} NOT NULL, + `activefrom` {DATE}, + `activeuntil` {DATE}, + `cache` {FULLTEXT} NOT NULL DEFAULT '', + `domain` varchar(255) NOT NULL, + `interval_time` {INT}, + `created` {DATE}, + `modified` {DATECURRENT}, + `active` {BOOLEAN_TRUE}, + {PRIMARY} (`email`)); + "); + + db_query_parsed(" + CREATE TABLE $vacation_notification_table ( + `on_vacation` varchar(255) NOT NULL, + `notified` varchar(255) NOT NULL, + `notified_at` {DATECURRENT}, + {PRIMARY} (`on_vacation`,`notified`), + CONSTRAINT `vacation_notification_pkey` FOREIGN KEY (`on_vacation`) REFERENCES `vacation` (`email`) ON DELETE CASCADE); + "); + +} + # TODO MySQL: # - various varchar fields do not have a default value # https://sourceforge.net/projects/postfixadmin/forums/forum/676076/topic/3419725 From 80e99e1b54d45ba3ff2576a8b730290928ef2ba9 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 4 Feb 2016 22:41:56 +0000 Subject: [PATCH 2/5] tw.lang language update by Wally LEE https://sourceforge.net/p/postfixadmin/bugs/362/ git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1825 a1433add-5e2c-0410-b055-b7f2511e0802 --- languages/tw.lang | 144 +++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 71 deletions(-) diff --git a/languages/tw.lang b/languages/tw.lang index 5362562e..fbcb190f 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -3,23 +3,24 @@ // // Language file Traditional Chinese // by John Chen (johnpupu @SF) +// Last updated 4 Feb 2016 by Wally LEE (wlee@clubx.net) // $PALANG['YES'] = '是'; $PALANG['NO'] = '否'; $PALANG['edit'] = '編輯'; $PALANG['del'] = '刪除'; -$PALANG['exit'] = 'Exit'; # XXX -$PALANG['cancel'] = 'Cancel'; # XXX -$PALANG['save'] = 'Save changes'; # XXX +$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_admin'] = '確定要刪除 %s 這個管理員帳戶嗎?'; +$PALANG['confirm_delete_alias'] = '確定要刪除 %s 這個別名嗎?'; +$PALANG['confirm_delete_aliasdomain'] = '確定要刪除網域%s的別名嗎?'; $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['confirm_delete_mailbox'] = '確定要刪除 %s 的郵箱嗎?'; +$PALANG['confirm_delete_vacation'] = '確定要刪除%s的自動回覆內容嗎?'; $PALANG['no_delete_permissions'] = 'You are not allowed to delete %s!'; # XXX $PALANG['check_update'] = '檢查新版本'; $PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX @@ -27,7 +28,7 @@ $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['download_csv'] = '下載此名單的CSV檔案'; $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 @@ -37,18 +38,18 @@ $PALANG['edit_not_allowed'] = 'You are not allowed to edit %s'; # XXX $PALANG['searchparams'] = 'Search parameters:'; # XXX $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing) -$PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域名.'; -$PALANG['pLogin_username'] = '帳號 (郵件地址)'; # XXX compare with pUsersLogin_username - should be "Login (email)" +$PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域.'; +$PALANG['pLogin_username'] = '帳號(電郵)'; $PALANG['password'] = '密碼'; $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = '登錄'; -$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX +$PALANG['pLogin_failed'] = '你的帳號或密碼不正確。'; $PALANG['pLogin_login_users'] = '普通用戶點擊這裡進入用戶控制面板.'; -$PALANG['pMenu_main'] = 'Main'; # XXX +$PALANG['pMenu_main'] = '主頁'; $PALANG['pMenu_overview'] = '概覽'; $PALANG['add_alias'] = '新建別名'; -$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX +$PALANG['add_alias_domain'] = '新建網域別名'; $PALANG['add_mailbox'] = '新建郵箱'; # XXX check text - should be 'Add Mailbox' $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX $PALANG['pMenu_sendmail'] = '發送郵件'; @@ -65,43 +66,43 @@ $PALANG['pMain_password'] = '修改你的管理員密碼.'; $PALANG['pMain_viewlog'] = '查看日誌文件.'; $PALANG['pMain_logout'] = '退出系統'; -$PALANG['pOverview_disabled'] = 'Disabled'; # XXX -$PALANG['pOverview_unlimited'] = 'Unlimited'; # XXX +$PALANG['pOverview_disabled'] = '已停用'; +$PALANG['pOverview_unlimited'] = '無限'; $PALANG['pOverview_title'] = ':: 網域'; $PALANG['pOverview_up_arrow'] = '返回頂端'; $PALANG['pOverview_right_arrow'] = '下一頁'; $PALANG['pOverview_left_arrow'] = '上一頁'; -$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX +$PALANG['pOverview_alias_domain_title'] = ':: 網域別名'; $PALANG['pOverview_alias_title'] = ':: 別名'; $PALANG['pOverview_mailbox_title'] = ':: 郵箱'; $PALANG['go'] = '執行'; $PALANG['pOverview_welcome'] = '瀏覽 '; -$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX +$PALANG['pOverview_alias_domain_aliases'] = '網域名'; $PALANG['pOverview_alias_address'] = '前往'; -$PALANG['active'] = '活動'; +$PALANG['active'] = '生效'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = '郵件地址'; $PALANG['name'] = '姓名'; $PALANG['pOverview_mailbox_quota'] = '限制 (MB)'; -$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX -$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX +$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['domain'] = '網域'; -$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX -$PALANG['mailboxes'] = '郵箱數'; +$PALANG['domain'] = '網域名'; +$PALANG['pOverview_get_alias_domains'] = '網域別名'; +$PALANG['mailboxes'] = '郵箱'; $PALANG['pOverview_get_quota'] = '郵箱限制 (MB)'; $PALANG['pDelete_delete_error'] = '不能刪除本記錄'; -$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX +$PALANG['pDelete_delete_success'] = '%s 已刪除。'; $PALANG['pDelete_domain_error'] = '你沒有該網域的管理權限'; -$PALANG['pDelete_alias_error'] = 'Unable to delete alias '; # XXX +$PALANG['pDelete_alias_error'] = '不能刪除此別名 '; $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX -$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX -$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX -$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX +$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 @@ -109,8 +110,8 @@ $PALANG['alias_domain_does_not_exist'] = 'This domain isn\'t an alias domain!'; $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_error4'] = 'All domains are already aliased.'; # XXX -$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['pCreate_alias_domain_success'] = '已新增網域%s的別名。'; +$PALANG['alias_domain_changed'] = '網域%s的別名已修改。'; $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 @@ -126,15 +127,15 @@ $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['pEdit_alias_welcome'] = '編輯你網域名中的別名.'; # XXX Text change to: 'Edit forwarding settings' +$PALANG['pEdit_alias_welcome'] = '編輯你網域中的別名.'; # XXX Text change to: 'Edit forwarding settings' $PALANG['pEdit_alias_help'] = '每行一條記錄.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.' $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_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX -$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX +$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['pCreate_mailbox_welcome'] = '在你的網域中新建一個本地郵箱.'; @@ -169,22 +170,23 @@ $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['pEdit_vacation_set'] = 'Change / Set away message'; # XXX -$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX +$PALANG['pEdit_vacation_set'] = '啟動自動回覆'; +$PALANG['pEdit_vacation_remove'] = '取消自動回覆'; $PALANG['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX -$PALANG['pVacation_result_removed'] = 'Auto response for %s has been disabled!'; # XXX -$PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!'; # XXX -$PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX +$PALANG['pVacation_result_removed'] = '%s的自動回覆功能已取消!'; +$PALANG['pVacation_result_added'] = '%s的自動回覆功能已啟動!'; +$PALANG['pVacation_reply_type'] = '回覆方式'; $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_once'] = '回覆一次'; $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['reply_once_per_week'] = '每星期回覆一次'; -$PALANG['pViewlog_welcome'] = '查看最新的10項操作日誌 網域名: '; +$PALANG['pViewlog_welcome'] = '查看最新的10項操作日誌 網域: '; $PALANG['pViewlog_timestamp'] = '時間'; $PALANG['pViewlog_action'] = '操作'; $PALANG['pViewlog_data'] = '內容'; @@ -226,7 +228,7 @@ $PALANG['pSendmail_result_error'] = '建立郵箱失敗! (%s)'; # XXX text chang $PALANG['pSendmail_result_success'] = '建立郵箱成功! (%s)'; # XXX text change - new: Email sent to %s. $PALANG['pAdminMenu_list_admin'] = '管理員清單'; -$PALANG['pAdminMenu_list_domain'] = '網域名清單'; +$PALANG['pAdminMenu_list_domain'] = '網域清單'; $PALANG['pAdminMenu_list_virtual'] = '虛擬用戶清單'; $PALANG['pAdminMenu_backup'] = '備份'; $PALANG['pAdminMenu_create_domain_admins'] = '網域管理員'; @@ -282,54 +284,54 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功! (%s)'; # $PALANG['pAdminEdit_admin_welcome'] = '修改網域管理員'; $PALANG['admin'] = '管理員'; $PALANG['password_again'] = '密碼 (驗證)'; -$PALANG['super_admin'] = 'Super admin'; # XXX -$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'] = '超級管理員'; +$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['pUsersMenu_vacation'] = '自動回復'; +$PALANG['pUsersMenu_vacation'] = '自動回覆'; $PALANG['pUsersMenu_edit_alias'] = '修改轉發'; -$PALANG['pUsersMain_vacation'] = '設置外出信息或自動回復.'; -$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX +$PALANG['pUsersMain_vacation'] = '設置外出信息或自動回覆.'; +$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . '啟用中, 如要修改請點擊 \'' . $PALANG['pUsersMenu_vacation'] . '\''; $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_subject_text'] = '我現在無法回信'; +$PALANG['pUsersVacation_welcome'] = '自動回覆.'; +$PALANG['pUsersVacation_welcome_text'] = '你已經設置了自動回覆! (%s)'; # XXX Text changed to: 'Auto response for %s is active!' +$PALANG['pUsersVacation_subject_text'] = '自動回覆: 我暫時未能回信'; $PALANG['message'] = '內容'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = << 到 這段時間內暫時無法回信. -如果你有急事請與 聯繫. + 我在 XXXX年XX月XX日 到 XXXX年XX月XX日 這段時間內暫時無法回信. +如果你有急事請與 XXXX 聯繫. EOM; -$PALANG['pUsersVacation_activefrom'] = 'Active from'; # XXX -$PALANG['pUsersVacation_activeuntil'] = 'Active until'; # XXX +$PALANG['pUsersVacation_activefrom'] = '啟用日期'; +$PALANG['pUsersVacation_activeuntil'] = '直至'; -$PALANG['pEdit_dbLog_editactive'] = '改變活動狀態'; +$PALANG['pEdit_dbLog_editactive'] = '改變生效狀態'; $PALANG['pSearch'] = 'search'; # XXX $PALANG['pSearch_welcome'] = '搜索: '; $PALANG['pReturn_to'] = 'Return to'; # XXX -$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX -$PALANG['pBroadcast_name'] = 'Your name'; # XXX -$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX -$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX +$PALANG['pBroadcast_title'] = '發郵件給所有用戶'; +$PALANG['pBroadcast_name'] = '你的名字'; +$PALANG['pBroadcast_success'] = '你給所有用戶的郵件已發出。'; +$PALANG['pAdminMenu_broadcast_message'] = '發送給所有用戶'; $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX -$PALANG['pStatus_custom'] = 'Delivers to '; # XXX +$PALANG['pStatus_undeliverable'] = '可能無法送遞 '; +$PALANG['pStatus_custom'] = '送遞至 '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX -$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_too_short'] = "密碼太短 - 需要 %s 個字附"; +$PALANG['password_no_characters'] = "你的密碼最少要有 %s 字母。"; +$PALANG['password_no_digits'] = "你的密碼最少要有 %s 數字。"; +$PALANG['pInvalidDomainRegex'] = "網域名 %s 不正確,未能通過 regexp 檢查"; +$PALANG['pInvalidDomainDNS'] = "網域名 %s 不正確,或在DNS找不到"; +$PALANG['pInvalidMailRegex'] = '電郵地址 %s 不正確,未能通過 regexp 檢查'; $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['fetchmail_already_exists'] = 'This fetchmail job already exists!'; # XXX From 48dde6468ac922cf38837b3214f886f08bfc9d85 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 14 Feb 2016 00:46:14 +0000 Subject: [PATCH 3/5] list.tpl: - getting the key from $RAW_item.$id_field turned out to be broken in corner cases, leading to empty output. The better (and simpler) fix is to just let the foreach loop set 'itemkey'. - the example for special handling of a specific table and field contained a superfluous git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1826 a1433add-5e2c-0410-b055-b7f2511e0802 --- templates/list.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/list.tpl b/templates/list.tpl index f5f50f22..b355bc14 100644 --- a/templates/list.tpl +++ b/templates/list.tpl @@ -51,8 +51,8 @@   -{foreach from=$RAW_items item=RAW_item} - {assign "item" $items.{$RAW_item.$id_field|escape:"html"}} {* array keys in $items are html-escaped *} +{foreach key=itemkey from=$RAW_items item=RAW_item} + {assign "item" $items.${itemkey|escape:"html"}} {* array keys in $items are html-escaped *} {#tr_hilightoff#} {foreach key=key item=field from=$struct} @@ -66,7 +66,7 @@ {/if} {if $table == 'foo' && $key == 'bar'} - Special handling (complete table row) for {$table} / {$key} + Special handling (complete table row) for {$table} / {$key} {else} {if $table == 'foo' && $key == 'bar'} From 2102c1baa8641f3e6592ff01a6605ad77303a4ed Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 14 Feb 2016 01:02:18 +0000 Subject: [PATCH 4/5] list.tpl: - 'itemkey' escaping again. I found another corner case that was broken with |escape:"html". Therefore switch to the exact htmlentities() call that we use in smarty.inc.php. git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1827 a1433add-5e2c-0410-b055-b7f2511e0802 --- templates/list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/list.tpl b/templates/list.tpl index b355bc14..c23bb799 100644 --- a/templates/list.tpl +++ b/templates/list.tpl @@ -52,7 +52,7 @@ {foreach key=itemkey from=$RAW_items item=RAW_item} - {assign "item" $items.${itemkey|escape:"html"}} {* array keys in $items are html-escaped *} + {assign "item" $items.{htmlentities($itemkey, $smarty.const.ENT_QUOTES, 'UTF-8', false)}} {* array keys in $items are escaped using htmlentities(), see smarty.inc.php *} {#tr_hilightoff#} {foreach key=key item=field from=$struct} From a9bb4b83ad0cae5e812c4614e3a8ed8cf24498f0 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Tue, 16 Feb 2016 19:01:27 +0000 Subject: [PATCH 5/5] cs.lang: translation update by updated by Jan Laufik (jlaufik @ sf) https://sourceforge.net/p/postfixadmin/patches/130/ git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1828 a1433add-5e2c-0410-b055-b7f2511e0802 --- languages/cs.lang | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/languages/cs.lang b/languages/cs.lang index d9f8486b..5f5e1920 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -8,7 +8,7 @@ // * 2008-04-26 // updated by Jan Laufik (jlaufik @ sf) // * 2015-01-10 - +// * 2016-02-16 $PALANG['YES'] = 'ANO'; $PALANG['NO'] = 'NE'; @@ -18,13 +18,13 @@ $PALANG['exit'] = 'Odejít'; $PALANG['cancel'] = 'Zrušit'; $PALANG['save'] = 'Uložit změny'; $PALANG['confirm'] = 'Jste si jistí?\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'] = 'Opravdu chcete smazat všechny záznamy v této doméně Tohle nelze vrátit!\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['confirm_delete_admin'] = 'Opravdu chcete smazat účet správce %s?'; +$PALANG['confirm_delete_alias'] = 'Opravdu chcete smazat přesměrování %s?'; +$PALANG['confirm_delete_aliasdomain'] = 'Opravdu chcete smazat přesměrování domény %s?'; +$PALANG['confirm_delete_domain'] = 'Opravdu chcete smazat všechny záznamy pro doménu %s? Tohle nelze vrátit!'; +$PALANG['confirm_delete_fetchmail'] = 'Opravdu chcete smazat úlohu pro stažení pošty %s?'; +$PALANG['confirm_delete_mailbox'] = 'Opravdu chcete smazat schránku %s?'; +$PALANG['confirm_delete_vacation'] = 'Opravdu chcete smazat správu o nepřítomnosti pro %s?'; $PALANG['no_delete_permissions'] = 'Nemáte oprávnění ke smazání! (%s)'; $PALANG['check_update'] = 'Zkontrolovat aktualizace'; $PALANG['invalid_parameter'] = 'Neplatný parametr!'; @@ -35,7 +35,7 @@ $PALANG['unknown'] = 'neznámý'; $PALANG['download_csv'] = 'Stáhnout tento seznam jako CSV soubor'; $PALANG['missing_field'] = 'Pole %s chybí'; $PALANG['must_be_numeric'] = '%s musí být číslice'; -$PALANG['must_be_numeric_bigger_than_null'] = '%s must be numeric and bigger than 0'; # XXX +$PALANG['must_be_numeric_bigger_than_null'] = '%s musí být číslo větší než 0'; $PALANG['must_be_boolean'] = '%s musí být typu boolean'; $PALANG['invalid_value_given'] = 'Zadána nesprávná hodnota pro %s'; $PALANG['edit_not_allowed'] = 'Nemáte oprávnění ke změně %s'; @@ -217,9 +217,9 @@ $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_create_fetchmail'] = 'create fetchmail job'; # XXX -$PALANG['pViewlog_action_edit_fetchmail'] = 'edit fetchmail job'; # XXX -$PALANG['pViewlog_action_delete_fetchmail'] = 'delete fetchmail job'; # XXX +$PALANG['pViewlog_action_create_fetchmail'] = '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'; $PALANG['pViewlog_result_error'] = 'Nepodařilo se najít záznamy!'; @@ -231,8 +231,8 @@ $PALANG['subject'] = 'Předmět'; $PALANG['pSendmail_subject_text'] = 'Vítejte'; $PALANG['pSendmail_body'] = 'Obsah'; $PALANG['pSendmail_button'] = 'Poslat email'; -$PALANG['pSendmail_result_error'] = 'Nepodařilo se odeslat email! (%s)'; # XXX text change - new: Unable to send email to %s! -$PALANG['pSendmail_result_success'] = 'Email odeslán! (%s)'; # XXX text change - new: Email sent to %s. +$PALANG['pSendmail_result_error'] = 'Email na %s se nepodařilo odeslat!'; +$PALANG['pSendmail_result_success'] = 'Email odeslán na %s'; $PALANG['pAdminMenu_list_admin'] = 'Administrátoři domén'; $PALANG['pAdminMenu_list_domain'] = 'Domény'; @@ -345,8 +345,8 @@ $PALANG['pInvalidDomainDNS'] = "Neplatná doména %s, a/nebo nezjištěn DNS zá $PALANG['pInvalidMailRegex'] = "Neplatná emailová adresa %s, nevyhověla regulárnímu výrazu."; $PALANG['pFetchmail_welcome'] = 'Stahovat poštu pro:'; $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'] = 'Tato úloha pro stažení pošty již existuje!'; +$PALANG['fetchmail_does_not_exist'] = 'Tato úloha pro stažení pošty neexistuje!'; $PALANG['pFetchmail_database_save_error'] = 'Tuto položku není možné uložit do databáze!'; $PALANG['pFetchmail_database_save_success'] = 'Položka byla uložena do databáze.'; $PALANG['pFetchmail_error_invalid_id'] = 'Položka s ID %s nebyla nalezena!'; @@ -389,8 +389,8 @@ $PALANG['pFetchmail_desc_extra_options'] = 'Extra parametry pro fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Program pro doručení pošty do schránky (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'] = '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['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: */