Thread: SF.net SVN: postfixadmin:[1519] trunk (Page 10)
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
postfixadmin-svn
|
From: <chr...@us...> - 2013-08-18 18:41:01
|
Revision: 1519
http://sourceforge.net/p/postfixadmin/code/1519
Author: christian_boltz
Date: 2013-08-18 18:40:57 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
fetchmail: add sslcertck, sslcertpath, sslfingerprint
ADDITIONS/fetchmail.pl
- add sslcertck, sslcertpath and sslfingerprint to fetchmail config
- some whitespace fixes
fetchmail.php
- add sslcertck, sslcertpath, sslfingerprint fields
(sslcertpath and sslfingerprint require $CONF[fetchmail_extra_options]
because they don't have input validation)
languages/*.lang
- add new texts needed for the added fields
templates/fetchmail.tpl:
- add the new fields
- also add extra_options and mda fields - they were not displayed yet
upgrade.php
- fix _db_add_field() to call _db_field_exists() with correct table name
- upgrade_1519(): add sslcertck, sslcertpath, sslfingerprint fields to the
fetchmail table
Most parts of this commit are based on the work of Lars Engelhard
(modified files sent on the mailinglist 2013-07-30)
Modified Paths:
--------------
trunk/ADDITIONS/fetchmail.pl
trunk/fetchmail.php
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/templates/fetchmail.tpl
trunk/upgrade.php
Modified: trunk/ADDITIONS/fetchmail.pl
===================================================================
--- trunk/ADDITIONS/fetchmail.pl 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/ADDITIONS/fetchmail.pl 2013-08-18 18:40:57 UTC (rev 1519)
@@ -87,7 +87,7 @@
}
$sql = "
- SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,usessl
+ SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,usessl, sslcertck, sslcertpath, sslfingerprint
FROM fetchmail
WHERE $sql_cond > poll_time*60
";
@@ -97,19 +97,22 @@
my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl)=@$_;
syslog("info","fetch ${src_user}@${src_server} for ${mailbox}");
-
+
$cmd="user '${src_user}' there with password '".decode_base64($src_password)."'";
$cmd.=" folder '${src_folder}'" if ($src_folder);
$cmd.=" mda ".$mda if ($mda);
# $cmd.=" mda \"/usr/local/libexec/dovecot/deliver -m ${mailbox}\"";
$cmd.=" is '${mailbox}' here";
-
+
$cmd.=" keep" if ($keep);
$cmd.=" fetchall" if ($fetchall);
$cmd.=" ssl" if ($usessl);
+ $cmd.=" sslcertck" if($sslcertck);
+ $cmd.=" sslcertpath $sslcertpath" if ($sslcertck && $sslcertpath);
+ $cmd.=" sslfingerprint \"$sslfingerprint\"" if ($sslfingerprint);
$cmd.=" ".$extra_options if ($extra_options);
-
+
$text=<<TXT;
set postmaster "postmaster"
set nobouncemail
@@ -119,7 +122,7 @@
poll ${src_server} with proto ${protocol}
$cmd
-
+
TXT
($file_handler, $filename) = mkstemp( "/tmp/fetchmail-all-XXXXX" ) or log_and_die "cannot open/create fetchmail temp file";
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/fetchmail.php 2013-08-18 18:40:57 UTC (rev 1519)
@@ -65,6 +65,9 @@
"keep" => array(1, 1, 'bool' ),
"protocol" => array(1, 1, 'enum' ),
"usessl" => array(1, 1, 'bool' ),
+ "sslcertck" => array(1, 1, 'bool' ),
+ "sslcertpath" => array($extra_options, $extra_options, 'text' ), # TODO: input validation
+ "sslfingerprint" => array($extra_options, $extra_options, 'text' ), # TODO: input validation
"extra_options" => array($extra_options, $extra_options, 'longtext' ),
"mda" => array($extra_options, $extra_options, 'longtext' ),
"date" => array(0, $display_status, 'text' ),
@@ -215,6 +218,7 @@
$formvars['fetchall']=('t'==$formvars['fetchall']) ? 1 : 0;
$formvars['keep']=('t'==$formvars['keep']) ? 1 : 0;
$formvars['usessl']=('t'==$formvars['usessl']) ? 1 : 0;
+ $formvars['sslcertck']=('t'==$formvars['sslcertck']) ? 1: 0;
}
} elseif ($new) { # create entry form
foreach (array_keys($fm_struct) as $value) {
@@ -240,6 +244,7 @@
$row['fetchall']=('t'==$row['fetchall']) ? 1 : 0;
$row['keep']=('t'==$row['keep']) ? 1 : 0;
$row['usessl']=('t'==$row['usessl']) ? 1 : 0;
+ $row['sslcertck']=('t'==$row['sslcertck']) ? 1: 0;
}
$tFmail[] = $row;
}
@@ -391,6 +396,7 @@
$smarty->assign ('headers', $headers);
$smarty->assign ('user_domains', $user_domains);
$smarty->assign ('tFmail', $tFmail);
+$smarty->assign ('extra_options', $extra_options);
$smarty->assign ('smarty_template', 'fetchmail');
$smarty->display ('index.tpl');
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/bg.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/ca.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/cn.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/cs.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -320,6 +320,9 @@
$PALANG['pFetchmail_field_keep'] = 'Nemazat';
$PALANG['pFetchmail_field_protocol'] = 'Protokol';
$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_extra_options'] = 'Extra Parametry';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/da.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -322,6 +322,9 @@
$PALANG['pFetchmail_field_keep'] = 'Behold';
$PALANG['pFetchmail_field_protocol'] = 'Protokol';
$PALANG['pFetchmail_field_usessl'] = 'SSL aktiv';
+$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_extra_options'] = 'Ekstra tilvalg';
$PALANG['pFetchmail_field_mda'] = 'MDA (Mail Delivery Agent)';
$PALANG['pFetchmail_field_date'] = 'Dato';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/de.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -320,6 +320,9 @@
$PALANG['pFetchmail_field_keep'] = 'Behalten';
$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
$PALANG['pFetchmail_field_usessl'] = 'SSL aktiv';
+$PALANG['pFetchmail_field_sslcertck'] = 'SSL Zertifikatsprüfung';
+$PALANG['pFetchmail_field_sslcertpath'] = 'SSL Pfad der Zertifikate';
+$PALANG['pFetchmail_field_sslfingerprint'] = 'SSL fingerprint (md5)';
$PALANG['pFetchmail_field_extra_options'] = 'Zusätzliche Optionen';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/en.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -323,6 +323,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep';
$PALANG['pFetchmail_field_protocol'] = 'Protocol';
$PALANG['pFetchmail_field_usessl'] = 'SSL active';
+$PALANG['pFetchmail_field_sslcertck'] = 'SSL certificate check';
+$PALANG['pFetchmail_field_sslcertpath'] = 'SSL path to certificates';
+$PALANG['pFetchmail_field_sslfingerprint'] = 'SSL fingerprint (md5)';
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Date';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/es.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -310,6 +310,9 @@
$PALANG['pFetchmail_field_keep'] = 'Conservar';
$PALANG['pFetchmail_field_protocol'] = 'Protocolo';
$PALANG['pFetchmail_field_usessl'] = 'SSL activado';
+$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_extra_options'] = 'Opciones extras';
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Fecha';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/et.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -312,6 +312,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/eu.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -307,6 +307,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/fi.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
$PALANG['pFetchmail_field_keep'] = 'Pidä';
$PALANG['pFetchmail_field_protocol'] = 'Protokolla';
$PALANG['pFetchmail_field_usessl'] = 'SSL aktiivinen';
+$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_extra_options'] = 'Lisämääritteet';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Päivämäärä';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/fo.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -313,6 +313,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/fr.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -310,6 +310,9 @@
$PALANG['pFetchmail_field_keep'] = 'Conserver';
$PALANG['pFetchmail_field_protocol'] = 'Protocole';
$PALANG['pFetchmail_field_usessl'] = 'SSL activé';
+$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_extra_options'] = 'Options supplémentaires';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Date';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/hr.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -307,6 +307,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/hu.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -321,6 +321,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/is.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/it.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
$PALANG['pFetchmail_field_keep'] = 'Conserva';
$PALANG['pFetchmail_field_protocol'] = 'Protocollo';
$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_extra_options'] = 'Extra';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Data';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/ja.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -319,6 +319,9 @@
$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_extra_options'] = '追加オプション';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = '日付';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/lt.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -314,6 +314,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/mk.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/nb.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
$PALANG['pFetchmail_field_keep'] = 'Behold';
$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
$PALANG['pFetchmail_field_usessl'] = 'Bruk 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_extra_options'] = 'Ekstra alternativer';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Dato';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/nl.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -312,6 +312,9 @@
$PALANG['pFetchmail_field_keep'] = 'behouden';
$PALANG['pFetchmail_field_protocol'] = 'protocol';
$PALANG['pFetchmail_field_usessl'] = 'SSL actief';
+$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_extra_options'] = 'extra opties';
$PALANG['pFetchmail_field_mda'] = 'MD';
$PALANG['pFetchmail_field_date'] = 'datum';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/nn.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -231,6 +231,7 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator';
$PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke gyldig adresse!';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
$PALANG['pAdminCreate_admin_result_error'] = 'Klarte ikke å legge til administratoren!';
$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
@@ -307,6 +308,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/pl.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -314,6 +314,9 @@
$PALANG['pFetchmail_field_keep'] = 'Pozostaw';
$PALANG['pFetchmail_field_protocol'] = 'Protokół';
$PALANG['pFetchmail_field_usessl'] = 'Aktywne 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_extra_options'] = 'Dodatkowe opcje';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Data';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/pt-br.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -321,6 +321,9 @@
$PALANG['pFetchmail_field_keep'] = 'Manter';
$PALANG['pFetchmail_field_protocol'] = 'Protocolo';
$PALANG['pFetchmail_field_usessl'] = 'SSL habilitado';
+$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_extra_options'] = 'Opções extra';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Data';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/ru.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -321,6 +321,9 @@
$PALANG['pFetchmail_field_keep'] = 'Не удалять';
$PALANG['pFetchmail_field_protocol'] = 'Протокол';
$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_extra_options'] = 'Дополнительные параметры';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Дата';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/sk.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
$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_extra_options'] = 'Parametre';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Dátum';
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/sl.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/sv.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -310,6 +310,9 @@
$PALANG['pFetchmail_field_keep'] = 'Behåll';
$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
$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_extra_options'] = 'Extra inställningsmöjligheter';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/tr.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/tw.lang 2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
$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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
Modified: trunk/templates/fetchmail.tpl
===================================================================
--- trunk/templates/fetchmail.tpl 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/templates/fetchmail.tpl 2013-08-18 18:40:57 UTC (rev 1519)
@@ -29,6 +29,13 @@
<td nowrap="nowrap">{$row.keep} </td>
<td nowrap="nowrap">{$row.protocol} </td>
<td nowrap="nowrap">{$row.usessl} </td>
+ <td nowrap="nowrap">{$row.sslcertck} </td>
+{if $extra_options}
+ <td nowrap="nowrap">{$row.sslcertpath} </td>
+ <td nowrap="nowrap">{$row.sslfingerprint} </td>
+ <td nowrap="nowrap">{$row.extra_options} </td>
+ <td nowrap="nowrap">{$row.mda} </td>
+{/if}
<td nowrap="nowrap">{$row.date} </td>
<td nowrap="nowrap">{$row.returned_text}--x-- </td> <!-- Inhalt mit if auswerten! -->
<td><a href="fetchmail.php?edit={$row.id|escape:"url"}">{$PALANG.edit}</a></td>
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/upgrade.php 2013-08-18 18:40:57 UTC (rev 1519)
@@ -80,7 +80,7 @@
$query .= " AFTER $after "; # PgSQL does not support to specify where to add the column, MySQL does
}
- if(! _db_field_exists($table, $field)) {
+ if(! _db_field_exists(table_by_key($table), $field)) {
$result = db_query_parsed($query);
} else {
printdebug ("field already exists: $table.$field");
@@ -1328,7 +1328,13 @@
db_query_parsed("ALTER TABLE `$table_vacation` ADD `interval_time` INT NOT NULL DEFAULT '0' AFTER `reply_type` ");
}
+function upgrade_1519() {
+ _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');
+}
+
# TODO MySQL:
# - various varchar fields do not have a default value
# https://sourceforge.net/projects/postfixadmin/forums/forum/676076/topic/3419725
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-10-07 18:43:13
|
Revision: 1529
http://sourceforge.net/p/postfixadmin/code/1529
Author: christian_boltz
Date: 2013-10-07 18:42:59 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
functions.inc.php:
- pacrypt(), dovecot:* method:
- allow "." in dovecot method (to allow a suffix like ".b64")
- blacklist SCRAM-SHA-1 (needs -u)
- check against list of non-salted methods to be backward compatible
with dovecot < 2.1 again
Thanks to Szilagyi Jozsef <szjozsef AT yahoo DOT com> for providing
the list of non-salted methods etc.
functions.inc.php, scripts/postfixadmin-cli.php:
- drop unused global variables $table_admin and $table_alias_domain
Modified Paths:
--------------
trunk/functions.inc.php
trunk/scripts/postfixadmin-cli.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2013-10-06 22:35:02 UTC (rev 1528)
+++ trunk/functions.inc.php 2013-10-07 18:42:59 UTC (rev 1529)
@@ -910,12 +910,14 @@
elseif (preg_match("/^dovecot:/", $CONF['encrypt'])) {
$split_method = preg_split ('/:/', $CONF['encrypt']);
$method = strtoupper($split_method[1]);
- if (! preg_match("/^[A-Z0-9-]+$/", $method)) { die("invalid dovecot encryption method"); } # TODO: check against a fixed list?
+ 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 hashes include the username - until someone implements it, let's declare it as unsupported
+ # 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'];
@@ -927,9 +929,12 @@
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 (!empty($pw_db)) {
- # TODO: only use -t for salted passwords to be backward compatible with dovecot < 2.1 again
+ 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);
@@ -1850,9 +1855,9 @@
return Config::bool($setting);
}
-$table_admin = table_by_key ('admin');
+#$table_admin = table_by_key ('admin');
$table_alias = table_by_key ('alias');
-$table_alias_domain = table_by_key ('alias_domain');
+#$table_alias_domain = table_by_key ('alias_domain');
$table_domain = table_by_key ('domain');
$table_domain_admins = table_by_key ('domain_admins');
$table_log = table_by_key ('log');
Modified: trunk/scripts/postfixadmin-cli.php
===================================================================
--- trunk/scripts/postfixadmin-cli.php 2013-10-06 22:35:02 UTC (rev 1528)
+++ trunk/scripts/postfixadmin-cli.php 2013-10-07 18:42:59 UTC (rev 1529)
@@ -550,9 +550,9 @@
//bugfix shitty globals and OOP.....
-$table_admin = table_by_key ('admin');
+#$table_admin = table_by_key ('admin');
$table_alias = table_by_key ('alias');
-$table_alias_domain = table_by_key ('alias_domain');
+#$table_alias_domain = table_by_key ('alias_domain');
$table_domain = table_by_key ('domain');
$table_domain_admins = table_by_key ('domain_admins');
$table_log = table_by_key ('log');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-10-09 20:11:09
|
Revision: 1533
http://sourceforge.net/p/postfixadmin/code/1533
Author: christian_boltz
Date: 2013-10-09 20:11:06 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
PFAHandler.php:
- set(): make "field $key is missing" translateable
- store(): call db_log() even if storemore() failed
MailboxHandler.php
- storemore(): use $this->infomsg instead of flash_info
*.lang
- add 'missing_field' = 'Field %s is missing';
- change reate_mailbox_result_success' and
'pCreate_mailbox_result_succes_nosubfolders'
to "The mailbox %s ..."
en.lang, nl.lang:
- remove unused texts 'pAdminList_domain_usercontrol',
'pAdminCreate_domain_usercontrol', 'pAdminEdit_domain_usercontrol'
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/model/MailboxHandler.php
trunk/model/PFAHandler.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/bg.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Потребител %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Администратора може да се логне оттук за администриране на домейн.';
@@ -120,8 +121,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Пълно име';
$PALANG['pCreate_mailbox_mail'] = 'Създай пощенска кутия'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Не мога да добавя пощенската кутия в таблицата!';
-$PALANG['pCreate_mailbox_result_success'] = 'Пощенската кутия бе успешно създадена и добавена в таблицата!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$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'] = 'The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Редакция на пощенска кутия за вашия домейн.';
$PALANG['pEdit_mailbox_username'] = 'Логин';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/ca.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
@@ -118,8 +119,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
$PALANG['pCreate_mailbox_mail'] = 'Crear bústia'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Imposible afegir una bústia a la taula de bústies!';
-$PALANG['pCreate_mailbox_result_success'] = 'La bústia ha estat afegida a la taula de bústies!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = 'La bústia ha estat afegida a la taula de bústies! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Editar una bústia pel seu domini.';
$PALANG['pEdit_mailbox_username'] = 'Usuari';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/cn.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = '全名';
$PALANG['pCreate_mailbox_mail'] = '新建邮箱'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = '不能将邮箱增加到邮箱表中!';
-$PALANG['pCreate_mailbox_result_success'] = '增加邮箱成功!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$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'] = 'The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = '编辑你域中的邮箱.';
$PALANG['pEdit_mailbox_username'] = '用户名';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/cs.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -23,6 +23,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Přihlášen jako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
@@ -124,8 +125,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Celé jméno';
$PALANG['pCreate_mailbox_mail'] = 'Vytvořit schránku na disku (odešle uvítací email)'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Nepodařilo se přidat schránku do tabulky schránek!';
-$PALANG['pCreate_mailbox_result_success'] = 'Schránka byla přidána do tabulky schránek!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka byla přidána do tabulky schránek, ale žádné (nebo pouze některé) ze předdefinovaných podsložek bylo možné vytovořit';
+$PALANG['pCreate_mailbox_result_success'] = 'Schránka byla přidána do tabulky schránek! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka byla přidána do tabulky schránek, ale žádné (nebo pouze některé) ze předdefinovaných podsložek bylo možné vytovořit (%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['pEdit_mailbox_welcome'] = 'Upravit lokální chránku v doméně.';
$PALANG['pEdit_mailbox_username'] = 'Uživatelské jméno';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/da.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -22,6 +22,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Indlogget som %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
@@ -124,8 +125,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Fulde navn';
$PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Kan ikke tilføje postboksen til postboks-tabellen!';
-$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede undermapper kunne oprettes.';
+$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede undermapper kunne oprettes. (%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['pEdit_mailbox_welcome'] = 'Rediger postboks.';
$PALANG['pEdit_mailbox_username'] = 'Brugernavn';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/de.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Anzeigen:';
$PALANG['all'] = 'Alle';
$PALANG['created'] = 'Erstellt';
+$PALANG['missing_field'] = 'Das Feld %s fehlt';
$PALANG['pFooter_logged_as'] = 'Angemeldet als %s';
@@ -121,8 +122,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Vollständiger Name';
$PALANG['pCreate_mailbox_mail'] = 'Begrüßungsmail senden';
$PALANG['pCreate_mailbox_result_error'] = 'Unmöglich die Mailbox in die Mailbox-Tabelle einzutragen!';
-$PALANG['pCreate_mailbox_result_success'] = 'Die Mailbox wurde in die Mailbox-Tabelle eingetragen!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Die Mailbox wurde in der Mailbox-Tabelle eingetragen, aber keine (oder nur einige) der vorkonfigurierten Unterordner konnte erstellt werden';
+$PALANG['pCreate_mailbox_result_success'] = 'Die Mailbox %s wurde in die Mailbox-Tabelle eingetragen.';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Die Mailbox %s wurde in der Mailbox-Tabelle eingetragen, aber keine (oder nur einige) der vorkonfigurierten Unterordner konnte erstellt werden!';
$PALANG['pEdit_mailbox_welcome'] = 'Ändern Sie ihre Mailbox hier.';
$PALANG['pEdit_mailbox_username'] = 'Benutzername';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/en.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:';
$PALANG['all'] = 'All';
$PALANG['created'] = 'Created';
+$PALANG['missing_field'] = 'Field %s is missing';
$PALANG['pFooter_logged_as'] = 'Logged in as %s';
@@ -122,8 +123,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Full name';
$PALANG['pCreate_mailbox_mail'] = 'Send Welcome mail';
$PALANG['pCreate_mailbox_result_error'] = 'Unable to add the mailbox to the mailbox table!';
-$PALANG['pCreate_mailbox_result_success'] = 'The mailbox has been added to the mailbox table!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created';
+$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['pEdit_mailbox_welcome'] = 'Edit a mailbox for your domain.';
$PALANG['pEdit_mailbox_username'] = 'Username';
@@ -208,7 +209,6 @@
$PALANG['aliases'] = 'Aliases';
$PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)';
$PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
-$PALANG['pAdminList_domain_usercontrol'] = 'User Control';
$PALANG['last_modified'] = 'Last modified';
@@ -218,7 +218,6 @@
$PALANG['pAdminCreate_domain_domain_text_error2'] = 'The domain is invalid!';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Add default mail aliases';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
-$PALANG['pAdminCreate_domain_usercontrol'] = 'Allow user control';
$PALANG['pAdminCreate_domain_button'] = 'Add Domain';
$PALANG['pAdminCreate_domain_result_error'] = 'Unable to add domain!';
$PALANG['pAdminCreate_domain_result_success'] = 'Domain has been added!';
@@ -235,7 +234,6 @@
$PALANG['transport'] = 'Transport';
$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
-$PALANG['pAdminEdit_domain_usercontrol'] = 'Allow user control';
$PALANG['pAdminEdit_domain_result_error'] = 'Unable to modify domain!';
$PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/es.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Nombre completo';
$PALANG['pCreate_mailbox_mail'] = 'Enviar correo bienvenida';
$PALANG['pCreate_mailbox_result_error'] = '¡Imposible añadir un buzón a la tabla de buzones!';
-$PALANG['pCreate_mailbox_result_success'] = '¡El buzón ha sido añadido a la tabla de buzones!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = '¡El buzón ha sido añadido a la tabla de buzones! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Editar un buzón para su dominio.';
$PALANG['pEdit_mailbox_username'] = 'Usuario';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/et.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimiseks sisse.';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Täielik nimi';
$PALANG['pCreate_mailbox_mail'] = 'Loo postkast'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Postkasti lisamine tabelisse ebaõnnestus!';
-$PALANG['pCreate_mailbox_result_success'] = 'Postkast lisati postkastide tabelisse!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = 'Postkast lisati postkastide tabelisse! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Muuda postkasti.';
$PALANG['pEdit_mailbox_username'] = 'Kasutajanimi';
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/eu.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
@@ -117,8 +118,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Izen osoa';
$PALANG['pCreate_mailbox_mail'] = 'Postontzia sortu'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Ezinezkoa postontzi taulara postontzia gehitzea!';
-$PALANG['pCreate_mailbox_result_success'] = 'Postontzia postontzi taulara sartu da!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = 'Postontzia postontzi taulara sartu da! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Domeinuarentzat postontzi bat aldatu.';
$PALANG['pEdit_mailbox_username'] = 'Erabiltzailea';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/fi.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Kirjautunut sisään tunnuksella %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Kirjautuminen';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Koko nimi';
$PALANG['pCreate_mailbox_mail'] = 'Luo postilaatikko'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Postilaatikon lisääminen ei onnistu!';
-$PALANG['pCreate_mailbox_result_success'] = 'Postilaatikko on lisätty!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Sähköpostilaatikko on lisätty tauluun, mutta ennaltamääriteltyjen alikansioiden luonneista yksi tai useampi epäonnistui';
+$PALANG['pCreate_mailbox_result_success'] = 'Postilaatikko on lisätty! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Sähköpostilaatikko on lisätty tauluun, mutta ennaltamääriteltyjen alikansioiden luonneista yksi tai useampi epäonnistui (%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['pEdit_mailbox_welcome'] = 'Muokkaa postilaatikkoa.';
$PALANG['pEdit_mailbox_username'] = 'Käyttäjätunnus';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/fo.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Umsitarar kunnu logga inn her fyri at umsita tykkara navnaøki.';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Fult navn';
$PALANG['pCreate_mailbox_mail'] = 'Stovna postkassa'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Fái ikki stovnað postkassa!';
-$PALANG['pCreate_mailbox_result_success'] = 'Postkassin er stovnaður!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = 'Postkassin er stovnaður! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Broyt postkassa á tínum navnaøki.';
$PALANG['pEdit_mailbox_username'] = 'Brúkaranavn';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/fr.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -21,6 +21,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Bonjour %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
@@ -120,8 +121,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
$PALANG['pCreate_mailbox_mail'] = 'Envoyer le message de bienvenue'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Impossible d\'ajouter un compte courriel dans la table!';
-$PALANG['pCreate_mailbox_result_success'] = 'Le compte courriel a été ajouté!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Le compte courriel a été ajouté à la table, mais un ou plusieurs dossiers prédéfinis n\'ont pu être créés !';
+$PALANG['pCreate_mailbox_result_success'] = 'Le compte courriel a été ajouté! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Le compte courriel a été ajouté à la table, mais un ou plusieurs dossiers prédéfinis n\'ont pu être créés ! (%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['pEdit_mailbox_welcome'] = 'Modifier un compte courriel.';
$PALANG['pEdit_mailbox_username'] = 'Nom d\'utilisateur';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/hr.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -18,6 +18,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
@@ -118,8 +119,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Puno ime';
$PALANG['pCreate_mailbox_mail'] = 'Stvori potanski ormarić'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Potanski ormarić nije moguče stvoriti!';
-$PALANG['pCreate_mailbox_result_success'] = 'Potanski ormarić je uspjeno stvoren!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = 'Potanski ormarić je uspjeno stvoren! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Uredi potanski ormarić za domenu.';
$PALANG['pEdit_mailbox_username'] = 'Korisničko ime';
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/hu.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
@@ -121,8 +122,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Teljes név';
$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!';
-$PALANG['pCreate_mailbox_result_success'] = 'A postafiókot sikeresen felvettük a mailbox adatbázis táblába!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'A postafiókot hozzáadtuk a postafiók táblához, de egyik előre definiált alkönyvtárat sem tudtuk létrehozni (vagy csak néhányat)';
+$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!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'A postafiókot hozzáadtuk a postafiók táblához, de egyik előre definiált alkönyvtárat sem tudtuk létrehozni (vagy csak néhányat) (%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['pEdit_mailbox_welcome'] = 'Postafiók szerkesztése az adott domainhez.';
$PALANG['pEdit_mailbox_username'] = 'Felhasználónév';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/is.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Fullt nafn';
$PALANG['pCreate_mailbox_mail'] = 'Stofna pósthólf'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Get ekki bætt við pósthólfi í mailbox töfluna!';
-$PALANG['pCreate_mailbox_result_success'] = 'Pósthólfinu hefur verið bætt við mailbox töfluna!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = 'Pósthólfinu hefur verið bætt við mailbox töfluna! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Breyta pósthólfi i léninu þínu.';
$PALANG['pEdit_mailbox_username'] = 'Auðkenni'; # XXX check / compare with pCreate_mailbox_username - should be "Username"
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/it.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Collegato come %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Gli amministratori di posta devono effettuare il login qui per amministrare il proprio dominio.';
@@ -120,8 +121,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Nome completo';
$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!';
-$PALANG['pCreate_mailbox_result_success'] = 'La casella di posta è stata aggiunta alla tabella!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'La casella è stata aggiunta, ma non sono riuscito ad aggiungere (tutte) le sottocartelle definite';
+$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!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'La casella è stata aggiunta, ma non sono riuscito ad aggiungere (tutte) le sottocartelle definite (%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['pEdit_mailbox_welcome'] = 'Modifica una casella di posta per il tuo dominio.';
$PALANG['pEdit_mailbox_username'] = 'Nome utente';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/ja.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = '閲覧:';
$PALANG['all'] = '全て';
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'ログイン名 %s';
@@ -121,8 +122,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'フルネーム';
$PALANG['pCreate_mailbox_mail'] = 'ようこそメールの送信'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'メールアドレスを追加できません！';
-$PALANG['pCreate_mailbox_result_success'] = 'メールアドレスを追加しました。';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'メールアドレスを追加しました。しかし、いくつかのサブフォルダの作成に失敗しました。';
+$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['pEdit_mailbox_welcome'] = 'メールアドレスの編集';
$PALANG['pEdit_mailbox_username'] = 'メールアドレス'; # XXX check / compare with pCreate_mailbox_username - should be "Username"
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/lt.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Rodyti:';
$PALANG['all'] = 'Visi';
$PALANG['created'] = 'Sukurta';
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Prisijungęs kaip %s';
$PALANG['pLogin_welcome'] = 'Pašto srities administratorius.';
@@ -120,8 +121,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Vardas Pavardė';
$PALANG['pCreate_mailbox_mail'] = 'Siųsti pasveikinimo žinutę';
$PALANG['pCreate_mailbox_result_error'] = 'Pašto dėžutės užregistruoti nepavyko!';
-$PALANG['pCreate_mailbox_result_success'] = 'Pašto dėžutė užregistruota!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Pašto dėžutė užregistruota, bet nepavyko sukurti (galbūt kai kurių) nustatytų subdirektorijų';
+$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!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Pašto dėžutė užregistruota, bet nepavyko sukurti (galbūt kai kurių) nustatytų subdirektorijų (%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['pEdit_mailbox_welcome'] = 'Keisti pašto dėžutę.';
$PALANG['pEdit_mailbox_username'] = 'Vartotojas';
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/mk.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Логин за администрирање на домени (Само за администратори!)';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Цело име';
$PALANG['pCreate_mailbox_mail'] = 'Креирање на поштенско сандаче'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Не можам да додадам ново сандаче на табелата!';
-$PALANG['pCreate_mailbox_result_success'] = 'Поштенското сандаче е додадено на табелата!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$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'] = 'The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Измена на поштенско сандаче на доменот.';
$PALANG['pEdit_mailbox_username'] = 'Корисничко име';
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/nb.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -21,6 +21,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logget inn som %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'E-postadministratorer kan logge inn her for å administrere sine domener';
@@ -120,8 +121,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Fullt navn';
$PALANG['pCreate_mailbox_mail'] = 'Send velkomstmelding'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Kunne ikke legge til e-postkontoen i mailbox-tabellen!';
-$PALANG['pCreate_mailbox_result_success'] = 'E-postkontoen er blitt opprettet i mailbox-tabellen!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'E-postkontoen er blitt opprettet i mailbox-tabellen, men ingen (eller kun noen) av de forhåndsdefinerte undermappene kunne opprettes.';
+$PALANG['pCreate_mailbox_result_success'] = 'E-postkontoen er blitt opprettet i mailbox-tabellen! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'E-postkontoen er blitt opprettet i mailbox-tabellen, men ingen (eller kun noen) av de forhåndsdefinerte undermappene kunne opprettes. (%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['pEdit_mailbox_welcome'] = 'Endre en e-postkonto.';
$PALANG['pEdit_mailbox_username'] = 'Brukernavn';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/nl.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Toon:';
$PALANG['all'] = 'Alle';
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'aangemeld als %s';
$PALANG['pLogin_welcome'] = 'Mail beheerders log hier in om uw domeinen te beheren.';
@@ -120,8 +121,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Volledige naam';
$PALANG['pCreate_mailbox_mail'] = 'Mailbox toevoegen'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Mislukt om de mailbox toe te voegen.';
-$PALANG['pCreate_mailbox_result_success'] = 'De mailbox is toegevoegd.';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'De mailbox is aan de mailbox tabel toegevoegd, maar geen (of sommige) van de vooraf gedefinieerde sub-folders kon aangemaakt worden';
+$PALANG['pCreate_mailbox_result_success'] = 'De mailbox is toegevoegd. (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'De mailbox is aan de mailbox tabel toegevoegd, maar geen (of sommige) van de vooraf gedefinieerde sub-folders kon aangemaakt worden (%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['pEdit_mailbox_welcome'] = 'Bewerk een mailbox voor uw domein.';
$PALANG['pEdit_mailbox_username'] = 'Gebruikersnaam';
@@ -206,8 +207,6 @@
$PALANG['pAdminList_domain_backupmx'] = 'Back-up MX';
$PALANG['last_modified'] = 'Laatst bewerkt';
-$PALANG['pAdminList_domain_userscontrol'] = 'Gebruikers<br />Beheer';
-
$PALANG['pAdminCreate_domain_welcome'] = 'Voeg een nieuw domein toe';
$PALANG['pAdminCreate_domain_domain_text_error'] = 'Het domein bestaat al.';
$PALANG['domain_does_not_exist'] = 'This domain does not exist!'; # XXX
@@ -230,7 +229,6 @@
$PALANG['pAdminEdit_domain_transport_text'] = 'Definieer transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is back-up MX';
$PALANG['pAdminEdit_domain_result_error'] = 'Mislukt het domein te bewerken.';
-$PALANG['pAdminEdit_domain_userscontrol'] = 'Sta contorle door gebruikers toe';
$PALANG['pAdminCreate_admin_welcome'] = 'Voeg een nieuw domein beheerder toe';
$PALANG['pAdminCreate_admin_username_text'] = 'E-mail adres';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/nn.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Postadministrator; Logg inn her for å administrere ditt domene';
@@ -118,8 +119,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Fornavn og etternavn';
$PALANG['pCreate_mailbox_mail'] = 'Opprett epostkonto'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Klarte ikke å legge til e-postkontoen!';
-$PALANG['pCreate_mailbox_result_success'] = 'E-postkontoen er opprettet!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = 'E-postkontoen er opprettet! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Endre en e-postkonto.';
$PALANG['pEdit_mailbox_username'] = 'Brukernavn';
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/pl.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -22,6 +22,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Zalogowano jako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.';
@@ -121,8 +122,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Pełna nazwa';
$PALANG['pCreate_mailbox_mail'] = 'Utwórz konto'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Nie można dodać konta do tabeli kont!';
-$PALANG['pCreate_mailbox_result_success'] = 'Konto zostało dodane do tabeli kont!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Konto zostało dodane do tabeli kont, ale żadne (lub tylko niektóre) z predefiniowanych folderów nie zostały utworzone';
+$PALANG['pCreate_mailbox_result_success'] = 'Konto zostało dodane do tabeli kont! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Konto zostało dodane do tabeli kont, ale żadne (lub tylko niektóre) z predefiniowanych folderów nie zostały utworzone (%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['pEdit_mailbox_welcome'] = 'Edytuj konto w Twojej domenie.';
$PALANG['pEdit_mailbox_username'] = 'Nazwa użytkownika';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/pt-br.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
@@ -123,8 +124,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Nome completo';
$PALANG['pCreate_mailbox_mail'] = 'Enviar mensagem de boas-vindas'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Não foi possível criar a conta de email!';
-$PALANG['pCreate_mailbox_result_success'] = 'Conta de email criada!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Conta de email criada, mas nenhum (ou apenas alguns) dos subdiretórios pré-definidos puderam ser criados';
+$PALANG['pCreate_mailbox_result_success'] = 'Conta de email criada! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Conta de email criada, mas nenhum (ou apenas alguns) dos subdiretórios pré-definidos puderam ser criados (%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['pEdit_mailbox_welcome'] = 'Edição de conta de email do domínio.';
$PALANG['pEdit_mailbox_username'] = 'Usuário';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/ru.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -21,6 +21,7 @@
$PALANG['show'] = 'Показать:';
$PALANG['all'] = 'Все';
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Вошли как %s';
@@ -123,8 +124,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Полное имя';
$PALANG['pCreate_mailbox_mail'] = 'Отправить приветственное письмо';
$PALANG['pCreate_mailbox_result_error'] = 'Невозможно добавить ящик в список существующих ящиков!';
-$PALANG['pCreate_mailbox_result_success'] = 'Почтовый ящик был успешно создан!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Почтовый ящик был успешно создан, но в нем не удалось создать (некоторые) стандартные папки';
+$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['pEdit_mailbox_welcome'] = 'Редактирование ящика для вашего домена.';
$PALANG['pEdit_mailbox_username'] = 'Название';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/sk.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Prihlásený ako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Prihlásenie administrátorov pre správu domén';
@@ -120,8 +121,8 @@
$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!';
-$PALANG['pCreate_mailbox_result_success'] = 'Schránka bola pridaná do tabuľky!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka bola pridaná do tabuľky, ale nepodarilo sa vytvoriť (niektoré) definované adresáre';
+$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['pEdit_mailbox_welcome'] = 'Upraviť schránku v doméne';
$PALANG['pEdit_mailbox_username'] = 'Užívateľské meno';
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/sl.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Administratorji se prijavite tukaj.';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Polno ime';
$PALANG['pCreate_mailbox_mail'] = 'Ustvari predal'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Predala ni bilo mogoče ustvariti!';
-$PALANG['pCreate_mailbox_result_success'] = 'Predal je bil uspešno ustvarjen!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$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!
+$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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Uredi določen predal za izbrano domeno.';
$PALANG['pEdit_mailbox_username'] = 'Uporabniško ime';
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/sv.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -21,6 +21,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Inloggad som %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Mail administratörer loggar in här för att sköta er domän.';
@@ -121,8 +122,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Fullständigt namn';
$PALANG['pCreate_mailbox_mail'] = 'Skicka välkomstbrev'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Kan ej lägga till brevlådat i tabellen för konton!';
-$PALANG['pCreate_mailbox_result_success'] = 'Mailkontot har lagts till!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Brevlådan har lagts till i tabellen mailbox, men inga (eller få) av de fördefinierade underkatalogerna kunde skapas';
+$PALANG['pCreate_mailbox_result_success'] = 'Mailkontot har lagts till! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Brevlådan har lagts till i tabellen mailbox, men inga (eller få) av de fördefinierade underkatalogerna kunde skapas (%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['pEdit_mailbox_welcome'] = 'Ändra ett brevlåda i din domän.';
$PALANG['pEdit_mailbox_username'] = 'Epostadress';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/tr.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged in as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Posta Yöneticileri buradan domainlerinizi yönetmek için giriþ yapabilirsiniz.';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = 'Tam isim';
$PALANG['pCreate_mailbox_mail'] = 'Posta kutusu yarat'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = 'Posta kutusu posta kutusu tablosuna eklenemiyor!';
-$PALANG['pCreate_mailbox_result_success'] = 'Posta kutusu tabloya eklendi!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_result_success'] = 'Posta kutusu tabloya eklendi! (%s)'; # XXX Text changed to: 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.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Domaninizdeki bir posta kutusunu düzenleyin.';
$PALANG['pEdit_mailbox_username'] = 'kullanýcý adý'; # XXX check / compare with pCreate_mailbox_username - should be "Username"
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/languages/tw.lang 2013-10-09 20:11:06 UTC (rev 1533)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域名.';
@@ -119,8 +120,8 @@
$PALANG['pCreate_mailbox_name_text'] = '全名';
$PALANG['pCreate_mailbox_mail'] = '新建郵箱'; # XXX Text change to 'Send Welcome mail'
$PALANG['pCreate_mailbox_result_error'] = '不能將郵箱增加到郵箱表中!';
-$PALANG['pCreate_mailbox_result_success'] = '增加郵箱成功!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$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'] = 'The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.'; # XXX
$PALANG['pEdit_mailbox_welcome'] = '編輯你網域中的郵箱.';
$PALANG['pEdit_mailbox_username'] = '用戶名';
Modified: trunk/model/MailboxHandler.php
===================================================================
--- trunk/model/MailboxHandler.php 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/model/MailboxHandler.php 2013-10-09 20:11:06 UTC (rev 1533)
@@ -236,10 +236,10 @@
if ( !$this->create_mailbox_subfolders() ) {
# TODO: implement $tShowpass
- flash_info(Lang::read('pCreate_mailbox_result_succes_nosubfolders') . " ($fUsername$tShowpass)"); # TODO: don't use flash_info
+ $this->infomsg[] = Lang::read_f('pCreate_mailbox_result_succes_nosubfolders', "$fUsername$tShowpass");
} else { # everything ok
# TODO: implement $tShowpass
- # flash_info(Lang::read('pCreate_mailbox_result_success']) . " ($fUsername$tShowpass)*"); # TODO: don't use flash_info
+ # $this->infomsg[] = Lang::read_f('pCreate_mailbox_result_success'], "$fUsername$tShowpass");
# TODO: currently edit.php displays the default success message from webformConfig
}
Modified: trunk/model/PFAHandler.php
===================================================================
--- trunk/model/PFAHandler.php 2013-10-08 19:30:28 UTC (rev 1532)
+++ trunk/model/PFAHandler.php 2013-10-09 20:11:06 UTC (rev 1533)
@@ -292,8 +292,7 @@
}
}
} elseif ($this->new) { # new, field not set in input data
- $this->errormsg[] = "field $key is missing"; # TODO: make translateable # TODO: use $this->errormsg[$key] ?
- # echo "MISSING / not set: $key\n";
+ $this->errormsg[$key] = Lang::read_f('missing_field', $key);
} else { # edit, field unchanged
# echo "skipped / not set: $key\n";
}
@@ -363,10 +362,10 @@
$result = $this->storemore();
+ # db_log() even if storemore() failed
+ db_log ($this->id, $this->msg['logname'], "");
+
if ($result) {
- # TODO: does it really make sense to skip logging if storemore() failed?
- db_log ($this->id, $this->msg['logname'], "");
-
# return success message
# TODO: use sprintf to add $this->id
# TODO: add option to override the success message (for example to include autogenerated passwords)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-10-13 15:26:43
|
Revision: 1534
http://sourceforge.net/p/postfixadmin/code/1534
Author: christian_boltz
Date: 2013-10-13 15:26:37 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
model/*Handler.php and various other files
- rename $this->return to $this->result
Modified Paths:
--------------
trunk/edit.php
trunk/model/AliasHandler.php
trunk/model/AliasdomainHandler.php
trunk/model/MailboxHandler.php
trunk/model/PFAHandler.php
trunk/scripts/shells/alias.php
trunk/scripts/shells/mailbox.php
Modified: trunk/edit.php
===================================================================
--- trunk/edit.php 2013-10-09 20:11:06 UTC (rev 1533)
+++ trunk/edit.php 2013-10-13 15:26:37 UTC (rev 1534)
@@ -81,7 +81,7 @@
header ("Location: " . $formconf['listview']);
exit;
} else {
- $values = $handler->return;
+ $values = $handler->result;
$values[$id_field] = $edit;
}
}
Modified: trunk/model/AliasHandler.php
===================================================================
--- trunk/model/AliasHandler.php 2013-10-09 20:11:06 UTC (rev 1533)
+++ trunk/model/AliasHandler.php 2013-10-13 15:26:37 UTC (rev 1534)
@@ -115,15 +115,15 @@
$retval = parent::init($id);
# hide 'goto_mailbox' for non-mailbox aliases
- # parent::init called view() before, so we can rely on having $this->return filled
- # (only validate_new_id() is called from parent::init and could in theory change $this->return)
- if ($this->new || $this->return['is_mailbox'] == 0) {
+ # parent::init called view() before, so we can rely on having $this->result filled
+ # (only validate_new_id() is called from parent::init and could in theory change $this->result)
+ if ($this->new || $this->result['is_mailbox'] == 0) {
$this->struct['goto_mailbox']['editable'] = 0;
$this->struct['goto_mailbox']['display_in_form'] = 0;
$this->struct['goto_mailbox']['display_in_list'] = 0;
}
- if ( !$this->new && $this->return['is_mailbox'] && $this->admin_username != ''&& !authentication_has_role('global-admin') ) {
+ if ( !$this->new && $this->result['is_mailbox'] && $this->admin_username != ''&& !authentication_has_role('global-admin') ) {
# domain admins are not allowed to change mailbox alias $CONF['alias_control_admin'] = NO
# TODO: apply the same restriction to superadmins?
if (!Config::bool('alias_control_admin')) {
@@ -369,7 +369,7 @@
return false;
}
- if ($this->return['is_mailbox']) {
+ if ($this->result['is_mailbox']) {
$this->errormsg[] = 'This alias belongs to a mailbox and can\'t be deleted.'; # TODO: make translatable
return false;
}
Modified: trunk/model/AliasdomainHandler.php
===================================================================
--- trunk/model/AliasdomainHandler.php 2013-10-09 20:11:06 UTC (rev 1533)
+++ trunk/model/AliasdomainHandler.php 2013-10-13 15:26:37 UTC (rev 1534)
@@ -32,8 +32,8 @@
$used_targets = array();
foreach ($this->allowed_domains as $dom) {
- if (isset($this->return[$dom]) ) { # already used as alias_domain
- $used_targets[$this->return[$dom]['target_domain']] = $this->return[$dom]['target_domain'];
+ if (isset($this->result[$dom]) ) { # already used as alias_domain
+ $used_targets[$this->result[$dom]['target_domain']] = $this->result[$dom]['target_domain'];
} else { # might be available
$this->struct['alias_domain']['options'][$dom] = $dom;
$this->struct['target_domain']['options'][$dom] = $dom;
Modified: trunk/model/MailboxHandler.php
===================================================================
--- trunk/model/MailboxHandler.php 2013-10-09 20:11:06 UTC (rev 1533)
+++ trunk/model/MailboxHandler.php 2013-10-13 15:26:37 UTC (rev 1534)
@@ -55,7 +55,7 @@
if ($this->new) {
$currentquota = 0;
} else {
- $currentquota = $this->return['quotabytes']; # parent::init called ->view()
+ $currentquota = $this->result['quotabytes']; # parent::init called ->view()
}
$this->updateMaxquota($domain, $currentquota);
Modified: trunk/model/PFAHandler.php
===================================================================
--- trunk/model/PFAHandler.php 2013-10-09 20:11:06 UTC (rev 1533)
+++ trunk/model/PFAHandler.php 2013-10-13 15:26:37 UTC (rev 1534)
@@ -493,13 +493,13 @@
* get the values of an item
* @param boolean (optional) - if false, $this->errormsg[] will not be filled in case of errors
* @return bool - true if item was found
- * The data is stored in $this->return (as associative array of column => value)
+ * The data is stored in $this->result (as associative array of column => value)
* error messages (if any) are stored in $this->errormsg
*/
public function view($errors=true) {
$result = $this->read_from_db(array($this->id_field => $this->id) );
if (count($result) == 1) {
- $this->return = $result[$this->id];
+ $this->result = $result[$this->id];
return true;
}
@@ -514,12 +514,12 @@
* @param integer limit - maximum number of rows to return
* @param integer offset - number of first row to return
* @return bool - true if at least one item was found
- * The data is stored in $this->return (as array of rows, each row is an associative array of column => value)
+ * The data is stored in $this->result (as array of rows, each row is an associative array of column => value)
*/
public function getList($condition, $limit=-1, $offset=-1) {
$result = $this->read_from_db($condition, $limit, $offset);
if (count($result) >= 1) {
- $this->return = $result;
+ $this->result = $result;
return true;
}
@@ -570,7 +570,7 @@
* @return return value of previously called method
*/
public function result() {
- return $this->return;
+ return $this->result;
}
Modified: trunk/scripts/shells/alias.php
===================================================================
--- trunk/scripts/shells/alias.php 2013-10-09 20:11:06 UTC (rev 1533)
+++ trunk/scripts/shells/alias.php 2013-10-13 15:26:37 UTC (rev 1534)
@@ -174,7 +174,7 @@
if ( ! $handler->view() ) {
$this->error("Error: Not Found", "The requested alias was not found!");
} else {
- $result = $handler->return;
+ $result = $handler->result;
$this->out(sprintf("Entries for: %s\n", $address));
$this->out("Goto: \t");
Modified: trunk/scripts/shells/mailbox.php
===================================================================
--- trunk/scripts/shells/mailbox.php 2013-10-09 20:11:06 UTC (rev 1533)
+++ trunk/scripts/shells/mailbox.php 2013-10-13 15:26:37 UTC (rev 1534)
@@ -306,7 +306,7 @@
}
# TODO: offer alternative output formats (based on parameter)
# TODO: whitespace fix - 8 lines below
- $result = $handler->return;
+ $result = $handler->result;
$this->out(sprintf("Entries for: %s\n", $address));
$this->out("");
$this->out(sprintf("+%'-25s+%'-15s+%'-10s+%'-20s+%'-8s+%'-8s+%'-6s+",'','','','','','',''));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-10-13 16:11:19
|
Revision: 1535
http://sourceforge.net/p/postfixadmin/code/1535
Author: christian_boltz
Date: 2013-10-13 16:11:15 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
model/PFAHandler.php:
- getList: change return value to be always true (even if the database
result is an empty array), and die() if the database result is not an
array.
This avoids some if blocks in various files to implement a fallback
to array() on empty results.
functions.inc.php:
- list_admins(): simplify after the *Handler->getList() change
- get_domain_properties(): change a forgotten $handler->return to
$handler->result() (follow-up for r1534)
list-domain, list-virtual.php:
- simplify after the *Handler->getList() change
Revision Links:
--------------
http://sourceforge.net/p/postfixadmin/code/1534
Modified Paths:
--------------
trunk/functions.inc.php
trunk/list-domain.php
trunk/list-virtual.php
trunk/model/PFAHandler.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2013-10-13 15:26:37 UTC (rev 1534)
+++ trunk/functions.inc.php 2013-10-13 16:11:15 UTC (rev 1535)
@@ -410,7 +410,7 @@
die("Error: " . join("\n", $handler->errormsg));
}
- $result = $handler->return;
+ $result = $handler->result();
return $result;
}
@@ -631,14 +631,8 @@
function list_admins () {
$handler = new AdminHandler();
- if ($handler->getList('1=1')) {
- $list = $handler->result();
- } else {
- $list = array();
- # TODO: check if there was an error or simply no admins (which shouldn't happen because nobody could login then...)
- }
-
- return $list;
+ $handler->getList('');
+ return $handler->result();
}
Modified: trunk/list-domain.php
===================================================================
--- trunk/list-domain.php 2013-10-13 15:26:37 UTC (rev 1534)
+++ trunk/list-domain.php 2013-10-13 16:11:15 UTC (rev 1535)
@@ -37,14 +37,9 @@
}
$handler = new DomainHandler(0, $admin_username);
-if ($handler->getList('1=1')) {
- $domain_properties = $handler->result();
-} else {
- $domain_properties = array();
- # TODO: check if there was an error or simply no domains
-}
+$handler->getList('');
+$domain_properties = $handler->result();
-
$smarty->assign ('domain_properties', $domain_properties);
$smarty->assign ('select_options', select_options($list_admins, array ($fUsername)), false);
if ($is_superadmin) {
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2013-10-13 15:26:37 UTC (rev 1534)
+++ trunk/list-virtual.php 2013-10-13 16:11:15 UTC (rev 1535)
@@ -103,21 +103,16 @@
}
$handler = new AliasdomainHandler(0, $admin_username);
- if ($handler->getList($list_param)) {
- $tAliasDomains = $handler->result();
- } else {
- $tAliasDomains = array();
- # TODO: check if there was an error or simply no alias domains
- }
+ $handler->getList($list_param);
+ $tAliasDomains = $handler->result();
$can_create_alias_domain = 1;
foreach ($tAliasDomains as $row) {
if ($row['alias_domain'] == $fDomain) $can_create_alias_domain = 0; # domain is already an alias domain
}
# set $can_create_alias_domain = 0 if all domains (of this admin) are already used as alias domains
- if ($handler->getList("1=1")) {
- if ( count($handler->result()) + 1 >= count($list_domains) ) $can_create_alias_domain = 0; # all domains (of this admin) are already alias domains
- }
+ $handler->getList("");
+ if ( count($handler->result()) + 1 >= count($list_domains) ) $can_create_alias_domain = 0; # all domains (of this admin) are already alias domains
}
#
@@ -150,12 +145,8 @@
*/
$handler = new AliasHandler(0, $admin_username);
-if ($handler->getList($list_param, $page_size, $fDisplay)) {
- $tAlias = $handler->result();
-} else {
- $tAlias= array();
- # TODO: check if there was an error or simply no aliases
-}
+$handler->getList($list_param, $page_size, $fDisplay);
+$tAlias = $handler->result();
Modified: trunk/model/PFAHandler.php
===================================================================
--- trunk/model/PFAHandler.php 2013-10-13 15:26:37 UTC (rev 1534)
+++ trunk/model/PFAHandler.php 2013-10-13 16:11:15 UTC (rev 1535)
@@ -513,19 +513,20 @@
* @param array or string $condition - see read_from_db for details
* @param integer limit - maximum number of rows to return
* @param integer offset - number of first row to return
- * @return bool - true if at least one item was found
+ * @return bool - always true, no need to check ;-) (if $result is not an array, getList die()s)
* The data is stored in $this->result (as array of rows, each row is an associative array of column => value)
*/
public function getList($condition, $limit=-1, $offset=-1) {
$result = $this->read_from_db($condition, $limit, $offset);
- if (count($result) >= 1) {
- $this->result = $result;
- return true;
+
+ if (!is_array($result)) {
+ error_log('getList: read_from_db didn\'t return an array. table: ' . $this->db_table . ' - condition: $condition - limit: $limit - offset: $offset');
+ error_log('getList: This is most probably caused by read_from_db_postprocess()');
+ die('Unexpected error while reading from database! (Please check the error log for details, and open a bugreport)');
}
-# $this->errormsg[] = Lang::read($this->msg['error_does_not_exist']);
-# $this->errormsg[] = $result['error'];
- return false;
+ $this->result = $result;
+ return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-10-13 18:11:22
|
Revision: 1536
http://sourceforge.net/p/postfixadmin/code/1536
Author: christian_boltz
Date: 2013-10-13 18:11:18 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
After hunting an "undefined index transport" error in list-domain, I
found out that the 'Config' class is too static - it shares its static
data with the 'Lang' child class.
This caused a conflict because we have $CONF[transport] and
$PALANG[transport], and Config::read('transport') returned the $PALANG
text.
To fix this, all texts are now stored as $CONF[__LANG].
I also dropped the 'Lang' class.
model/Config.php:
- mark the 'Config' class as final to ensure we don't trap into the
"too static" problem again.
- bool(): display and log an error message if a $CONF option does not
contain YES or NO (that would have uncovered this bug much earlier)
- add lang() and lang_f() wrapper functions to get $PALANG texts
- remove unused $__cache and $__objects
model/Lang.php:
- deleted
common.php:
- store $PALANG as $CONF[__LANG]
lots of files:
- replace Lang::read() and Lang::read_f() calls with Config::lang()
and Config::lang_f()
Modified Paths:
--------------
trunk/common.php
trunk/edit.php
trunk/functions.inc.php
trunk/model/AdminHandler.php
trunk/model/AdminpasswordHandler.php
trunk/model/AliasHandler.php
trunk/model/AliasdomainHandler.php
trunk/model/Config.php
trunk/model/DomainHandler.php
trunk/model/MailboxHandler.php
trunk/model/PFAHandler.php
trunk/setup.php
Removed Paths:
-------------
trunk/model/Lang.php
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/common.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -64,8 +64,6 @@
}
}
-Config::write($CONF);
-
require_once("$incpath/languages/language.php");
require_once("$incpath/functions.inc.php");
@@ -83,8 +81,11 @@
$PALANG = $hook_func ($PALANG, $language);
}
-Lang::write($PALANG);
+$CONF['__LANG'] = $PALANG;
+Config::write($CONF);
+
+
if (!defined('POSTFIXADMIN_CLI')) {
if(!is_file("$incpath/smarty.inc.php")) {
die("smarty.inc.php is missing! Something is wrong...");
Modified: trunk/edit.php
===================================================================
--- trunk/edit.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/edit.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -190,12 +190,12 @@
if ($new) {
$smarty->assign ('mode', 'create');
- $smarty->assign('formtitle', Lang::read($formconf['formtitle_create']));
- $smarty->assign('submitbutton', Lang::read($formconf['create_button']));
+ $smarty->assign('formtitle', Config::lang($formconf['formtitle_create']));
+ $smarty->assign('submitbutton', Config::lang($formconf['create_button']));
} else {
$smarty->assign ('mode', 'edit');
- $smarty->assign('formtitle', Lang::read($formconf['formtitle_edit']));
- $smarty->assign('submitbutton', Lang::read('save'));
+ $smarty->assign('formtitle', Config::lang($formconf['formtitle_edit']));
+ $smarty->assign('submitbutton', Config::lang('save'));
}
$smarty->assign ('struct', $form_fields);
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/functions.inc.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -199,7 +199,7 @@
*/
function check_domain ($domain) {
if (!preg_match ('/^([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', ($domain))) {
- return sprintf(Lang::read('pInvalidDomainRegex'), htmlentities($domain));
+ return sprintf(Config::lang('pInvalidDomainRegex'), htmlentities($domain));
}
if (Config::bool('emailcheck_resolve_domain') && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7)))) {
@@ -213,7 +213,7 @@
}
if (checkdnsrr($domain,'A')) return '';
if (checkdnsrr($domain,'MX')) return '';
- return sprintf(Lang::Read('pInvalidDomainDNS'), htmlentities($domain));
+ return sprintf(Config::lang('pInvalidDomainDNS'), htmlentities($domain));
} else {
return 'emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!';
}
@@ -243,13 +243,13 @@
// Perform non-domain-part sanity checks
if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', $ce_email)) {
- return Lang::read_f('pInvalidMailRegex', $email);
+ return Config::lang_f('pInvalidMailRegex', $email);
}
// Determine domain name
$matches=array();
if (!preg_match('|@(.+)$|',$ce_email,$matches)) {
- return Lang::read_f('pInvalidMailRegex', $email);
+ return Config::lang_f('pInvalidMailRegex', $email);
}
$domain=$matches[1];
@@ -375,8 +375,8 @@
* @return array for $struct
*/
function pacol($allow_editing, $display_in_form, $display_in_list, $type, $PALANG_label, $PALANG_desc, $default = "", $options = array(), $not_in_db=0, $dont_write_to_db=0, $select="", $extrafrom="") {
- if ($PALANG_label != '') $PALANG_label = Lang::Read($PALANG_label);
- if ($PALANG_desc != '') $PALANG_desc = Lang::Read($PALANG_desc );
+ if ($PALANG_label != '') $PALANG_label = Config::lang($PALANG_label);
+ if ($PALANG_desc != '') $PALANG_desc = Config::lang($PALANG_desc );
return array(
'editable' => $allow_editing,
@@ -807,9 +807,9 @@
if (!preg_match($regex, $password)) {
$msgparts = preg_split("/ /", $message, 2);
if (count($msgparts) == 1) {
- $result[] = Lang::read($msgparts[0]);
+ $result[] = Config::lang($msgparts[0]);
} else {
- $result[] = sprintf(Lang::read($msgparts[0]), $msgparts[1]);
+ $result[] = sprintf(Config::lang($msgparts[0]), $msgparts[1]);
}
}
}
Modified: trunk/model/AdminHandler.php
===================================================================
--- trunk/model/AdminHandler.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/AdminHandler.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -13,7 +13,7 @@
return true;
} else {
$this->errormsg[] = $email_check;
- $this->errormsg[$this->id_field] = Lang::read('pAdminCreate_admin_username_text_error1');
+ $this->errormsg[$this->id_field] = Config::lang('pAdminCreate_admin_username_text_error1');
return false;
}
}
Modified: trunk/model/AdminpasswordHandler.php
===================================================================
--- trunk/model/AdminpasswordHandler.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/AdminpasswordHandler.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -82,7 +82,7 @@
return true;
}
- $this->errormsg[$field] = Lang::read('pPassword_password_current_text_error');
+ $this->errormsg[$field] = Config::lang('pPassword_password_current_text_error');
return false;
}
Modified: trunk/model/AliasHandler.php
===================================================================
--- trunk/model/AliasHandler.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/AliasHandler.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -138,20 +138,20 @@
protected function validate_new_id() {
if ($this->id == '') {
- $this->errormsg[$this->id_field] = Lang::read('pCreate_alias_address_text_error1');
+ $this->errormsg[$this->id_field] = Config::lang('pCreate_alias_address_text_error1');
return false;
}
list($local_part,$domain) = explode ('@', $this->id);
if(!$this->create_allowed($domain)) {
- $this->errormsg[$this->id_field] = Lang::read('pCreate_alias_address_text_error3');
+ $this->errormsg[$this->id_field] = Config::lang('pCreate_alias_address_text_error3');
return false;
}
# TODO: already checked in set() - does it make sense to check it here also? Only advantage: it's an early check
# if (!in_array($domain, $this->allowed_domains)) {
-# $this->errormsg[] = Lang::read('pCreate_alias_address_text_error1');
+# $this->errormsg[] = Config::lang('pCreate_alias_address_text_error1');
# return false;
# }
@@ -235,7 +235,7 @@
$values['goto'][] = $this->id;
# if the alias points to the mailbox, don't display the "empty goto" error message
- if (isset($this->errormsg['goto']) && $this->errormsg['goto'] == Lang::read('pEdit_alias_goto_text_error1') ) {
+ if (isset($this->errormsg['goto']) && $this->errormsg['goto'] == Config::lang('pEdit_alias_goto_text_error1') ) {
unset($this->errormsg['goto']);
}
}
@@ -291,7 +291,7 @@
protected function _field_goto($field, $val) {
if (count($val) == 0) {
# empty is ok for mailboxes - this is checked in setmore() which can clear the error message
- $this->errormsg[$field] = Lang::read('pEdit_alias_goto_text_error1');
+ $this->errormsg[$field] = Config::lang('pEdit_alias_goto_text_error1');
return false;
}
Modified: trunk/model/AliasdomainHandler.php
===================================================================
--- trunk/model/AliasdomainHandler.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/AliasdomainHandler.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -54,7 +54,7 @@
$success = parent::init($id);
if ($success) {
if (count($this->struct['alias_domain']['options']) == 0 && $this->new) {
- $this->errormsg[] = Lang::read('pCreate_alias_domain_error4');
+ $this->errormsg[] = Config::lang('pCreate_alias_domain_error4');
return false;
}
# TODO: check if target domains are available (in new and edit mode)
@@ -125,7 +125,7 @@
*/
protected function _field_target_domain($field, $val) {
if ($val == $this->id) {
- $this->errormsg[$field] = Lang::read('pCreate_alias_domain_error2'); # TODO: error message could be better...
+ $this->errormsg[$field] = Config::lang('pCreate_alias_domain_error2'); # TODO: error message could be better...
return false;
}
return true;
Modified: trunk/model/Config.php
===================================================================
--- trunk/model/Config.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/Config.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -1,23 +1,12 @@
<?php
# $Id$
-class Config {
- /**
- * Determine if $__objects cache should be wrote
- *
- * @var boolean
- * @access private
- */
- private $__cache = false;
- /**
- * Holds and key => value array of objects type
- *
- * @var array
- * @access private
- */
- private $__objects = array();
+# This class is too static - if you inherit a class from it, it will share the static $instance and all its contents
+# Therefore the class is marked as final to prevent someone accidently does this ;-)
+final class Config {
private static $instance = null;
+
/**
* Return a singleton instance of Configure.
*
@@ -152,9 +141,14 @@
if (strtoupper($value) == 'YES') { # YES
return true;
- } else { # NO, unknown value
- # TODO: show/log error message on unknown value?
+ } elseif (strtoupper($value) == 'NO') { # NO
return false;
+ } else { # unknown value
+ # show and log error message on unknown value
+ $msg = "\$CONF['$var'] has an invalid value, should be 'YES' or 'NO'";
+ flash_error($msg);
+ error_log("$msg (value: $value)");
+ return false;
}
}
@@ -168,6 +162,32 @@
+/**
+ * Get translated text from $PALANG
+ * (wrapper for self::read(), see also the comments there)
+ *
+ * @param string $var Variable to obtain
+ * @return string value of $PALANG[$var]
+ * @access public
+ */
+ public static function lang($var) {
+ return self::read(array('__LANG', $var));
+ }
+
+ /**
+ * Get translated text from $PALANG and apply sprintf on it
+ * (wrapper for self::read_f(), see also the comments there)
+ *
+ * @param string $var Text (from $PALANG) to obtain
+ * @param string $value Value to use as sprintf parameter
+ * @return string value of $PALANG[$var], parsed by sprintf
+ * @access public
+ */
+ public static function lang_f($var, $value) {
+ return self::read_f(array('__LANG', $var), $value);
+ }
+
+
function getAll() {
$output = $this->config;
return $output;
Modified: trunk/model/DomainHandler.php
===================================================================
--- trunk/model/DomainHandler.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/DomainHandler.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -116,14 +116,14 @@
}
}
if ($this->new) {
- $tMessage = Lang::read('pAdminCreate_domain_result_success') . " (" . $this->id . ")"; # TODO: tMessage is not used/returned anywhere
+ $tMessage = Config::lang('pAdminCreate_domain_result_success') . " (" . $this->id . ")"; # TODO: tMessage is not used/returned anywhere
} else {
# TODO: success message for edit
}
if ($this->new) {
if (!domain_postcreation($this->id)) {
- $this->errormsg[] = Lang::read('pAdminCreate_domain_error');
+ $this->errormsg[] = Config::lang('pAdminCreate_domain_error');
}
} else {
# we don't have domain_postedit()
Deleted: trunk/model/Lang.php
===================================================================
--- trunk/model/Lang.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/Lang.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -1,8 +0,0 @@
-<?php
-# $Id$
-
-class Lang extends Config {
- # exactly the same code, just another name ;-)
-}
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Modified: trunk/model/MailboxHandler.php
===================================================================
--- trunk/model/MailboxHandler.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/MailboxHandler.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -78,7 +78,7 @@
# } elseif ($maxquota < 0) {
# TODO: show 'disabled' - at the moment, just shows '-1'
} else {
- $this->struct['quota']['desc'] = Lang::read_f('mb_max', $maxquota);
+ $this->struct['quota']['desc'] = Config::lang_f('mb_max', $maxquota);
}
}
@@ -120,7 +120,7 @@
protected function validate_new_id() {
if ($this->id == '') {
- $this->errormsg[$this->id_field] = Lang::read('pCreate_mailbox_username_text_error1');
+ $this->errormsg[$this->id_field] = Config::lang('pCreate_mailbox_username_text_error1');
return false;
}
@@ -133,14 +133,14 @@
list(/*NULL*/,$domain) = explode ('@', $this->id);
if(!$this->create_allowed($domain)) {
- $this->errormsg[] = Lang::read('pCreate_mailbox_username_text_error3');
+ $this->errormsg[] = Config::lang('pCreate_mailbox_username_text_error3');
return false;
}
# check if an alias with this name already exists - if yes, don't allow to create the mailbox
$handler = new AliasHandler(1);
if (!$handler->init($this->id)) {
- $this->errormsg[] = Lang::read('email_address_already_exists');
+ $this->errormsg[] = Config::lang('email_address_already_exists');
return false;
}
@@ -236,10 +236,10 @@
if ( !$this->create_mailbox_subfolders() ) {
# TODO: implement $tShowpass
- $this->infomsg[] = Lang::read_f('pCreate_mailbox_result_succes_nosubfolders', "$fUsername$tShowpass");
+ $this->infomsg[] = Config::lang_f('pCreate_mailbox_result_succes_nosubfolders', "$fUsername$tShowpass");
} else { # everything ok
# TODO: implement $tShowpass
- # $this->infomsg[] = Lang::read_f('pCreate_mailbox_result_success'], "$fUsername$tShowpass");
+ # $this->infomsg[] = Config::lang_f('pCreate_mailbox_result_success'], "$fUsername$tShowpass");
# TODO: currently edit.php displays the default success message from webformConfig
}
@@ -293,7 +293,7 @@
*/
protected function _field_quota($field, $val) {
if ( !$this->check_quota ($val) ) {
- $this->errormsg[$field] = Lang::Read('pEdit_mailbox_quota_text_error');
+ $this->errormsg[$field] = Config::lang('pEdit_mailbox_quota_text_error');
return false;
}
return true;
@@ -376,11 +376,11 @@
$fTo = $this->id;
$fFrom = smtp_get_admin_email();
if(empty($fFrom) || $fFrom == 'CLI') $fFrom = $this->id;
- $fSubject = Lang::read('pSendmail_subject_text');
+ $fSubject = Config::lang('pSendmail_subject_text');
$fBody = Config::read('welcome_text');
if (!smtp_mail ($fTo, $fFrom, $fSubject, $fBody)) {
- $this->errormsg[] = Lang::read('pSendmail_result_error');
+ $this->errormsg[] = Config::lang('pSendmail_result_error');
return false;
} else {
# TODO flash_info($PALANG['pSendmail_result_success']);
@@ -641,7 +641,7 @@
if ($result != 1) {
db_log ($domain, 'edit_password', "FAILURE: " . $this->id);
- $this->errormsg[] = Lang::read('pEdit_mailbox_result_error');
+ $this->errormsg[] = Config::lang('pEdit_mailbox_result_error');
return false;
}
@@ -706,7 +706,7 @@
$postdel_res=mailbox_postdeletion($username,$domain);
if ($result != 1 || !$postdel_res) {
- $tMessage = Lang::read('pDelete_delete_error') . "$username (";
+ $tMessage = Config::lang('pDelete_delete_error') . "$username (";
if ($result['rows']!=1) { # TODO: invalid test, $result is from db_delete and only contains the number of deleted rows
$tMessage.='mailbox';
if (!$postdel_res) $tMessage.=', ';
Modified: trunk/model/PFAHandler.php
===================================================================
--- trunk/model/PFAHandler.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/model/PFAHandler.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -142,7 +142,7 @@
/**
* init $this->msg[] with messages used in various functions.
*
- * always list the key to hand over to Lang::read
+ * always list the key to hand over to Config::lang
* the only exception is 'logname' which uses the key for db_log
*
* The values can depend on $this->new
@@ -181,7 +181,7 @@
if ($this->new) {
if ($exists) {
- $this->errormsg[$this->id_field] = Lang::read($this->msg['error_already_exists']);
+ $this->errormsg[$this->id_field] = Config::lang($this->msg['error_already_exists']);
return false;
} elseif (!$this->validate_new_id() ) {
# errormsg filled by validate_new_id()
@@ -191,7 +191,7 @@
}
} else { # edit mode
if (!$exists) {
- $this->errormsg[$this->id_field] = Lang::read($this->msg['error_does_not_exist']);
+ $this->errormsg[$this->id_field] = Config::lang($this->msg['error_does_not_exist']);
return false;
} else {
return true;
@@ -292,7 +292,7 @@
}
}
} elseif ($this->new) { # new, field not set in input data
- $this->errormsg[$key] = Lang::read_f('missing_field', $key);
+ $this->errormsg[$key] = Config::lang_f('missing_field', $key);
} else { # edit, field unchanged
# echo "skipped / not set: $key\n";
}
@@ -356,7 +356,7 @@
$result = db_update($this->db_table, $this->id_field, $this->id, $db_values);
}
if ($result != 1) {
- $this->errormsg[] = Lang::read($this->msg['store_error']) . "\n(" . $this->id . ")\n"; # TODO: change message + use sprintf
+ $this->errormsg[] = Config::lang($this->msg['store_error']) . "\n(" . $this->id . ")\n"; # TODO: change message + use sprintf
return false;
}
@@ -369,7 +369,7 @@
# return success message
# TODO: use sprintf to add $this->id
# TODO: add option to override the success message (for example to include autogenerated passwords)
- $this->infomsg['success'] = sprintf(Lang::read($this->msg['successmessage']), $this->id);
+ $this->infomsg['success'] = sprintf(Config::lang($this->msg['successmessage']), $this->id);
}
return $result;
@@ -409,8 +409,8 @@
protected function read_from_db($condition, $limit=-1, $offset=-1) {
$select_cols = array();
- $yes = escape_string(Lang::read('YES'));
- $no = escape_string(Lang::read('NO'));
+ $yes = escape_string(Config::lang('YES'));
+ $no = escape_string(Config::lang('NO'));
# TODO: replace hardcoded %Y-%m-%d with a country-specific date format via *.lang?
# TODO: (not too easy because pgsql uses a different formatstring format :-/ )
@@ -503,7 +503,7 @@
return true;
}
- if ($errors) $this->errormsg[] = Lang::read($this->msg['error_does_not_exist']);
+ if ($errors) $this->errormsg[] = Config::lang($this->msg['error_does_not_exist']);
# $this->errormsg[] = $result['error'];
return false;
}
@@ -587,7 +587,7 @@
return true;
}
- $this->errormsg[$field2] = Lang::read('pEdit_mailbox_password_text_error');
+ $this->errormsg[$field2] = Config::lang('pEdit_mailbox_password_text_error');
return false;
}
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2013-10-13 16:11:15 UTC (rev 1535)
+++ trunk/setup.php 2013-10-13 18:11:18 UTC (rev 1536)
@@ -515,7 +515,7 @@
return array(
0,
- Lang::read($formconf['successmessage']),
+ Config::lang($formconf['successmessage']),
array(),
);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-10-13 20:33:52
|
Revision: 1539
http://sourceforge.net/p/postfixadmin/code/1539
Author: christian_boltz
Date: 2013-10-13 20:33:48 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
model/PFAHandler.php:
- use Config::lang_f() for msg['store_error']
*.lang:
- add %s to all messages that are used as store_error
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/model/PFAHandler.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/bg.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -90,7 +90,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
$PALANG['pCreate_alias_domain_error1'] = 'Не ви е позволено да използвате избраната конфигурация.';
$PALANG['pCreate_alias_domain_error2'] = 'Избраната конфигурация е невалидна. Изберете друга!';
-$PALANG['pCreate_alias_domain_error3'] = 'Възникна грешка при добавяне в базата.';
+$PALANG['pCreate_alias_domain_error3'] = 'Възникна грешка при добавяне в базата. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
@@ -99,7 +99,7 @@
$PALANG['pCreate_alias_address_text_error3'] = 'Достигнали сте лимита си за създаване на alias-и!';
$PALANG['pCreate_alias_goto_text'] = 'Накъде трябва да се изпраща писмото.';
$PALANG['pCreate_alias_goto_text_error'] = 'Избраният адрес в полето Към не е валиден!';
-$PALANG['pCreate_alias_result_error'] = 'Не мога да добавя alias-а към таблицата!';
+$PALANG['pCreate_alias_result_error'] = 'Не мога да добавя alias-а към таблицата! (%s)'; # XXX Text changed to: Creating the alias %s failed!
$PALANG['pCreate_alias_result_success'] = 'Alias-а беше добавен успешно в таблицата!'; # XXX text change: 'The alias %s has been created!'
$PALANG['pCreate_alias_catchall_text'] = 'За да създадете catch-all използвайте "*" за alias. За пренасочване на домейн към домейн използвайте "*@domain.tld" в полето Към.'; # XXX check/beautify - was split in two lines before
@@ -112,7 +112,7 @@
$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_result_error'] = 'Не мога да модифицирам този alias!';
+$PALANG['pEdit_alias_result_error'] = 'Не мога да модифицирам този alias! (%s)'; # XXX Text changed to: Modifying the alias %s failed!
$PALANG['pCreate_mailbox_welcome'] = 'Създаване на нова пощенска кутия за вашия домейн.';
$PALANG['pCreate_mailbox_username_text_error1'] = 'Е-мейл-а не е валиден!';
@@ -120,7 +120,7 @@
$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'] = 'Не мога да добавя пощенската кутия в таблицата!';
+$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'] = 'The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.'; # XXX
@@ -142,11 +142,11 @@
$PALANG['pPassword_password2'] = 'Нова парола (отново)';
$PALANG['pPassword_password_text_error'] = 'Паролите, които сте въвели не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Смени парола';
-$PALANG['pPassword_result_error'] = 'Не мога да сменя паролата!';
+$PALANG['pPassword_result_error'] = 'Не мога да сменя паролата! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'Паролата ви бе сменена успешно!';
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
-$PALANG['pVacation_result_error'] = 'Unable to update auto response settings!'; # XXX
+$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
@@ -214,7 +214,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Добави alias-и по подразбиране';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Добави домейн';
-$PALANG['pAdminCreate_domain_result_error'] = 'Не мога да добавя домейна!';
+$PALANG['pAdminCreate_domain_result_error'] = 'Не мога да добавя домейна! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Домейна бе добавен успешно!';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Грешка при изтриването на домейна!';
@@ -228,14 +228,14 @@
$PALANG['transport'] = 'Transport';
$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Мейл сървъра е резервен MX';
-$PALANG['pAdminEdit_domain_result_error'] = 'Не мога да модифицирам домейна!';
+$PALANG['pAdminEdit_domain_result_error'] = 'Не мога да модифицирам домейна! (%s)'; # XXX Text changed to: Modifying the domain %s failed!
$PALANG['pAdminCreate_admin_welcome'] = 'Добави нов админ на домейна';
$PALANG['pAdminCreate_admin_username_text'] = 'Е-мейл адрес';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Админ не е валиден е-мейл адрес!';
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Админ-а вече съществува или не е валиден';
$PALANG['pAdminCreate_admin_button'] = 'Добави админ';
-$PALANG['pAdminCreate_admin_result_error'] = 'Не мога да добавя админа!';
+$PALANG['pAdminCreate_admin_result_error'] = 'Не мога да добавя админа! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добавен успешно!';
$PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн';
@@ -243,7 +243,7 @@
$PALANG['password_again'] = 'Парола (отново)';
$PALANG['pAdminEdit_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'] = 'Не мога да модифицирам админа!';
+$PALANG['pAdminEdit_admin_result_error'] = 'Не мога да модифицирам админа! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
$PALANG['pAdminEdit_admin_result_success'] = 'Админ-а беше модифициран!';
$PALANG['pUsersLogin_welcome'] = 'Потребителски вход за смяна на парола и alias-и.';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/ca.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -88,7 +88,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
$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['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
@@ -97,7 +97,7 @@
$PALANG['pCreate_alias_address_text_error3'] = 'Has arribat al límit de creació d\'àlies!';
$PALANG['pCreate_alias_goto_text'] = 'A on ha de ser enviat l\'e-mail.';
$PALANG['pCreate_alias_goto_text_error'] = 'El destí no és vàlid!';
-$PALANG['pCreate_alias_result_error'] = '¡No és posible afegir l\'àlies a la taula d\'àlies!';
+$PALANG['pCreate_alias_result_error'] = '¡No és posible afegir l\'àlies a la taula d\'àlies! (%s)'; # XXX Text changed to: Creating the alias %s failed!
$PALANG['pCreate_alias_result_success'] = 'L\'àlies ha estat creat correctament!'; # XXX text change: 'The alias %s has been created!'
$PALANG['pCreate_alias_catchall_text'] = 'Per crear un àlies general usi "*" com a àlies. Per una redirecció de domini a domini, usi "*@domain.tld" com a Destí.'; # XXX check/beautify - was split in two lines before
@@ -110,7 +110,7 @@
$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_result_error'] = 'Imposible modificar l\'àlies!';
+$PALANG['pEdit_alias_result_error'] = 'Imposible modificar l\'àlies! (%s)'; # XXX Text changed to: Modifying the alias %s failed!
$PALANG['pCreate_mailbox_welcome'] = 'Crear una nova bústia pel seu domini.';
$PALANG['pCreate_mailbox_username_text_error1'] = 'L\'e-mail no és vàlido!';
@@ -118,7 +118,7 @@
$PALANG['pCreate_mailbox_password_text'] = 'Contrasenya per a POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
$PALANG['pCreate_mailbox_mail'] = 'Crear bústia'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_result_error'] = 'Imposible afegir una bústia a la taula de bústies!';
+$PALANG['pCreate_mailbox_result_error'] = 'Imposible afegir una bústia a la taula de bústies! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'La bústia ha estat afegida a la taula de bústies! (%s)'; # XXX Text changed to: 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.'; # XXX
@@ -140,11 +140,11 @@
$PALANG['pPassword_password2'] = 'Nova contrasenya (repetiu)';
$PALANG['pPassword_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Canviar la contrasenya';
-$PALANG['pPassword_result_error'] = 'Imposible canviar la contrasenya!';
+$PALANG['pPassword_result_error'] = 'Imposible canviar la contrasenya! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'La seva contrasenya ha estat canviada!';
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
-$PALANG['pVacation_result_error'] = 'Unable to update auto response settings!'; # XXX
+$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
@@ -212,7 +212,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Afegir àlies per defecte';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Afegir domini';
-$PALANG['pAdminCreate_domain_result_error'] = 'Imposible afegir el domini!';
+$PALANG['pAdminCreate_domain_result_error'] = 'Imposible afegir el domini! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit!';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
@@ -226,7 +226,7 @@
$PALANG['transport'] = 'Transport'; # XXX
$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
-$PALANG['pAdminEdit_domain_result_error'] = 'Imposible modificar el domini!';
+$PALANG['pAdminEdit_domain_result_error'] = 'Imposible modificar el domini! (%s)'; # XXX Text changed to: Modifying the domain %s failed!
$PALANG['pAdminCreate_admin_welcome'] = 'Afegir un nou administrador de domini';
$PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
@@ -234,7 +234,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'administrador ja existeix o no es vàlid!';
$PALANG['pAdminCreate_admin_button'] = 'Afegir administrador';
-$PALANG['pAdminCreate_admin_result_error'] = 'Imposible afegir l\'administrador!';
+$PALANG['pAdminCreate_admin_result_error'] = 'Imposible afegir l\'administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'L\'administrador ha estat afegit!';
$PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de domini';
@@ -242,7 +242,7 @@
$PALANG['password_again'] = 'Contrasenya (repetiu)';
$PALANG['pAdminEdit_admin_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'] = 'Imposible modificar l\'administrador!';
+$PALANG['pAdminEdit_admin_result_error'] = 'Imposible modificar l\'administrador! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrador ha estat modificat!';
$PALANG['pUsersLogin_welcome'] = 'Login d\'usuaris per canviar la contrasenya i els àlies.';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/cn.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -89,7 +89,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
$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['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
@@ -98,7 +98,7 @@
$PALANG['pCreate_alias_address_text_error3'] = '你的别名已经达到上限!';
$PALANG['pCreate_alias_goto_text'] = '邮件接收地址.';
$PALANG['pCreate_alias_goto_text_error'] = '接收地址不正确!';
-$PALANG['pCreate_alias_result_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['pCreate_alias_catchall_text'] = '要将所有的邮件全部转发请使用"*"作为别名. 域到域的转发请使用"*@domain.tld".'; # XXX check/beautify - was split in two lines before
@@ -111,7 +111,7 @@
$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_result_error'] = '不能修改该别名!';
+$PALANG['pEdit_alias_result_error'] = '不能修改该别名! (%s)'; # XXX Text changed to: Modifying the alias %s failed!
$PALANG['pCreate_mailbox_welcome'] = '在你的域中新建一个本地邮箱.';
$PALANG['pCreate_mailbox_username_text_error1'] = '邮件非法!';
@@ -119,7 +119,7 @@
$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'] = '不能将邮箱增加到邮箱表中!';
+$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'] = 'The mailbox %s has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created.'; # XXX
@@ -141,11 +141,11 @@
$PALANG['pPassword_password2'] = '新密码 (验证)';
$PALANG['pPassword_password_text_error'] = '你两次输入的新密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = '更改密码'; # XXX check text - should be 'Change Password'
-$PALANG['pPassword_result_error'] = '更改密码失败!';
+$PALANG['pPassword_result_error'] = '更改密码失败! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = '更改密码成功!';
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
-$PALANG['pVacation_result_error'] = 'Unable to update auto response settings!'; # XXX
+$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
@@ -213,7 +213,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = '增加默认别名';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = '新增';
-$PALANG['pAdminCreate_domain_result_error'] = '新增域失败!';
+$PALANG['pAdminCreate_domain_result_error'] = '新增域失败! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = '新增域成功!';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
@@ -227,14 +227,14 @@
$PALANG['transport'] = 'Transport'; # XXX
$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
$PALANG['pAdminEdit_domain_backupmx'] = '备份邮件服务器';
-$PALANG['pAdminEdit_domain_result_error'] = '修改域失败!';
+$PALANG['pAdminEdit_domain_result_error'] = '修改域失败! (%s)'; # XXX Text changed to: Modifying the domain %s failed!
$PALANG['pAdminCreate_admin_welcome'] = '新增域管理员';
$PALANG['pAdminCreate_admin_username_text'] = '邮件地址';
$PALANG['pAdminCreate_admin_username_text_error1'] = '管理员名不是一个合法的邮件地址!';
$PALANG['pAdminCreate_admin_username_text_error2'] = '管理员已经存在或者管理员名非法!';
$PALANG['pAdminCreate_admin_button'] = '新增';
-$PALANG['pAdminCreate_admin_result_error'] = '新增管理员失败!';
+$PALANG['pAdminCreate_admin_result_error'] = '新增管理员失败! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功!';
$PALANG['pAdminEdit_admin_welcome'] = '修改域管理员';
@@ -242,7 +242,7 @@
$PALANG['password_again'] = '密码 (验证)';
$PALANG['pAdminEdit_admin_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'] = '编辑域管理员失败!';
+$PALANG['pAdminEdit_admin_result_error'] = '编辑域管理员失败! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
$PALANG['pAdminEdit_admin_result_success'] = '编辑域管理员成功!';
$PALANG['pUsersLogin_welcome'] = '邮件用户从这里登录管理你的密码和别名.';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/cs.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -94,7 +94,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
$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['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
@@ -103,7 +103,7 @@
$PALANG['pCreate_alias_address_text_error3'] = 'Dosáhli jste limitu, nemůžete vytvářet další aliasy!';
$PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodit.';
$PALANG['pCreate_alias_goto_text_error'] = 'Cíl není platný!';
-$PALANG['pCreate_alias_result_error'] = 'Nepodařilo se přidat přesměrování do tabulky aliasů!';
+$PALANG['pCreate_alias_result_error'] = 'Nepodařilo se přidat přesměrování do tabulky aliasů! (%s)'; # XXX Text changed to: Creating the alias %s failed!
$PALANG['pCreate_alias_result_success'] = 'Přesměrování bylo uspěšně přidáno do tabulky aliasů!'; # XXX text change: 'The alias %s has been created!'
$PALANG['pCreate_alias_catchall_text'] = 'Pro vytvoření doménového koše použijte * jako alias. Pro alias doména -> doména použijte *@domain.tld jako cíl.'; # XXX check/beautify - was split in two lines before
@@ -116,7 +116,7 @@
$PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
$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í!';
+$PALANG['pEdit_alias_result_error'] = 'Nepodařilo se upravit přesměrování! (%s)'; # XXX Text changed to: Modifying the alias %s failed!
$PALANG['pCreate_mailbox_welcome'] = 'Vytvořit novou lokální schránku v doméně.';
$PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa neni platná!';
@@ -124,7 +124,7 @@
$PALANG['pCreate_mailbox_password_text'] = 'Heslo pro POP3/IMAP/SMTP';
$PALANG['pCreate_mailbox_name_text'] = 'Celé jméno';
$PALANG['pCreate_mailbox_mail'] = 'Vytvořit schránku na disku (odešle uvítací email)'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_result_error'] = 'Nepodařilo se přidat schránku do tabulky schránek!';
+$PALANG['pCreate_mailbox_result_error'] = 'Nepodařilo se přidat schránku do tabulky schránek! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'Schránka byla přidána do tabulky schránek! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka byla přidána do tabulky schránek, ale žádné (nebo pouze některé) ze předdefinovaných podsložek bylo možné vytovořit (%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.
@@ -146,13 +146,13 @@
$PALANG['pPassword_password2'] = 'Nové heslo (znovu)';
$PALANG['pPassword_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Změnit heslo'; # XXX check text - should be 'Change Password'
-$PALANG['pPassword_result_error'] = 'Nepodařilo se změnit heslo!';
+$PALANG['pPassword_result_error'] = 'Nepodařilo se změnit heslo! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'Heslo bylo změněno!';
$PALANG['pEdit_vacation_set'] = 'Změnit / Nastavit zprávu o nepřítomnosti';
$PALANG['pEdit_vacation_remove'] = 'Ostranit zprávu o nepřítomnosti';
-$PALANG['pVacation_result_error'] = 'Nebylo možné aktualizovat nastavení automatické odpověďi!';
+$PALANG['pVacation_result_error'] = 'Nebylo možné aktualizovat nastavení automatické odpověďi! (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
$PALANG['pVacation_result_removed'] = 'Automatická odpověď byla odstraněna! (%s)'; # XXX Text changed to "Auto response for %s has been disabled!"
$PALANG['pVacation_result_added'] = 'Automatická odpověd byla zapnuta! (%s)'; # XXX Text changed to "Auto response for %s has been enabled!"
$PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX
@@ -221,7 +221,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Přidat implicitní přesměrování';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Přidat doménu';
-$PALANG['pAdminCreate_domain_result_error'] = 'Nepodařilo se přidat doménu!';
+$PALANG['pAdminCreate_domain_result_error'] = 'Nepodařilo se přidat doménu! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána!';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
@@ -236,14 +236,14 @@
$PALANG['transport'] = 'Transport';
$PALANG['pAdminEdit_domain_transport_text'] = 'Nastavit transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Tento server je záložní MX domény';
-$PALANG['pAdminEdit_domain_result_error'] = 'Nepodařilo se upravit doménu!';
+$PALANG['pAdminEdit_domain_result_error'] = 'Nepodařilo se upravit doménu! (%s)'; # XXX Text changed to: Modifying the domain %s failed!
$PALANG['pAdminCreate_admin_welcome'] = 'Přidat nového doménového administrátora';
$PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Tato adresa není platná!';
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Taková adresa již existuje!';
$PALANG['pAdminCreate_admin_button'] = 'Přidat administrátora';
-$PALANG['pAdminCreate_admin_result_error'] = 'Nepodařilo se přidat administrátora!';
+$PALANG['pAdminCreate_admin_result_error'] = 'Nepodařilo se přidat administrátora! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administrátor byl přidán!';
$PALANG['pAdminEdit_admin_welcome'] = 'Upravit doménového administrátora';
@@ -251,7 +251,7 @@
$PALANG['password_again'] = 'Heslo (znovu)';
$PALANG['pAdminEdit_admin_super_admin'] = 'Superuživatel';
$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
-$PALANG['pAdminEdit_admin_result_error'] = 'Nepodařilo se upravit administrátora!';
+$PALANG['pAdminEdit_admin_result_error'] = 'Nepodařilo se upravit administrátora! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor byl upraven!';
$PALANG['pUsersLogin_welcome'] = 'Zde se přihlašují uživatelé pro změnu hesla, přesměrování nebo automatické odpovědi.';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/da.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -94,7 +94,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'Domæne hvor emails skal sendes til.';
$PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tilladelse til at lave den valgte konfiguration';
$PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfiguration er ikke korrekt, vælg venligst en anden.';
-$PALANG['pCreate_alias_domain_error3'] = 'Indsætning i databasen fejlede.';
+$PALANG['pCreate_alias_domain_error3'] = 'Indsætning i databasen fejlede. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'Alle domænerne har allerede aliases.';
$PALANG['pCreate_alias_domain_success'] = 'Domæne-alias blev tilføjet alias-tabellen.';
@@ -103,7 +103,7 @@
$PALANG['pCreate_alias_address_text_error3'] = 'Du har nået grænsen for antallet af aliases til domænet.';
$PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
$PALANG['pCreate_alias_goto_text_error'] = 'Modtageradressen er ikke gyldig!';
-$PALANG['pCreate_alias_result_error'] = 'Kan ikke tilføje aliaset til alias-tabellen!';
+$PALANG['pCreate_alias_result_error'] = 'Kan ikke tilføje aliaset til alias-tabellen! (%s)'; # XXX Text changed to: Creating the alias %s failed!
$PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilføjet alias-tabellen!'; # XXX text change: 'The alias %s has been created!'
$PALANG['pCreate_alias_catchall_text'] = 'For at tilføje et stjerne-alias, brug en "*" som alias. For domæne til domæne-videresending brug "*@domæne.tld" som modtager.'; # XXX check/beautify - was split in two lines before
@@ -116,7 +116,7 @@
$PALANG['pEdit_alias_domain_result_error'] = 'Kan ikke ændre alias-domænet.';
$PALANG['pEdit_alias_forward_and_store'] = 'Aflever email til den lokale postboks.';
$PALANG['pEdit_alias_forward_only'] = 'Videresend til angivene emailadresse uden lokal kopi.';
-$PALANG['pEdit_alias_result_error'] = 'Kan ikke redigere aliaset.';
+$PALANG['pEdit_alias_result_error'] = 'Kan ikke redigere aliaset. (%s)'; # XXX Text changed to: Modifying the alias %s failed!
$PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til domænet.';
$PALANG['pCreate_mailbox_username_text_error1'] = 'Emailadressen er ikke gyldig!';
@@ -124,7 +124,7 @@
$PALANG['pCreate_mailbox_password_text'] = 'Adgangskode til POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Fulde navn';
$PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_result_error'] = 'Kan ikke tilføje postboksen til postboks-tabellen!';
+$PALANG['pCreate_mailbox_result_error'] = 'Kan ikke tilføje postboksen til postboks-tabellen! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen! (%s)'; # XXX Text changed to: The mailbox %s has been added to the mailbox table!
$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede undermapper kunne oprettes. (%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.
@@ -146,13 +146,13 @@
$PALANG['pPassword_password2'] = 'Ny adgangskode (igen)';
$PALANG['pPassword_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Ændr adgangskode';
-$PALANG['pPassword_result_error'] = 'Kan ikke ændre adgangskoden!';
+$PALANG['pPassword_result_error'] = 'Kan ikke ændre adgangskoden! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = 'Din adgangskode er ændret!';
$PALANG['pEdit_vacation_set'] = 'Ændr / Angiv autosvar';
$PALANG['pEdit_vacation_remove'] = 'Fjern autosvar';
-$PALANG['pVacation_result_error'] = 'Indstillingerne til autosvar kunne ikke opdateres.';
+$PALANG['pVacation_result_error'] = 'Indstillingerne til autosvar kunne ikke opdateres. (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
$PALANG['pVacation_result_removed'] = 'Autosvar er fjernet! (%s)'; # XXX Text changed to "Auto response for %s has been disabled!"
$PALANG['pVacation_result_added'] = 'Autosvar er aktiveret! (%s)'; # XXX Text changed to "Auto response for %s has been enabled!"
$PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX
@@ -221,7 +221,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard alias(es)';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne';
-$PALANG['pAdminCreate_domain_result_error'] = 'Kan ikke tilføje domænet!';
+$PALANG['pAdminCreate_domain_result_error'] = 'Kan ikke tilføje domænet! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!';
$PALANG['pAdminDelete_admin_error'] = 'Administratoren kunne ikke slettes.';
@@ -236,14 +236,14 @@
$PALANG['transport'] = 'Transport';
$PALANG['pAdminEdit_domain_transport_text'] = 'Præcisér transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Mailserveren er backup MX';
-$PALANG['pAdminEdit_domain_result_error'] = 'Kan ikke rette domænet!';
+$PALANG['pAdminEdit_domain_result_error'] = 'Kan ikke rette domænet! (%s)'; # XXX Text changed to: Modifying the domain %s failed!
$PALANG['pAdminCreate_admin_welcome'] = 'Tilføj en ny domæneadministrator';
$PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke en gyldig emailadresse!';
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Aministratoren findes allerede eller er ikke gyldig';
$PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
-$PALANG['pAdminCreate_admin_result_error'] = 'Administratoren kunne ikke tilføjes!';
+$PALANG['pAdminCreate_admin_result_error'] = 'Administratoren kunne ikke tilføjes! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er tilføjet!';
$PALANG['pAdminEdit_admin_welcome'] = 'Redigér en domæneadministrator';
@@ -251,7 +251,7 @@
$PALANG['password_again'] = 'Adgangskode (igen)';
$PALANG['pAdminEdit_admin_super_admin'] = 'Superadministrator';
$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
-$PALANG['pAdminEdit_admin_result_error'] = 'Kunne ikke rette administrator!';
+$PALANG['pAdminEdit_admin_result_error'] = 'Kunne ikke rette administrator! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
$PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet!';
$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Log ind for at ændre adgangskode og videresending.';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/de.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -91,7 +91,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'Die Domain, an die die Mails gehen sollen.';
$PALANG['pCreate_alias_domain_error1'] = 'Sie dürfen die gewählte Konfiguration nicht erstellen.';
$PALANG['pCreate_alias_domain_error2'] = 'Die gewählte Konfiguration ist ungültig, bitte wählen Sie eine andere';
-$PALANG['pCreate_alias_domain_error3'] = 'Datenbank-Eintrag fehlgeschlagen.';
+$PALANG['pCreate_alias_domain_error3'] = 'Das Erstellen der Alias-Domain %s ist fehlgeschlagen!';
$PALANG['pCreate_alias_domain_error4'] = 'Alle Domains sind bereits Alias-Domains.';
$PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain wurde in der Datenbank eingetragen!';
@@ -100,7 +100,7 @@
$PALANG['pCreate_alias_address_text_error3'] = 'Sie haben Ihr Limit für Aliase auf dieser Domain erreicht!';
$PALANG['pCreate_alias_goto_text'] = 'Wohin soll die eMail weitergeleitet werden?';
$PALANG['pCreate_alias_goto_text_error'] = 'Das An-Feld ist falsch!';
-$PALANG['pCreate_alias_result_error'] = 'Unmöglich dieses Alias in die Alias-Tabelle einzutragen!';
+$PALANG['pCreate_alias_result_error'] = 'Das Erstellen des Aliases %s ist fehlgeschlagen!';
$PALANG['pCreate_alias_result_success'] = 'Der Alias %s wurde erstellt!';
$PALANG['pCreate_alias_catchall_text'] = 'Um alle Adressen abzudecken benutzen Sie einen "*" als Alias. Um ganze Domains an andere Domains weiterzuleiten benutzen Sie "*@domain.tld" im "An"-Feld.';
@@ -113,7 +113,7 @@
$PALANG['pEdit_alias_domain_result_error'] = 'Alias-Domain kann nicht geändert werden!';
$PALANG['pEdit_alias_forward_and_store'] = 'Mail in der lokalen Mailbox ablegen.';
$PALANG['pEdit_alias_forward_only'] = 'Nur zur angegebenen Adresse weiterleiten.';
-$PALANG['pEdit_alias_result_error'] = 'Ändern des Aliases nicht möglich!';
+$PALANG['pEdit_alias_result_error'] = 'Ändern des Aliases %s ist fehlgeschlagen!';
$PALANG['pCreate_mailbox_welcome'] = 'Legen Sie eine neue Mailbox für Ihre Domain an.';
$PALANG['pCreate_mailbox_username_text_error1'] = 'Die EMAIL ist nicht korrekt!';
@@ -121,7 +121,7 @@
$PALANG['pCreate_mailbox_password_text'] = 'Passwort für POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Vollständiger Name';
$PALANG['pCreate_mailbox_mail'] = 'Begrüßungsmail senden';
-$PALANG['pCreate_mailbox_result_error'] = 'Unmöglich die Mailbox in die Mailbox-Tabelle einzutragen!';
+$PALANG['pCreate_mailbox_result_error'] = 'Das Erstellen der Mailbox %s ist fehlgeschlagen';
$PALANG['pCreate_mailbox_result_success'] = 'Die Mailbox %s wurde in die Mailbox-Tabelle eingetragen.';
$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Die Mailbox %s wurde in der Mailbox-Tabelle eingetragen, aber keine (oder nur einige) der vorkonfigurierten Unterordner konnte erstellt werden!';
@@ -143,18 +143,18 @@
$PALANG['pPassword_password2'] = 'Neues Passwort (nochmal)';
$PALANG['pPassword_password_text_error'] = 'Die beiden angegebenen Passwörter sind nicht identisch oder leer!';
$PALANG['change_password'] = 'Passwort ändern';
-$PALANG['pPassword_result_error'] = 'Unmöglich das Passwort zu ändern!';
+$PALANG['pPassword_result_error'] = 'Das Passwort für %s konnte nicht geändert werden';
$PALANG['pPassword_result_success'] = 'Ihr Passwort wurde geändert!';
$PALANG['pEdit_vacation_set'] = 'Automatische Antwort ändern / einrichten';
$PALANG['pEdit_vacation_remove'] = 'Automatische Antwort abschalten';
-$PALANG['pVacation_result_error'] = 'Änderungen der automatischen Antwort konnten nicht gespeichert werden!';
+$PALANG['pVacation_result_error'] = 'Änderungen der automatischen Antwort für %s konnten nicht gespeichert werden!';
$PALANG['pVacation_result_removed'] = 'Automatische Antwort für %s wurde abgeschaltet!';
$PALANG['pVacation_result_added'] = 'Automatische Antwort für %s wurde aktiviert!';
$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_reply_delay_time_text'] = 'Zeit in Sekunden';
$PALANG['pViewlog_welcome'] = 'Zeigt die letzten 10 Aktionen für ';
$PALANG['pViewlog_timestamp'] = 'Zeitpunkt';
@@ -218,7 +218,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Standard-Aliase hinzufügen';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Domain hinzufügen';
-$PALANG['pAdminCreate_domain_result_error'] = 'Konnte Domain nicht anlegen!';
+$PALANG['pAdminCreate_domain_result_error'] = 'Das Anlegen der Domain %s ist fehlgeschlagen!';
$PALANG['pAdminCreate_domain_result_success'] = 'Domain wurde angelegt!';
$PALANG['pAdminDelete_admin_error'] = 'Admin kann nicht gelöscht werden!';
@@ -233,14 +233,14 @@
$PALANG['transport'] = 'Transport';
$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
-$PALANG['pAdminEdit_domain_result_error'] = 'Konnte Domain nicht editieren!';
+$PALANG['pAdminEdit_domain_result_error'] = 'Das Ändern der Domain %s ist fehlgeschlagen';
$PALANG['pAdminCreate_admin_welcome'] = 'Neuen Domain-Admin hinzufügen';
$PALANG['pAdminCreate_admin_username_text'] = 'Email Adresse';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin-Adresse ist keine echte Email-Adresse!';
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Der Admin existiert bereits bzw. ist nicht korrekt';
$PALANG['pAdminCreate_admin_button'] = 'Admin hinzufügen';
-$PALANG['pAdminCreate_admin_result_error'] = 'Konnte den Admin nicht anlegen!';
+$PALANG['pAdminCreate_admin_result_error'] = 'Das anlegen des Admins %s ist fehlgeschlagen';
$PALANG['pAdminCreate_admin_result_success'] = 'Admin angelegt!';
$PALANG['pAdminEdit_admin_welcome'] = 'Domain Admin editieren';
@@ -248,7 +248,7 @@
$PALANG['password_again'] = 'Passwort (nochmal)';
$PALANG['pAdminEdit_admin_super_admin'] = 'Super-Admin';
$PALANG['super_admin_desc'] = 'Super-Admins haben Zugriff auf alle Domains und können Domains und Admins verwalten.';
-$PALANG['pAdminEdit_admin_result_error'] = 'Konnte Admin nicht ändern';
+$PALANG['pAdminEdit_admin_result_error'] = 'Das Ändern des Admins %s ist fehlgeschlagen!';
$PALANG['pAdminEdit_admin_result_success'] = 'Admin geändert!';
$PALANG['pUsersLogin_welcome'] = 'Benutzer bitte hier einloggen, um Weiterleitungen bzw. das Passwort zu ändern.';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/en.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -92,7 +92,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.';
$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.';
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!';
-$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.';
+$PALANG['pCreate_alias_domain_error3'] = 'Creating the alias domain %s failed!';
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.';
$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!';
@@ -101,7 +101,7 @@
$PALANG['pCreate_alias_address_text_error3'] = 'You have reached your limit to create aliases!';
$PALANG['pCreate_alias_goto_text'] = 'Where the mail needs to be sent to.';
$PALANG['pCreate_alias_goto_text_error'] = 'The To: is not valid!';
-$PALANG['pCreate_alias_result_error'] = 'Unable to add the alias to the alias table!';
+$PALANG['pCreate_alias_result_error'] = 'Creating the alias %s failed!';
$PALANG['pCreate_alias_result_success'] = 'The alias %s has been created!';
$PALANG['pCreate_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.'; # XXX don't propagate usage of *@target-domain.com for domain-aliasing any longer
@@ -114,7 +114,7 @@
$PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!';
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.';
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
-$PALANG['pEdit_alias_result_error'] = 'Unable to modify the alias!';
+$PALANG['pEdit_alias_result_error'] = 'Modifying the alias %s failed!';
$PALANG['pCreate_mailbox_welcome'] = 'Create a new mailbox for your domain.';
$PALANG['pCreate_mailbox_username_text_error1'] = 'The EMAIL is not valid!';
@@ -122,7 +122,7 @@
$PALANG['pCreate_mailbox_password_text'] = 'Password for POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Full name';
$PALANG['pCreate_mailbox_mail'] = 'Send Welcome mail';
-$PALANG['pCreate_mailbox_result_error'] = 'Unable to add the mailbox to the mailbox table!';
+$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.';
@@ -144,13 +144,13 @@
$PALANG['pPassword_password2'] = 'New Password (again)';
$PALANG['pPassword_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
$PALANG['change_password'] = 'Change Password';
-$PALANG['pPassword_result_error'] = 'Unable to change your password!';
+$PALANG['pPassword_result_error'] = 'Changing the password for %s failed!';
$PALANG['pPassword_result_success'] = 'Your password has been changed!';
$PALANG['pEdit_vacation_set'] = 'Change / Set away message';
$PALANG['pEdit_vacation_remove'] = 'Remove away message';
-$PALANG['pVacation_result_error'] = 'Unable to update auto response settings!';
+$PALANG['pVacation_result_error'] = 'Updating the auto response settings for %s failed';
$PALANG['pVacation_result_removed'] = 'Auto response for %s has been disabled!';
$PALANG['pVacation_result_added'] = 'Auto response for %s has been enabled!';
$PALANG['pVacation_reply_type'] = 'Choice of reply';
@@ -219,7 +219,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Add default mail aliases';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Add Domain';
-$PALANG['pAdminCreate_domain_result_error'] = 'Unable to add domain!';
+$PALANG['pAdminCreate_domain_result_error'] = 'Adding the domain %s failed!';
$PALANG['pAdminCreate_domain_result_success'] = 'Domain has been added!';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!';
@@ -234,14 +234,14 @@
$PALANG['transport'] = 'Transport';
$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
-$PALANG['pAdminEdit_domain_result_error'] = 'Unable to modify domain!';
+$PALANG['pAdminEdit_domain_result_error'] = 'Modifying the domain %s failed!';
$PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin';
$PALANG['pAdminCreate_admin_username_text'] = 'Email address';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin is not a valid email address!';
$PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid';
$PALANG['pAdminCreate_admin_button'] = 'Add Admin';
-$PALANG['pAdminCreate_admin_result_error'] = 'Unable to add admin!';
+$PALANG['pAdminCreate_admin_result_error'] = 'Adding the admin %s failed!';
$PALANG['pAdminCreate_admin_result_success'] = 'Admin has been added!';
$PALANG['pAdminEdit_admin_welcome'] = 'Edit a domain admin';
@@ -249,7 +249,7 @@
$PALANG['password_again'] = 'Password (again)';
$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin';
$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.';
-$PALANG['pAdminEdit_admin_result_error'] = 'Unable to modify admin!';
+$PALANG['pAdminEdit_admin_result_error'] = 'Modifying the admin %s failed!';
$PALANG['pAdminEdit_admin_result_success'] = 'Admin has been modified!';
$PALANG['pUsersLogin_welcome'] = 'Mailbox users login to change your password and aliases.';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/es.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -89,7 +89,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'El dominio al que deberían ir los emails.';
$PALANG['pCreate_alias_domain_error1'] = 'No estás autorizado a crear la configuración que has elegido.';
$PALANG['pCreate_alias_domain_error2'] = '¡La configuración seleccionada no es válida, por favor elige una diferente!';
-$PALANG['pCreate_alias_domain_error3'] = 'Falló la inserción en la base de datos.';
+$PALANG['pCreate_alias_domain_error3'] = 'Falló la inserción en la base de datos. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'Ya están todos los dominios asignados.';
$PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla!';
@@ -98,7 +98,7 @@
$PALANG['pCreate_alias_address_text_error3'] = '¡Ha llegado a su límite de creación de alias!';
$PALANG['pCreate_alias_goto_text'] = 'A donde debe de ser enviado el e-mail.';
$PALANG['pCreate_alias_goto_text_error'] = '¡El PARA no es válido!';
-$PALANG['pCreate_alias_result_error'] = '¡No es posible añadir el alias a la tabla de alias!';
+$PALANG['pCreate_alias_result_error'] = '¡No es posible añadir el alias a la tabla de alias! (%s)'; # XXX Text changed to: Creating the alias %s failed!
$PALANG['pCreate_alias_result_success'] = '¡El alias ha sido añadido a la tabla de alias!'; # XXX text change: 'The alias %s has been created!'
$PALANG['pCreate_alias_catchall_text'] = 'Para crear un alias general use "*" como alias. Para una redirección de dominio a dominio, use "*@domain.tld" como Destino.'; # XXX check/beautify - was split in two lines before
@@ -111,7 +111,7 @@
$PALANG['pEdit_alias_domain_result_error'] = '¡No se pudo modificar el alias de dominio!';
$PALANG['pEdit_alias_forward_and_store'] = 'Entregar al buzón local.';
$PALANG['pEdit_alias_forward_only'] = 'Reenviar sólo al email especificado.';
-$PALANG['pEdit_alias_result_error'] = '¡Imposible modificar el alias!';
+$PALANG['pEdit_alias_result_error'] = '¡Imposible modificar el alias! (%s)'; # XXX Text changed to: Modifying the alias %s failed!
$PALANG['pCreate_mailbox_welcome'] = 'Crear un nuevo buzón para su dominio.';
$PALANG['pCreate_mailbox_username_text_error1'] = '¡El e-mail no es válido!';
@@ -119,7 +119,7 @@
$PALANG['pCreate_mailbox_password_text'] = 'Contraseña para POP3/IMAP';
$PALANG['pCreate_mailbox_name_text'] = 'Nombre completo';
$PALANG['pCreate_mailbox_mail'] = 'Enviar correo bienvenida';
-$PALANG['pCreate_mailbox_result_error'] = '¡Imposible añadir un buzón a la tabla de buzones!';
+$PALANG['pCreate_mailbox_result_error'] = '¡Imposible añadir un buzón a la tabla de buzones! (%s)'; # XXX Text changed to: Creating the mailbox %s failed!
$PALANG['pCreate_mailbox_result_success'] = '¡El buzón ha sido añadido a la tabla de buzones! (%s)'; # XXX Text changed to: 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.'; # XXX
@@ -141,12 +141,12 @@
$PALANG['pPassword_password2'] = 'Nueva contraseña (repetir)';
$PALANG['pPassword_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Cambiar contraseña'; # XXX check text - should be 'Change Password'
-$PALANG['pPassword_result_error'] = '¡Imposible cambiar la contraseña!';
+$PALANG['pPassword_result_error'] = '¡Imposible cambiar la contraseña! (%s)'; # XXX Text changed to: Changing the password for %s failed!
$PALANG['pPassword_result_success'] = '¡Su contraseña ha sido cambiada!';
$PALANG['pEdit_vacation_set'] = 'Cambiar / Establecer mensaje de ausencia';
$PALANG['pEdit_vacation_remove'] = 'Quitar mensaje de ausencia';
-$PALANG['pVacation_result_error'] = '¡Imposible actualizar la configuracióne la respuesta automática!';
+$PALANG['pVacation_result_error'] = '¡Imposible actualizar la configuracióne la respuesta automática! (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
$PALANG['pVacation_result_removed'] = '¡Autorespuesta eliminada! (%s)'; # XXX Text changed to "Auto response for %s has been disabled!"
$PALANG['pVacation_result_added'] = '¡Autorespuesta habilitada! (%s)'; # XXX Text changed to "Auto response for %s has been enabled!"
$PALANG['pVacation_reply_type'] = 'Choice of reply'; # XXX
@@ -214,7 +214,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Añadir alias por defecto';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Añadir dominio';
-$PALANG['pAdminCreate_domain_result_error'] = '¡Imposible añadir el dominio!';
+$PALANG['pAdminCreate_domain_result_error'] = '¡Imposible añadir el dominio! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido!';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = '¡No se pudo eliminar el dominio!';
@@ -228,7 +228,7 @@
$PALANG['transport'] = 'Transport'; # XXX check text - should be 'Transport'
$PALANG['pAdminEdit_domain_transport_text'] = 'Definir transport'; # XXX
$PALANG['pAdminEdit_domain_backupmx'] = 'El servidor de correo es backup MX'; # XXX
-$PALANG['pAdminEdit_domain_result_error'] = '¡Imposible modificar el dominio!';
+$PALANG['pAdminEdit_domain_result_error'] = '¡Imposible modificar el dominio! (%s)'; # XXX Text changed to: Modifying the domain %s failed!
$PALANG['pAdminCreate_admin_welcome'] = 'Añadir un nuevo administrador de dominio';
$PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
@@ -236,7 +236,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'El administrador ya existe o no es válido!';
$PALANG['pAdminCreate_admin_button'] = 'Añadir administrador';
-$PALANG['pAdminCreate_admin_result_error'] = '¡Imposible añadir el administrador!';
+$PALANG['pAdminCreate_admin_result_error'] = '¡Imposible añadir el administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = '¡El administrador ha sido añadido!';
$PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de dominio';
@@ -244,7 +244,7 @@
$PALANG['password_again'] = 'Contraseña (repetir)';
$PALANG['pAdminEdit_admin_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'] = '¡Imposible modificar el administrador!';
+$PALANG['pAdminEdit_admin_result_error'] = '¡Imposible modificar el administrador! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
$PALANG['pAdminEdit_admin_result_success'] = '¡El administrador ha sido modificado!';
$PALANG['pUsersLogin_welcome'] = 'Login de usuarios para cambiar la contraseña y alias.';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-10-13 20:07:34 UTC (rev 1538)
+++ trunk/languages/et.lang 2013-10-13 20:33:48 UTC (rev 1539)
@@ -89,7 +89,7 @@
$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
$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['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
@@ -98,7 +98,7 @@
$PALANG['pCreate_alias_address_text_error3'] = 'Oled kasutanud kogu aliaste arvu!';
$PALANG['pCreate_alias_goto_text'] = 'Kuhu peab kirja saatma.';
$PALANG['pCreate_alias_goto_text_error'] = 'Kellele pole kehtiv!';
-$PALANG['pCreate_alias_result_error'] = 'Aliase lisamine tabelisse ebaõnnestus!';
+$PALANG['pCreate_alias_result_error'] = 'Aliase lisamine tabelisse ebaõnnestus! (%s)'; # XXX Text changed to: Creating the alias %s failed!
$PALANG['pCreate_alias_result_success'] = 'Alias lisati aliaste tabelisse!'; # XXX text change: 'The alias %s has been created!'
$PALANG['pCreate_alias_catchall_text'] = 'Loomaks püüa-kõik aadressi kasuta aliasena "*". Domeenilt domeenile edasisaatmiseks kasuta kellele väljal "*@domeen.xx".'; # XXX check/beautify - was split in two lines before
@@ -111,7 +111,7 @@
$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_result_error'] = 'Aliase muutmine ebaõnnestus!';
+$PALANG['pEdit_alias_result_error'] = 'Aliase muutmine ebaõnnestus! (%s)'; # XXX Text changed to: Modifying the alias %s failed!
$PALANG['pCreate_mailbox_welcome'] = 'Loo uus postkast domeenis.';
$PALANG['pCreate_mailbox_username_text_error1'] = 'E-posti aadress pole kehtiv!';
@@ -119,7 +119,7 @@
$PALANG['pCreate_mailbox_password_text'] = 'Parool POP3/IMAP\'le';
$PALANG['pCreate_mailbox_name_text'] = 'Täielik nimi';
$PALANG['pCreate_mailbox_mail'] = 'Loo postkast'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_result_error'] = 'Postkasti lisamine tabelisse ebaõnnestus!';
+$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!
$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.'; # XXX
@@ -141,11 +141,11 @@
$PALANG['pPassword_password2'] = 'Uus parool (uuesti)';
$PALANG['pPassword_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Muuda parool';
-$PALANG['pPassword_result_error'] = 'Parooli muutmine ebaõnnestus!';
+$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!';
$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
-$PALANG['pVacation_result_error'] = 'Unable to update auto response settings!'; # XXX
+$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
@@ -213,7 +213,7 @@
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Lisa vaikimisi aliased';
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Lisa domeen';
-$PALANG['pAdminCreate_domain_result_error'] = 'Domeeni lisamine ebaõnnestus!';
+$PALANG['pAdminCreate_domain_result_error'] = 'Domeeni lisamine ebaõnnestus! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud!';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
@@ -227,14 +227,14 @@
$PALANG['transport'] = 'Transport';
$PALANG['pAdminEdit_domain_transport_text'] = 'Kirjelda transport';
$PALANG['pAdminEdit_domain_backupmx'] = 'E-posti server on varuserver (backup MX)';
-$PALANG['pAdminEdit_domain_result_error'] = 'Domeeni muutmine ebaõnnestus!';
+$PALANG['pAdminEdit_domain_result_error'] = 'Domeen...
[truncated message content] |
|
From: <chr...@us...> - 2013-10-13 22:07:18
|
Revision: 1540
http://sourceforge.net/p/postfixadmin/code/1540
Author: christian_boltz
Date: 2013-10-13 22:07:15 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
model/PFAHandler.php, setup.php:
- use Config::lang_f() for $this->msg['successmessage']
*.lang:
- add %s to all texts used for 'successmessage'
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/model/PFAHandler.php
trunk/setup.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/bg.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -92,7 +92,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'Избраната конфигурация е невалидна. Изберете друга!';
$PALANG['pCreate_alias_domain_error3'] = 'Възникна грешка при добавяне в базата. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Този ALIAS не е валиден!';
$PALANG['email_address_already_exists'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -143,7 +143,7 @@
$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'] = 'Паролата ви бе сменена успешно!';
+$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['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -215,7 +215,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Добави домейн';
$PALANG['pAdminCreate_domain_result_error'] = 'Не мога да добавя домейна! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Домейна бе добавен успешно!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Домейна бе добавен успешно! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Грешка при изтриването на домейна!';
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
@@ -236,7 +236,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Админ-а вече съществува или не е валиден';
$PALANG['pAdminCreate_admin_button'] = 'Добави админ';
$PALANG['pAdminCreate_admin_result_error'] = 'Не мога да добавя админа! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добавен успешно!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добавен успешно! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн';
$PALANG['admin'] = 'Админ';
@@ -244,7 +244,7 @@
$PALANG['pAdminEdit_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'] = 'Не мога да модифицирам админа! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Админ-а беше модифициран!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Админ-а беше модифициран! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Потребителски вход за смяна на парола и alias-и.';
$PALANG['pUsersLogin_username_incorrect'] = 'Вашият логин не е правилен. Моля проверете за коректност на вашият е-мейл адрес!';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/ca.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -90,7 +90,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'L\'àlies no és vàlid!';
$PALANG['email_address_already_exists'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -141,7 +141,7 @@
$PALANG['pPassword_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Canviar la contrasenya';
$PALANG['pPassword_result_error'] = 'Imposible canviar la contrasenya! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'La seva contrasenya ha estat canviada!';
+$PALANG['pPassword_result_success'] = 'La seva contrasenya ha estat canviada! (%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['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -213,7 +213,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Afegir domini';
$PALANG['pAdminCreate_domain_result_error'] = 'Imposible afegir el domini! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit!';
+$PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
@@ -235,7 +235,7 @@
$PALANG['pAdminCreate_admin_button'] = 'Afegir administrador';
$PALANG['pAdminCreate_admin_result_error'] = 'Imposible afegir l\'administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'L\'administrador ha estat afegit!';
+$PALANG['pAdminCreate_admin_result_success'] = 'L\'administrador ha estat afegit! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de domini';
$PALANG['admin'] = 'Administrador';
@@ -243,7 +243,7 @@
$PALANG['pAdminEdit_admin_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'] = 'Imposible modificar l\'administrador! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrador ha estat modificat!';
+$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrador ha estat modificat! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Login d\'usuaris per canviar la contrasenya i els àlies.';
$PALANG['pUsersLogin_username_incorrect'] = 'El seu login no és correcte. Asseguri\'s d\'haver introduït la seva adreça d\'e-mail com a login!';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/cn.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -91,7 +91,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = '该别名非法!';
$PALANG['email_address_already_exists'] = '邮件地址已经存在, 请重新选择!';
@@ -142,7 +142,7 @@
$PALANG['pPassword_password_text_error'] = '你两次输入的新密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
$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'] = '更改密码成功!';
+$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['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -214,7 +214,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = '新增';
$PALANG['pAdminCreate_domain_result_error'] = '新增域失败! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = '新增域成功!';
+$PALANG['pAdminCreate_domain_result_success'] = '新增域成功! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
@@ -235,7 +235,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = '管理员已经存在或者管理员名非法!';
$PALANG['pAdminCreate_admin_button'] = '新增';
$PALANG['pAdminCreate_admin_result_error'] = '新增管理员失败! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功!';
+$PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = '修改域管理员';
$PALANG['admin'] = '管理员';
@@ -243,7 +243,7 @@
$PALANG['pAdminEdit_admin_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'] = '编辑域管理员成功!';
+$PALANG['pAdminEdit_admin_result_success'] = '编辑域管理员成功! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = '邮件用户从这里登录管理你的密码和别名.';
$PALANG['pUsersLogin_username_incorrect'] = '登录失败. 请确认你是使用你的邮箱地址登录!';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/cs.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -96,7 +96,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Adresa neni platná!';
$PALANG['email_address_already_exists'] = 'Taková emailová adresa již existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -147,7 +147,7 @@
$PALANG['pPassword_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Změnit heslo'; # XXX check text - should be 'Change Password'
$PALANG['pPassword_result_error'] = 'Nepodařilo se změnit heslo! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'Heslo bylo změněno!';
+$PALANG['pPassword_result_success'] = 'Heslo bylo změněno! (%s)'; # XXX Text changed to: The password for %s has been changed.
$PALANG['pEdit_vacation_set'] = 'Změnit / Nastavit zprávu o nepřítomnosti';
$PALANG['pEdit_vacation_remove'] = 'Ostranit zprávu o nepřítomnosti';
@@ -222,7 +222,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Přidat doménu';
$PALANG['pAdminCreate_domain_result_error'] = 'Nepodařilo se přidat doménu! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Nepodařilo se odstranit doménu!';
@@ -244,7 +244,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Taková adresa již existuje!';
$PALANG['pAdminCreate_admin_button'] = 'Přidat administrátora';
$PALANG['pAdminCreate_admin_result_error'] = 'Nepodařilo se přidat administrátora! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Administrátor byl přidán!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Administrátor byl přidán! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Upravit doménového administrátora';
$PALANG['admin'] = 'Uživatelské jméno'; # XXX check text - should be 'Admin'
@@ -252,7 +252,7 @@
$PALANG['pAdminEdit_admin_super_admin'] = 'Superuživatel';
$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
$PALANG['pAdminEdit_admin_result_error'] = 'Nepodařilo se upravit administrátora! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor byl upraven!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Administrátor byl upraven! (%s)'; # XXX Text changed to: The admin %s has been modified.
$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!';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/da.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -96,7 +96,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfiguration er ikke korrekt, vælg venligst en anden.';
$PALANG['pCreate_alias_domain_error3'] = 'Indsætning i databasen fejlede. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'Alle domænerne har allerede aliases.';
-$PALANG['pCreate_alias_domain_success'] = 'Domæne-alias blev tilføjet alias-tabellen.';
+$PALANG['pCreate_alias_domain_success'] = 'Domæne-alias blev tilføjet alias-tabellen. (%s)'; # XXX Text changed to: The alias domain %s has been created.
$PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt.';
$PALANG['email_address_already_exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.';
@@ -147,7 +147,7 @@
$PALANG['pPassword_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Ændr adgangskode';
$PALANG['pPassword_result_error'] = 'Kan ikke ændre adgangskoden! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'Din adgangskode er ændret!';
+$PALANG['pPassword_result_success'] = 'Din adgangskode er ændret! (%s)'; # XXX Text changed to: The password for %s has been changed.
$PALANG['pEdit_vacation_set'] = 'Ændr / Angiv autosvar';
$PALANG['pEdit_vacation_remove'] = 'Fjern autosvar';
@@ -222,7 +222,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne';
$PALANG['pAdminCreate_domain_result_error'] = 'Kan ikke tilføje domænet! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Administratoren kunne ikke slettes.';
$PALANG['pAdminDelete_domain_error'] = 'Domænet kunne ikke slettes!';
@@ -244,7 +244,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Aministratoren findes allerede eller er ikke gyldig';
$PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
$PALANG['pAdminCreate_admin_result_error'] = 'Administratoren kunne ikke tilføjes! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er tilføjet!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er tilføjet! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Redigér en domæneadministrator';
$PALANG['admin'] = 'Administrator';
@@ -252,7 +252,7 @@
$PALANG['pAdminEdit_admin_super_admin'] = 'Superadministrator';
$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
$PALANG['pAdminEdit_admin_result_error'] = 'Kunne ikke rette administrator! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Log ind for at ændre adgangskode og videresending.';
$PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Tjek at du bruger din emailadresse som brugernavn!';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/de.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -93,7 +93,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'Die gewählte Konfiguration ist ungültig, bitte wählen Sie eine andere';
$PALANG['pCreate_alias_domain_error3'] = 'Das Erstellen der Alias-Domain %s ist fehlgeschlagen!';
$PALANG['pCreate_alias_domain_error4'] = 'Alle Domains sind bereits Alias-Domains.';
-$PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain wurde in der Datenbank eingetragen!';
+$PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain %s wurde erstellt.';
$PALANG['pCreate_alias_address_text_error1'] = 'Dieses ALIAS ist nicht erlaubt!';
$PALANG['email_address_already_exists'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!';
@@ -144,7 +144,7 @@
$PALANG['pPassword_password_text_error'] = 'Die beiden angegebenen Passwörter sind nicht identisch oder leer!';
$PALANG['change_password'] = 'Passwort ändern';
$PALANG['pPassword_result_error'] = 'Das Passwort für %s konnte nicht geändert werden';
-$PALANG['pPassword_result_success'] = 'Ihr Passwort wurde geändert!';
+$PALANG['pPassword_result_success'] = 'Das Passwort für %s wurde geändert.';
$PALANG['pEdit_vacation_set'] = 'Automatische Antwort ändern / einrichten';
$PALANG['pEdit_vacation_remove'] = 'Automatische Antwort abschalten';
@@ -219,7 +219,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Domain hinzufügen';
$PALANG['pAdminCreate_domain_result_error'] = 'Das Anlegen der Domain %s ist fehlgeschlagen!';
-$PALANG['pAdminCreate_domain_result_success'] = 'Domain wurde angelegt!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Die Domain %s wurde angelegt.';
$PALANG['pAdminDelete_admin_error'] = 'Admin kann nicht gelöscht werden!';
$PALANG['pAdminDelete_domain_error'] = 'Domain konnte nicht gelöscht werden!';
@@ -241,7 +241,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Der Admin existiert bereits bzw. ist nicht korrekt';
$PALANG['pAdminCreate_admin_button'] = 'Admin hinzufügen';
$PALANG['pAdminCreate_admin_result_error'] = 'Das anlegen des Admins %s ist fehlgeschlagen';
-$PALANG['pAdminCreate_admin_result_success'] = 'Admin angelegt!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Der Admin %s wurde angelegt.';
$PALANG['pAdminEdit_admin_welcome'] = 'Domain Admin editieren';
$PALANG['admin'] = 'Admin';
@@ -249,7 +249,7 @@
$PALANG['pAdminEdit_admin_super_admin'] = 'Super-Admin';
$PALANG['super_admin_desc'] = 'Super-Admins haben Zugriff auf alle Domains und können Domains und Admins verwalten.';
$PALANG['pAdminEdit_admin_result_error'] = 'Das Ändern des Admins %s ist fehlgeschlagen!';
-$PALANG['pAdminEdit_admin_result_success'] = 'Admin geändert!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Der Admin %s wurde geändert.';
$PALANG['pUsersLogin_welcome'] = 'Benutzer bitte hier einloggen, um Weiterleitungen bzw. das Passwort zu ändern.';
$PALANG['pUsersLogin_username_incorrect'] = 'Falscher Login! Bitte benutzen Sie ihre Email-Adresse als Login';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/en.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -94,7 +94,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!';
$PALANG['pCreate_alias_domain_error3'] = 'Creating the alias domain %s failed!';
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.';
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!';
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.';
$PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS is not valid!';
$PALANG['email_address_already_exists'] = 'This email address already exists, please choose a different one!';
@@ -145,7 +145,7 @@
$PALANG['pPassword_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
$PALANG['change_password'] = 'Change Password';
$PALANG['pPassword_result_error'] = 'Changing the password for %s failed!';
-$PALANG['pPassword_result_success'] = 'Your password has been changed!';
+$PALANG['pPassword_result_success'] = 'The password for %s has been changed.';
$PALANG['pEdit_vacation_set'] = 'Change / Set away message';
$PALANG['pEdit_vacation_remove'] = 'Remove away message';
@@ -220,7 +220,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Add Domain';
$PALANG['pAdminCreate_domain_result_error'] = 'Adding the domain %s failed!';
-$PALANG['pAdminCreate_domain_result_success'] = 'Domain has been added!';
+$PALANG['pAdminCreate_domain_result_success'] = 'The domain %s has been added.';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!';
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!';
@@ -242,7 +242,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid';
$PALANG['pAdminCreate_admin_button'] = 'Add Admin';
$PALANG['pAdminCreate_admin_result_error'] = 'Adding the admin %s failed!';
-$PALANG['pAdminCreate_admin_result_success'] = 'Admin has been added!';
+$PALANG['pAdminCreate_admin_result_success'] = 'The admin %s has been added!';
$PALANG['pAdminEdit_admin_welcome'] = 'Edit a domain admin';
$PALANG['admin'] = 'Admin';
@@ -250,7 +250,7 @@
$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin';
$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.';
$PALANG['pAdminEdit_admin_result_error'] = 'Modifying the admin %s failed!';
-$PALANG['pAdminEdit_admin_result_success'] = 'Admin has been modified!';
+$PALANG['pAdminEdit_admin_result_success'] = 'The admin %s has been modified.';
$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!';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/es.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -91,7 +91,7 @@
$PALANG['pCreate_alias_domain_error2'] = '¡La configuración seleccionada no es válida, por favor elige una diferente!';
$PALANG['pCreate_alias_domain_error3'] = 'Falló la inserción en la base de datos. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'Ya están todos los dominios asignados.';
-$PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla!';
+$PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla! (%s)'; # XXX Text changed to: The alias domain %s has been created.
$PALANG['pCreate_alias_address_text_error1'] = '¡El ALIAS no es válido!';
$PALANG['email_address_already_exists'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -142,7 +142,7 @@
$PALANG['pPassword_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Cambiar contraseña'; # XXX check text - should be 'Change Password'
$PALANG['pPassword_result_error'] = '¡Imposible cambiar la contraseña! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = '¡Su contraseña ha sido cambiada!';
+$PALANG['pPassword_result_success'] = '¡Su contraseña ha sido cambiada! (%s)'; # XXX Text changed to: The password for %s has been changed.
$PALANG['pEdit_vacation_set'] = 'Cambiar / Establecer mensaje de ausencia';
$PALANG['pEdit_vacation_remove'] = 'Quitar mensaje de ausencia';
@@ -215,7 +215,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Añadir dominio';
$PALANG['pAdminCreate_domain_result_error'] = '¡Imposible añadir el dominio! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido!';
+$PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = '¡No se pudo eliminar el dominio!';
$PALANG['pAdminDelete_alias_domain_error'] = '¡No se pudo eliminar el alias de dominio!';
@@ -237,7 +237,7 @@
$PALANG['pAdminCreate_admin_button'] = 'Añadir administrador';
$PALANG['pAdminCreate_admin_result_error'] = '¡Imposible añadir el administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = '¡El administrador ha sido añadido!';
+$PALANG['pAdminCreate_admin_result_success'] = '¡El administrador ha sido añadido! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de dominio';
$PALANG['admin'] = 'Administrador';
@@ -245,7 +245,7 @@
$PALANG['pAdminEdit_admin_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'] = '¡Imposible modificar el administrador! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = '¡El administrador ha sido modificado!';
+$PALANG['pAdminEdit_admin_result_success'] = '¡El administrador ha sido modificado! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Login de usuarios para cambiar la contraseña y alias.';
$PALANG['pUsersLogin_username_incorrect'] = 'Su login no es correcto. ¡Asegúrese de haber introducido su dirección de e-mail como login!';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/et.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -91,7 +91,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'ALIAS pole kehtiv!';
$PALANG['email_address_already_exists'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -142,7 +142,7 @@
$PALANG['pPassword_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
$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!';
+$PALANG['pPassword_result_success'] = 'Parool on muudetud! (%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['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -214,7 +214,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Lisa domeen';
$PALANG['pAdminCreate_domain_result_error'] = 'Domeeni lisamine ebaõnnestus! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
@@ -235,7 +235,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Selline haldaja on juba olemas';
$PALANG['pAdminCreate_admin_button'] = 'Lisa haldaja';
$PALANG['pAdminCreate_admin_result_error'] = 'Haldaja lisamine ebaõnnestus! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Muuda domeeni haldajat';
$PALANG['admin'] = 'Haldaja';
@@ -243,7 +243,7 @@
$PALANG['pAdminEdit_admin_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'] = 'Haldaja muutmine ebaõnnestus! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Haldaja on muudetud!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Haldaja on muudetud! (%s)'; # XXX Text changed to: The admin %s has been modified.
$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!';
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/eu.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -90,7 +90,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'ALIASa okerra da!';
$PALANG['email_address_already_exists'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
$PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!';
@@ -140,7 +140,7 @@
$PALANG['pPassword_password_text_error'] = 'Sarturiko pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Pasahitza aldatu';
$PALANG['pPassword_result_error'] = 'Ezinezkoa pasahitza aldatzea! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'Pasahitza aldatuta!';
+$PALANG['pPassword_result_success'] = 'Pasahitza aldatuta! (%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['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -212,7 +212,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Domeinua gehitu';
$PALANG['pAdminCreate_domain_result_error'] = 'Ezinezkoa domeinua gehitzea! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Domeinua gehituta!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domeinua gehituta! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
@@ -234,7 +234,7 @@
$PALANG['pAdminCreate_admin_button'] = 'Kudeatzailea gehitu';
$PALANG['pAdminCreate_admin_result_error'] = 'Ezinezkoa kudeatzailea gehitzea! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1';
+$PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1 (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Domeinu kudeatzaile bat aldatu';
$PALANG['admin'] = 'Kudeatzailea';
@@ -242,7 +242,7 @@
$PALANG['pAdminEdit_admin_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'] = 'Ezinezkoa kudeatzailea aldatzea! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Kudeatzailea aldatu da!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Kudeatzailea aldatu da! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Erabiltzaileen logina pasahitz eta aliasa aldatzeko.';
$PALANG['pUsersLogin_username_incorrect'] = 'Login okerra. Ziurta zaitez posta helbidea login gisa sartu duzula!';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/fi.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -92,7 +92,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'Valittu konfiguraatio on viallinen, ole hyvä ja valitse toinen!';
$PALANG['pCreate_alias_domain_error3'] = 'Syöttö tietokantaan epäonnistui. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'Kaikilla domaineilla on jo alias.';
-$PALANG['pCreate_alias_domain_success'] = 'Domainin alias on lisätty domain alias tauluun!';
+$PALANG['pCreate_alias_domain_success'] = 'Domainin alias on lisätty domain alias tauluun! (%s)'; # XXX Text changed to: The alias domain %s has been created.
$PALANG['pCreate_alias_address_text_error1'] = 'Alias ei ole oikean muotoinen!';
$PALANG['email_address_already_exists'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -142,7 +142,7 @@
$PALANG['pPassword_password_text_error'] = 'Antamasi salasanat eivät täsmää! Tai ovat tyhjiä!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Vaihda salasana';
$PALANG['pPassword_result_error'] = 'Salasanan vaihto ei onnistunut! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'Salasana vaihdettu!';
+$PALANG['pPassword_result_success'] = 'Salasana vaihdettu! (%s)'; # XXX Text changed to: The password for %s has been changed.
$PALANG['pEdit_vacation_set'] = 'Muuta / Aseta poissaoloviesti';
$PALANG['pEdit_vacation_remove'] = 'Poista poissaoloviesti';
$PALANG['pVacation_result_error'] = 'Automaattivastauksen asetuksia ei voitu päivittää! (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
@@ -214,7 +214,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Lisää domain';
$PALANG['pAdminCreate_domain_result_error'] = 'Domainin lisäys ei onnistunut! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Domain on lisätty!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domain on lisätty! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Domainin voitu poistaa!';
$PALANG['pAdminDelete_alias_domain_error'] = 'Domainin aliasta ei voitu poistaa!';
@@ -235,7 +235,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Ylläpitäjän sähköpostiosoite on jo olemassa tai se ei ole oikean muotoinen';
$PALANG['pAdminCreate_admin_button'] = 'Lisää ylläpitäjä';
$PALANG['pAdminCreate_admin_result_error'] = 'Ylläpitäjän lisäys ei onnistu! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Ylläpitäjä on lisätty!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Ylläpitäjä on lisätty! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Muokkaa domainin ylläpitäjää';
$PALANG['admin'] = 'Ylläpitäjä'; # XXX check text - should be 'Admin'
@@ -243,7 +243,7 @@
$PALANG['pAdminEdit_admin_super_admin'] = 'Pääylläpitäjä';
$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
$PALANG['pAdminEdit_admin_result_error'] = 'Ylläpitäjän muokkaaminen ei onnistu! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Ylläpitäjän muokkaus onnistui!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Ylläpitäjän muokkaus onnistui! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Salasanan vaihto.';
$PALANG['pUsersLogin_username_incorrect'] = 'Käyttäjätunnus tai salasana väärin!';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/fo.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -91,7 +91,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'DULNEVNI er ógyldugt!';
$PALANG['email_address_already_exists'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!';
@@ -142,7 +142,7 @@
$PALANG['pPassword_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Broyt loyniorð';
$PALANG['pPassword_result_error'] = 'Fái ikki broytt títt loyniorð! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'Títt loyniorð er broytt!';
+$PALANG['pPassword_result_success'] = 'Títt loyniorð er broytt! (%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['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -214,7 +214,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Stovna navnaøki';
$PALANG['pAdminCreate_domain_result_error'] = 'Fái ikki stovnað navnaøki! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Navnaøki er stovnað!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Navnaøki er stovnað! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
@@ -235,7 +235,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Umsitari finst longu ella er ógyldugur';
$PALANG['pAdminCreate_admin_button'] = 'Stovna umsitara';
$PALANG['pAdminCreate_admin_result_error'] = 'Fái ikki stovnað umsitara! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Broyt navnaøki umsitara';
$PALANG['admin'] = 'Umsitari';
@@ -243,7 +243,7 @@
$PALANG['pAdminEdit_admin_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'] = 'Fái ikki broytt umsitara! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Umsitari er broyttur!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Umsitari er broyttur! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Postkassa brúkarar loggi inn fyri at broyta loyniorð, víðarisending ella frítíðarboð.';
$PALANG['pUsersLogin_username_incorrect'] = 'Títt login er skeivt. Minst til at logga inn við tíni e-post adressu!';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/fr.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -93,7 +93,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'La configuration choisie est invalide, merci d\'en choisir une autre!';
$PALANG['pCreate_alias_domain_error3'] = 'Insertion dans la base de donnée échouée. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'Tous les domaines sont déj\xE0 liés \xE0 un alias.';
-$PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj\xE0 pr\xE9sent dans la table de domaine!';
+$PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj\xE0 pr\xE9sent dans la table de domaine! (%s)'; # XXX Text changed to: The alias domain %s has been created.
$PALANG['pCreate_alias_address_text_error1'] = 'Cet ALIAS n\'est pas valide!';
$PALANG['email_address_already_exists'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
$PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !';
@@ -143,7 +143,7 @@
$PALANG['pPassword_password_text_error'] = 'Le mot de passe fournit ne correspond pas! Ou est vide!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Changer le mot de passe'; # XXX check text - should be 'Change Password'
$PALANG['pPassword_result_error'] = 'Impossible de changer votre mot de passe! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'Votre mot de passe a été change!';
+$PALANG['pPassword_result_success'] = 'Votre mot de passe a été change! (%s)'; # XXX Text changed to: The password for %s has been changed.
$PALANG['pEdit_vacation_set'] = 'Modifier le message';
$PALANG['pEdit_vacation_remove'] = 'Effacer le message';
$PALANG['pVacation_result_error'] = 'Impossible de mettre à jour les réglages du répondeur! (%s)'; # XXX Text changed to: Updating the auto response settings for %s failed
@@ -215,7 +215,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Ajouter un domaine';
$PALANG['pAdminCreate_domain_result_error'] = 'Impossible d\'ajouter le domaine! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Le domaine a été ajouté!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Le domaine a été ajouté! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Impossible de supprimer le domain!';
@@ -237,7 +237,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Cet adresse courriel administrateur existe déjà ou n\'est pas valide';
$PALANG['pAdminCreate_admin_button'] = 'Ajouter un administrateur';
$PALANG['pAdminCreate_admin_result_error'] = 'Impossible d\'ajouter un administrateur! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajouté!';
+$PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajouté! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Modifier un domaine';
$PALANG['admin'] = 'Administrateur';
@@ -245,7 +245,7 @@
$PALANG['pAdminEdit_admin_super_admin'] = 'Super administrateur';
$PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
$PALANG['pAdminEdit_admin_result_error'] = 'Impossible de modifier l\'administrateur ! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur a été ajouté!';
+$PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur a été ajouté! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Entrer votre adresse courriel pour modifier votre mot de passe et vos transferts.';
$PALANG['pUsersLogin_username_incorrect'] = 'L\'adresse courriel est invalide. Assurez-vous d\'avoir correctement saisie votre adresse courriel!';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/hr.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -90,7 +90,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!';
$PALANG['email_address_already_exists'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!';
@@ -141,7 +141,7 @@
$PALANG['pPassword_password_text_error'] = 'Uneene lozinke se ne podudaraju ili su prazne!'; # XXX check/beautify - was split in two lines before
$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 uspjeno promijenjena!';
+$PALANG['pPassword_result_success'] = 'Lozinka je uspjeno promijenjena! (%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['pVacation_result_error'] = 'Updating the auto response settings for %s failed'; # XXX
@@ -213,7 +213,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_button'] = 'Dodaj domenu';
$PALANG['pAdminCreate_domain_result_error'] = 'Domenu nije bilo moguče dodati! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspjeno dodana!';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspjeno dodana! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
@@ -234,7 +234,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator već postoji ili nije valjan';
$PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
$PALANG['pAdminCreate_admin_result_error'] = 'Administratora nije bilo moguće dodati! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspjeno dodan';
+$PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspjeno dodan (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Uredi administratora domene';
$PALANG['admin'] = 'Administrator';
@@ -242,7 +242,7 @@
$PALANG['pAdminEdit_admin_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'] = 'Administratora nije bilo moguće promjeniti! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je uspjeno promjenjen!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je uspjeno promjenjen! (%s)'; # XXX Text changed to: The admin %s has been modified.
$PALANG['pUsersLogin_welcome'] = 'Korisnici potanskih ormarića ukoliko elite promjeniti lozinku ili aliase.';
$PALANG['pUsersLogin_username_incorrect'] = 'Korisničko ime nije pravilno! Morate upotrijebiti adresu vae e-pote!';
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/hu.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -93,7 +93,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Az ALIAS érvénytelen!';
$PALANG['email_address_already_exists'] = 'Ez az email cím már létezik, kérlek válassz másikat!';
@@ -144,7 +144,7 @@
$PALANG['pPassword_password_text_error'] = 'A beírt jelszavak nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before
$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!';
+$PALANG['pPassword_result_success'] = 'A jelszavad megváltozott! (%s)'; # XXX Text changed to: The password for %s has been changed.
$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';
@@ -219,7 +219,7 @@
$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_button'] = 'Domain felvétele';
$PALANG['pAdminCreate_domain_result_error'] = 'A domain felvétele sikertelen! (%s)'; # XXX Text changed to: Adding the domain %s failed!
-$PALANG['pAdminCreate_domain_result_success'] = 'A domain-t felvettük az adatbázisba!';
+$PALANG['pAdminCreate_domain_result_success'] = 'A domain-t felvettük az adatbázisba! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
$PALANG['pAdminDelete_domain_error'] = 'A domain törlése nem sikerült!';
@@ -241,7 +241,7 @@
$PALANG['pAdminCreate_admin_username_text_error2'] = 'Az Admin már létezik, vagy nem valós a cím!';
$PALANG['pAdminCreate_admin_button'] = 'Admin felvétele';
$PALANG['pAdminCreate_admin_result_error'] = 'Nemsikerült az Admint felvenni! (%s)'; # XXX Text changed to: Adding the admin %s failed!
-$PALANG['pAdminCreate_admin_result_success'] = 'Az Admin sikeresen bekerült az adatbázisba!';
+$PALANG['pAdminCreate_admin_result_success'] = 'Az Admin sikeresen bekerült az adatbázisba! (%s)'; # XXX Text changed to: The admin %s has been added.
$PALANG['pAdminEdit_admin_welcome'] = 'Domain admin szerkesztése';
$PALANG['admin'] = 'Admin';
@@ -249,7 +249,7 @@
$PALANG['pAdminEdit_admin_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'] = 'Nemsikerült módosítani az admint! (%s)'; # XXX Text changed to: Modifying the admin %s failed!
-$PALANG['pAdminEdit_admin_result_success'] = 'Az Admin módosítása megtörtént!';
+$PALANG['pAdminEdit_admin_result_success'] = 'Az Admin módosítása megtörtént! (%s)'; # XXX Text changed to: The admin %s has been modified.
$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!';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-10-13 20:33:48 UTC (rev 1539)
+++ trunk/languages/is.lang 2013-10-13 22:07:15 UTC (rev 1540)
@@ -91,7 +91,7 @@
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Aliasinn er ekki í lagi!';
$PALANG['email_address_already_exists'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -142,7 +142,7 @@
$PALANG['pPassword_password_text_error'] = 'Lykilorðin sem þú gafst upp passa ekki saman! Eða þú gefur upp tómt lykilorð!'; # XXX check/beautify - was split in two lines before
$PALANG['change_password'] = 'Breyta lykilorði';
$PALANG['pPassword_result_error'] = 'Get ekki breytt lykilorði! (%s)'; # XXX Text changed to: Changing the password for %s failed!
-$PALANG['pPassword_result_success'] = 'Lykilorðinu hefur verið breytt!';
+$PALANG['pPassword_result_success'] = 'Lykilorðinu hefur verið breytt! (%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['pVacation_result_error'] = 'Updating the auto response setting...
[truncated message content] |
|
From: <chr...@us...> - 2013-10-19 18:45:44
|
Revision: 1541
http://sourceforge.net/p/postfixadmin/code/1541
Author: christian_boltz
Date: 2013-10-19 18:45:41 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
AliasdomainHandler.php:
- better error/success messages
- cleanup TODO notes
*.lang:
- new texts for alias domains: alias_domain_change_failed,
alias_domain_changed, alias_domain_to_itsself
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/model/AliasdomainHandler.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/bg.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -91,8 +91,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Не ви е позволено да използвате избраната конфигурация.';
$PALANG['pCreate_alias_domain_error2'] = 'Избраната конфигурация е невалидна. Изберете друга!';
$PALANG['pCreate_alias_domain_error3'] = 'Възникна грешка при добавяне в базата. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Този ALIAS не е валиден!';
$PALANG['email_address_already_exists'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/ca.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -89,8 +89,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'L\'àlies no és vàlid!';
$PALANG['email_address_already_exists'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/cn.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = '该别名非法!';
$PALANG['email_address_already_exists'] = '邮件地址已经存在, 请重新选择!';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/cs.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -95,8 +95,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Adresa neni platná!';
$PALANG['email_address_already_exists'] = 'Taková emailová adresa již existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/da.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -95,8 +95,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tilladelse til at lave den valgte konfiguration';
$PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfiguration er ikke korrekt, vælg venligst en anden.';
$PALANG['pCreate_alias_domain_error3'] = 'Indsætning i databasen fejlede. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Alle domænerne har allerede aliases.';
$PALANG['pCreate_alias_domain_success'] = 'Domæne-alias blev tilføjet alias-tabellen. (%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['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt.';
$PALANG['email_address_already_exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/de.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -92,8 +92,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Sie dürfen die gewählte Konfiguration nicht erstellen.';
$PALANG['pCreate_alias_domain_error2'] = 'Die gewählte Konfiguration ist ungültig, bitte wählen Sie eine andere';
$PALANG['pCreate_alias_domain_error3'] = 'Das Erstellen der Alias-Domain %s ist fehlgeschlagen!';
+$PALANG['alias_domain_change_failed'] = 'Ändern der Alias-Domain %s fehlgeschlagen!';
$PALANG['pCreate_alias_domain_error4'] = 'Alle Domains sind bereits Alias-Domains.';
$PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain %s wurde erstellt.';
+$PALANG['alias_domain_changed'] = 'Die Alias-Domain %s wurde geändert.';
+$PALANG['alias_domain_to_itsself'] = 'Eine Domain kann keine Alias-Domain von sich selbst sein!';
$PALANG['pCreate_alias_address_text_error1'] = 'Dieses ALIAS ist nicht erlaubt!';
$PALANG['email_address_already_exists'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/en.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -93,8 +93,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.';
$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!';
$PALANG['pCreate_alias_domain_error3'] = 'Creating the alias domain %s failed!';
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!';
$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.';
$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.';
+$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.';
+$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!';
$PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS is not valid!';
$PALANG['email_address_already_exists'] = 'This email address already exists, please choose a different one!';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/es.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'No estás autorizado a crear la configuración que has elegido.';
$PALANG['pCreate_alias_domain_error2'] = '¡La configuración seleccionada no es válida, por favor elige una diferente!';
$PALANG['pCreate_alias_domain_error3'] = 'Falló la inserción en la base de datos. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Ya están todos los dominios asignados.';
$PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla! (%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['pCreate_alias_address_text_error1'] = '¡El ALIAS no es válido!';
$PALANG['email_address_already_exists'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/et.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'ALIAS pole kehtiv!';
$PALANG['email_address_already_exists'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/eu.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -89,8 +89,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'ALIASa okerra da!';
$PALANG['email_address_already_exists'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
$PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/fi.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -91,8 +91,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Sinulla ei ole oikeutta luoda valittua konfiguraatiota.';
$PALANG['pCreate_alias_domain_error2'] = 'Valittu konfiguraatio on viallinen, ole hyvä ja valitse toinen!';
$PALANG['pCreate_alias_domain_error3'] = 'Syöttö tietokantaan epäonnistui. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Kaikilla domaineilla on jo alias.';
$PALANG['pCreate_alias_domain_success'] = 'Domainin alias on lisätty domain alias tauluun! (%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['pCreate_alias_address_text_error1'] = 'Alias ei ole oikean muotoinen!';
$PALANG['email_address_already_exists'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/fo.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'DULNEVNI er ógyldugt!';
$PALANG['email_address_already_exists'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/fr.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -92,8 +92,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Vous n\'etes pas autorisé a créer la configuration choisie.';
$PALANG['pCreate_alias_domain_error2'] = 'La configuration choisie est invalide, merci d\'en choisir une autre!';
$PALANG['pCreate_alias_domain_error3'] = 'Insertion dans la base de donnée échouée. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Tous les domaines sont déj\xE0 liés \xE0 un alias.';
$PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj\xE0 pr\xE9sent dans la table de domaine! (%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['pCreate_alias_address_text_error1'] = 'Cet ALIAS n\'est pas valide!';
$PALANG['email_address_already_exists'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
$PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/hr.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -89,8 +89,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!';
$PALANG['email_address_already_exists'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!';
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/hu.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -92,8 +92,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Az ALIAS érvénytelen!';
$PALANG['email_address_already_exists'] = 'Ez az email cím már létezik, kérlek válassz másikat!';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/is.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Aliasinn er ekki í lagi!';
$PALANG['email_address_already_exists'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/it.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -91,8 +91,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'L\' Alias non è valido!';
$PALANG['email_address_already_exists'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/ja.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -92,8 +92,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$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['pCreate_alias_address_text_error1'] = 'メールアドレスが無効です。';
$PALANG['email_address_already_exists'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/lt.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Jūs negalite sukurti pasirinktos konfigūracijos.';
$PALANG['pCreate_alias_domain_error2'] = 'Pasirinkta neteisinga konfigūracija, pasirinkite kitą!';
$PALANG['pCreate_alias_domain_error3'] = 'Duomenų bazės papildyti nepavyko. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Visos sritys jau turi sinonimus.';
$PALANG['pCreate_alias_domain_success'] = 'Srities sinonimas užregistruotas! (%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['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!';
$PALANG['email_address_already_exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!';
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/mk.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Алијасот не е валиден!';
$PALANG['email_address_already_exists'] = 'Оваа адреса веќе постои. Ве молам одберете друга!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/nb.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -92,8 +92,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tillatelse til å opprette den valgte konfigurasjonen.';
$PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfigurasjonen er ugyldig, vennligst endre den!';
$PALANG['pCreate_alias_domain_error3'] = 'Det mislyktes å lagre informasjonen i databasen. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Det er allerede opprettet alias for alle domenene.';
$PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener! (%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['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!';
$PALANG['email_address_already_exists'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/nl.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -91,8 +91,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'U heeft niet genoeg rechten om de huidige configuratie te maken.';
$PALANG['pCreate_alias_domain_error2'] = 'De huidige configuratie is ongeldig, slecteer een andere!';
$PALANG['pCreate_alias_domain_error3'] = 'Fout bij vullen database. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Alle domeinen hebben al een alias!';
$PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de alias domein tabel! (%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['pCreate_alias_address_text_error1'] = 'De Alias is niet geldig!';
$PALANG['email_address_already_exists'] = 'Dit e-mail aders bestaat al, kies aub een andere.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/nn.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!';
$PALANG['email_address_already_exists'] = 'Denne epostadressen eksisterer allerede, velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/pl.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -93,8 +93,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Nie masz uprawnień do tworzenia takiej konfiguracji.';
$PALANG['pCreate_alias_domain_error2'] = 'Wybrana konfiguracja jest nieprawidłowa, proszę wybrać inną!';
$PALANG['pCreate_alias_domain_error3'] = 'Dodanie do bazy nie powiodło się. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Wszystkie domeny są już aliasowane.';
$PALANG['pCreate_alias_domain_success'] = 'Alias domeny został dodany do tabeli aliasów domen! (%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['pCreate_alias_address_text_error1'] = 'Alias jest niepoprawny!';
$PALANG['email_address_already_exists'] = 'Taki adres email juz istnieje, proszę wybrać inny!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/pt-br.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -94,8 +94,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Você não possui permissão para criar a configuração desejada.';
$PALANG['pCreate_alias_domain_error2'] = 'Configuração inválida. Por favor, defina outra configuração!';
$PALANG['pCreate_alias_domain_error3'] = 'Não foi possível criar o alias de domínio. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Todos os domínios já estão espelhados.';
$PALANG['pCreate_alias_domain_success'] = 'Alias de domínio criado! (%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['pCreate_alias_address_text_error1'] = 'Alias inválido!';
$PALANG['email_address_already_exists'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/ru.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -94,8 +94,11 @@
$PALANG['pCreate_alias_domain_error1'] = 'Вам не разрешено создавать выбранную конфигурацию.';
$PALANG['pCreate_alias_domain_error2'] = 'Выбранная конфигурация некорректна, пожалуйста, выберите другую!';
$PALANG['pCreate_alias_domain_error3'] = 'Не удалось добавить запись в базу данных. (%s)'; # XXX Text changed to: Creating the alias domain %s failed!
+$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX
$PALANG['pCreate_alias_domain_error4'] = 'Все домены уже задействованы в доменах-алиасах.';
$PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавлен в таблицу доменов-алиасов! (%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['pCreate_alias_address_text_error1'] = 'Неверное имя алиаса!';
$PALANG['email_address_already_exists'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/sk.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -91,8 +91,11 @@
$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['pCreate_alias_domain_error3'] = '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['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['pCreate_alias_address_text_error1'] = 'Adresa nie je platná!';
$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\!'
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/sl.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Sintaksa aliasa je napačna!';
$PALANG['email_address_already_exists'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/sv.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -92,8 +92,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Detta ALIAS är inte giltigt!';
$PALANG['email_address_already_exists'] = 'Denna epostadress existerar redan, välj en annan epostadress!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/tr.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'ALIAS uygun deðil!';
$PALANG['email_address_already_exists'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/languages/tw.lang 2013-10-19 18:45:41 UTC (rev 1541)
@@ -90,8 +90,11 @@
$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['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed!
+$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['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = '該別名非法!';
$PALANG['email_address_already_exists'] = '郵件地址已經存在, 請重新選擇!';
Modified: trunk/model/AliasdomainHandler.php
===================================================================
--- trunk/model/AliasdomainHandler.php 2013-10-13 22:07:15 UTC (rev 1540)
+++ trunk/model/AliasdomainHandler.php 2013-10-19 18:45:41 UTC (rev 1541)
@@ -10,10 +10,7 @@
protected $id_field = 'alias_domain';
protected $domain_field = 'alias_domain';
- # init $this->struct, $this->db_table and $this->id_field
protected function initStruct() {
- # TODO: add public function set_options_for_admin() to list only domains available to that admin
-
$this->struct=array(
# field name allow display in... type $PALANG label $PALANG description default / options / ...
# editing? form list
@@ -67,12 +64,12 @@
$this->msg['error_does_not_exist'] = 'pCreate_alias_domain_error2'; # TODO: better error message
if ($this->new) {
$this->msg['logname'] = 'create_alias_domain';
- $this->msg['store_error'] = 'pCreate_alias_domain_error3'; # TODO: error message could be better
+ $this->msg['store_error'] = 'pCreate_alias_domain_error3';
$this->msg['successmessage'] = 'pCreate_alias_domain_success';
} else {
$this->msg['logname'] = 'edit_alias_domain';
- $this->msg['store_error'] = 'pCreate_alias_domain_error3'; # TODO: error message could be better
- $this->msg['successmessage'] = 'pCreate_alias_domain_success'; # TODO: better message for edit
+ $this->msg['store_error'] = 'alias_domain_change_failed';
+ $this->msg['successmessage'] = 'alias_domain_changed';
}
}
@@ -125,7 +122,7 @@
*/
protected function _field_target_domain($field, $val) {
if ($val == $this->id) {
- $this->errormsg[$field] = Config::lang('pCreate_alias_domain_error2'); # TODO: error message could be better...
+ $this->errormsg[$field] = Config::lang('alias_domain_to_itsself');
return false;
}
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-10-19 18:59:02
|
Revision: 1542
http://sourceforge.net/p/postfixadmin/code/1542
Author: christian_boltz
Date: 2013-10-19 18:58:59 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
backup.php:
- move "unmaintained" warning to templates/backupwarning.tpl (that's
the easiest way to have working HTML tags)
- remove <p> tag from pgsql error message
templates/backupwarning.tpl
- new file, contains the "unmaintained" warning for backup.php
Modified Paths:
--------------
trunk/backup.php
Added Paths:
-----------
trunk/templates/backupwarning.tpl
Modified: trunk/backup.php
===================================================================
--- trunk/backup.php 2013-10-19 18:45:41 UTC (rev 1541)
+++ trunk/backup.php 2013-10-19 18:58:59 UTC (rev 1542)
@@ -29,20 +29,14 @@
// TODO: make backup supported for postgres
if ('pgsql'==$CONF['database_type']) {
- flash_error('<p>Sorry: Backup is currently not supported for your DBMS ('.$CONF['database_type'].').</p>');
+ flash_error('Sorry: Backup is currently not supported for your DBMS ('.$CONF['database_type'].').');
$smarty->assign ('smarty_template', 'message');
$smarty->display ('index.tpl');
die;
}
if (safeget('download') == "") {
- flash_error('
- <p><span class="error_msg">Warning:</span> The backup module of PostfixAdmin is poorly maintained and might contain bugs.</p>
- <p>Please use <tt>mysqldump</tt> to get a reliable backup of your database.</p>
- <p> </p>
- <p>If you still trust this backup module, you can <a href="backup.php?download=1" class="button">download the database dump now</a></p>
- ');
- $smarty->assign ('smarty_template', 'message');
+ $smarty->assign ('smarty_template', 'backupwarning');
$smarty->display ('index.tpl');
die;
}
Added: trunk/templates/backupwarning.tpl
===================================================================
--- trunk/templates/backupwarning.tpl (rev 0)
+++ trunk/templates/backupwarning.tpl 2013-10-19 18:58:59 UTC (rev 1542)
@@ -0,0 +1,6 @@
+<ul class="flash-error">
+ <li><span class='error_msg'><b>Warning:</b></span> The backup module of PostfixAdmin is poorly maintained and might contain bugs.
+ <li>Please use <tt>mysqldump</tt> to get a reliable backup of your database.
+ <li>
+ <li>If you still trust this backup module, you can <a href="backup.php?download=1" class="button">download the database dump now</a>
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-10-19 20:12:07
|
Revision: 1544
http://sourceforge.net/p/postfixadmin/code/1544
Author: christian_boltz
Date: 2013-10-19 20:12:02 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
smarty.inc.php:
- move header() calls from index.tpl to smarty.inc.php, which means
we no longer need to use SmartyBC class
- use Smarty instead of SmartyBC class
- eval_size(): use Config::Lang instead of $PALANG
templates/header.tpl:
- move header() calls to smarty.inc.php, and drop {php} usage
Modified Paths:
--------------
trunk/smarty.inc.php
trunk/templates/header.tpl
Modified: trunk/smarty.inc.php
===================================================================
--- trunk/smarty.inc.php 2013-10-19 19:19:56 UTC (rev 1543)
+++ trunk/smarty.inc.php 2013-10-19 20:12:02 UTC (rev 1544)
@@ -1,7 +1,5 @@
<?php
-#require_once ("$incpath/smarty/libs/Smarty.class.php");
-# We have to use the SmartyBC ("Backwards Compatible") class because some templates use {php}. (TODO: do we really need {php}?)
-require_once ("$incpath/smarty/libs/SmartyBC.class.php");
+require_once ("$incpath/smarty/libs/Smarty.class.php");
/**
* Turn on sanitisation of all data by default so it's not possible for XSS flaws to occur in PFA
@@ -9,7 +7,7 @@
class PFASmarty {
protected $template = null;
public function __construct() {
- $this->template = new SmartyBC();
+ $this->template = new Smarty();
//$this->template->debugging = true;
$incpath = dirname(__FILE__);
@@ -28,6 +26,13 @@
}
public function display($template) {
+ header ("Expires: Sun, 16 Mar 2003 05:00:00 GMT");
+ header ("Last-Modified: " . gmdate ("D, d M Y H:i:s") . " GMT");
+ header ("Cache-Control: no-store, no-cache, must-revalidate");
+ header ("Cache-Control: post-check=0, pre-check=0", false);
+ header ("Pragma: no-cache");
+ header ("Content-Type: text/html; charset=UTF-8");
+
$this->template->display($template);
unset($_SESSION['flash']); # cleanup flash messages
}
@@ -80,8 +85,8 @@
return $ret_val;
}
function eval_size ($aSize) {
- if ($aSize == 0) {$ret_val = $GLOBALS ['PALANG']['pOverview_unlimited']; }
- elseif ($aSize < 0) {$ret_val = $GLOBALS ['PALANG']['pOverview_disabled']; }
+ if ($aSize == 0) {$ret_val = Config::Lang('pOverview_unlimited'); }
+ elseif ($aSize < 0) {$ret_val = Config::Lang('pOverview_disabled'); }
else {$ret_val = $aSize; }
return $ret_val;
}
Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl 2013-10-19 19:19:56 UTC (rev 1543)
+++ trunk/templates/header.tpl 2013-10-19 20:12:02 UTC (rev 1544)
@@ -1,12 +1,4 @@
<!-- {$smarty.template} -->
-{php}
- @header ("Expires: Sun, 16 Mar 2003 05:00:00 GMT");
- @header ("Last-Modified: " . gmdate ("D, d M Y H:i:s") . " GMT");
- @header ("Cache-Control: no-store, no-cache, must-revalidate");
- @header ("Cache-Control: post-check=0, pre-check=0", false);
- @header ("Pragma: no-cache");
- @header ("Content-Type: text/html; charset=UTF-8");
-{/php}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-08 21:49:55
|
Revision: 1556
http://sourceforge.net/p/postfixadmin/code/1556
Author: christian_boltz
Date: 2013-11-08 21:49:53 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
PFAHandler:
- make error messages in _inp_*() translateable
- make date format in SQL "translateable"
*.lang:
- add the texts needed for the changes listed above
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/model/PFAHandler.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/bg.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Потребител %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Администратора може да се логне оттук за администриране на домейн.';
@@ -336,6 +339,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/ca.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
@@ -335,6 +338,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/cn.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
@@ -335,6 +338,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/cs.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -24,6 +24,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Přihlášen jako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
@@ -347,6 +350,8 @@
$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 # 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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/da.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -23,6 +23,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Indlogget som %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
@@ -349,6 +352,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Dato for seneste prøve/konfigurationsændring';
$PALANG['pFetchmail_desc_returned_text'] = 'Tekstbesked fra seneste prøve';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/de.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'Alle';
$PALANG['created'] = 'Erstellt';
$PALANG['missing_field'] = 'Das Feld %s fehlt';
+$PALANG['must_be_numeric'] = '%s muss numerisch sein';
+$PALANG['must_be_boolean'] = "%s muss ein Bool'scher Wert sein";
+$PALANG['invalid_value_given'] = 'Ungültiger Wert für %s angegeben';
$PALANG['pFooter_logged_as'] = 'Angemeldet als %s';
@@ -347,6 +350,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Programm zur Mailauslieferung';
$PALANG['pFetchmail_desc_date'] = 'Datum des letzten Mailabrufs/Konfigurationsänderung';
$PALANG['pFetchmail_desc_returned_text'] = 'Textausgabe des letzten Mailabrufs';
+$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: */
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/en.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'All';
$PALANG['created'] = 'Created';
$PALANG['missing_field'] = 'Field %s is missing';
+$PALANG['must_be_numeric'] = '%s must be numeric';
+$PALANG['must_be_boolean'] = '%s must be boolean';
+$PALANG['invalid_value_given'] = 'Invalid value given for %s';
$PALANG['pFooter_logged_as'] = 'Logged in as %s';
@@ -348,6 +351,9 @@
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change';
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling';
+$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: */
?>
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/es.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
@@ -337,6 +340,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Fecha del último sondeo/cambio en la configuración';
$PALANG['pFetchmail_desc_returned_text'] = 'Mensaje del último sondeo';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/et.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimiseks sisse.';
@@ -339,6 +342,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/eu.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
@@ -334,6 +337,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/fi.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Kirjautunut sisään tunnuksella %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Kirjautuminen';
@@ -335,6 +338,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Viimeisen tarkistuksen/konfiguraatio muutoksen päivämäärä';
$PALANG['pFetchmail_desc_returned_text'] = 'Viesti edellisestä tarkistuksesta';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/fo.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Umsitarar kunnu logga inn her fyri at umsita tykkara navnaøki.';
@@ -340,6 +343,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/fr.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -22,6 +22,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Bonjour %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
@@ -337,6 +340,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Date dernière vérification/changement configuration';
$PALANG['pFetchmail_desc_returned_text'] = 'Message dernière vérification';
+$PALANG['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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/hr.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -19,6 +19,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
@@ -334,6 +337,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/hu.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
@@ -348,6 +351,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/is.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.';
@@ -335,6 +338,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/it.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Collegato come %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Gli amministratori di posta devono effettuare il login qui per amministrare il proprio dominio.';
@@ -336,6 +339,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Data dell\'ultima modifica o attività';
$PALANG['pFetchmail_desc_returned_text'] = 'Risultato dell\'ultima attività';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/ja.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = '全て';
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'ログイン名 %s';
@@ -346,6 +349,8 @@
$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/lt.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'Visi';
$PALANG['created'] = 'Sukurta';
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Prisijungęs kaip %s';
$PALANG['pLogin_welcome'] = 'Pašto srities administratorius.';
@@ -341,6 +344,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/mk.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Логин за администрирање на домени (Само за администратори!)';
@@ -336,6 +339,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/nb.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -22,6 +22,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logget inn som %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'E-postadministratorer kan logge inn her for å administrere sine domener';
@@ -336,6 +339,8 @@
$PALANG['pFetchmail_desc_mda'] = 'E-postleveringsagent (Mail Delivery Agent)';
$PALANG['pFetchmail_desc_date'] = 'Dato for siste spørring/konfigurasjonsendring';
$PALANG['pFetchmail_desc_returned_text'] = 'Tekstmelding fra siste spørring';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/nl.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'Alle';
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'aangemeld als %s';
$PALANG['pLogin_welcome'] = 'Mail beheerders log hier in om uw domeinen te beheren.';
@@ -336,6 +339,8 @@
$PALANG['pFetchmail_desc_mda'] = 'mail delivery agent.';
$PALANG['pFetchmail_desc_date'] = 'datum van de laatste berichtencontrole/configuratie verandering.';
$PALANG['pFetchmail_desc_returned_text'] = 'text bericht van de laatste berichtencontrole.';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/nn.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Postadministrator; Logg inn her for å administrere ditt domene';
@@ -335,6 +338,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/pl.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -23,6 +23,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Zalogowano jako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.';
@@ -341,6 +344,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Data ostatniego sprawdzenia/zmiany konfiguracji';
$PALANG['pFetchmail_desc_returned_text'] = 'Wiadomość tekstowa z ostatniego sprawdzenia';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/pt-br.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
@@ -348,6 +351,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Data da última checagem/mudança de configuração';
$PALANG['pFetchmail_desc_returned_text'] = 'Mensagem de texto da última checagem';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/ru.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -22,6 +22,9 @@
$PALANG['all'] = 'Все';
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Вошли как %s';
@@ -348,6 +351,8 @@
$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/sk.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -21,6 +21,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Prihlásený ako %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Prihlásenie administrátorov pre správu domén';
@@ -336,6 +339,8 @@
$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/sl.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Administratorji se prijavite tukaj.';
@@ -335,6 +338,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/sv.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -22,6 +22,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Inloggad som %s'; # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = 'Mail administratörer loggar in här för att sköta er domän.';
@@ -337,6 +340,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mailserveragent (MDA)';
$PALANG['pFetchmail_desc_date'] = 'Datum för senaste kontroll/konfigurationsändring';
$PALANG['pFetchmail_desc_returned_text'] = 'Textmeddelande från senaste kontroll';
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/tr.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged in as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Posta Yöneticileri buradan domainlerinizi yönetmek için giriþ yapabilirsiniz.';
@@ -335,6 +338,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/languages/tw.lang 2013-11-08 21:49:53 UTC (rev 1556)
@@ -20,6 +20,9 @@
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
+$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
+$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
+$PALANG['invalid_value_given'] = 'Invalid value given for %s'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged in as %s' (the 'in' was missing)
$PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域名.';
@@ -335,6 +338,8 @@
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$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['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/model/PFAHandler.php
===================================================================
--- trunk/model/PFAHandler.php 2013-11-08 21:26:46 UTC (rev 1555)
+++ trunk/model/PFAHandler.php 2013-11-08 21:49:53 UTC (rev 1556)
@@ -366,7 +366,6 @@
if ($result) {
# return success message
- # TODO: use sprintf to add $this->id
# TODO: add option to override the success message (for example to include autogenerated passwords)
$this->infomsg['success'] = Config::lang_f($this->msg['successmessage'], $this->id);
}
@@ -411,12 +410,10 @@
$yes = escape_string(Config::lang('YES'));
$no = escape_string(Config::lang('NO'));
- # TODO: replace hardcoded %Y-%m-%d with a country-specific date format via *.lang?
- # TODO: (not too easy because pgsql uses a different formatstring format :-/ )
if (Config::read('database_type') == 'pgsql') {
- $formatted_date = "TO_DATE(text(###KEY###), 'YYYY-mm-dd')";
+ $formatted_date = "TO_DATE(text(###KEY###), '" . escape_string(Config::Lang('dateformat_pgsql')) . "')";
} else {
- $formatted_date = "DATE_FORMAT(###KEY###, '%Y-%m-%d')";
+ $formatted_date = "DATE_FORMAT(###KEY###, '" . escape_string(Config::Lang('dateformat_mysql')) . "')";
}
$colformat = array(
@@ -614,7 +611,7 @@
protected function _inp_num($field, $val) {
$valid = is_numeric($val);
if ($val < -1) $valid = false;
- if (!$valid) $this->errormsg[$field] = "$field must be numeric"; # TODO: make translateable
+ if (!$valid) $this->errormsg[$field] = Config::Lang_f('must_be_numeric', $field);
return $valid;
# return (int)($val);
}
@@ -624,7 +621,7 @@
*/
protected function _inp_bool($field, $val) {
if ($val == "0" || $val == "1") return true;
- $this->errormsg[$field] = "$field must be boolean"; # TODO: make translateable
+ $this->errormsg[$field] = Config::Lang_f('must_be_boolean', $field);
return false;
# return $val ? db_get_boolean(true): db_get_boolean(false);
}
@@ -634,7 +631,7 @@
*/
protected function _inp_enum($field, $val) {
if(in_array($val, $this->struct[$field]['options'])) return true;
- $this->errormsg[$field] = "Invalid parameter given for $field"; # TODO: make translateable
+ $this->errormsg[$field] = Config::Lang_f('invalid_value_given', $field);
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-10 15:41:17
|
Revision: 1557
http://sourceforge.net/p/postfixadmin/code/1557
Author: christian_boltz
Date: 2013-11-10 15:41:13 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
list-virtual.php:
- make "unknown" translateable
*.lang:
- add "unknown"
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/list-virtual.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/bg.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/ca.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/cn.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/cs.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -23,6 +23,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/da.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -22,6 +22,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/de.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Anzeigen:';
$PALANG['all'] = 'Alle';
$PALANG['created'] = 'Erstellt';
+$PALANG['unknown'] = 'unbekannt';
$PALANG['missing_field'] = 'Das Feld %s fehlt';
$PALANG['must_be_numeric'] = '%s muss numerisch sein';
$PALANG['must_be_boolean'] = "%s muss ein Bool'scher Wert sein";
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/en.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:';
$PALANG['all'] = 'All';
$PALANG['created'] = 'Created';
+$PALANG['unknown'] = 'unknown';
$PALANG['missing_field'] = 'Field %s is missing';
$PALANG['must_be_numeric'] = '%s must be numeric';
$PALANG['must_be_boolean'] = '%s must be boolean';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/es.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/et.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/eu.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/fi.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/fo.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/fr.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -21,6 +21,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/hr.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -18,6 +18,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/hu.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/is.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/it.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/ja.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = '閲覧:';
$PALANG['all'] = '全て';
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/lt.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Rodyti:';
$PALANG['all'] = 'Visi';
$PALANG['created'] = 'Sukurta';
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/mk.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/nb.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -21,6 +21,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/nl.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Toon:';
$PALANG['all'] = 'Alle';
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/nn.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/pl.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -22,6 +22,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/pt-br.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/ru.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -21,6 +21,7 @@
$PALANG['show'] = 'Показать:';
$PALANG['all'] = 'Все';
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/sk.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -20,6 +20,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/sl.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/sv.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -21,6 +21,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/tr.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/languages/tw.lang 2013-11-10 15:41:13 UTC (rev 1557)
@@ -19,6 +19,7 @@
$PALANG['show'] = 'Show:'; # XXX
$PALANG['all'] = 'All'; # XXX
$PALANG['created'] = 'Created'; # XXX
+$PALANG['unknown'] = 'unknown'; # XXX
$PALANG['missing_field'] = 'Field %s is missing'; # XXX
$PALANG['must_be_numeric'] = '%s must be numeric'; # XXX
$PALANG['must_be_boolean'] = '%s must be boolean'; # XXX
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2013-11-08 21:49:53 UTC (rev 1556)
+++ trunk/list-virtual.php 2013-11-10 15:41:13 UTC (rev 1557)
@@ -309,7 +309,7 @@
$divide_quota ['percent'][$i] = min(100, round(($divide_quota ['current'][$i]/max(1,$divide_quota ['quota'][$i]))*100));
$divide_quota ['quota_width'][$i] = ($divide_quota ['percent'][$i] / 100 * 120);
} else {
- $divide_quota ['current'][$i] = 'unknown'; # TODO: make translateable
+ $divide_quota ['current'][$i] = Config::Lang('unknown');
$divide_quota ['quota_width'][$i] = 0; # TODO: use special value?
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-10 15:57:34
|
Revision: 1558
http://sourceforge.net/p/postfixadmin/code/1558
Author: christian_boltz
Date: 2013-11-10 15:57:32 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
remove "postfixadmin.com" in comments in lots of files
Modified Paths:
--------------
trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl
trunk/CHANGELOG.TXT
trunk/backup.php
trunk/broadcast-message.php
trunk/common.php
trunk/config.inc.php
trunk/delete.php
trunk/edit.php
trunk/fetchmail.php
trunk/functions.inc.php
trunk/index.php
trunk/languages/language-update.sh
trunk/list-admin.php
trunk/list-domain.php
trunk/list-virtual.php
trunk/login.php
trunk/logout.php
trunk/main.php
trunk/sendmail.php
trunk/setup.php
trunk/users/edit-alias.php
trunk/users/index.php
trunk/users/login.php
trunk/users/logout.php
trunk/users/main.php
trunk/users/password.php
trunk/users/vacation.php
trunk/vacation.php
trunk/variables.inc.php
trunk/viewlog.php
Modified: trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl
===================================================================
--- trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
# This source file is subject to the GPL license that is bundled with
# this package in the file LICENSE.TXT.
#
-# Further details on the project are available at :
-# http://www.postfixadmin.com or http://postfixadmin.sf.net
+# Further details on the project are available at http://postfixadmin.sf.net
#
# @version $Id$
# @license GNU GPL v2 or later.
Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/CHANGELOG.TXT 2013-11-10 15:57:32 UTC (rev 1558)
@@ -4,12 +4,12 @@
# This source file is subject to the GPL license that is bundled with
# this package in the file LICENSE.TXT.
#
-# Further details on the project are available at :
-# http://www.postfixadmin.com or http://postfixadmin.sf.net
+# Further details on the project are available at http://postfixadmin.sf.net
#
# Last update:
# $Id$
+# (last real update was in r1166 - the above Id: was a minor change)
Version ***svn*** - 2009/12/26 - SVN r***
-----------------------------------
Modified: trunk/backup.php
===================================================================
--- trunk/backup.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/backup.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/broadcast-message.php
===================================================================
--- trunk/broadcast-message.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/broadcast-message.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/common.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/config.inc.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/delete.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/edit.php
===================================================================
--- trunk/edit.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/edit.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/fetchmail.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/functions.inc.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/index.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/languages/language-update.sh
===================================================================
--- trunk/languages/language-update.sh 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/languages/language-update.sh 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
# This source file is subject to the GPL license that is bundled with
# this package in the file LICENSE.TXT.
#
- # Further details on the project are available at :
- # http://www.postfixadmin.com or http://postfixadmin.sf.net
+ # Further details on the project are available at http://postfixadmin.sf.net
#
# @version $Id$
# @license GNU GPL v2 or later.
Modified: trunk/list-admin.php
===================================================================
--- trunk/list-admin.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/list-admin.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/list-domain.php
===================================================================
--- trunk/list-domain.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/list-domain.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -5,8 +5,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/list-virtual.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/login.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/logout.php
===================================================================
--- trunk/logout.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/logout.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/main.php
===================================================================
--- trunk/main.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/main.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/sendmail.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/setup.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/users/edit-alias.php
===================================================================
--- trunk/users/edit-alias.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/users/edit-alias.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/users/index.php
===================================================================
--- trunk/users/index.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/users/index.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/users/login.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/users/logout.php
===================================================================
--- trunk/users/logout.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/users/logout.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/users/main.php
===================================================================
--- trunk/users/main.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/users/main.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/users/password.php
===================================================================
--- trunk/users/password.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/users/password.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/users/vacation.php
===================================================================
--- trunk/users/vacation.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/users/vacation.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/vacation.php
===================================================================
--- trunk/vacation.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/vacation.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/variables.inc.php
===================================================================
--- trunk/variables.inc.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/variables.inc.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
Modified: trunk/viewlog.php
===================================================================
--- trunk/viewlog.php 2013-11-10 15:41:13 UTC (rev 1557)
+++ trunk/viewlog.php 2013-11-10 15:57:32 UTC (rev 1558)
@@ -6,8 +6,7 @@
* This source file is subject to the GPL license that is bundled with
* this package in the file LICENSE.TXT.
*
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ * Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-10 19:52:52
|
Revision: 1563
http://sourceforge.net/p/postfixadmin/code/1563
Author: christian_boltz
Date: 2013-11-10 19:52:49 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
delete.php:
- use *Handler for deletion
(which also means delete.php only has 17 lines of code now - 130 lines
less than before :-)
templates/list-virtual_*.tpl:
- remove now superfluous "domain" parameter in delete.php link
Modified Paths:
--------------
trunk/delete.php
trunk/templates/list-virtual_alias.tpl
trunk/templates/list-virtual_alias_domain.tpl
trunk/templates/list-virtual_mailbox.tpl
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2013-11-10 19:38:43 UTC (rev 1562)
+++ trunk/delete.php 2013-11-10 19:52:49 UTC (rev 1563)
@@ -12,167 +12,39 @@
* @license GNU GPL v2 or later.
*
* File: delete.php
- * Used to delete admins, domains, mailboxes and aliases.
- * Note: if a domain is deleted, all mailboxes and aliases belonging
- * to the domain are also removed.
+ * Used to delete admins, domains, mailboxes, aliases etc.
*
- * Template File: message.tpl
- *
- * Template Variables:
- *
- * none
- *
- * Form POST \ GET Variables:
- *
- * fTable
- * fDelete
- * fDomain
+ * Template File: none
*/
require_once('common.php');
-authentication_require_role('admin');
+$username = authentication_get_username(); # enforce login
-$SESSID_USERNAME = authentication_get_username();
-$error = 0;
+$id = safeget('delete');
+$table = safeget('table');
-$fTable = escape_string (safeget('table') ); # see the if blocks below for valid values
-$fDelete = escape_string (safeget('delete'));
-$fDomain = escape_string (safeget('domain'));
+$handlerclass = ucfirst($table) . 'Handler';
-$error=0;
+if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table
+ die ("Invalid table name given!");
+}
-if ($fTable == "admin")
-{
- authentication_require_role('global-admin');
- $fWhere = 'username';
- $result_admin = db_delete ('admin',$fWhere,$fDelete);
- $result_domain_admins = db_delete ('domain_admins',$fWhere,$fDelete);
+$handler = new $handlerclass(0, $username);
- if ($result_admin != 1) {
- flash_error($PALANG['pAdminDelete_admin_error']);
- }
- header ("Location: list-admin.php");
- exit;
-} # ($fTable == "admin")
-elseif ($fTable == "domain")
-{
- authentication_require_role('global-admin');
- $fWhere = 'domain';
- $result_domain_admins = db_delete ('domain_admins',$fWhere,$fDelete);
- $result_alias = db_delete ('alias',$fWhere,$fDelete);
- $result_mailbox = db_delete ('mailbox',$fWhere,$fDelete);
- $result_alias_domain = db_delete('alias_domain','alias_domain',$fDelete);
- $result_log = db_delete ('log',$fWhere,$fDelete);
- if ($CONF['vacation'] == "YES")
- {
- $result_vacation = db_delete ('vacation',$fWhere,$fDelete);
- }
- $result_domain = db_delete ('domain',$fWhere,$fDelete);
+$formconf = $handler->webformConfig();
- if (!$result_domain || !domain_postdeletion($fDelete))
- {
- flash_error($PALANG['pAdminDelete_domain_error']);
- }
- header ("Location: list-domain.php");
- exit;
-} # ($fTable == "domain")
-elseif ($fTable == "alias_domain")
-{
- authentication_require_role('global-admin');
- $table_domain_alias = table_by_key('alias_domain');
- $fWhere = 'alias_domain';
- $fDelete = $fDomain;
- if(db_delete('alias_domain',$fWhere,$fDelete) != 1) {
- flash_error($PALANG['pAdminDelete_alias_domain_error']);
- }
- header ("Location: list-domain.php");
- exit;
-} # ($fTable == "alias_domain")
+authentication_require_role($formconf['required_role']);
-elseif ($fTable == "alias" or $fTable == "mailbox")
-{
-
- if (!check_owner ($SESSID_USERNAME, $fDomain))
- {
- $error = 1;
- flash_error($PALANG['pDelete_domain_error'] . "($fDomain)!");
- }
- elseif (!check_alias_owner ($SESSID_USERNAME, $fDelete))
- {
- $error = 1;
- flash_error($PALANG['pDelete_alias_error'] . "($fDelete)!");
- }
- else
- {
- db_begin();
- /* there may be no aliases to delete */
- $result = db_query("SELECT * FROM $table_alias WHERE address = '$fDelete' AND domain = '$fDomain'");
- if($result['rows'] == 1) {
- $result = db_query ("DELETE FROM $table_alias WHERE address='$fDelete' AND domain='$fDomain'");
- db_log ($fDomain, 'delete_alias', $fDelete);
- }
- /* is there a mailbox? if do delete it from orbit; it's the only way to be sure */
- $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
- if ($result['rows'] == 1)
- {
- $result = db_query ("DELETE FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
- $postdel_res=mailbox_postdeletion($fDelete,$fDomain);
- if ($result['rows'] != 1 || !$postdel_res)
- {
- $error = 1;
- $deletionMessage = $PALANG['pDelete_delete_error'] . "$fDelete (";
- if ($result['rows']!=1)
- {
- $deletionMessage.='mailbox';
- if (!$postdel_res) $deletionMessage.=', ';
- }
- if (!$postdel_res)
- {
- $deletionMessage.='post-deletion';
- }
- $deletionMessage.=')';
- flash_error($deletionMessage);
- }
- db_log ($fDomain, 'delete_mailbox', $fDelete);
- }
- $result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'");
- if($result['rows'] == 1) {
- db_query ("DELETE FROM $table_vacation WHERE email='$fDelete' AND domain='$fDomain'");
- db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$fDelete' "); /* should be caught by cascade, if PgSQL */
- }
- $result = db_query("SELECT * FROM $table_quota WHERE username='$fDelete'");
- if($result['rows'] >= 1) {
- db_query ("DELETE FROM $table_quota WHERE username='$fDelete'");
- }
- $result = db_query("SELECT * FROM $table_quota2 WHERE username='$fDelete'");
- if($result['rows'] == 1) {
- db_query ("DELETE FROM $table_quota2 WHERE username='$fDelete'");
- }
- }
-
- if ($error != 1)
- {
- db_commit();
- } else {
- flash_error($PALANG['pDelete_delete_error'] . "$fDelete (physical mail)!");
- db_rollback();
- }
- header ("Location: list-virtual.php?domain=$fDomain");
- exit;
+if ($handler->init($id)) { # errors will be displayed as last step anyway, no need for duplicated code ;-)
+ $handler->delete();
}
-else
-{
- flash_error($PALANG['invalid_parameter']);
- header("Location: main.php");
- exit;
-}
-# we should most probably never reach this point
-$smarty->assign ('smarty_template', 'message');
-flash_error("If you see this, please open a bugreport and include the exact delete.php parameters.");
-$smarty->display ('index.tpl');
+flash_error($handler->errormsg);
+flash_info($handler->infomsg);
+header ("Location: " . $formconf['listview']);
+exit;
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
?>
Modified: trunk/templates/list-virtual_alias.tpl
===================================================================
--- trunk/templates/list-virtual_alias.tpl 2013-11-10 19:38:43 UTC (rev 1562)
+++ trunk/templates/list-virtual_alias.tpl 2013-11-10 19:52:49 UTC (rev 1563)
@@ -40,7 +40,7 @@
<td><a href="{#url_create_alias#}&edit={$item.address|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}"
>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
<td><a href="{#url_create_alias#}&edit={$item.address|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="delete.php?table=alias&delete={$item.address|escape:"url"}&domain={$fDomain|escape:"url"}"
+ <td><a href="delete.php?table=alias&delete={$item.address|escape:"url"}"
onclick="return confirm ('{$PALANG.confirm}{$PALANG.aliases}: {$item.address}');">{$PALANG.del}</a></td>
{else}
<td>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</td>
Modified: trunk/templates/list-virtual_alias_domain.tpl
===================================================================
--- trunk/templates/list-virtual_alias_domain.tpl 2013-11-10 19:38:43 UTC (rev 1562)
+++ trunk/templates/list-virtual_alias_domain.tpl 2013-11-10 19:52:49 UTC (rev 1563)
@@ -32,7 +32,7 @@
<td>{$item.modified}</td>
<td><a href="{#url_create_alias_domain#}&edit={$item.alias_domain|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
<td><a href="{#url_create_alias_domain#}&edit={$item.alias_domain|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="{#url_delete#}?table=alias_domain&delete={$item.alias_domain|escape:"url"}&domain={$item.alias_domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain}');">{$PALANG.del}</a></td>
+ <td><a href="{#url_delete#}?table=aliasdomain&delete={$item.alias_domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain}');">{$PALANG.del}</a></td>
</tr>
{/foreach}
{/if}
Modified: trunk/templates/list-virtual_mailbox.tpl
===================================================================
--- trunk/templates/list-virtual_mailbox.tpl 2013-11-10 19:38:43 UTC (rev 1562)
+++ trunk/templates/list-virtual_mailbox.tpl 2013-11-10 19:52:49 UTC (rev 1563)
@@ -87,7 +87,7 @@
<td><a href="edit.php?table=alias&edit={$item.username|escape:"url"}">{$PALANG.alias}</a></td>
{/if}
<td><a href="edit.php?table=mailbox&edit={$item.username|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="delete.php?table=mailbox&delete={$item.username|escape:"url"}&domain={$fDomain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.mailboxes}: {$item.username}');">{$PALANG.del}</a></td>
+ <td><a href="delete.php?table=mailbox&delete={$item.username|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.mailboxes}: {$item.username}');">{$PALANG.del}</a></td>
</tr>
{/foreach}
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-10 21:17:20
|
Revision: 1564
http://sourceforge.net/p/postfixadmin/code/1564
Author: christian_boltz
Date: 2013-11-10 21:17:17 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
delete.php:
- require token for CSRF protection, see
https://sourceforge.net/p/postfixadmin/bugs/269/
login.php, users/login.php:
- create token and store it in $_SESSION
templates/*:
- add token to all delete.php links
templates/list-virtual_alias_domain.tpl:
- change delete confirmation dialog to contain "from->target"
Modified Paths:
--------------
trunk/delete.php
trunk/login.php
trunk/templates/adminlistadmin.tpl
trunk/templates/adminlistdomain.tpl
trunk/templates/fetchmail.tpl
trunk/templates/list-virtual_alias.tpl
trunk/templates/list-virtual_alias_domain.tpl
trunk/templates/list-virtual_mailbox.tpl
trunk/users/login.php
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/delete.php 2013-11-10 21:17:17 UTC (rev 1564)
@@ -19,6 +19,8 @@
require_once('common.php');
+if (safeget('token') != $_SESSION['PFA_token']) die('Invalid token!');
+
$username = authentication_get_username(); # enforce login
$id = safeget('delete');
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/login.php 2013-11-10 21:17:17 UTC (rev 1564)
@@ -53,6 +53,8 @@
$_SESSION['sessid']['roles'][] = 'admin';
$_SESSION['sessid']['username'] = $fUsername;
+ $_SESSION['PFA_token'] = md5(uniqid(rand(), true));
+
# they've logged in, so see if they are a domain admin, as well.
if (!$h->init($fUsername)) {
Modified: trunk/templates/adminlistadmin.tpl
===================================================================
--- trunk/templates/adminlistadmin.tpl 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/templates/adminlistadmin.tpl 2013-11-10 21:17:17 UTC (rev 1564)
@@ -20,7 +20,8 @@
<td>{$admin.modified}</td>
<td><a href="{#url_edit_admin#}&edit={$admin.username|escape:"url"}&active={if ($admin.active==0)}1{else}0{/if}">{$admin._active}</a></td>
<td><a href="{#url_edit_admin#}&edit={$admin.username|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="{#url_delete#}?table=admin&delete={$admin.username|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.admin}: {$admin.username}');">{$PALANG.del}</a></td>
+ <td><a href="{#url_delete#}?table=admin&delete={$admin.username|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
+ onclick="return confirm ('{$PALANG.confirm}{$PALANG.admin}: {$admin.username}');">{$PALANG.del}</a></td>
</tr>
{/foreach}
</table>
Modified: trunk/templates/adminlistdomain.tpl
===================================================================
--- trunk/templates/adminlistdomain.tpl 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/templates/adminlistdomain.tpl 2013-11-10 21:17:17 UTC (rev 1564)
@@ -35,7 +35,8 @@
<td>{$domain.modified}</td>
<td><a href="{#url_edit_domain#}&edit={$domain.domain|escape:"url"}&active={if ($domain.active==0)}1{else}0{/if}">{$domain._active}</a></td>
<td><a href="{#url_edit_domain#}&edit={$domain.domain|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="{#url_delete#}?table=domain&delete={$domain.domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm_domain}{$PALANG.domain}: {$domain.domain}')">{$PALANG.del}</a></td>
+ <td><a href="{#url_delete#}?table=domain&delete={$domain.domain|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
+ onclick="return confirm ('{$PALANG.confirm_domain}{$PALANG.domain}: {$domain.domain}')">{$PALANG.del}</a></td>
</tr>
{/foreach}
</table>
Modified: trunk/templates/fetchmail.tpl
===================================================================
--- trunk/templates/fetchmail.tpl 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/templates/fetchmail.tpl 2013-11-10 21:17:17 UTC (rev 1564)
@@ -39,7 +39,8 @@
<td nowrap="nowrap">{$row.date} </td>
<td nowrap="nowrap">{$row.returned_text}--x-- </td> <!-- Inhalt mit if auswerten! -->
<td><a href="fetchmail.php?edit={$row.id|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="fetchmail.php?delete={$row.id|escape:"url"}" onclick="return confirm('{$PALANG.confirm}{$PALANG.pMenu_fetchmail}:{$row.src_user}@{$row.src_server}')">{$PALANG.del}</a></td>
+ <td><a href="fetchmail.php?delete={$row.id|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
+ onclick="return confirm('{$PALANG.confirm}{$PALANG.pMenu_fetchmail}:{$row.src_user}@{$row.src_server}')">{$PALANG.del}</a></td>
</tr>
{/foreach}
{/if}
Modified: trunk/templates/list-virtual_alias.tpl
===================================================================
--- trunk/templates/list-virtual_alias.tpl 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/templates/list-virtual_alias.tpl 2013-11-10 21:17:17 UTC (rev 1564)
@@ -40,7 +40,7 @@
<td><a href="{#url_create_alias#}&edit={$item.address|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}"
>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
<td><a href="{#url_create_alias#}&edit={$item.address|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="delete.php?table=alias&delete={$item.address|escape:"url"}"
+ <td><a href="delete.php?table=alias&delete={$item.address|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
onclick="return confirm ('{$PALANG.confirm}{$PALANG.aliases}: {$item.address}');">{$PALANG.del}</a></td>
{else}
<td>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</td>
Modified: trunk/templates/list-virtual_alias_domain.tpl
===================================================================
--- trunk/templates/list-virtual_alias_domain.tpl 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/templates/list-virtual_alias_domain.tpl 2013-11-10 21:17:17 UTC (rev 1564)
@@ -32,7 +32,8 @@
<td>{$item.modified}</td>
<td><a href="{#url_create_alias_domain#}&edit={$item.alias_domain|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
<td><a href="{#url_create_alias_domain#}&edit={$item.alias_domain|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="{#url_delete#}?table=aliasdomain&delete={$item.alias_domain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain}');">{$PALANG.del}</a></td>
+ <td><a href="{#url_delete#}?table=aliasdomain&delete={$item.alias_domain|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
+ onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain} -> {$item.target_domain}');">{$PALANG.del}</a></td>
</tr>
{/foreach}
{/if}
Modified: trunk/templates/list-virtual_mailbox.tpl
===================================================================
--- trunk/templates/list-virtual_mailbox.tpl 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/templates/list-virtual_mailbox.tpl 2013-11-10 21:17:17 UTC (rev 1564)
@@ -87,7 +87,8 @@
<td><a href="edit.php?table=alias&edit={$item.username|escape:"url"}">{$PALANG.alias}</a></td>
{/if}
<td><a href="edit.php?table=mailbox&edit={$item.username|escape:"url"}">{$PALANG.edit}</a></td>
- <td><a href="delete.php?table=mailbox&delete={$item.username|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.mailboxes}: {$item.username}');">{$PALANG.del}</a></td>
+ <td><a href="delete.php?table=mailbox&delete={$item.username|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
+ onclick="return confirm ('{$PALANG.confirm}{$PALANG.mailboxes}: {$item.username}');">{$PALANG.del}</a></td>
</tr>
{/foreach}
</table>
Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php 2013-11-10 19:52:49 UTC (rev 1563)
+++ trunk/users/login.php 2013-11-10 21:17:17 UTC (rev 1564)
@@ -48,6 +48,7 @@
$_SESSION['sessid']['roles'] = array();
$_SESSION['sessid']['roles'][] = 'user';
$_SESSION['sessid']['username'] = $fUsername;
+ $_SESSION['PFA_token'] = md5(uniqid(rand(), true));
header("Location: main.php");
exit;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-10 22:00:18
|
Revision: 1565
http://sourceforge.net/p/postfixadmin/code/1565
Author: christian_boltz
Date: 2013-11-10 22:00:16 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
AdminHandler.php, AdminpasswordHandler.php:
- initMsg(): better texts for error_already_exists and error_does_not_exist
*.lang:
- rename pAdminCreate_admin_username_text_error2 to admin_already_exists
and change the text
- add admin_does_not_exist
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/model/AdminHandler.php
trunk/model/AdminpasswordHandler.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/bg.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -240,7 +240,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Добави нов админ на домейна';
$PALANG['pAdminCreate_admin_username_text'] = 'Е-мейл адрес';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Админ не е валиден е-мейл адрес!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Админ-а вече съществува или не е валиден';
+$PALANG['admin_already_exists'] = 'Админ-а вече съществува или не е валиден'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$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.
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/ca.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -238,7 +238,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Afegir un nou administrador de domini';
$PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail vàlid!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'administrador ja existeix o no es vàlid!';
+$PALANG['admin_already_exists'] = 'L\'administrador ja existeix o no es vàlid!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Afegir administrador';
$PALANG['pAdminCreate_admin_result_error'] = 'Imposible afegir l\'administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/cn.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = '新增域管理员';
$PALANG['pAdminCreate_admin_username_text'] = '邮件地址';
$PALANG['pAdminCreate_admin_username_text_error1'] = '管理员名不是一个合法的邮件地址!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = '管理员已经存在或者管理员名非法!';
+$PALANG['admin_already_exists'] = '管理员已经存在或者管理员名非法!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$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.
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/cs.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -248,7 +248,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Přidat nového doménového administrátora';
$PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Tato adresa není platná!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Taková adresa již existuje!';
+$PALANG['admin_already_exists'] = 'Taková adresa již existuje!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Přidat administrátora';
$PALANG['pAdminCreate_admin_result_error'] = 'Nepodařilo se přidat administrátora! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administrátor byl přidán! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/da.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -248,7 +248,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Tilføj en ny domæneadministrator';
$PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke en gyldig emailadresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Aministratoren findes allerede eller er ikke gyldig';
+$PALANG['admin_already_exists'] = 'Aministratoren findes allerede eller er ikke gyldig'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
$PALANG['pAdminCreate_admin_result_error'] = 'Administratoren kunne ikke tilføjes! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er tilføjet! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/de.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -245,7 +245,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Neuen Domain-Admin hinzufügen';
$PALANG['pAdminCreate_admin_username_text'] = 'Email Adresse';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin-Adresse ist keine echte Email-Adresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Der Admin existiert bereits bzw. ist nicht korrekt';
+$PALANG['admin_already_exists'] = 'Der Admin existiert bereits!';
+$PALANG['admin_does_not_exist'] = 'Der Admin existiert nicht!';
$PALANG['pAdminCreate_admin_button'] = 'Admin hinzufügen';
$PALANG['pAdminCreate_admin_result_error'] = 'Das anlegen des Admins %s ist fehlgeschlagen';
$PALANG['pAdminCreate_admin_result_success'] = 'Der Admin %s wurde angelegt.';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/en.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -246,7 +246,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin';
$PALANG['pAdminCreate_admin_username_text'] = 'Email address';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin is not a valid email address!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid';
+$PALANG['admin_already_exists'] = 'The admin already exists!';
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!';
$PALANG['pAdminCreate_admin_button'] = 'Add Admin';
$PALANG['pAdminCreate_admin_result_error'] = 'Adding the admin %s failed!';
$PALANG['pAdminCreate_admin_result_success'] = 'The admin %s has been added!';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/es.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -240,7 +240,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Añadir un nuevo administrador de dominio';
$PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail válido!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'El administrador ya existe o no es válido!';
+$PALANG['admin_already_exists'] = 'El administrador ya existe o no es válido!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Añadir administrador';
$PALANG['pAdminCreate_admin_result_error'] = '¡Imposible añadir el administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/et.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Lisa uus domeeni haldaja';
$PALANG['pAdminCreate_admin_username_text'] = 'E-posti aadress';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Väljal haldaja pole kehtiv e-posti aadress!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Selline haldaja on juba olemas';
+$PALANG['admin_already_exists'] = 'Selline haldaja on juba olemas'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Lisa haldaja';
$PALANG['pAdminCreate_admin_result_error'] = 'Haldaja lisamine ebaõnnestus! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/eu.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -237,7 +237,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Domeinu kudeatzaile berri bat gehitu';
$PALANG['pAdminCreate_admin_username_text'] = 'E-mail helbidea';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Kudeatzaile e-mailak ez du balio!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Kudeatzailea existitzen da edo ez du balio!';
+$PALANG['admin_already_exists'] = 'Kudeatzailea existitzen da edo ez du balio!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Kudeatzailea gehitu';
$PALANG['pAdminCreate_admin_result_error'] = 'Ezinezkoa kudeatzailea gehitzea! (%s)'; # XXX Text changed to: Adding the admin %s failed!
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/fi.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Lisää uusi domainin ylläpitäjä';
$PALANG['pAdminCreate_admin_username_text'] = 'Sähköpostiosoite';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Ylläpitäjän sähköpostiosoite ei ole oikeanmuotoinen!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Ylläpitäjän sähköpostiosoite on jo olemassa tai se ei ole oikean muotoinen';
+$PALANG['admin_already_exists'] = 'Ylläpitäjän sähköpostiosoite on jo olemassa tai se ei ole oikean muotoinen'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Lisää ylläpitäjä';
$PALANG['pAdminCreate_admin_result_error'] = 'Ylläpitäjän lisäys ei onnistu! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Ylläpitäjä on lisätty! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/fo.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Stovna navnaøki umsitara';
$PALANG['pAdminCreate_admin_username_text'] = 'E-post adressa';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Umsitari er ógyldug e-post adressa!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Umsitari finst longu ella er ógyldugur';
+$PALANG['admin_already_exists'] = 'Umsitari finst longu ella er ógyldugur'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Stovna umsitara';
$PALANG['pAdminCreate_admin_result_error'] = 'Fái ikki stovnað umsitara! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/fr.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -241,7 +241,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Ajouter un nouvel administrateur de domaine';
$PALANG['pAdminCreate_admin_username_text'] = 'adresse courriel';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Ce n\'est pas une adresse courriel administrateur valide!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Cet adresse courriel administrateur existe déjà ou n\'est pas valide';
+$PALANG['admin_already_exists'] = 'Cet adresse courriel administrateur existe déjà ou n\'est pas valide'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Ajouter un administrateur';
$PALANG['pAdminCreate_admin_result_error'] = 'Impossible d\'ajouter un administrateur! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajouté! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/hr.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -238,7 +238,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Dodaj administratora domene';
$PALANG['pAdminCreate_admin_username_text'] = 'Adresa e-pote';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator nije valjana adresa e-pote!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator već postoji ili nije valjan';
+$PALANG['admin_already_exists'] = 'Adminstrator već postoji ili nije valjan'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
$PALANG['pAdminCreate_admin_result_error'] = 'Administratora nije bilo moguće dodati! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspjeno dodan (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/hu.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -245,7 +245,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Új domain admin felvétele';
$PALANG['pAdminCreate_admin_username_text'] = 'Email cím';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Az Admin nem valós email cím!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Az Admin már létezik, vagy nem valós a cím!';
+$PALANG['admin_already_exists'] = 'Az Admin már létezik, vagy nem valós a cím!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Admin felvétele';
$PALANG['pAdminCreate_admin_result_error'] = 'Nemsikerült az Admint felvenni! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Az Admin sikeresen bekerült az adatbázisba! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/is.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Bæta nýju léni við';
$PALANG['pAdminCreate_admin_username_text'] = 'Póstfang';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Kerfisstjóri er ekki rétt póstfang!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Kerfisstjóri er til nú þegar eða er ekki leyfilegt';
+$PALANG['admin_already_exists'] = 'Kerfisstjóri er til nú þegar eða er ekki leyfilegt'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Bæta við kerfisstjóra';
$PALANG['pAdminCreate_admin_result_error'] = 'Get ekki bætt við kerfisstjóra! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Kerfisstjórinn hefur verið skráður! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/it.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -240,7 +240,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Aggiungi un nuovo amministratore per il dominio';
$PALANG['pAdminCreate_admin_username_text'] = 'Indirizzo email';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'L\'indirizzo dell\'amministratore non è valido!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'amministratore esiste di già, oppure non è valido';
+$PALANG['admin_already_exists'] = 'L\'amministratore esiste di già, oppure non è valido'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Aggiungi amministratore';
$PALANG['pAdminCreate_admin_result_error'] = 'Impossibile aggiungere amministratore! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'L\'amministratore è stato aggiunto! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/ja.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -245,7 +245,8 @@
$PALANG['pAdminCreate_admin_welcome'] = '新しいドメイン管理者の追加';
$PALANG['pAdminCreate_admin_username_text'] = 'メールアドレス';
$PALANG['pAdminCreate_admin_username_text_error1'] = '管理者は有効なメールアドレスではありません。';
-$PALANG['pAdminCreate_admin_username_text_error2'] = '管理者は存在するか無効です。';
+$PALANG['admin_already_exists'] = '管理者は存在するか無効です。'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$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.
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/lt.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -240,7 +240,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Registruoti naują srities administratorių';
$PALANG['pAdminCreate_admin_username_text'] = 'El.pašto adresas';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administratorius turi būti el.pašto adresas!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratorius šiai sričiai jau yra arba neteisingas';
+$PALANG['admin_already_exists'] = 'Administratorius šiai sričiai jau yra arba neteisingas'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Registruoti administratorių';
$PALANG['pAdminCreate_admin_result_error'] = 'Administratoriaus užregistruoti nepavyko! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/mk.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -240,7 +240,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Додади нов администратор на домен';
$PALANG['pAdminCreate_admin_username_text'] = 'Email адреса';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Администратор не е валидна адреса!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Администраторот веќе постои или не е валидна';
+$PALANG['admin_already_exists'] = 'Администраторот веќе постои или не е валидна'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$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.
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/nb.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -240,7 +240,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Legg til en ny domeneadministrator';
$PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Du har ikke skrevet inn en gyldig e-postadresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratoren er allerede definert, eller du har skrevet inn en ugyldig adresse';
+$PALANG['admin_already_exists'] = 'Administratoren er allerede definert, eller du har skrevet inn en ugyldig adresse'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
$PALANG['pAdminCreate_admin_result_error'] = 'Kunne ikke legge til administratoren! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/nl.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -240,7 +240,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Voeg een nieuw domein beheerder toe';
$PALANG['pAdminCreate_admin_username_text'] = 'E-mail adres';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Beheerder is geen geldig e-mail adres!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'De beheerder bestaat al of is niet geldig';
+$PALANG['admin_already_exists'] = 'De beheerder bestaat al of is niet geldig'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Voeg beheerder toe';
$PALANG['pAdminCreate_admin_result_error'] = 'Mislukt om beheerder toe te voegen! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Beheerder is toegevoegd. (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/nn.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator';
$PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke gyldig adresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid'; # XXX
+$PALANG['admin_already_exists'] = 'The admin already exists!'; # XXX
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
$PALANG['pAdminCreate_admin_result_error'] = 'Klarte ikke å legge til administratoren! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/pl.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -242,7 +242,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Dodaj konto administratora';
$PALANG['pAdminCreate_admin_username_text'] = 'Adres email';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administartor nie jest poprawnym adresem email!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administrator już istnieje lub jest niepoprawny';
+$PALANG['admin_already_exists'] = 'Administrator już istnieje lub jest niepoprawny'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
$PALANG['pAdminCreate_admin_result_error'] = 'Nie można dodać administratora! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/pt-br.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -247,7 +247,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Criação de um novo administrador de domínio.';
$PALANG['pAdminCreate_admin_username_text'] = 'Endereço de email';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Endereço de email inválido!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administrador já existe ou é inválido';
+$PALANG['admin_already_exists'] = 'Administrador já existe ou é inválido'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Criar Administrador';
$PALANG['pAdminCreate_admin_result_error'] = 'Não foi possível criar o administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Administrador criado! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/ru.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -247,7 +247,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Добавление нового администратора домена';
$PALANG['pAdminCreate_admin_username_text'] = 'Почтовый адрес';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Некорректный адрес администратора!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Администратор уже существует либо некорректное имя';
+$PALANG['admin_already_exists'] = 'Администратор уже существует либо некорректное имя'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$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.
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/sk.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -240,7 +240,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora';
$PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Táto adresa nie je platná!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Takáto adresa už existuje!';
+$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['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.
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/sl.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Dodaj domenskega administratorja';
$PALANG['pAdminCreate_admin_username_text'] = 'E-poštni naslov';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator ni veljaven e-poštni naslov!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator že obstaja ali pa ni pravilen';
+$PALANG['admin_already_exists'] = 'Adminstrator že obstaja ali pa ni pravilen'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Dodaj administratorja';
$PALANG['pAdminCreate_admin_result_error'] = 'Administratorja ni bilo mogoče dodati! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je bil uspešno dodan (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/sv.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -241,7 +241,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Lägg till ny domänadmin';
$PALANG['pAdminCreate_admin_username_text'] = 'Epostadress';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin är inte en giltig epostadress!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Denna admin finns redan eller är inte giltig';
+$PALANG['admin_already_exists'] = 'Denna admin finns redan eller är inte giltig'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Lägg till admin';
$PALANG['pAdminCreate_admin_result_error'] = 'Kan inte lägga till admin! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Admin har lagts till! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/tr.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = 'Yöneticiye yeni bir domain ekle';
$PALANG['pAdminCreate_admin_username_text'] = 'Eposta adresi';
$PALANG['pAdminCreate_admin_username_text_error1'] = 'Yönetici uygun bir eposta adresi deðil!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Yönetici halen bulunmakta ya da uygun deðil';
+$PALANG['admin_already_exists'] = 'Yönetici halen bulunmakta ya da uygun deðil'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$PALANG['pAdminCreate_admin_button'] = 'Yönetici ekle';
$PALANG['pAdminCreate_admin_result_error'] = 'Yönetici eklenemiyor! (%s)'; # XXX Text changed to: Adding the admin %s failed!
$PALANG['pAdminCreate_admin_result_success'] = 'Yönetici eklendi! (%s)'; # XXX Text changed to: The admin %s has been added.
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/languages/tw.lang 2013-11-10 22:00:16 UTC (rev 1565)
@@ -239,7 +239,8 @@
$PALANG['pAdminCreate_admin_welcome'] = '新增網域管理員';
$PALANG['pAdminCreate_admin_username_text'] = '郵件地址';
$PALANG['pAdminCreate_admin_username_text_error1'] = '管理員名不是一個合法的郵件地址!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = '管理員已經存在或者管理員名非法!';
+$PALANG['admin_already_exists'] = '管理員已經存在或者管理員名非法!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
$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.
Modified: trunk/model/AdminHandler.php
===================================================================
--- trunk/model/AdminHandler.php 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/model/AdminHandler.php 2013-11-10 22:00:16 UTC (rev 1565)
@@ -82,8 +82,8 @@
}
protected function initMsg() {
- $this->msg['error_already_exists'] = 'pAdminCreate_admin_username_text_error2'; # TODO: better error message
- $this->msg['error_does_not_exist'] = 'pAdminEdit_admin_result_error'; # TODO: better error message
+ $this->msg['error_already_exists'] = 'admin_already_exists';
+ $this->msg['error_does_not_exist'] = 'admin_does_not_exist';
if ($this->new) {
$this->msg['logname'] = 'create_admin';
$this->msg['store_error'] = 'pAdminCreate_admin_result_error';
Modified: trunk/model/AdminpasswordHandler.php
===================================================================
--- trunk/model/AdminpasswordHandler.php 2013-11-10 21:17:17 UTC (rev 1564)
+++ trunk/model/AdminpasswordHandler.php 2013-11-10 22:00:16 UTC (rev 1565)
@@ -50,8 +50,8 @@
}
public function initMsg() {
- $this->msg['error_already_exists'] = 'pAdminCreate_admin_username_text_error2'; # probably unused
- $this->msg['error_does_not_exist'] = 'pAdminEdit_admin_result_error'; # probably unused
+ $this->msg['error_already_exists'] = 'admin_already_exists'; # probably unused
+ $this->msg['error_does_not_exist'] = 'admin_does_not_exist'; # probably unused
$this->msg['logname'] = 'edit_password';
$this->msg['store_error'] = 'pPassword_result_error';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-10 22:22:25
|
Revision: 1566
http://sourceforge.net/p/postfixadmin/code/1566
Author: christian_boltz
Date: 2013-11-10 22:22:22 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
editactive.php:
- new, small script to change the 'active' status
- also include CSRF protection token
edit.php:
- remove handling of 'active' to make it more readable
*list*.tpl:
- change links to use editactive.php, add CSRF token
configs/menu.conf
- add url_editactive
Modified Paths:
--------------
trunk/configs/menu.conf
trunk/edit.php
trunk/templates/adminlistadmin.tpl
trunk/templates/adminlistdomain.tpl
trunk/templates/list-virtual_alias.tpl
trunk/templates/list-virtual_alias_domain.tpl
trunk/templates/list-virtual_mailbox.tpl
Added Paths:
-----------
trunk/editactive.php
Modified: trunk/configs/menu.conf
===================================================================
--- trunk/configs/menu.conf 2013-11-10 22:00:16 UTC (rev 1565)
+++ trunk/configs/menu.conf 2013-11-10 22:22:22 UTC (rev 1566)
@@ -1,4 +1,5 @@
url_main = main.php
+url_editactive = editactive.php?table=
# list_admin
url_list_admin = list-admin.php
url_create_admin = edit.php?table=admin
Modified: trunk/edit.php
===================================================================
--- trunk/edit.php 2013-11-10 22:00:16 UTC (rev 1565)
+++ trunk/edit.php 2013-11-10 22:22:22 UTC (rev 1566)
@@ -19,7 +19,6 @@
* GET parameters:
* table what to edit (*Handler)
* edit item to edit (if net given: a new item will be created)
- * active if given: only change active state to given value (which must be 0 or 1) and return to listview
* additional parameters will be accepted if specified in *Handler->webformConfig()[prefill] when creating a new item
*/
@@ -40,19 +39,13 @@
$new = 0;
if ($edit == "") $new = 1;
-$active = safeget('active');
-
$handler = new $handlerclass($new, $username);
$formconf = $handler->webformConfig();
authentication_require_role($formconf['required_role']);
-if ($active != '0' && $active != '1') {
- $active = ''; # ignore invalid values
-}
-
-if ($edit != '' || $active != '' || $formconf['early_init']) {
+if ($edit != '' || $formconf['early_init']) {
if (!$handler->init($edit)) {
flash_error($handler->errormsg);
header ("Location: " . $formconf['listview']);
@@ -63,7 +56,7 @@
$form_fields = $handler->getStruct();
$id_field = $handler->getId_field();
-if ($_SERVER['REQUEST_METHOD'] == "GET" && $active == '') {
+if ($_SERVER['REQUEST_METHOD'] == "GET") {
if ($edit == '') { # new - prefill fields from URL parameters if allowed in $formconf['prefill']
if ( isset($formconf['prefill']) ) {
foreach ($formconf['prefill'] as $field) {
@@ -113,11 +106,7 @@
}
}
-if ($active != '') {
- $values['active'] = $active;
-}
-
-if ($_SERVER['REQUEST_METHOD'] == "POST" || $active != '') {
+if ($_SERVER['REQUEST_METHOD'] == "POST") {
if (isset($formconf['hardcoded_edit']) && $formconf['hardcoded_edit']) {
$values[$id_field] = $form_fields[$id_field]['default'];
} elseif ($edit != "") {
Added: trunk/editactive.php
===================================================================
--- trunk/editactive.php (rev 0)
+++ trunk/editactive.php 2013-11-10 22:22:22 UTC (rev 1566)
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Postfix Admin
+ *
+ * LICENSE
+ * This source file is subject to the GPL license that is bundled with
+ * this package in the file LICENSE.TXT.
+ *
+ * Further details on the project are available at http://postfixadmin.sf.net
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: delete.php
+ * Used to delete admins, domains, mailboxes, aliases etc.
+ *
+ * Template File: none
+ */
+
+require_once('common.php');
+
+if (safeget('token') != $_SESSION['PFA_token']) die('Invalid token!');
+
+$username = authentication_get_username(); # enforce login
+
+$id = safeget('id');
+$table = safeget('table');
+$active = safeget('active');
+
+$handlerclass = ucfirst($table) . 'Handler';
+
+if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table
+ die ("Invalid table name given!");
+}
+
+$handler = new $handlerclass(0, $username);
+
+$formconf = $handler->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'));
+ }
+
+ $values['active'] = $active;
+
+ 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: */
+?>
Property changes on: trunk/editactive.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/templates/adminlistadmin.tpl
===================================================================
--- trunk/templates/adminlistadmin.tpl 2013-11-10 22:00:16 UTC (rev 1565)
+++ trunk/templates/adminlistadmin.tpl 2013-11-10 22:22:22 UTC (rev 1566)
@@ -18,8 +18,8 @@
{/if}
</td>
<td>{$admin.modified}</td>
- <td><a href="{#url_edit_admin#}&edit={$admin.username|escape:"url"}&active={if ($admin.active==0)}1{else}0{/if}">{$admin._active}</a></td>
- <td><a href="{#url_edit_admin#}&edit={$admin.username|escape:"url"}">{$PALANG.edit}</a></td>
+ <td><a href="{#url_editactive#}admin&id={$admin.username|escape:"url"}&active={if ($admin.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}">{$admin._active}</a></td>
+ <td><a href="{#url_edit_admin#}&edit={$admin.username|escape:"url"}">{$PALANG.edit}</a></td>
<td><a href="{#url_delete#}?table=admin&delete={$admin.username|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
onclick="return confirm ('{$PALANG.confirm}{$PALANG.admin}: {$admin.username}');">{$PALANG.del}</a></td>
</tr>
Modified: trunk/templates/adminlistdomain.tpl
===================================================================
--- trunk/templates/adminlistdomain.tpl 2013-11-10 22:00:16 UTC (rev 1565)
+++ trunk/templates/adminlistdomain.tpl 2013-11-10 22:22:22 UTC (rev 1566)
@@ -33,7 +33,7 @@
{if $CONF.transport==YES}<td>{$domain.transport}</td>{/if}
<td>{$domain._backupmx}</td>
<td>{$domain.modified}</td>
- <td><a href="{#url_edit_domain#}&edit={$domain.domain|escape:"url"}&active={if ($domain.active==0)}1{else}0{/if}">{$domain._active}</a></td>
+ <td><a href="{#url_editactive#}domain&id={$domain.domain|escape:"url"}&active={if ($domain.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}">{$domain._active}</a></td>
<td><a href="{#url_edit_domain#}&edit={$domain.domain|escape:"url"}">{$PALANG.edit}</a></td>
<td><a href="{#url_delete#}?table=domain&delete={$domain.domain|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
onclick="return confirm ('{$PALANG.confirm_domain}{$PALANG.domain}: {$domain.domain}')">{$PALANG.del}</a></td>
Modified: trunk/templates/list-virtual_alias.tpl
===================================================================
--- trunk/templates/list-virtual_alias.tpl 2013-11-10 22:00:16 UTC (rev 1565)
+++ trunk/templates/list-virtual_alias.tpl 2013-11-10 22:22:22 UTC (rev 1566)
@@ -37,7 +37,7 @@
{/if}
<td>{$item.modified}</td>
{if $check_alias_owner[$i]==true}
- <td><a href="{#url_create_alias#}&edit={$item.address|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}"
+ <td><a href="{#url_editactive#}alias&id={$item.address|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}"
>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
<td><a href="{#url_create_alias#}&edit={$item.address|escape:"url"}">{$PALANG.edit}</a></td>
<td><a href="delete.php?table=alias&delete={$item.address|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
Modified: trunk/templates/list-virtual_alias_domain.tpl
===================================================================
--- trunk/templates/list-virtual_alias_domain.tpl 2013-11-10 22:00:16 UTC (rev 1565)
+++ trunk/templates/list-virtual_alias_domain.tpl 2013-11-10 22:22:22 UTC (rev 1566)
@@ -30,7 +30,7 @@
{/if}
{if $item.target_domain != $fDomain}</a>{/if}</td>
<td>{$item.modified}</td>
- <td><a href="{#url_create_alias_domain#}&edit={$item.alias_domain|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
+ <td><a href="{#url_editactive#}aliasdomain&id={$item.alias_domain|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}">{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
<td><a href="{#url_create_alias_domain#}&edit={$item.alias_domain|escape:"url"}">{$PALANG.edit}</a></td>
<td><a href="{#url_delete#}?table=aliasdomain&delete={$item.alias_domain|escape:"url"}&token={$smarty.session.PFA_token|escape:"url"}"
onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_alias_domains}: {$item.alias_domain} -> {$item.target_domain}');">{$PALANG.del}</a></td>
Modified: trunk/templates/list-virtual_mailbox.tpl
===================================================================
--- trunk/templates/list-virtual_mailbox.tpl 2013-11-10 22:00:16 UTC (rev 1565)
+++ trunk/templates/list-virtual_mailbox.tpl 2013-11-10 22:22:22 UTC (rev 1566)
@@ -66,7 +66,7 @@
</td>
{/if}
<td>{$item.modified}</td>
- <td><a href="{#url_create_mailbox#}&edit={$item.username|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}"
+ <td><a href="{#url_editactive#}mailbox&id={$item.username|escape:"url"}&active={if ($item.active==0)}1{else}0{/if}&token={$smarty.session.PFA_token|escape:"url"}"
>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
{if $CONF.vacation_control_admin===YES && $CONF.vacation===YES}
{if $item.v_active!==-1}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-10 23:05:47
|
Revision: 1567
http://sourceforge.net/p/postfixadmin/code/1567
Author: christian_boltz
Date: 2013-11-10 23:05:43 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
DomainHandler.php
- delete(): check if the domain is an alias domain target - if yes, do
not allow to delete it
- better error message if domain_postdeletion() fails
*.lang:
- rename pAdminDelete_domain_error to domain_postdel_failed and change
the text
- add delete_domain_aliasdomain_target
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/model/DomainHandler.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/bg.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$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_address_text_error1'] = 'Този ALIAS не е валиден!';
$PALANG['email_address_already_exists'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -224,7 +225,7 @@
$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['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Грешка при изтриването на домейна!';
+$PALANG['domain_postdel_failed'] = 'Грешка при изтриването на домейна!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Редактиране на домейн';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/ca.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -98,6 +98,7 @@
$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_address_text_error1'] = 'L\'àlies no és vàlid!';
$PALANG['email_address_already_exists'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -222,7 +223,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Imposible afegir el domini! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un domini';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/cn.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = '该别名非法!';
$PALANG['email_address_already_exists'] = '邮件地址已经存在, 请重新选择!';
@@ -223,7 +224,7 @@
$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['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = '修改域';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/cs.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -104,6 +104,7 @@
$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_address_text_error1'] = 'Adresa neni platná!';
$PALANG['email_address_already_exists'] = 'Taková emailová adresa již existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -232,7 +233,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Nepodařilo se odstranit doménu!';
+$PALANG['domain_postdel_failed'] = 'Nepodařilo se odstranit doménu!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Upravit doménu';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/da.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -104,6 +104,7 @@
$PALANG['pCreate_alias_domain_success'] = 'Domæne-alias blev tilføjet alias-tabellen. (%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_address_text_error1'] = 'Aliaset er ikke gyldigt.';
$PALANG['email_address_already_exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.';
@@ -232,7 +233,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Administratoren kunne ikke slettes.';
-$PALANG['pAdminDelete_domain_error'] = 'Domænet kunne ikke slettes!';
+$PALANG['domain_postdel_failed'] = 'Domænet kunne ikke slettes!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Domæne-aliaset kunne ikke slettes!';
$PALANG['pAdminEdit_domain_welcome'] = 'Redigér et domæne';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/de.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain %s wurde erstellt.';
$PALANG['alias_domain_changed'] = 'Die Alias-Domain %s wurde geändert.';
$PALANG['alias_domain_to_itsself'] = 'Eine Domain kann keine Alias-Domain von sich selbst sein!';
+$PALANG['delete_domain_aliasdomain_target'] = 'Die Domain %s ist das Ziel einer oder mehrerer Alias-Domains und kann nicht gelöscht werden! (Löschen Sie zuerst die Alias-Domains.)';
$PALANG['pCreate_alias_address_text_error1'] = 'Dieses ALIAS ist nicht erlaubt!';
$PALANG['email_address_already_exists'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!';
@@ -229,7 +230,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Die Domain %s wurde angelegt.';
$PALANG['pAdminDelete_admin_error'] = 'Admin kann nicht gelöscht werden!';
-$PALANG['pAdminDelete_domain_error'] = 'Domain konnte nicht gelöscht werden!';
+$PALANG['domain_postdel_failed'] = 'Domain konnte nicht gelöscht werden!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Alias-Domain konnte nicht gelöscht werden!';
$PALANG['pAdminEdit_domain_welcome'] = 'Domain editieren';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/en.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -102,6 +102,7 @@
$PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.';
$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.';
$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!';
+$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.)';
$PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS is not valid!';
$PALANG['email_address_already_exists'] = 'This email address already exists, please choose a different one!';
@@ -230,7 +231,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'The domain %s has been added.';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!';
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!';
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!';
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!';
$PALANG['pAdminEdit_domain_welcome'] = 'Edit a domain';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/es.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla! (%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_address_text_error1'] = '¡El ALIAS no es válido!';
$PALANG['email_address_already_exists'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '¡Imposible añadir el dominio! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = '¡No se pudo eliminar el dominio!';
+$PALANG['domain_postdel_failed'] = '¡No se pudo eliminar el dominio!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = '¡No se pudo eliminar el alias de dominio!';
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/et.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = 'ALIAS pole kehtiv!';
$PALANG['email_address_already_exists'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domeeni lisamine ebaõnnestus! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Redigeeri domeeni';
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/eu.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -98,6 +98,7 @@
$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_address_text_error1'] = 'ALIASa okerra da!';
$PALANG['email_address_already_exists'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
$PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!';
@@ -221,7 +222,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Ezinezkoa domeinua gehitzea! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domeinua gehituta! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domeinu bat aldatu';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/fi.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$PALANG['pCreate_alias_domain_success'] = 'Domainin alias on lisätty domain alias tauluun! (%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_address_text_error1'] = 'Alias ei ole oikean muotoinen!';
$PALANG['email_address_already_exists'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domainin lisäys ei onnistunut! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domain on lisätty! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Domainin voitu poistaa!';
+$PALANG['domain_postdel_failed'] = 'Domainin voitu poistaa!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Domainin aliasta ei voitu poistaa!';
$PALANG['pAdminEdit_domain_welcome'] = 'Muokkaa domainia';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/fo.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = 'DULNEVNI er ógyldugt!';
$PALANG['email_address_already_exists'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!';
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Fái ikki stovnað navnaøki! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Navnaøki er stovnað! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Broyt navnaøki';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/fr.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj\xE0 pr\xE9sent dans la table de domaine! (%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_address_text_error1'] = 'Cet ALIAS n\'est pas valide!';
$PALANG['email_address_already_exists'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
$PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !';
@@ -225,7 +226,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Le domaine a été ajouté! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Impossible de supprimer le domain!';
+$PALANG['domain_postdel_failed'] = 'Impossible de supprimer le domain!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Impossible de supprimé cet alias de domaine!';
$PALANG['pAdminEdit_domain_welcome'] = 'Modifier un domaine';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/hr.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -98,6 +98,7 @@
$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_address_text_error1'] = 'ALIAS nije valjan!';
$PALANG['email_address_already_exists'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!';
@@ -222,7 +223,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domenu nije bilo moguče dodati! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspjeno dodana! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Uredi domenu';
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/hu.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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_address_text_error1'] = 'Az ALIAS érvénytelen!';
$PALANG['email_address_already_exists'] = 'Ez az email cím már létezik, kérlek válassz másikat!';
@@ -229,7 +230,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'A domain-t felvettük az adatbázisba! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'A domain törlése nem sikerült!';
+$PALANG['domain_postdel_failed'] = 'A domain törlése nem sikerült!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domain szerkesztése';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/is.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = 'Aliasinn er ekki í lagi!';
$PALANG['email_address_already_exists'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Get ekki bætt við léni! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Lén hefur verið bætt inn! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Breyta léni';
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/it.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$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_address_text_error1'] = 'L\' Alias non è valido!';
$PALANG['email_address_already_exists'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Impossibile aggiungere il dominio! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Il dominio è stato aggiunto! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Impossibile cancellare il dominio!';
+$PALANG['domain_postdel_failed'] = 'Impossibile cancellare il dominio!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Modifica un domain';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/ja.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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_address_text_error1'] = 'メールアドレスが無効です。';
$PALANG['email_address_already_exists'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before
@@ -229,7 +230,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'ドメインを追加しました。 (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'ドメインが削除できません！';
+$PALANG['domain_postdel_failed'] = 'ドメインが削除できません！'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'ドメインの修正';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/lt.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$PALANG['pCreate_alias_domain_success'] = 'Srities sinonimas užregistruotas! (%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_address_text_error1'] = 'Netinkamas sinonimas!';
$PALANG['email_address_already_exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!';
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Srities užregistruoti nepavyko! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Sritis užregistruota! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Nepavyko panaikinti administratoriaus!';
-$PALANG['pAdminDelete_domain_error'] = 'Nepavyko panaikinti srities!';
+$PALANG['domain_postdel_failed'] = 'Nepavyko panaikinti srities!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Nepavyko panaikinti srities sinonimo!';
$PALANG['pAdminEdit_domain_welcome'] = 'Keisti sritį';
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/mk.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = 'Алијасот не е валиден!';
$PALANG['email_address_already_exists'] = 'Оваа адреса веќе постои. Ве молам одберете друга!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -224,7 +225,7 @@
$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['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Измена на домен';
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/nb.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener! (%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_address_text_error1'] = 'Aliaset er ikke gyldig!';
$PALANG['email_address_already_exists'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Kunne ikke opprette domenet! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domenet er blitt opprettet! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Kunne ikke fjerne domenet!';
+$PALANG['domain_postdel_failed'] = 'Kunne ikke fjerne domenet!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Kunne ikke fjerne domenealias!';
$PALANG['pAdminEdit_domain_welcome'] = 'Endre et domene';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/nl.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de alias domein tabel! (%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_address_text_error1'] = 'De Alias is niet geldig!';
$PALANG['email_address_already_exists'] = 'Dit e-mail aders bestaat al, kies aub een andere.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Mislukt om het domein toe te voegen. (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domein is toegevoegd! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Niet in staat beheerder te verwijderen!';
-$PALANG['pAdminDelete_domain_error'] = 'Niet in staat domein te verwijderen!';
+$PALANG['domain_postdel_failed'] = 'Niet in staat domein te verwijderen!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Niet in staat domein alias te verwijderen!';
$PALANG['pAdminEdit_domain_welcome'] = 'Bewerk een domein';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/nn.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = 'Aliaset er ikke gyldig!';
$PALANG['email_address_already_exists'] = 'Denne epostadressen eksisterer allerede, velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Klarte ikke å legge til domenet! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domenet er lagt til! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Endre domenet';
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/pl.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -102,6 +102,7 @@
$PALANG['pCreate_alias_domain_success'] = 'Alias domeny został dodany do tabeli aliasów domen! (%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_address_text_error1'] = 'Alias jest niepoprawny!';
$PALANG['email_address_already_exists'] = 'Taki adres email juz istnieje, proszę wybrać inny!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -226,7 +227,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Nie można dodać domeny! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domena została dodana! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Nie można usunąć domeny!';
+$PALANG['domain_postdel_failed'] = 'Nie można usunąć domeny!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Nie można usunąć aliasu domeny!';
$PALANG['pAdminEdit_domain_welcome'] = 'Edytuj domenę';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/pt-br.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -103,6 +103,7 @@
$PALANG['pCreate_alias_domain_success'] = 'Alias de domínio criado! (%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_address_text_error1'] = 'Alias inválido!';
$PALANG['email_address_already_exists'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!';
@@ -231,7 +232,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domínio criado! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Não foi possível remover o domínio!';
+$PALANG['domain_postdel_failed'] = 'Não foi possível remover o domínio!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Não foi possível remover o alias de domínio!';
$PALANG['pAdminEdit_domain_welcome'] = 'Edição de domínio.';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/ru.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -103,6 +103,7 @@
$PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавлен в таблицу доменов-алиасов! (%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_address_text_error1'] = 'Неверное имя алиаса!';
$PALANG['email_address_already_exists'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -231,7 +232,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Домен был добавлен! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Невозможно удалить администратора!';
-$PALANG['pAdminDelete_domain_error'] = 'Невозможно удалить домен!';
+$PALANG['domain_postdel_failed'] = 'Невозможно удалить домен!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Невозможно удалить домен-алиас!';
$PALANG['pAdminEdit_domain_welcome'] = 'Редактирование домена';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/sk.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$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_address_text_error1'] = 'Adresa nie je platná!';
$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\!'
@@ -224,7 +225,7 @@
$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['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Nepodarilo sa odstrániť doménu!';
+$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['pAdminDelete_alias_domain_error'] = 'Nepodario sa odstrániť alias domény!';
$PALANG['pAdminEdit_domain_welcome'] = 'Upraviť doménu';
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/sl.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = 'Sintaksa aliasa je napačna!';
$PALANG['email_address_already_exists'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domene ni bilo mogoče dodati! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspešno dodana! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Uredi domeno';
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/sv.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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_address_text_error1'] = 'Detta ALIAS är inte giltigt!';
$PALANG['email_address_already_exists'] = 'Denna epostadress existerar redan, välj en annan epostadress!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -225,7 +226,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Kan inte skapa domänen! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domänen har skapats! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Kunde inte tabort domän!';
+$PALANG['domain_postdel_failed'] = 'Kunde inte tabort domän!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Ändra en domän';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/tr.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = 'ALIAS uygun deðil!';
$PALANG['email_address_already_exists'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domain eklenemedi! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domain eklendi! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domain düzenle';
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/tw.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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_address_text_error1'] = '該別名非法!';
$PALANG['email_address_already_exists'] = '郵件地址已經存在, 請重新選擇!';
@@ -223,7 +224,7 @@
$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['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = '修改網域';
Modified: trunk/model/DomainHandler.php
===================================================================
--- trunk/model/DomainHandler.php 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/model/DomainHandler.php 2013-11-10 23:05:43 UTC (rev 1567)
@@ -140,8 +140,17 @@
return false;
}
- # TODO: check if this domain is an alias domain target - if yes, do not allow to delete it
+ if (Config::bool('alias_domain')) {
+ # check if this domain is an alias domain target - if yes, do not allow to delete it
+ $handler = new AliasdomainHandler(0, $this->admin_username);
+ $handler->getList("target_domain = '" . escape_string($this->id) . "'");
+ $aliasdomains = $handler->result();
+ if (count($aliasdomains) > 0) {
+ $this->errormsg[] = Config::Lang_f('delete_domain_aliasdomain_target', $this->id);
+ return false;
+ }
+ }
# the correct way would be to recursively delete mailboxes, aliases, alias_domains, fetchmail entries
# with *Handler before deleting the domain, but this would be terribly slow on domains with many aliases etc.,
@@ -166,7 +175,7 @@
db_delete($this->db_table, $this->id_field, $this->id);
if ( !domain_postdeletion($this->id) ) {
- $this->error_msg[] = $PALANG['pAdminDelete_domain_error']; # TODO: better error message
+ $this->error_msg[] = $PALANG['domain_postdel_failed'];
}
db_log ($this->id, 'delete_domain', $this->id); # TODO delete_domain is not a valid db_log keyword yet
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-11 00:06:29
|
Revision: 1568
http://sourceforge.net/p/postfixadmin/code/1568
Author: christian_boltz
Date: 2013-11-11 00:06:27 +0000 (Mon, 11 Nov 2013)
Log Message:
-----------
login.php, common.php:
- when login.php is requested, logout the current admin/user
https://sourceforge.net/p/postfixadmin/bugs/284/
Modified Paths:
--------------
trunk/common.php
trunk/login.php
trunk/users/login.php
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2013-11-10 23:05:43 UTC (rev 1567)
+++ trunk/common.php 2013-11-11 00:06:27 UTC (rev 1568)
@@ -21,6 +21,13 @@
if (!defined('POSTFIXADMIN_CLI')) {
session_start();
+
+ if (defined('POSTFIXADMIN_LOGOUT')) {
+ session_unset();
+ session_destroy();
+ session_start();
+ }
+
if(empty($_SESSION['flash'])) {
$_SESSION['flash'] = array();
}
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2013-11-10 23:05:43 UTC (rev 1567)
+++ trunk/login.php 2013-11-11 00:06:27 UTC (rev 1568)
@@ -26,6 +26,7 @@
* lang
*/
+define('POSTFIXADMIN_LOGOUT', 1);
require_once('common.php');
if($CONF['configured'] !== true) {
Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php 2013-11-10 23:05:43 UTC (rev 1567)
+++ trunk/users/login.php 2013-11-11 00:06:27 UTC (rev 1568)
@@ -27,6 +27,7 @@
*/
$rel_path = '../';
+define('POSTFIXADMIN_LOGOUT', 1);
require_once("../common.php");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-11 00:13:34
|
Revision: 1569
http://sourceforge.net/p/postfixadmin/code/1569
Author: christian_boltz
Date: 2013-11-11 00:13:31 +0000 (Mon, 11 Nov 2013)
Log Message:
-----------
As a side effect of the previous commit (r1568), we can use login.php
for logout.
This means:
- change logout URL to login.php in menu.conf and users_main.tpl
- delete logout.php and users/logout.php
Revision Links:
--------------
http://sourceforge.net/p/postfixadmin/code/1568
Modified Paths:
--------------
trunk/configs/menu.conf
trunk/templates/users_main.tpl
Removed Paths:
-------------
trunk/logout.php
trunk/users/logout.php
Modified: trunk/configs/menu.conf
===================================================================
--- trunk/configs/menu.conf 2013-11-11 00:06:27 UTC (rev 1568)
+++ trunk/configs/menu.conf 2013-11-11 00:13:31 UTC (rev 1569)
@@ -24,14 +24,14 @@
# viewlog
url_viewlog = viewlog.php
# logout
-url_logout = logout.php
+url_logout = login.php
# user-menu
url_user_main = main.php
url_user_edit_alias = edit-alias.php
url_user_vacation = vacation.php
url_user_password = password.php
-url_user_logout = logout.php
+url_user_logout = login.php
tr_header = <tr class="header">
Deleted: trunk/logout.php
===================================================================
--- trunk/logout.php 2013-11-11 00:06:27 UTC (rev 1568)
+++ trunk/logout.php 2013-11-11 00:13:31 UTC (rev 1569)
@@ -1,32 +0,0 @@
-<?php
-/**
- * Postfix Admin
- *
- * LICENSE
- * This source file is subject to the GPL license that is bundled with
- * this package in the file LICENSE.TXT.
- *
- * Further details on the project are available at http://postfixadmin.sf.net
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * File: logout.php
- * De-authenticates a user.
- * Template File: -none-
- *
- * Template Variables: -none-
- *
- * Form POST \ GET Variables: -none-
- */
-
-require_once('common.php');
-
-session_unset ();
-session_destroy ();
-
-header ("Location: login.php");
-exit;
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
Modified: trunk/templates/users_main.tpl
===================================================================
--- trunk/templates/users_main.tpl 2013-11-11 00:06:27 UTC (rev 1568)
+++ trunk/templates/users_main.tpl 2013-11-11 00:13:31 UTC (rev 1569)
@@ -15,7 +15,7 @@
<td>{$PALANG.pUsersMain_password}</td>
</tr>
<tr>
- <td nowrap="nowrap"><a target="_top" href="logout.php">{$PALANG.pMenu_logout}</a></td>
+ <td nowrap="nowrap"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></td>
<td>{$PALANG.pMain_logout}</td>
</tr>
</table>
Deleted: trunk/users/logout.php
===================================================================
--- trunk/users/logout.php 2013-11-11 00:06:27 UTC (rev 1568)
+++ trunk/users/logout.php 2013-11-11 00:13:31 UTC (rev 1569)
@@ -1,33 +0,0 @@
-<?php
-/**
- * Postfix Admin
- *
- * LICENSE
- * This source file is subject to the GPL license that is bundled with
- * this package in the file LICENSE.TXT.
- *
- * Further details on the project are available at http://postfixadmin.sf.net
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * File: logout.php
- * De-authenticates a user.
- *
- * Template File: -none-
- *
- * Template Variables: -none-
- *
- * Form POST \ GET Variables: -none-
- */
-
-require_once('../common.php');
-
-session_unset ();
-session_destroy ();
-
-header ("Location: login.php");
-exit;
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-12 19:32:15
|
Revision: 1570
http://sourceforge.net/p/postfixadmin/code/1570
Author: christian_boltz
Date: 2013-11-12 19:32:12 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
model/CliDelete.php
- new file, handles deleting something with the CLI
(based on DeleteTask in scripts/shells/*.php)
scripts/shells/*.php
- remove DeleteTask, obsoleted by model/CliDelete.php
scripts/shells/shell.php:
- use CliDelete instead of DeleteTask
Modified Paths:
--------------
trunk/scripts/shells/alias.php
trunk/scripts/shells/domain.php
trunk/scripts/shells/mailbox.php
trunk/scripts/shells/shell.php
Added Paths:
-----------
trunk/model/CliDelete.php
Added: trunk/model/CliDelete.php
===================================================================
--- trunk/model/CliDelete.php (rev 0)
+++ trunk/model/CliDelete.php 2013-11-12 19:32:12 UTC (rev 1570)
@@ -0,0 +1,85 @@
+<?php
+/**
+ * class to handle 'delete' in Cli
+ */
+
+class CliDelete extends Shell {
+
+ /**
+ * Execution method always used for tasks
+ */
+ protected function execute() {
+
+ if (empty($this->args)) {
+ $this->__interactive();
+ }
+
+ if (!empty($this->args[0])) {
+ $this->__handle($this->args[0]);
+ }
+ }
+
+ /**
+ * Interactive mode
+ */
+ protected function __interactive() {
+ $module = preg_replace('/Handler$/', '', $this->handler_to_use);
+ $module = strtolower($module);
+
+ $question = "Which $module do you want to delete?";
+ $address = $this->in($question);
+
+ $question = "Do you really want to delete '$address'?";
+ $create = $this->in($question, array('y','n'));
+
+ if ($create == 'y') $this->__handle($address);
+ }
+
+ /**
+ * actually delete something
+ *
+ * @param string address to delete
+ */
+ protected function __handle($address) {
+ $handler = new $this->handler_to_use($this->new);
+
+ if (!$handler->init($address)) {
+ $this->err($handler->errormsg);
+ return;
+ }
+
+ if (!$handler->delete()) {
+ $this->err($handler->errormsg);
+ } else {
+ $this->out($handler->infomsg);
+ }
+ }
+
+ /**
+ * Display help contents
+ *
+ * @access public
+ */
+ protected function help() {
+ $module = preg_replace('/Handler$/', '', $this->handler_to_use);
+ $module = strtolower($module);
+
+ $this->out(
+"Usage:
+
+ postfixadmin-cli $module delete
+
+ Deletes $module in interactive mode.
+
+- or -
+
+ postfixadmin-cli $module delete <address>
+
+ Deletes $module <address> in non-interactive mode.
+");
+ $this->_stop();
+ }
+
+}
+
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Property changes on: trunk/model/CliDelete.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/scripts/shells/alias.php
===================================================================
--- trunk/scripts/shells/alias.php 2013-11-11 00:13:31 UTC (rev 1569)
+++ trunk/scripts/shells/alias.php 2013-11-12 19:32:12 UTC (rev 1570)
@@ -52,83 +52,6 @@
}
#TODO: implement
-class DeleteTask extends Shell {
-/**
- * Execution method always used for tasks
- *
- * @access public
- */
- function execute() {
-
- if (empty($this->args)) {
-# $this->help();
- $this->__interactive();
- }
-
- if (!empty($this->args[0])) {
- $this->__handle($this->args[0]);
- }
- }
-/**
- * Interactive
- *
- * @access private
- */
- function __interactive() {
- $question[] = "Which Address do you want to delete?";
-
- $address = $this->in(join("\n", $question));
-
-
- $question = "Do you really want to delete the alias '$address'?";
-
- $create = $this->in($question, array('y','n'));
-
- $create == 'y' ? $create = true : $create = false;
-
- if ($create)
- $this->__handle($address);
-
-
-
- }
- /**
- * Interactive
- *
- * @access private
- */
- function __handle($address) {
-
- $handler = new AliasHandler();
- $handler->init($address);
- $status = $handler->delete();
- if ($status == true) {
- $this->out("Alias '$address' was deleted.");
-
- } else {
- $this->err($handler->errormsg);
- }
- return;
-
- }
-/**
- * Displays help contents
- *
- * @access public
- */
- function help() {
- $this->hr();
- $this->out("NOT implemented yet.");
- //$this->out("Usage: postfixadmin-cli user model <arg1>");
- //$this->hr();
- //$this->out('Commands:');
- //$this->out("\n\tdelete\n\t\tdeletes mailbox in interactive mode.");
- //$this->out("\n\tdelete <address>\n\t\tdeletes mailbox with address <address>");
- //$this->out("");
- $this->_stop();
- }
-
-}
class ViewTask extends Shell {
/**
* Execution method always used for tasks
Modified: trunk/scripts/shells/domain.php
===================================================================
--- trunk/scripts/shells/domain.php 2013-11-11 00:13:31 UTC (rev 1569)
+++ trunk/scripts/shells/domain.php 2013-11-12 19:32:12 UTC (rev 1570)
@@ -63,78 +63,6 @@
}
-class DeleteTask extends Shell {
-/**
- * Execution method always used for tasks
- *
- * @access public
- */
- function execute() {
-
- if (empty($this->args)) {
- $this->__interactive();
- }
-
- if (!empty($this->args[0])) {
- $output = $this->__handle($this->args[0]);
- $this->out($output);
- }
- }
-/**
- * Interactive
- *
- * @access private
- */
- function __interactive() {
- $question = "Which domain do you want to delete?";
- $address = $this->in($question);
-
- $question = "Do you really want to delete domain '$address'?";
- $create = $this->in($question, array('y','n'));
-
- if ($create == 'y') $this->__handle($address);
- }
- /**
- * Interactive
- *
- * @access private
- */
- function __handle($address) {
- $handler = new DomainHandler();
- if (!$handler->init($address)) {
- $this->err($handler->errormsg);
- return;
- }
-
- $status = $handler->delete();
- if ($status == true) {
- $this->out("Domain '$address' was deleted.");
-
- } else {
- $this->err($handler->errormsg);
- }
- return;
-
- }
-/**
- * Displays help contents
- *
- * @access public
- */
- function help() {
- $this->out("NOT Implemented yet.");
- $this->hr();
- $this->out("Usage: postfixadmin-cli user model <arg1>");
- $this->hr();
- //$this->out('Commands:');
- //$this->out("\n\tdelete\n\t\tdeletes mailbox in interactive mode.");
- //$this->out("\n\tdelete <address>\n\t\tdeletes mailbox with address <address>");
- //$this->out("");
- $this->_stop();
- }
-
-}
-##Deleted PasswordTask because its silly in domain shell
class ViewTask extends Shell {
/**
* Execution method always used for tasks
Modified: trunk/scripts/shells/mailbox.php
===================================================================
--- trunk/scripts/shells/mailbox.php 2013-11-11 00:13:31 UTC (rev 1569)
+++ trunk/scripts/shells/mailbox.php 2013-11-12 19:32:12 UTC (rev 1570)
@@ -51,84 +51,6 @@
}
-class DeleteTask extends Shell {
-/**
- * Execution method always used for tasks
- *
- * @access public
- */
- function execute() {
-
- if (empty($this->args)) {
- $this->__interactive();
- }
-
- if (!empty($this->args[0])) {
- $output = $this->__handle($this->args[0]);
- $this->out($output);
-
- }
- }
-/**
- * Interactive
- *
- * @access private
- */
- function __interactive() {
- $question[] = "Which Address do you want to delete?";
-
- $address = $this->in(join("\n", $question));
-
-
- $question = "Do you really want to delete mailbox of '$address'?";
-
- $create = $this->in($question, array('y','n'));
-
- $create == 'y' ? $create = true : $create = false;
-
- if ($create)
- $this->__handle($address);
-
- }
- /**
- * Interactive
- *
- * @access private
- */
- function __handle($address) {
-
- $handler = new MailboxHandler();
- if (!$handler->init($address)) {
- $this->error("Error:", join("\n", $handler->errormsg));
- }
-
- $status = $handler->delete();
- if ( ! $status ) {
- $this->err($handler->errormsg);
-
- } else {
- $this->out("Mailbox of '$address' was deleted.");
- }
- return;
-
- }
-/**
- * Displays help contents
- *
- * @access public
- */
- function help() {
- $this->hr();
- $this->out("Usage: postfixadmin-cli mailbox model <arg1>");
- $this->hr();
- $this->out('Commands:');
- $this->out("\n\tdelete\n\t\tdeletes mailbox in interactive mode.");
- $this->out("\n\tdelete <address>\n\t\tdeletes mailbox with address <address>");
- $this->out("");
- $this->_stop();
- }
-
-}
class PasswordTask extends Shell {
/**
* Execution method always used for tasks
Modified: trunk/scripts/shells/shell.php
===================================================================
--- trunk/scripts/shells/shell.php 2013-11-11 00:13:31 UTC (rev 1569)
+++ trunk/scripts/shells/shell.php 2013-11-12 19:32:12 UTC (rev 1570)
@@ -209,8 +209,10 @@
if ($taskName == 'Add' || $taskName == 'Update') {
$taskClass = 'CliEdit';
+ } elseif ($taskName == 'Delete') {
+ $taskClass = 'CliDelete';
+ }
- }
# elseif (!class_exists($taskClass)) {
# foreach ($this->Dispatch->shellPaths as $path) {
# $taskPath = $path . 'tasks' . DS . $task.'.php';
@@ -221,12 +223,8 @@
# }
# }
- $this->taskNames[] = $taskName;
-# if (!PHP5) {
-# $this->{$taskName} = new $taskClass($this->Dispatch);
-# } else {
- $this->{$taskName} = new $taskClass($this->Dispatch);
-# }
+ $this->taskNames[] = $taskName;
+ $this->{$taskName} = new $taskClass($this->Dispatch);
if ($taskName == 'Add') {
$this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';
@@ -234,8 +232,11 @@
} elseif ($taskName == 'Update') {
$this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';
$this->{$taskName}->new = 0;
- }
-
+ } elseif ($taskName == 'Delete') {
+ $this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';
+ $this->{$taskName}->new = 0;
+ }
+
if (!isset($this->{$taskName})) {
$this->err("Task '".$taskName."' could not be loaded");
$this->_stop();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-12 21:32:52
|
Revision: 1572
http://sourceforge.net/p/postfixadmin/code/1572
Author: christian_boltz
Date: 2013-11-12 21:32:49 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
model/CliView.php:
- new file for CLI 'view'
- based on the ViewTask classes in scripts/shells/*.php
- introduces usage of *Handler->_formatted_$field() to get "pretty"
output for a field
(not sure if this is the final solution, but it works ;-)
scripts/shells/*.php
- remove ViewTask, obsoleted by model/CliView.php
scripts/shells/shell.php:
- use CliView instead of ViewTask
Modified Paths:
--------------
trunk/scripts/shells/alias.php
trunk/scripts/shells/domain.php
trunk/scripts/shells/mailbox.php
trunk/scripts/shells/shell.php
Added Paths:
-----------
trunk/model/CliView.php
Added: trunk/model/CliView.php
===================================================================
--- trunk/model/CliView.php (rev 0)
+++ trunk/model/CliView.php 2013-11-12 21:32:49 UTC (rev 1572)
@@ -0,0 +1,113 @@
+<?php
+/**
+ * class to handle 'view' in Cli
+ */
+
+class CliView extends Shell {
+
+ /**
+ * Execution method always used for tasks
+ */
+ public function execute() {
+
+ if (empty($this->args)) {
+ $this->__interactive();
+ }
+
+ if (!empty($this->args[0])) {
+ $this->__handle($this->args[0]);
+ }
+ }
+
+ /**
+ * Interactive mode
+ */
+ protected function __interactive() {
+ $module = preg_replace('/Handler$/', '', $this->handler_to_use);
+ $module = strtolower($module);
+
+ $question = "Which $module do you want to view?";
+ $address = $this->in($question);
+
+ $this->__handle($address);
+ }
+
+ /**
+ * actually view something
+ *
+ * @param string address to view
+ */
+ protected function __handle($address) {
+ $handler = new $this->handler_to_use($this->new);
+
+ if (!$handler->init($address)) {
+ $this->err($handler->errormsg);
+ return;
+ }
+
+ if (!$handler->view()) {
+ $this->err($handler->errormsg);
+ return;
+ }
+
+ $result = $handler->result();
+ $struct = $handler->getStruct();
+
+ foreach(array_keys($struct) as $field) {
+ if (isset($struct[$field]) && empty($struct[$field]['label'])) {
+ # $struct[$field]['label'] = "--- $field ---";
+ $struct[$field]['display_in_list'] = 0;
+ }
+
+ if ($struct[$field]['display_in_list'] == 0) {
+ # do nothing
+ } else {
+ $value = $result[$field];
+
+ $func="_formatted_".$field;
+ if (method_exists($handler, $func) ) {
+ $value = $handler->{$func}($result); # call _formatted_$fieldname()
+ }
+
+
+ if ($struct[$field]['type'] == 'txtl') {
+ # $value = join("\n" . str_repeat(" ", 20 + 2), $value); # multiline, one item per line
+ $value = join(", ", $value); # one line, comma-separated
+ } elseif ($struct[$field]['type'] == 'bool') {
+ $value = Config::Lang($value ? 'YES' : 'NO');
+ }
+
+ $this->out(sprintf("%20s: %s", $struct[$field]['label'], $value));
+ }
+ }
+
+ }
+
+ /**
+ * Display help contents
+ *
+ * @access public
+ */
+ public function help() {
+ $module = preg_replace('/Handler$/', '', $this->handler_to_use);
+ $module = strtolower($module);
+
+ $this->out(
+"Usage:
+
+ postfixadmin-cli $module view
+
+ View $module in interactive mode.
+
+- or -
+
+ postfixadmin-cli $module view <address>
+
+ View $module <address> in non-interactive mode.
+");
+ $this->_stop();
+ }
+
+}
+
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Property changes on: trunk/model/CliView.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/scripts/shells/alias.php
===================================================================
--- trunk/scripts/shells/alias.php 2013-11-12 21:19:54 UTC (rev 1571)
+++ trunk/scripts/shells/alias.php 2013-11-12 21:32:49 UTC (rev 1572)
@@ -51,90 +51,4 @@
}
-#TODO: implement
-class ViewTask extends Shell {
-/**
- * Execution method always used for tasks
- *
- * @access public
- */
- function execute() {
-
- if (empty($this->args)) {
- $this->__interactive();
- }
-
- if (!empty($this->args[0])) {
- $this->__handle($this->args[0]);
-
- }
- }
-/**
- * Interactive
- *
- * @access private
- */
- function __interactive() {
- $question[] = "Which Alias do you want to view?";
-
- $address = $this->in(join("\n", $question));
-
- $this->__handle($address);
-
-
-
- }
- /**
- * Interactive
- *
- * @access private
- */
- function __handle($address) {
-
-
- $handler = new AliasHandler();
- $handler->init($address);
- if ( ! $handler->view() ) {
- $this->error("Error: Not Found", "The requested alias was not found!");
- } else {
- $result = $handler->result;
-
- $this->out(sprintf("Entries for: %s\n", $address));
- $this->out("Goto: \t");
- foreach($result['goto'] AS $goto) {
- $this->out("\t -> ".$goto);
- }
- if( $result['is_mailbox'] ) {
- $this->out("A mailbox was set for this alias!\n");
- }
- if( $result['goto_mailbox'] ) {
- $this->out("The alias delivers to the mailbox!\n");
- }
- if( $result['on_vacation'] ) {
- $this->out("This alias is a vacation address!");
- }
- $this->out("Active: " . $result['active']);
- }
- return;
-
- }
-/**
- * Displays help contents
- *
- * @access public
- */
- function help() {
- $this->out("");
- $this->hr();
- $this->out("Usage: postfixadmin-cli user view <address>");
- $this->hr();
- $this->out('Commands:');
- $this->out("\n\tview\n\t\tView user. Select address in interactive mode.");
- $this->out("\n\tview <address>\n\t\tView user with address <address>");
- $this->out("");
- $this->_stop();
- }
-
-}
-
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Modified: trunk/scripts/shells/domain.php
===================================================================
--- trunk/scripts/shells/domain.php 2013-11-12 21:19:54 UTC (rev 1571)
+++ trunk/scripts/shells/domain.php 2013-11-12 21:32:49 UTC (rev 1572)
@@ -63,101 +63,4 @@
}
-class ViewTask extends Shell {
-/**
- * Execution method always used for tasks
- *
- * @access public
- */
- function execute() {
-
- if (empty($this->args)) {
- $this->__interactive();
- }
-
- if (!empty($this->args[0])) {
- $output = $this->__handle($this->args[0]);
- $this->out($output);
-
- }
- }
-/**
- * Interactive
- *
- * @access private
- */
- function __interactive() {
- $question[] = "Which Domain do you want to view?";
-
- $domain = $this->in(join("\n", $question));
-
- $this->__handle($domain);
-
-
-
- }
- /**
- * Interactive
- *
- * @access private
- */
- function __handle($domain) {
-
-
- $handler = new DomainHandler();
- if (!$handler->init($domain)) {
- $this->error("Error:",join("\n", $handler->errormsg));
- return;
- }
-
- $status = $handler->view();
- if (!$status) {
- $this->error("Error:",join("\n", $handler->errormsg));
- } else {
- $result = $handler->result();
- $struct = $handler->getStruct();
-
- # TODO: $totalfield should be in DomainHandler (in $struct or as separate array)
- $totalfield = array(
- 'aliases' => 'alias_count',
- 'mailboxes' => 'mailbox_count',
- 'quota' => 'total_quota',
- );
-
- foreach($struct as $key => $field) {
- if ($field['display_in_list']) {
- if (isset($totalfield[$key])) {
- # TODO: format based on $field['type'] (also in the else section)
- $this->out($field['label'] . ": \t" . $result[$totalfield[$key]] . " / " . $result[$key] );
- } else {
- if (!in_array($key, $totalfield)) { # skip if we already displayed the field as part of "x/y"
- $this->out($field['label'] . ": \t" . $result[$key]);
- }
- }
- }
- }
-
- return;
- }
-
- }
-/**
- * Displays help contents
- *
- * @access public
- */
- function help() {
-# TODO: this is the DOMAIN shell...
- $this->out("");
- $this->hr();
- $this->out("Usage: postfixadmin-cli user view <address>");
- $this->hr();
- $this->out('Commands:');
- $this->out("\n\tview\n\t\tView user. Select address in interactive mode.");
- $this->out("\n\tview <address>\n\t\tView user with address <address>");
- $this->out("");
- $this->_stop();
- }
-
-}
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Modified: trunk/scripts/shells/mailbox.php
===================================================================
--- trunk/scripts/shells/mailbox.php 2013-11-12 21:19:54 UTC (rev 1571)
+++ trunk/scripts/shells/mailbox.php 2013-11-12 21:32:49 UTC (rev 1572)
@@ -178,84 +178,3 @@
}
}
-class ViewTask extends Shell {
-/**
- * Execution method always used for tasks
- *
- * @access public
- */
- function execute() {
-
- if (empty($this->args)) {
- $this->__interactive();
- }
-
- if (!empty($this->args[0])) {
- $output = $this->__handle($this->args[0]);
- $this->out($output);
-
- }
- }
-/**
- * Interactive
- *
- * @access private
- */
- function __interactive() {
- $question[] = "Which Address do you want to view?";
-
- $address = $this->in(join("\n", $question));
-
- $this->__handle($address);
-
-
-
- }
- /**
- * Interactive
- *
- * @access private
- */
- function __handle($address) {
-
-
- $handler = new MailboxHandler();
- if ( ! $handler->init($address)) {
- $this->error("Not found!", "The mailbox you have searched could not be found.");
- }
- if ( ! $handler->view() ) {
- $this->error("Not Found!", "The mailbox you have searched could not be found.");
- }
-# TODO: offer alternative output formats (based on parameter)
-# TODO: whitespace fix - 8 lines below
- $result = $handler->result;
- $this->out(sprintf("Entries for: %s\n", $address));
- $this->out("");
- $this->out(sprintf("+%'-25s+%'-15s+%'-10s+%'-20s+%'-8s+%'-8s+%'-6s+",'','','','','','',''));
- $this->out(sprintf('|%25s|%15s|%10s|%20s|%8s|%8s|%6s|', 'Address', 'Name', 'Quota', 'Dir', 'Created', 'Modified', 'Active'));
- $this->out(sprintf("+%'-25s+%'-15s+%'-10s+%'-20s+%'-8s+%'-8s+%'-6s+",'','','','','','',''));
- $result['maildir'] = '--- skipped ---'; # TODO: include in view() result - or don't (try to) display it
- $this->out(sprintf('|%25s|%15s|%10s|%20s|%8s|%8s|%6s|', $result['username'], $result['name'], $result['quota'], $result['maildir'], $result['created'], $result['modified'], $result['active']));
- $this->out(sprintf("+%'-25s+%'-15s+%'-10s+%'-20s+%'-8s+%'-8s+%'-6s+",'','','','','','',''));
-
- return;
-
- }
-/**
- * Displays help contents
- *
- * @access public
- */
- function help() {
- $this->out("");
- $this->hr();
- $this->out("Usage: postfixadmin-cli mailbox view <address>");
- $this->hr();
- $this->out('Commands:');
- $this->out("\n\tview\n\t\tView mailbox. Select address in interactive mode.");
- $this->out("\n\tview <address>\n\t\tView mailbox with address <address>");
- $this->out("");
- $this->_stop();
- }
-
-}
Modified: trunk/scripts/shells/shell.php
===================================================================
--- trunk/scripts/shells/shell.php 2013-11-12 21:19:54 UTC (rev 1571)
+++ trunk/scripts/shells/shell.php 2013-11-12 21:32:49 UTC (rev 1572)
@@ -211,6 +211,8 @@
$taskClass = 'CliEdit';
} elseif ($taskName == 'Delete') {
$taskClass = 'CliDelete';
+ } elseif ($taskName == 'View') {
+ $taskClass = 'CliView';
}
# elseif (!class_exists($taskClass)) {
@@ -232,7 +234,7 @@
} elseif ($taskName == 'Update') {
$this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';
$this->{$taskName}->new = 0;
- } elseif ($taskName == 'Delete') {
+ } elseif ($taskName == 'Delete' || $taskName == 'View') {
$this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';
$this->{$taskName}->new = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-13 19:07:15
|
Revision: 1575
http://sourceforge.net/p/postfixadmin/code/1575
Author: christian_boltz
Date: 2013-11-13 19:07:12 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
Quite big CLI cleanup (and more)
model/CliHelp.php:
- new class, used for "postfixadmin-cli $module help"
- replaces the PostfixAdmin* classes in scripts/shells/*.php
model/PFAHandler.php
- add public $taskNames with the list of supported CLI commands
scripts/postfixadmin-cli.php - dispatch():
- directly set the classes to load instead of using shell->loadTasks()
- when "postfixadmin-cli $module" is called, display help instead of
error message about "invalid command ''"
- make it more readable by moving error checks to the beginning
(replaces deeply nested if's with return statements)
- remove unused code parts
scripts/shells/*.php:
- remove PostfixAdmin* classes (obsoleted by CliHelp)
- remove $tasks (now in PFAHandler)
- delete alias.php and domain.php because nothing is left
- mailbox.php still contains PasswordTask
scripts/shells/shell.php:
- remove $taskNames (moved to PFAHandler)
- remove loadTasks() (integrated in postfixadmin-cli.php's dispatch())
Modified Paths:
--------------
trunk/model/PFAHandler.php
trunk/scripts/postfixadmin-cli.php
trunk/scripts/shells/mailbox.php
trunk/scripts/shells/shell.php
Added Paths:
-----------
trunk/model/CliHelp.php
Removed Paths:
-------------
trunk/scripts/shells/alias.php
trunk/scripts/shells/domain.php
Added: trunk/model/CliHelp.php
===================================================================
--- trunk/model/CliHelp.php (rev 0)
+++ trunk/model/CliHelp.php 2013-11-13 19:07:12 UTC (rev 1575)
@@ -0,0 +1,65 @@
+<?php
+
+class CliHelp extends Shell {
+
+ public $handler_to_use = "__not_set__";
+
+/**
+ * Show help for this shell.
+ *
+ * @access public
+ */
+ public function execute() {
+ $this->help();
+ }
+
+ public function help() {
+
+ $handler = new $this->handler_to_use;
+ # TODO: adjust help text according to $handler->taskNames
+
+ $module = preg_replace('/Handler$/', '', $this->handler_to_use);
+ $module = strtolower($module);
+
+ $this->out(
+"Usage:
+
+ postfixadmin-cli $module <task> [<address>] [--option value]
+");
+/*
+ View $module in interactive mode.
+
+- or -
+
+ postfixadmin-cli $module view <address>
+
+ View $module <address> in non-interactive mode.
+"); */
+
+
+
+ $head = "Usage: postfixadmin-cli $module <task> [<address>] [--option value] [--option value]\n";
+ $head .= "-----------------------------------------------\n";
+ $head .= "Parameters:\n\n";
+
+ $commands = array(
+ 'task' => "\t<task>\n" .
+ "\t\tAvailable values:\n\n".
+ "\t\t".sprintf("%-20s %s", "view: ", "View an existing $module.")."\n".
+ "\t\t".sprintf("%-20s %s", "add: ", "Add a $module.")."\n".
+ "\t\t".sprintf("%-20s %s", "update: ", "Update a $module.")."\n".
+ "\t\t".sprintf("%-20s %s", "delete: ", "Delete a $module")."\n".
+ "\t\t".sprintf("%-20s %s", "password: ", "Changes the password for a $module")."\n",
+ 'address' => "\t[<address>]\n" .
+ "\t\tA address of recipient.\n",
+ );
+
+ foreach ($commands as $cmd) {
+ $this->out("{$cmd}\n\n");
+ }
+ }
+
+
+}
+
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Property changes on: trunk/model/CliHelp.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/model/PFAHandler.php
===================================================================
--- trunk/model/PFAHandler.php 2013-11-13 00:40:08 UTC (rev 1574)
+++ trunk/model/PFAHandler.php 2013-11-13 19:07:12 UTC (rev 1575)
@@ -11,6 +11,9 @@
# array of info messages (for example success messages)
public $infomsg = array();
+ # array of tasks available in CLI
+ public $taskNames = array('Help', 'Add', 'Update', 'Delete', 'View');
+
/**
* variables that must be defined in all *Handler classes
*/
Modified: trunk/scripts/postfixadmin-cli.php
===================================================================
--- trunk/scripts/postfixadmin-cli.php 2013-11-13 00:40:08 UTC (rev 1574)
+++ trunk/scripts/postfixadmin-cli.php 2013-11-13 19:07:12 UTC (rev 1575)
@@ -227,82 +227,82 @@
*/
function dispatch() {
$CONF = Config::read('all');
- if (isset($this->args[0])) {
- $plugin = null;
- $shell = $this->args[0];
- if (strpos($shell, '.') !== false) {
- list($plugin, $shell) = explode('.', $this->args[0]);
- }
- $this->shell = $shell;
+ if (!isset($this->args[0])) {
+ $this->help();
+ return;
+ }
+
+ $this->shell = $this->args[0];
$this->shiftArgs();
$this->shellName = Inflector::camelize($this->shell);
- $this->shellClass = 'PostfixAdmin'.$this->shellName;
+ $this->shellClass = $this->shellName . 'Handler';
if ($this->shell == 'help') {
$this->help();
- } else {
- $loaded = false;
- $paths = array();
-
- if ($plugin !== null) {
- $pluginPaths = Config::read('pluginPaths');
- $count = count($pluginPaths);
- for ($i = 0; $i < $count; $i++) {
- $paths[] = $pluginPaths[$i] . $plugin . DS . 'vendors' . DS . 'shells' . DS;
- }
- }
-
-
- $paths[] = CORE_INCLUDE_PATH . DS . "shells" . DS;
-
- $this->shellPaths = $paths;
- foreach ($this->shellPaths as $path) {
- $this->shellPath = $path . $this->shell . ".php";
- if (file_exists($this->shellPath)) {
- $loaded = true;
- break;
- }
- }
- if ($loaded) {
+ return;
+ }
+# TODO: move shells/shell.php to model/ to enable autoloading
if (!class_exists('Shell')) {
require CORE_INCLUDE_PATH . DS . "shells" . DS . 'shell.php';
}
-
- require $this->shellPath;
- if (class_exists($this->shellClass)) {
- $command = null;
+ $command = 'help'; # not the worst default ;-)
if (isset($this->args[0])) {
$command = $this->args[0];
}
+
$this->shellCommand = $command;
- $shell = new $this->shellClass($this);
+
+ $this->shellClass = 'Cli' . Inflector::camelize($command);
+
+ if (ucfirst($command) == 'Add' || ucfirst($command) == 'Update') {
+ $this->shellClass = 'CliEdit';
+ }
+
+ if (!class_exists($this->shellClass)) {
+ $this->stderr('Class '.$this->shellClass.' could not be loaded');
+ return;
+ }
+
+ $shell = new $this->shellClass($this);
+
+ $shell->handler_to_use = ucfirst($this->shell) . 'Handler';
+
+ if (!class_exists($shell->handler_to_use)) {
+ $this->stderr('Class '.$shell->handler_to_use.' could not be loaded');
+ return;
+ }
+
+ $task = Inflector::camelize($command);
+
+ $shell->new = 0;
+ if ($task == 'Add') {
+ $shell->new = 1;
+ }
+
+# TODO: add a way to Cli* to signal if the selected handler is supported (for example, not all *Handler support changing the password)
+
if (strtolower(get_parent_class($shell)) == 'shell') {
$shell->initialize();
- $shell->loadTasks();
- foreach ($shell->taskNames as $task) {
- if (strtolower(get_parent_class($shell)) == 'shell') {
- $shell->{$task}->initialize();
- $shell->{$task}->loadTasks();
- }
- }
+ $handler = new $shell->handler_to_use;
+ if (in_array($task, $handler->taskNames)) {
+ $this->shiftArgs();
+ $shell->startup();
- $task = Inflector::camelize($command);
- if (in_array($task, $shell->taskNames)) {
- $this->shiftArgs();
- $shell->{$task}->startup();
+
if (isset($this->args[0]) && $this->args[0] == 'help') {
- if (method_exists($shell->{$task}, 'help')) {
- $shell->{$task}->help();
+ if (method_exists($shell, 'help')) {
+ $shell->help();
exit();
} else {
$this->help();
}
}
- $shell->{$task}->execute();
+
+ $shell->execute();
return;
}
}
@@ -340,16 +340,6 @@
} else {
$this->stderr("Unknown {$this->shellName} command '$command'.\nFor usage, try 'postfixadmin-cli {$this->shell} help'.\n\n");
}
- } else {
- $this->stderr('Class '.$this->shellClass.' could not be loaded');
- }
- } else {
- $this->help();
- }
- }
- } else {
- $this->help();
- }
}
/**
Deleted: trunk/scripts/shells/alias.php
===================================================================
--- trunk/scripts/shells/alias.php 2013-11-13 00:40:08 UTC (rev 1574)
+++ trunk/scripts/shells/alias.php 2013-11-13 19:07:12 UTC (rev 1575)
@@ -1,54 +0,0 @@
-<?php
-
-
-class PostfixAdminAlias extends Shell {
-
-/**
- * Contains tasks to load and instantiate
- *
- * @var array
- * @access public
- */
- var $tasks = array('Add', 'Update', 'Delete', 'View');
-
-
-
-
-
-/**
- * Show help for this shell.
- *
- * @access public
- */
- function help() {
- $head = "Usage: postfixadmin-cli alias <task> [<address>] [] [-m <method>]\n";
- $head .= "-----------------------------------------------\n";
- $head .= "Parameters:\n\n";
-
- $commands = array(
- 'task' => "\t<task>\n" .
- "\t\tAvailable values:\n\n".
- "\t\t".sprintf("%-20s %s", "view: ", "View an existing alias.")."\n".
- "\t\t".sprintf("%-20s %s", "add: ", "Adds an alias.")."\n".
- "\t\t".sprintf("%-20s %s", "update: ", "Updates an alias.")."\n".
- "\t\t".sprintf("%-20s %s", "delete: ", "Deletes an alias")."\n",
- 'address' => "\t[<address>]\n" .
- "\t\tA address of recipient.\n",
- );
-
- $this->out($head);
- if (!isset($this->args[1])) {
- foreach ($commands as $cmd) {
- $this->out("{$cmd}\n\n");
- }
- } elseif (isset($commands[strtolower($this->args[1])])) {
- $this->out($commands[strtolower($this->args[1])] . "\n\n");
- } else {
- $this->out("Command '" . $this->args[1] . "' not found");
- }
- }
-
-
-}
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Deleted: trunk/scripts/shells/domain.php
===================================================================
--- trunk/scripts/shells/domain.php 2013-11-13 00:40:08 UTC (rev 1574)
+++ trunk/scripts/shells/domain.php 2013-11-13 19:07:12 UTC (rev 1575)
@@ -1,66 +0,0 @@
-<?php
-
-
-class PostfixAdminDomain extends Shell {
-
-/**
- * Contains tasks to load and instantiate
- *
- * @var array
- * @access public
- */
- var $tasks = array('Add', 'Update', 'Delete', 'View');
-
-
-
-
-
-/**
- * Show help for this shell.
- *
- * @access public
- */
- function help() {
- $head = "Usage: postfixadmin-cli domain <task> [<domain>] [-desc \"<description>\"] [-a <aliases>] [-m <mailboxes>] [-q <quota in MB>] [-t <transport>] [-default] [-backup]\n";
- $head .= "-----------------------------------------------\n";
- $head .= "Parameters:\n\n";
-
- $commands = array(
- 'task' => "\t<task>\n" .
- "\t\tAvailable values:\n\n".
- "\t\t".sprintf("%-20s %s", "view: ", "View an existing domain.")."\n".
- "\t\t".sprintf("%-20s %s", "add: ", "Adds a domain.")."\n".
- "\t\t".sprintf("%-20s %s", "update: ", "Updates an domain.")."\n".
- "\t\t".sprintf("%-20s %s", "delete: ", "Deletes a domain")."\n",
- 'domain' => "\t[<domain>]\n" .
- "\t\tA address of recipient.\n",
- 'a' => "\t[<aliaes>]\n" .
- "\t\tNumber of max aliases. -1 = disable | 0 = unlimited\n",
- 'm' => "\t[<mailboxes>]\n" .
- "\t\tNumber of max mailboxes. -1 = disable | 0 = unlimited\n",
- 'q' => "\t[<quota in MB>]\n" .
- "\t\tMax Quota in MB. -1 = disable | 0 = unlimited\n",
- 'd' => "\t[<domain quota in MB>]\n" .
- "\t\tDomain Quota in MB. -1 = disable | 0 = unlimited\n",
- 't' => "\t[<transport>]\n" .
- "\t\tTransport options from config.inc.php.\n",
- 'default' => "\t\tSet to add default Aliases.\n",
- 'backup' => "\t\tSet if mailserver is backup MX.\n",
- );
-
- $this->out($head);
- if (!isset($this->args[1])) {
- foreach ($commands as $cmd) {
- $this->out("{$cmd}\n\n");
- }
- } elseif (isset($commands[strtolower($this->args[1])])) {
- $this->out($commands[strtolower($this->args[1])] . "\n\n");
- } else {
- $this->out("Command '" . $this->args[1] . "' not found");
- }
- }
-
-
-}
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Modified: trunk/scripts/shells/mailbox.php
===================================================================
--- trunk/scripts/shells/mailbox.php 2013-11-13 00:40:08 UTC (rev 1574)
+++ trunk/scripts/shells/mailbox.php 2013-11-13 19:07:12 UTC (rev 1575)
@@ -1,56 +1,6 @@
<?php
-class PostfixAdminMailbox extends Shell {
-
-/**
- * Contains tasks to load and instantiate
- *
- * @var array
- * @access public
- */
- var $tasks = array('Add', 'Update', 'Delete', 'Password', 'View');
-
-
-
-
-/**
- * Show help for this shell.
- *
- * @access public
- */
- function help() {
- $head = "Usage: postfixadmin-cli mailbox <task> [<address>] [] [--<option> <value>]\n";
- $head .= "-----------------------------------------------\n";
- $head .= "Parameters:\n\n";
-
- $commands = array(
- 'task' => "\t<task>\n" .
- "\t\tAvailable values:\n\n".
- "\t\t".sprintf("%-20s %s", "view: ", "View an existing mailbox.")."\n".
- "\t\t".sprintf("%-20s %s", "add: ", "Adds a new mailbox.")."\n".
- "\t\t".sprintf("%-20s %s", "update: ", "Updates a mailbox.")."\n".
- "\t\t".sprintf("%-20s %s", "delete: ", "Deletes a mailbox")."\n".
- "\t\t".sprintf("%-20s %s", "password: ", "Changes the PW for a mailbox.")."\n",
- 'address' => "\t[<address>]\n" .
- "\t\tMail address\n",
- );
-
- $this->out($head);
- if (!isset($this->args[1])) {
- foreach ($commands as $cmd) {
- $this->out("{$cmd}\n\n");
- }
- } elseif (isset($commands[strtolower($this->args[1])])) {
- $this->out($commands[strtolower($this->args[1])] . "\n\n");
- } else {
- $this->out("Command '" . $this->args[1] . "' not found");
- }
- }
-
-
-}
-
class PasswordTask extends Shell {
/**
* Execution method always used for tasks
Modified: trunk/scripts/shells/shell.php
===================================================================
--- trunk/scripts/shells/shell.php 2013-11-13 00:40:08 UTC (rev 1574)
+++ trunk/scripts/shells/shell.php 2013-11-13 19:07:12 UTC (rev 1575)
@@ -102,13 +102,6 @@
*/
var $tasks = array();
/**
- * Contains the loaded tasks
- *
- * @var array
- * @access public
- */
- var $taskNames = array();
-/**
* Contains models to load and instantiate
*
* @var array
@@ -184,71 +177,7 @@
$this->hr();
}
- /**
- * Loads tasks defined in var $tasks
- *
- * @return bool
- * @access public
- */
- function loadTasks() {
- if ($this->tasks === null || $this->tasks === false) {
- return;
- }
-
- if ($this->tasks !== true && !empty($this->tasks)) {
-
- $tasks = $this->tasks;
- if (!is_array($tasks)) {
- $tasks = array($tasks);
- }
-
- foreach ($tasks as $taskName) {
- $task = Inflector::underscore($taskName);
- $taskClass = Inflector::camelize($taskName.'Task');
- $taskKey = Inflector::underscore($taskClass);
-
- if ($taskName == 'Add' || $taskName == 'Update') {
- $taskClass = 'CliEdit';
- } elseif ($taskName == 'Delete') {
- $taskClass = 'CliDelete';
- } elseif ($taskName == 'View') {
- $taskClass = 'CliView';
- }
-
-# elseif (!class_exists($taskClass)) {
-# foreach ($this->Dispatch->shellPaths as $path) {
-# $taskPath = $path . 'tasks' . DS . $task.'.php';
-# if (file_exists($taskPath)) {
-# require_once $taskPath;
-# break;
-# }
-# }
-# }
-
- $this->taskNames[] = $taskName;
- $this->{$taskName} = new $taskClass($this->Dispatch);
-
- if ($taskName == 'Add') {
- $this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';
- $this->{$taskName}->new = 1;
- } elseif ($taskName == 'Update') {
- $this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';
- $this->{$taskName}->new = 0;
- } elseif ($taskName == 'Delete' || $taskName == 'View') {
- $this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';
- $this->{$taskName}->new = 0;
- }
-
- if (!isset($this->{$taskName})) {
- $this->err("Task '".$taskName."' could not be loaded");
- $this->_stop();
- }
- }
- }
-
- return false;
- }
- /**
+/**
* Prompts the user for input, and returns it.
*
* @param string $prompt Prompt text.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2013-11-14 22:10:07
|
Revision: 1579
http://sourceforge.net/p/postfixadmin/code/1579
Author: christian_boltz
Date: 2013-11-14 22:10:05 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
functions.inc.php, DomainHandler, MailboxHandler:
- move mailbox_postdeletion() to MailboxHandler
- move domain_postcreation() and domain_postdeletion() to
DomainHandler
- adopt those functions for usage inside the *Handler (replace
print with $this->errormsg etc.)
Modified Paths:
--------------
trunk/functions.inc.php
trunk/model/DomainHandler.php
trunk/model/MailboxHandler.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2013-11-14 21:48:52 UTC (rev 1578)
+++ trunk/functions.inc.php 2013-11-14 22:10:05 UTC (rev 1579)
@@ -1607,104 +1607,6 @@
/*
- Called after a mailbox has been deleted in the DBMS.
- Returns: boolean.
- */
-function mailbox_postdeletion($username,$domain) {
- $cmd = Config::read('mailbox_postdeletion_script');
-
- if ( empty($cmd) ) {
- return true;
- }
-
- if (empty($username) || empty($domain)) {
- print '<p>Warning: empty username and/or domain parameter.</p>';
- return false;
- }
-
- $cmdarg1=escapeshellarg($username);
- $cmdarg2=escapeshellarg($domain);
- $command = "$cmd $cmdarg1 $cmdarg2";
- $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 '<p>WARNING: Problems running mailbox postdeletion script!</p>';
- return FALSE;
- }
-
- return TRUE;
-}
-
-/*
- Called after a domain has been added in the DBMS.
- Returns: boolean.
- */
-# TODO: move to DomainHandler
-# TODO: replace "print" with $this->errormsg (or infomsg?)
-function domain_postcreation($domain) {
- $script=Config::read('domain_postcreation_script');
-
- if (empty($script)) {
- return true;
- }
-
- if (empty($domain)) {
- print '<p>Warning: empty domain parameter.</p>';
- return false;
- }
-
- $cmdarg1=escapeshellarg($domain);
- $command= "$script $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 '<p>WARNING: Problems running domain postcreation script!</p>';
- return FALSE;
- }
-
- return TRUE;
-}
-
-/*
- Called after a domain has been deleted in the DBMS.
- Returns: boolean.
- */
-# TODO: move to DomainHandler (after moving the delete code there)
-# TODO: replace "print" with $this->errormsg (or infomsg?)
-function domain_postdeletion($domain) {
- $script=Config::read('domain_postdeletion_script');
-
- if (empty($script)) {
- return true;
- }
-
- if (empty($domain)) {
- print '<p>Warning: empty domain parameter.</p>';
- return false;
- }
-
- $cmdarg1=escapeshellarg($domain);
- $command= "$script $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 '<p>WARNING: Problems running domain postdeletion script!</p>';
- return FALSE;
- }
-
- return TRUE;
-}
-
-/*
Called after an alias_domain has been deleted in the DBMS.
Returns: boolean.
*/
Modified: trunk/model/DomainHandler.php
===================================================================
--- trunk/model/DomainHandler.php 2013-11-14 21:48:52 UTC (rev 1578)
+++ trunk/model/DomainHandler.php 2013-11-14 22:10:05 UTC (rev 1579)
@@ -122,7 +122,7 @@
}
if ($this->new) {
- if (!domain_postcreation($this->id)) {
+ if (!$this->domain_postcreation()) {
$this->errormsg[] = Config::lang('pAdminCreate_domain_error');
}
} else {
@@ -174,7 +174,7 @@
# finally delete the domain
db_delete($this->db_table, $this->id_field, $this->id);
- if ( !domain_postdeletion($this->id) ) {
+ if ( !$this->domain_postdeletion() ) {
$this->error_msg[] = $PALANG['domain_postdel_failed'];
}
@@ -194,5 +194,69 @@
public function _formatted_mailboxes($item) { return $item['mailbox_count'] . ' / ' . $item['mailboxes']; }
public function _formatted_quota ($item) { return $item['total_quota'] . ' / ' . $item['quota'] ; }
+ /**
+ * Called after a domain has been added
+ *
+ * @return boolean
+ */
+ protected function domain_postcreation() {
+ $script=Config::read('domain_postcreation_script');
+
+ if (empty($script)) {
+ return true;
+ }
+
+ if (empty($this->id)) {
+ $this->errormsg[] = 'Empty domain parameter in domain_postcreation';
+ return false;
+ }
+
+ $cmdarg1=escapeshellarg($this->id);
+ $command= "$script $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");
+ $this->errormsg[] = 'Problems running domain postcreation script!';
+ return FALSE;
+ }
+
+ return TRUE;
+ }
+
+ /**
+ * Called after a domain has been deleted
+ *
+ * @return boolean
+ */
+ protected function domain_postdeletion() {
+ $script=Config::read('domain_postdeletion_script');
+
+ if (empty($script)) {
+ return true;
+ }
+
+ if (empty($this->id)) {
+ $this->errormsg[] = 'Empty domain parameter in domain_postdeletion';
+ return false;
+ }
+
+ $cmdarg1=escapeshellarg($this->id);
+ $command= "$script $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");
+ $this->errormsg[] = 'Problems running domain postdeletion script!';
+ return FALSE;
+ }
+
+ return TRUE;
+ }
+
}
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Modified: trunk/model/MailboxHandler.php
===================================================================
--- trunk/model/MailboxHandler.php 2013-11-14 21:48:52 UTC (rev 1578)
+++ trunk/model/MailboxHandler.php 2013-11-14 22:10:05 UTC (rev 1579)
@@ -292,8 +292,7 @@
db_delete('alias', 'address', $this->id);
db_delete($this->db_table, $this->id_field, $this->id); # finally delete the mailbox
- list(/*NULL*/,$domain) = explode('@', $this->id);
- if ( !mailbox_postdeletion($username,$domain) ) {
+ if ( !$this->mailbox_postdeletion() ) {
$this->error_msg[] = 'Mailbox postdeletion failed!'; # TODO: make translateable
}
@@ -553,6 +552,44 @@
}
/**
+ * Called after a mailbox has been deleted
+ *
+ * @return boolean true on success, false on failure
+ * also adds a detailed error message to $this->errormsg[]
+ */
+ protected function mailbox_postdeletion() {
+ $cmd = Config::read('mailbox_postdeletion_script');
+
+ if ( empty($cmd) ) {
+ return true;
+ }
+
+ list(/*NULL*/,$domain) = explode('@', $this->id);
+
+ if (empty($this->id) || empty($domain)) {
+ $this->errormsg[] = 'Empty username and/or domain parameter in mailbox_postdeletion';
+ return false;
+ }
+
+ $cmdarg1=escapeshellarg($this->id);
+ $cmdarg2=escapeshellarg($domain);
+ $command = "$cmd $cmdarg1 $cmdarg2";
+ $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");
+ $this->errormsg[] = 'Problems running mailbox postdeletion script!';
+ return FALSE;
+ }
+
+ return TRUE;
+ }
+
+
+
+ /**
* Called by storemore() after a mailbox has been created.
* Immediately returns, unless configuration indicates
* that one or more sub-folders should be created.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X