From 33a55f5a67f62ad839c0f21ce539fcc3954af847 Mon Sep 17 00:00:00 2001 From: tokul Date: Sun, 8 Aug 2004 14:56:47 +0000 Subject: [PATCH] xtra_code updates in mime functions git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7854 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mime.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/functions/mime.php b/functions/mime.php index b9243f1b..d7ea053e 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -358,9 +358,9 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma $body = decodeBody($body, $body_message->header->encoding); if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode')) { if (mb_detect_encoding($body) != 'ASCII') { - $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body); + $body = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode',$body); } } $hookResults = do_hook("message_body", $body); @@ -625,8 +625,8 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true,$decide=false) { } if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { - $string = $languages[$squirrelmail_language]['XTRA_CODE']('decodeheader', $string); + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_decodeheader')) { + $string = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decodeheader', $string); // Do we need to return at this point? // return $string; } @@ -750,8 +750,8 @@ function encodeHeader ($string) { global $default_charset, $languages, $squirrelmail_language; if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { - return $languages[$squirrelmail_language]['XTRA_CODE']('encodeheader', $string); + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encodeheader')) { + return call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encodeheader', $string); } // Encode only if the string contains 8-bit characters or =? @@ -1983,9 +1983,9 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { } if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_downloadfilename')) { $filename = - $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT); + call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_downloadfilename', $filename, $HTTP_USER_AGENT); } else { $filename = ereg_replace('[\\/:\*\?"<>\|;]', '_', str_replace(' ', ' ', $filename)); } -- 2.25.1