diff --git a/broadcast-message.php b/broadcast-message.php index 882ef7d4..5a3f463a 100644 --- a/broadcast-message.php +++ b/broadcast-message.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" || $error == 1) $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: */ diff --git a/create-admin.php b/create-admin.php index 73e55b42..4d04eaf9 100644 --- a/create-admin.php +++ b/create-admin.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } $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'); diff --git a/create-alias-domain.php b/create-alias-domain.php index 3d3a7cf2..238eb781 100644 --- a/create-alias-domain.php +++ b/create-alias-domain.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $tMessage .= "
($fAliasDomain -> $fTargetDomain)
\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 = ''.$tMessage.''; -$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: */ diff --git a/create-alias.php b/create-alias.php index dd590270..eed5bd1f 100644 --- a/create-alias.php +++ b/create-alias.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } $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'); diff --git a/create-domain.php b/create-domain.php index f51eed50..1bb4e25e 100644 --- a/create-domain.php +++ b/create-domain.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } $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'); diff --git a/create-mailbox.php b/create-mailbox.php index bef39bb9..540a17be 100644 --- a/create-mailbox.php +++ b/create-mailbox.php @@ -264,13 +264,13 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } $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'); diff --git a/delete.php b/delete.php index 1430608f..66cd733a 100644 --- a/delete.php +++ b/delete.php @@ -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: * diff --git a/edit-active-admin.php b/edit-active-admin.php index d59bb50d..ba64d7eb 100644 --- a/edit-active-admin.php +++ b/edit-active-admin.php @@ -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: * diff --git a/edit-active-domain.php b/edit-active-domain.php index fa56f50a..a50d33dc 100644 --- a/edit-active-domain.php +++ b/edit-active-domain.php @@ -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: * diff --git a/edit-active.php b/edit-active.php index e56e82d3..32d8a961 100644 --- a/edit-active.php +++ b/edit-active.php @@ -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: * diff --git a/edit-admin.php b/edit-admin.php index a761cf9c..b3de4f3b 100644 --- a/edit-admin.php +++ b/edit-admin.php @@ -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 @@ if ($result['rows'] >= 1) { } $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'); diff --git a/edit-alias.php b/edit-alias.php index 2e6709fa..5fa8dba0 100644 --- a/edit-alias.php +++ b/edit-alias.php @@ -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 @@ $array = preg_split ('/,/', $tGoto); // 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'); diff --git a/edit-domain.php b/edit-domain.php index 3041d145..4aef73fc 100644 --- a/edit-domain.php +++ b/edit-domain.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } $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'); diff --git a/edit-mailbox.php b/edit-mailbox.php index b5351413..4ff98612 100644 --- a/edit-mailbox.php +++ b/edit-mailbox.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } $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: */ diff --git a/edit-vacation.php b/edit-vacation.php index cfc90b3f..a566321b 100644 --- a/edit-vacation.php +++ b/edit-vacation.php @@ -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 @@ if (empty ($tActiveUntil)) $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); diff --git a/fetchmail.php b/fetchmail.php index 54d4d2d8..3bc93e35 100644 --- a/fetchmail.php +++ b/fetchmail.php @@ -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 @@ function _listview_password($val){ $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); diff --git a/languages/nl.lang b/languages/nl.lang index 24728429..f5092f16 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -41,7 +41,7 @@ $PALANG['pMain_welcome'] = 'Welkom bij Postfix Admin!'; $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 één 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'] = 'Waar de e-mails heen gestuurd worden.'; $PALANG['pCreate_alias_goto_text_error'] = 'Waar de e-mail naar toe moet.
De NAAR is niet geldig.'; $PALANG['pCreate_alias_result_error'] = 'Mislukt om de alias toe te voegen.'; $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.
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.
Voor domein naar domein forwarding gebruik "*@domein.tld" als naar.'; $PALANG['pEdit_alias_welcome'] = 'Bewerk een alias voor uw domein.
Een alias per regel.'; $PALANG['pEdit_alias_address'] = 'Alias'; @@ -189,7 +189,7 @@ $PALANG['pViewlog_timestamp'] = 'Tijd'; $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'; diff --git a/list-admin.php b/list-admin.php index 7af1e100..6fc89718 100644 --- a/list-admin.php +++ b/list-admin.php @@ -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 @@ if ((is_array ($list_admins) and sizeof ($list_admins) > 0)) } } $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'); diff --git a/list-domain.php b/list-domain.php index c504f95e..108d4b82 100644 --- a/list-domain.php +++ b/list-domain.php @@ -1,5 +1,4 @@ -url = '&domain='.$fDomain; // 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); diff --git a/login.php b/login.php index c29f90dd..60787561 100644 --- a/login.php +++ b/login.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } $smarty->assign ('tUsername', $tUsername); - $smarty->assign ('tMessage', $tMessage); + $smarty->assign ('tMessage', $tMessage, false); $smarty->assign ('smarty_template', 'login'); $smarty->display ('index.tpl'); diff --git a/password.php b/password.php index f1989420..f623a60d 100644 --- a/password.php +++ b/password.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $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'); } diff --git a/search.php b/search.php index 846aa501..ec6a0854 100644 --- a/search.php +++ b/search.php @@ -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 @@ for ($i = 0; $i < sizeof ($tMailbox); $i++) } $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'); diff --git a/sendmail.php b/sendmail.php index 43696652..1f705548 100644 --- a/sendmail.php +++ b/sendmail.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } $smarty->assign ('SESSID_USERNAME', $SESSID_USERNAME); -$smarty->assign ('tMessage', $tMessage); +$smarty->assign ('tMessage', $tMessage, false); $smarty->assign ('smarty_template', 'sendmail'); $smarty->display ('index.tpl'); diff --git a/templates/admin_create-admin.tpl b/templates/admin_create-admin.tpl index 287805c7..ca96151d 100644 --- a/templates/admin_create-admin.tpl +++ b/templates/admin_create-admin.tpl @@ -17,14 +17,14 @@ {$PALANG.pAdminCreate_admin_password2}: -   + {$PALANG.pAdminCreate_admin_address}: -   + diff --git a/templates/admin_edit-admin.tpl b/templates/admin_edit-admin.tpl index 0ec5173b..a009cc1b 100644 --- a/templates/admin_edit-admin.tpl +++ b/templates/admin_edit-admin.tpl @@ -26,13 +26,13 @@ {$PALANG.pAdminEdit_admin_super_admin}: -   +   - - + {$PALANG.pAdminCreate_admin_address}: + + +   diff --git a/templates/footer.tpl b/templates/footer.tpl index 4ae8d488..f79c2453 100644 --- a/templates/footer.tpl +++ b/templates/footer.tpl @@ -10,7 +10,7 @@ {$PALANG.check_update} {if $CONF.show_footer_text == 'YES' && $CONF.footer_link}    |    - {$CONF.footer_text|escape:"url"} + {$CONF.footer_text|escape} {/if} diff --git a/users/edit-alias.php b/users/edit-alias.php index aec3f2fd..f28dd433 100644 --- a/users/edit-alias.php +++ b/users/edit-alias.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") 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: */ diff --git a/users/login.php b/users/login.php index 6c7c3d74..e9354950 100644 --- a/users/login.php +++ b/users/login.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $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'); } diff --git a/users/password.php b/users/password.php index 4b952d82..a6d27a9f 100644 --- a/users/password.php +++ b/users/password.php @@ -74,9 +74,9 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $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'); diff --git a/users/vacation.php b/users/vacation.php index b2c5ea7f..f1da1150 100644 --- a/users/vacation.php +++ b/users/vacation.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } -$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'); diff --git a/viewlog.php b/viewlog.php index a5e6cb90..dc640bf3 100644 --- a/viewlog.php +++ b/viewlog.php @@ -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 @@ if ($error != 1) 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');