From ad3aa533fe6c3478aa290eb75816b0643a25f97d Mon Sep 17 00:00:00 2001 From: pdontthink Date: Wed, 28 Feb 2007 05:08:15 +0000 Subject: [PATCH] Use $org_name instead of hard-coding "SquirrelMail" git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12289 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/options.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/options.php b/src/options.php index d4bb822f..73800373 100644 --- a/src/options.php +++ b/src/options.php @@ -285,7 +285,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { } if (!empty($notice)) { - $oTemplate->assign('note', $notice); + $oTemplate->assign('note', $notice, FALSE); $oTemplate->display('note.tpl'); } @@ -424,13 +424,15 @@ if ($optpage == SMOPT_PAGE_MAIN) { " \n"; // This is the only variable that is needed by *just* the template. - $oTemplate->assign('options', $optpage_data['options']); + // No output sanitizing needed because all widgets added through + // template output already + $oTemplate->assign('options', $optpage_data['options'], FALSE); - global $ask_user_info; + global $ask_user_info, $org_name; if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info && getPref($data_dir, $username,'email_address') == "" ) { $oTemplate->assign('topmessage', - _("Welcome to SquirrelMail. Please supply your full name and email address.") ); + sprintf(_("Welcome to %s. Please supply your full name and email address."), $org_name) ); } /** -- 2.25.1