X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ffortune%2Ffunctions.php;h=dbf066d8dccab6b746e51aed0d93726cceb89b10;hp=dddfdabdb5c2f0cc1dbc8aa09a59d3c91907a54b;hb=b1870063b2e576ca9ff3cd41ada9cda1f8812507;hpb=b0215f910166d59ba9f3ffec1f57c82fa2168cb1 diff --git a/plugins/fortune/functions.php b/plugins/fortune/functions.php index dddfdab..dbf066d 100644 --- a/plugins/fortune/functions.php +++ b/plugins/fortune/functions.php @@ -31,17 +31,12 @@ if (file_exists(SM_PATH . 'config/fortune_config.php')) { * @since 1.5.1 */ function fortune_function() { - global $fortune_visible, $color, $fortune_command; + global $oTemplate, $fortune_visible, $color, $fortune_command; if (!$fortune_visible) { return; } - echo "\n". - "
\n". - "
\n"; - echo '
'; - /* open handle and get all command output*/ $handle = popen($fortune_command,'r'); $fortune = ''; @@ -53,11 +48,12 @@ function fortune_function() { // %s shows executed fortune cookie command. $fortune = sprintf(_("Unable to execute \"%s\"."),$fortune_command); } - echo "
" . _("Today's Fortune") . "
\n" .
-            htmlspecialchars($fortune) .
-            "
\n"; - echo '
'; + $oTemplate->assign('color', $color); + $oTemplate->assign('fortune', htmlspecialchars($fortune)); + $output = $oTemplate->fetch('plugins/fortune/mailbox_index_before.tpl'); + return array('mailbox_index_before' => $output); + } /**