SF.net SVN: postfixadmin:[791] trunk
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[791] trunk
|
From: <Seb...@us...> - 2009-12-24 14:58:11
|
Revision: 791
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=791&view=rev
Author: Sebastian2009
Date: 2009-12-24 14:58:01 +0000 (Thu, 24 Dec 2009)
Log Message:
-----------
- fix some display errors after rev. 788, found and patch supplied by Jan-Kruis, thx.
Modified Paths:
--------------
trunk/broadcast-message.php
trunk/create-admin.php
trunk/create-alias-domain.php
trunk/create-alias.php
trunk/create-domain.php
trunk/create-mailbox.php
trunk/delete.php
trunk/edit-active-admin.php
trunk/edit-active-domain.php
trunk/edit-active.php
trunk/edit-admin.php
trunk/edit-alias.php
trunk/edit-domain.php
trunk/edit-mailbox.php
trunk/edit-vacation.php
trunk/fetchmail.php
trunk/languages/nl.lang
trunk/list-admin.php
trunk/list-domain.php
trunk/list-virtual.php
trunk/login.php
trunk/password.php
trunk/search.php
trunk/sendmail.php
trunk/templates/admin_create-admin.tpl
trunk/templates/admin_edit-admin.tpl
trunk/templates/footer.tpl
trunk/users/edit-alias.php
trunk/users/login.php
trunk/users/password.php
trunk/users/vacation.php
trunk/viewlog.php
Modified: trunk/broadcast-message.php
===================================================================
--- trunk/broadcast-message.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/broadcast-message.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: broadcast-message.php
* Used to send a message to _ALL_ users with mailboxes on this server.
*
- * Template File: broadcast-message.php
+ * Template File: broadcast-message.tpl
*
* Template Variables: -none-
*
@@ -94,7 +94,7 @@
$smarty->assign ('smarty_template', 'broadcast-message');
$smarty->display ('index.tpl');
-// include ("templates/broadcast-message.php");
+// include ("templates/broadcast-message.tpl");
}
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/create-admin.php
===================================================================
--- trunk/create-admin.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/create-admin.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: create-admin.php
* Used to create new administrators.
- * Template File: admin_create-admin.php
+ * Template File: admin_create-admin.tpl
*
*
* Template Variables:
@@ -59,10 +59,10 @@
}
$smarty->assign ('tUsername', $tUsername);
-$smarty->assign ('pAdminCreate_admin_username_text', $pAdminCreate_admin_username_text);
-$smarty->assign ('pAdminCreate_admin_password_text', $pAdminCreate_admin_password_text);
-$smarty->assign ('tMessage', $tMessage);
-$smarty->assign ('select_options', select_options ($list_domains, $tDomains));
+$smarty->assign ('pAdminCreate_admin_username_text', $pAdminCreate_admin_username_text, false);
+$smarty->assign ('pAdminCreate_admin_password_text', $pAdminCreate_admin_password_text, false);
+$smarty->assign ('tMessage', $tMessage, false);
+$smarty->assign ('select_options', select_options ($list_domains, $tDomains), false);
$smarty->assign ('smarty_template', 'admin_create-admin');
$smarty->display ('index.tpl');
Modified: trunk/create-alias-domain.php
===================================================================
--- trunk/create-alias-domain.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/create-alias-domain.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -11,7 +11,7 @@
* http://www.postfixadmin.com or http://postfixadmin.sf.net
*
* File: create-alias-domain.php
- * Template File: create-alias-domain.php
+ * Template File: create-alias-domain.tpl
* Responsible for allowing for the creation of alias domains.
*
* @version $Id$
@@ -136,11 +136,11 @@
$tMessage .= "<br />($fAliasDomain -> $fTargetDomain)<br />\n";
}
$smarty->assign ('alias_domains', (count($alias_domains) > 0));
-$smarty->assign ('select_options_alias', select_options ($alias_domains, array ($fAliasDomain)));
-$smarty->assign ('select_options_target', select_options ($target_domains, array ($fTargetDomain)));
+$smarty->assign ('select_options_alias', select_options ($alias_domains, array ($fAliasDomain)), false);
+$smarty->assign ('select_options_target', select_options ($target_domains, array ($fTargetDomain)), false);
if ($fActive) $smarty->assign ('fActive', ' checked="checked"');
if ($error == 1) $tMessage = '<span class="error_msg">'.$tMessage.'</span>';
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'create-alias-domain');
$smarty->display ('index.tpl');
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/create-alias.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -11,7 +11,7 @@
* http://www.postfixadmin.com or http://postfixadmin.sf.net
*
* File: create-alias.php
- * Template File: create-alias.php
+ * Template File: create-alias.tpl
* Responsible for allowing for the creation of mail aliases.
*
* @version $Id$
@@ -124,7 +124,7 @@
$tAddress = escape_string ($_POST['fAddress']);
$tGoto = $fGoto;
$tDomain = $fDomain;
- $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error2'];
+ $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error2'];
}
if ($fActive == "on") {
@@ -154,11 +154,11 @@
}
$smarty->assign ('tAddress', $tAddress);
-$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)));
-$smarty->assign ('pCreate_alias_address_text', $pCreate_alias_address_text);
-$smarty->assign ('tGoto', $tGoto);
+$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
+$smarty->assign ('pCreate_alias_address_text', $pCreate_alias_address_text, false);
+$smarty->assign ('tGoto', $tGoto, false);
$smarty->assign ('pCreate_alias_goto_text', $pCreate_alias_goto_text);
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'create-alias');
$smarty->display ('index.tpl');
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/create-domain.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: create-domain.php
* Allows administrators to create new domains.
- * Template File: admin_create-domain.php
+ * Template File: admin_create-domain.tpl
*
* Template Variables:
*
@@ -143,15 +143,15 @@
}
$smarty->assign ('tDomain', $tDomain);
-$smarty->assign ('pAdminCreate_domain_domain_text', $pAdminCreate_domain_domain_text);
-$smarty->assign ('tDescription', $tDescription);
+$smarty->assign ('pAdminCreate_domain_domain_text', $pAdminCreate_domain_domain_text, false);
+$smarty->assign ('tDescription', $tDescription, false);
$smarty->assign ('tAliases', $tAliases);
$smarty->assign ('tMailboxes', $tMailboxes);
-$smarty->assign ('tMaxquota', $tMaxquota);
-$smarty->assign ('select_options', select_options ($CONF ['transport_options'], array ($tTransport)));
+$smarty->assign ('tMaxquota', $tMaxquota,false);
+$smarty->assign ('select_options', select_options ($CONF ['transport_options'], array ($tTransport)),false);
$smarty->assign ('tDefaultaliases', ($tDefaultaliases == 'on') ? ' checked="checked"' : '');
$smarty->assign ('tBackupmx', ($tBackupmx == 'on') ? ' checked="checked"' : '');
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'admin_create-domain');
$smarty->display ('index.tpl');
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/create-mailbox.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -264,13 +264,13 @@
}
$smarty->assign ('tUsername', $tUsername);
-$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)));
-$smarty->assign ('pCreate_mailbox_username_text', $pCreate_mailbox_username_text);
-$smarty->assign ('pCreate_mailbox_password_text', $pCreate_mailbox_password_text);
-$smarty->assign ('tName', $tName);
+$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
+$smarty->assign ('pCreate_mailbox_username_text', $pCreate_mailbox_username_text, false);
+$smarty->assign ('pCreate_mailbox_password_text', $pCreate_mailbox_password_text, false);
+$smarty->assign ('tName', $tName, false);
$smarty->assign ('tQuota', $tQuota);
-$smarty->assign ('pCreate_mailbox_quota_text', $pCreate_mailbox_quota_text);
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('pCreate_mailbox_quota_text', $pCreate_mailbox_quota_text, false);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'create-mailbox');
$smarty->display ('index.tpl');
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/delete.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -17,7 +17,7 @@
* Note: if a domain is deleted, all mailboxes and aliases belonging
* to the domain are also removed.
*
- * Template File: message.php
+ * Template File: message.tpl
*
* Template Variables:
*
Modified: trunk/edit-active-admin.php
===================================================================
--- trunk/edit-active-admin.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/edit-active-admin.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: edit-active-admin.php
* Edit an active administrator. This is used as a 'toggle' page from list-admin.
*
- * Template File: message.php
+ * Template File: message.tpl
*
* Template Variables:
*
Modified: trunk/edit-active-domain.php
===================================================================
--- trunk/edit-active-domain.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/edit-active-domain.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: edit-active-domain.php
* Responsible for toggling the status of a domain
- * Template File: message.php
+ * Template File: message.tpl
*
* Template Variables:
*
Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/edit-active.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: edit-active.php
* Responsible for toggling the active status of a mailbox.
*
- * Template File: message.php
+ * Template File: message.tp
*
* Template Variables:
*
Modified: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/edit-admin.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: edit-admin.php
* Edits a normal administrator's details.
*
- * Template File: admin_edit-admin.php
+ * Template File: admin_edit-admin.tpl
*
* Template Variables:
*
@@ -151,11 +151,11 @@
}
$smarty->assign ('username', $username);
-$smarty->assign ('pAdminEdit_admin_password_text', $pAdminEdit_admin_password_text);
+$smarty->assign ('pAdminEdit_admin_password_text', $pAdminEdit_admin_password_text, false);
$smarty->assign ('tActive_checked', $tActive_checked);
$smarty->assign ('tSadmin_checked', $tSadmin_checked);
-$smarty->assign ('select_options', select_options ($tAllDomains, $tDomains));
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('select_options', select_options ($tAllDomains, $tDomains), false);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'admin_edit-admin');
$smarty->display ('index.tpl');
Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/edit-alias.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: edit-alias.php
* Used to update an alias.
*
- * Template File: edit-alias.php
+ * Template File: edit-alias.tpl
*
* Template Variables:
*
@@ -173,9 +173,9 @@
// TOCHECK
$array = $alias_list;
-$smarty->assign ('fAddress', $fAddress);
-$smarty->assign ('array', $array);
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('fAddress', $fAddress, false);
+$smarty->assign ('array', $array, false);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'edit-alias');
$smarty->display ('index.tpl');
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/edit-domain.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: edit-domain.php
* Updates the properties of a domain.
- * Template File: admin_edit-domain.php
+ * Template File: admin_edit-domain.tpl
*
* Template Variables:
*
@@ -114,14 +114,14 @@
}
$smarty->assign ('domain', $domain);
-$smarty->assign ('tDescription', htmlspecialchars($tDescription, ENT_QUOTES));
+$smarty->assign ('tDescription', htmlspecialchars($tDescription, ENT_QUOTES), false);
$smarty->assign ('tAliases', $tAliases);
$smarty->assign ('tMailboxes', $tMailboxes);
$smarty->assign ('tMaxquota', $tMaxquota);
-$smarty->assign ('select_options', select_options ($CONF ['transport_options'], array ($tTransport)));
+$smarty->assign ('select_options', select_options ($CONF ['transport_options'], array ($tTransport)), false);
if ($tBackupmx) $smarty->assign ('tBackupmx', ' checked="checked"');
if ($tActive) $smarty->assign ('tActive', ' checked="checked"');
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tMessage', $tMessage,false);
$smarty->assign ('smarty_template', 'admin_edit-domain');
$smarty->display ('index.tpl');
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/edit-mailbox.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: edit-mailbox.php
* Used to update an existing mailboxes settings.
- * Template File: edit-mailbox.php
+ * Template File: edit-mailbox.tpl
*
* Template Variables:
*
@@ -176,16 +176,17 @@
}
$smarty->assign ('fUsername', $fUsername);
-$smarty->assign ('fPassword', $user_details ['password']);
+$smarty->assign ('fPassword', $user_details ['password'], false);
//$smarty->assign ('pEdit_mailbox_username_text', $pEdit_mailbox_username_text);
-$smarty->assign ('pEdit_mailbox_password_text', $pEdit_mailbox_password_text);
-$smarty->assign ('tName', htmlspecialchars ($tName,ENT_QUOTES));
-$smarty->assign ('pEdit_mailbox_name_text', $pEdit_mailbox_name_text);
+$smarty->assign ('pEdit_mailbox_password_text', $pEdit_mailbox_password_text, false);
+//$smarty->assign ('tName', htmlspecialchars ($tName,ENT_QUOTES));
+$smarty->assign ('tName', $tName, false);
+$smarty->assign ('pEdit_mailbox_name_text', $pEdit_mailbox_name_text,false);
$smarty->assign ('tMaxquota', $tMaxquota);
$smarty->assign ('tQuota', $tQuota);
$smarty->assign ('pEdit_mailbox_quota_text', $pEdit_mailbox_quota_text);
if ($tActive) $smarty->assign ('tActive', ' checked="checked"');
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'edit-mailbox');
$smarty->display ('index.tpl');
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/edit-vacation.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: edit-vacation.php
* Responsible for allowing users to update their vacation status.
*
- * Template File: edit-vacation.php
+ * Template File: edit-vacation.tpl
*
* Template Variables:
*
@@ -209,9 +209,9 @@
$tActiveUntil = date ("Y-m-d");
$smarty->assign ('tUseremail', $tUseremail);
-$smarty->assign ('tSubject', htmlentities(stripslashes($tSubject), ENT_QUOTES, 'UTF-8'));
-$smarty->assign ('tBody', htmlentities(stripslashes($tBody), ENT_QUOTES , 'UTF-8'));
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tSubject', htmlentities(stripslashes($tSubject), ENT_QUOTES, 'UTF-8'),false);
+$smarty->assign ('tBody', htmlentities(stripslashes($tBody), ENT_QUOTES , 'UTF-8'),false);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('tActiveFrom', date ("d.m.Y", strtotime ($tActiveFrom)));
$smarty->assign ('tActiveUntil', date ("d.m.Y", strtotime ($tActiveUntil)));
$smarty->assign ('fCanceltarget', $fCanceltarget);
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/fetchmail.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,6 +14,7 @@
*
* File: fetchmail.php
* Responsible for setting up fetchmail
+ * template : fetchmail.tpl
*
* @version $Id$
* @license GNU GPL v2 or later.
@@ -372,7 +373,7 @@
$smarty->assign ('edit', $edit);
$smarty->assign ('new', $new);
-$smarty->assign ('fetchmail_edit_row', fetchmail_edit_row($formvars));
+$smarty->assign ('fetchmail_edit_row', fetchmail_edit_row($formvars),false);
$smarty->assign ('headers', $headers);
$smarty->assign ('user_domains', $user_domains);
$smarty->assign ('tFmail', $tFmail);
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/languages/nl.lang 2009-12-24 14:58:01 UTC (rev 791)
@@ -41,7 +41,7 @@
$PALANG['pMain_overview'] = 'Laat uw aliassen en mailboxen zien. U kunt ze vanaf hier bewerken / verwijderen.';
$PALANG['pMain_create_alias'] = 'Maak een nieuwe alias aan voor uw domein.';
$PALANG['pMain_create_mailbox'] = 'Maak een nieuwe mailbox aan voor uw domein.';
-$PALANG['pMain_sendmail'] = 'Verstuur een e-mail naar \xE9\xE9n van de nieuwe mailboxen.';
+$PALANG['pMain_sendmail'] = 'Verstuur een e-mail naar een van de nieuwe mailboxen.';
$PALANG['pMain_password'] = 'Wijzig uw wachtwoord.';
$PALANG['pMain_viewlog'] = 'Laat de log files zien';
$PALANG['pMain_logout'] = 'Uitloggen';
@@ -115,7 +115,7 @@
$PALANG['pCreate_alias_goto_text_error'] = 'Waar de e-mail naar toe moet.<br /><span class="error_msg">De NAAR is niet geldig.</span>';
$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Mislukt om de alias toe te voegen.</span>';
$PALANG['pCreate_alias_result_success'] = 'De alias is toegevoegd.';
-$PALANG['pCreate_alias_catchall_text'] = 'Om een catch-all te gebruiken, dient u een "*" (asteric) in te vullen als alias.<br />Voor domein naar domein forwarding gebruik "*@domein.tld" als naar.';
+$PALANG['pCreate_alias_catchall_text'] = 'Om een catch-all te gebruiken, dient u een "*" (asteric) in te vullen als alias.<br/>Voor domein naar domein forwarding gebruik "*@domein.tld" als naar.';
$PALANG['pEdit_alias_welcome'] = 'Bewerk een alias voor uw domein.<br />Een alias per regel.';
$PALANG['pEdit_alias_address'] = 'Alias';
@@ -189,7 +189,7 @@
$PALANG['pViewlog_username'] = 'Beheerder';
$PALANG['pViewlog_domain'] = 'Domein';
$PALANG['pViewlog_action'] = 'Actie';
-$PALANG['pViewlog_data'] = 'Datum';
+$PALANG['pViewlog_data'] = 'Aanpassing';
$PALANG['pViewlog_action_create_mailbox'] = 'Mailbox toegevoegd';
$PALANG['pViewlog_action_delete_mailbox'] = 'Mailbox verwijdert';
$PALANG['pViewlog_action_edit_mailbox'] = 'Mailbox bewerkt';
Modified: trunk/list-admin.php
===================================================================
--- trunk/list-admin.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/list-admin.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: list-admin.php
* Lists all administrators
- * Template File: list-admin.php
+ * Template File: list-admin.tpl
*
* Template Variables: -none-
*
@@ -40,7 +40,7 @@
}
}
$smarty->assign ('admin_properties', $admin_properties);
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'admin_list-admin');
$smarty->display ('index.tpl');
Modified: trunk/list-domain.php
===================================================================
--- trunk/list-domain.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/list-domain.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -1,5 +1,4 @@
-<?php
-/**
+<?php /**
* Postfix Admin
*
* LICENSE
@@ -14,7 +13,7 @@
*
* File: list-domain.php
* List all domains as a quick overview.
- * Template File: admin_list-domain.php
+ * Template File: admin_list-domain.tpl
*
* Template Variables:
*
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/list-virtual.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -87,7 +87,7 @@
}
// store fDomain in $_SESSION so after adding/editing aliases/mailboxes we can
-// take the user back to the appropriate domain listing. (see templates/menu.php)
+// take the user back to the appropriate domain listing. (see templates/menu.tpl)
if($fDomain) {
$_SESSION['list_virtual_sticky_domain'] = $fDomain;
}
@@ -431,9 +431,9 @@
// this is why we need a proper template layer.
$fDomain = htmlentities($fDomain, ENT_QUOTES);
-$smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)));
-$smarty->assign ('nav_bar_alias', array ('top' => $nav_bar_alias->display_top (), 'bottom' => $nav_bar_alias->display_bottom ()));
-$smarty->assign ('nav_bar_mailbox', array ('top' => $nav_bar_mailbox->display_top (), 'bottom' => $nav_bar_mailbox->display_bottom ()));
+$smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)), false);
+$smarty->assign ('nav_bar_alias', array ('top' => $nav_bar_alias->display_top (), 'bottom' => $nav_bar_alias->display_bottom ()), false);
+$smarty->assign ('nav_bar_mailbox', array ('top' => $nav_bar_mailbox->display_top (), 'bottom' => $nav_bar_mailbox->display_bottom ()), false);
$smarty->assign ('fDomain', $fDomain);
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/login.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: login.php
* Authenticates a user, and populates their $_SESSION as appropriate.
- * Template File: login.php
+ * Template File: login.tpl
*
* Template Variables:
*
@@ -97,7 +97,7 @@
}
$smarty->assign ('tUsername', $tUsername);
- $smarty->assign ('tMessage', $tMessage);
+ $smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'login');
$smarty->display ('index.tpl');
Modified: trunk/password.php
===================================================================
--- trunk/password.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/password.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: password.php
* Allows admins to change their own password.
- * Template File: password.php
+ * Template File: password.tpl
*
* Template Variables:
*
@@ -90,7 +90,7 @@
$smarty->assign ('pPassword_password_current_text', $pPassword_password_current_text);
$smarty->assign ('pPassword_password_text', $pPassword_password_text);
- $smarty->assign ('tMessage', $tMessage);
+ $smarty->assign ('tMessage', $tMessage,false);
$smarty->display ('index.tpl');
}
Modified: trunk/search.php
===================================================================
--- trunk/search.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/search.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: search.php
* Provides a method for searching for a user/mailbox
- * Template File: search.php
+ * Template File: search.tpl
*
* Template Variables:
*
@@ -174,11 +174,11 @@
}
$smarty->assign ('fSearch', $fSearch);
-$smarty->assign ('select_options', select_options ($list_domains, array ($list_domains[0])));
-$smarty->assign ('tAlias', $tAlias);
+$smarty->assign ('select_options', select_options ($list_domains, array ($list_domains[0])), false);
+$smarty->assign ('tAlias', $tAlias, false);
$smarty->assign ('check_alias_owner', $check_alias_owner);
-$smarty->assign ('tMailbox', $tMailbox);
+$smarty->assign ('tMailbox', $tMailbox, false);
$smarty->assign ('divide_quota', $divide_quota);
$smarty->assign ('smarty_template', 'search');
Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/sendmail.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: sendmail.php
* Used to send an email to a user.
- * Template File: sendmail.php
+ * Template File: sendmail.tpl
*
* Template Variables:
*
@@ -80,7 +80,7 @@
}
}
$smarty->assign ('SESSID_USERNAME', $SESSID_USERNAME);
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'sendmail');
$smarty->display ('index.tpl');
Modified: trunk/templates/admin_create-admin.tpl
===================================================================
--- trunk/templates/admin_create-admin.tpl 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/templates/admin_create-admin.tpl 2009-12-24 14:58:01 UTC (rev 791)
@@ -17,14 +17,14 @@
<tr>
<td>{$PALANG.pAdminCreate_admin_password2}:</td>
<td><input class="flat" type="password" name="fPassword2" /></td>
- <td> </td>
+
</tr>
<tr>
<td>{$PALANG.pAdminCreate_admin_address}:</td>
<td>
<select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select>
</td>
- <td> </td>
+
</tr>
<tr>
<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_admin_button}" /></td>
Modified: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/templates/admin_edit-admin.tpl 2009-12-24 14:58:01 UTC (rev 791)
@@ -26,13 +26,13 @@
<tr>
<td>{$PALANG.pAdminEdit_admin_super_admin}:</td>
<td><input class="flat" type="checkbox" name="fSadmin"{$tSadmin_checked}/></td>
- <td> </td>
+ <td> </td>
</tr>
<tr>
- <td colspan="3" align="center">
- <select name="fDomains[]" size="10" multiple="multiple">
- {$select_options}
- </select>
+ <td>{$PALANG.pAdminCreate_admin_address}:</td>
+ <td>
+ <select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select>
+ <td> </td>
</td>
</tr>
<tr>
Modified: trunk/templates/footer.tpl
===================================================================
--- trunk/templates/footer.tpl 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/templates/footer.tpl 2009-12-24 14:58:01 UTC (rev 791)
@@ -10,7 +10,7 @@
<a target="_blank" href="http://postfixadmin.sf.net/update-check.php?version={$version|escape:"url"}">{$PALANG.check_update}</a>
{if $CONF.show_footer_text == 'YES' && $CONF.footer_link}
|
- <a href="{$CONF.footer_link|escape:"url"}">{$CONF.footer_text|escape:"url"}</a>
+ <a href="{$CONF.footer_link|escape:"url"}">{$CONF.footer_text|escape}</a>
{/if}
</div>
</body>
Modified: trunk/users/edit-alias.php
===================================================================
--- trunk/users/edit-alias.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/users/edit-alias.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: edit-alias.php
* Users can use this to set forwards etc for their mailbox.
*
- * Template File: users_edit-alias.php
+ * Template File: users_edit-alias.tpl
*
* Template Variables:
*
@@ -113,8 +113,8 @@
else {
$tGotoArray = $goto;
}
- $smarty->assign ('tMessage', $tMessage);
- $smarty->display ('index.tpl');
+ $smarty->assign ('tMessage', $tMessage, false);
+ $smarty->display ('index.tpl');
}
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/users/login.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -14,7 +14,7 @@
*
* File: login.php
* Used to authenticate want-to-be users.
- * Template File: login.php
+ * Template File: login.tpl
*
* Template Variables:
*
@@ -30,7 +30,7 @@
require_once("../common.php");
-$smarty->assign ('language_selector', language_selector());
+$smarty->assign ('language_selector', language_selector(), false);
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
@@ -66,7 +66,7 @@
$tUsername = $fUsername;
}
$smarty->assign ('tUsername', $tUsername);
- $smarty->assign ('tMessage', $tMessage);
+ $smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'users_login');
$smarty->display ('index.tpl');
}
Modified: trunk/users/password.php
===================================================================
--- trunk/users/password.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/users/password.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -74,9 +74,9 @@
$smarty->assign ('USERID_USERNAME', $USERID_USERNAME);
//$smarty->assign ('pPassword_admin_text', $pPassword_admin_text);
-$smarty->assign ('pPassword_password_current_text', $pPassword_password_current_text);
-$smarty->assign ('pPassword_password_text', $pPassword_password_text);
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('pPassword_password_current_text', $pPassword_password_current_text, false);
+$smarty->assign ('pPassword_password_text', $pPassword_password_text, false);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('smarty_template', 'users_password');
$smarty->display ('index.tpl');
Modified: trunk/users/vacation.php
===================================================================
--- trunk/users/vacation.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/users/vacation.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: vacation.php
* Used by users to set/change their vacation settings.
*
- * Template File: users_vacation.php
+ * Template File: users_vacation.tpl
*
* Template Variables:
*
@@ -107,9 +107,9 @@
}
}
-$smarty->assign ('tSubject', htmlentities ($tSubject, ENT_QUOTES, 'UTF-8'));
-$smarty->assign ('tBody', htmlentities ($tBody, ENT_QUOTES, 'UTF-8'));
-$smarty->assign ('tMessage', $tMessage);
+$smarty->assign ('tSubject', htmlentities ($tSubject, ENT_QUOTES, 'UTF-8'), false);
+$smarty->assign ('tBody', htmlentities ($tBody, ENT_QUOTES, 'UTF-8'), false);
+$smarty->assign ('tMessage', $tMessage, false);
$smarty->assign ('tActiveFrom', date ("d.m.Y", strtotime ($fActiveFrom)));
$smarty->assign ('tActiveUntil', date ("d.m.Y", strtotime ($fActiveUntil)));
$smarty->assign ('smarty_template', 'users_vacation');
Modified: trunk/viewlog.php
===================================================================
--- trunk/viewlog.php 2009-12-15 17:21:10 UTC (rev 790)
+++ trunk/viewlog.php 2009-12-24 14:58:01 UTC (rev 791)
@@ -15,7 +15,7 @@
* File: viewlog.php
* Shows entries from the log table to users.
*
- * Template File: viewlog.php
+ * Template File: viewlog.tpl
*
* Template Variables:
*
@@ -77,8 +77,8 @@
for ($i = 0; $i < count ($tLog); $i++)
$tLog[$i]['action'] = $PALANG ['pViewlog_action_'.$tLog [$i]['action']];
-$smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)));
-$smarty->assign ('tLog', $tLog);
+$smarty->assign ('select_options', select_options ($list_domains, array ($fDomain)), false);
+$smarty->assign ('tLog', $tLog,false);
$smarty->assign ('fDomain', $fDomain);
$smarty->assign ('smarty_template', 'viewlog');
$smarty->display ('index.tpl');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
