X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=dbf0581fe2cb8a1a5a31adba8baa9a46a86b4819;hp=7b074a4a556feeb40c14ad00ef90e2e90e04129f;hb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;hpb=6f1b6e1a3f791d21d1b6465db310d21fe35804c8 diff --git a/inc/functions.php b/inc/functions.php index 7b074a4a55..dbf0581fe2 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -353,7 +353,7 @@ function loadTemplate ($template, $return=false, $content=array()) { $ret = ''; if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) { // Normal HTML output? - if ($GLOBALS['output_mode'] == 0) { + if (getOutputMode() == 0) { // Add surrounding HTML comments to help finding bugs faster $ret = "\n" . $GLOBALS['tpl_content'] . "\n"; @@ -458,7 +458,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { } // END - if // Load user's data - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):UID={$UID},template={$template},content[]=".gettype($content)."
"); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):UID={$UID},template={$template},content[]=".gettype($content).'
'); if (($UID > 0) && (is_array($content))) { // If nickname extension is installed, fetch nickname as well if (isExtensionActive('nickname')) { @@ -527,10 +527,9 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { if (isFileReadable($FQFN)) { // The local file does exists so we load it. :) $GLOBALS['tpl_content'] = readFromFile($FQFN); - $GLOBALS['tpl_content'] = SQL_ESCAPE($GLOBALS['tpl_content']); // Run code - $GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileCode($GLOBALS['tpl_content'])."\");"; + $GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileCode(smartAddSlashes($GLOBALS['tpl_content']))."\");"; eval($GLOBALS['tpl_content']); } elseif (!empty($template)) { // Template file not found! @@ -586,7 +585,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' // Load email address $result_email = SQL_QUERY_ESC("SELECT `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($toEmail)), __FUNCTION__, __LINE__); - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):numRows=".SQL_NUMROWS($result_email)."
"); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):numRows=".SQL_NUMROWS($result_email).'
'); // Does the user exist? if (SQL_NUMROWS($result_email)) { @@ -600,7 +599,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' // Free result SQL_FREERESULT($result_email); } - } elseif ($toEmail == 0) { + } elseif ($toEmail == '0') { // Is the webmaster! $toEmail = getConfig('WEBMASTER'); } @@ -636,12 +635,12 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' if (empty($isHtml)) $isHtml = 'N'; if (isDebugModeEnabled()) { // In debug mode we want to display the mail instead of sending it away so we can debug this part - outputHtml("
-".htmlentities(trim($mailHeader))."
-To      : " . $toEmail."
-Subject : " . $subject."
-Message : " . $message."
-
\n"); + outputHtml('
+Headers : ' . str_replace('<', '<', str_replace('>', '>', htmlentities(trim($mailHeader)))) . '
+To      : ' . $toEmail . '
+Subject : ' . $subject . '
+Message : ' . $message . '
+
'); } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) { // Send mail as HTML away sendHtmlEmail($toEmail, $subject, $message, $mailHeader); @@ -671,6 +670,11 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { // get new instance $mail = new PHPMailer(); + + // Set charset to UTF-8 + $mail->CharSet('UTF-8'); + + // Path for PHPMailer $mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH')); $mail->IsSMTP(); @@ -1308,7 +1312,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') { // Calculate number for generating the code $a = $code + getConfig('_ADD') - 1; - if (isConfigEntrySet('master_hash')) { + if (isConfigEntrySet('master_salt')) { // Generate hash with master salt from modula of number with the prime number and other data $saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, getConfig('master_salt')); @@ -1316,7 +1320,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') { $rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi(); } else { // Generate hash with "hash of site key" from modula of number with the prime number and other data - $saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, substr(sha1(getConfig('SITE_KEY')), 0, 8)); + $saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, substr(sha1(getConfig('SITE_KEY')), 0, getConfig('salt_length'))); // Create number from hash $rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi(); @@ -1725,7 +1729,7 @@ function extractHostnameFromUrl (&$script) { if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/')); // Generate relative URL - //* DEBUG: */ print("SCRIPT=" . $script."
"); + //* DEBUG: */ print("SCRIPT=" . $script.'
'); if (substr(strtolower($script), 0, 7) == 'http://') { // But only if http:// is in front! $script = substr($script, (strlen($url) + 7)); @@ -1734,7 +1738,7 @@ function extractHostnameFromUrl (&$script) { $script = substr($script, (strlen($url) + 8)); } - //* DEBUG: */ print("SCRIPT=" . $script."
"); + //* DEBUG: */ print("SCRIPT=" . $script.'
'); if (substr($script, 0, 1) == '/') $script = substr($script, 1); // Return host name @@ -1835,7 +1839,7 @@ function sendRawRequest ($host, $request) { } // END - if // Open connection - //* DEBUG: */ die("SCRIPT=" . $script."
"); + //* DEBUG: */ die("SCRIPT=" . $script.'
'); if ($useProxy === true) { // Connect to host through proxy connection $fp = @fsockopen(compileCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30); @@ -1953,11 +1957,11 @@ function isEmailValid ($email) { function isUrlValid ($URL, $compile=true) { // Trim URL a little $URL = trim(urldecode($URL)); - //* DEBUG: */ outputHtml($URL."
"); + //* DEBUG: */ outputHtml($URL.'
'); // Compile some chars out... if ($compile === true) $URL = compileUriCode($URL, false, false, false); - //* DEBUG: */ outputHtml($URL."
"); + //* DEBUG: */ outputHtml($URL.'
'); // Check for the extension filter if (isExtensionActive('filter')) { @@ -2036,7 +2040,7 @@ function generateEmailLink ($email, $table = 'admins') { // Generate a hash for extra-security for all passwords function generateHash ($plainText, $salt = '') { // Is the required extension 'sql_patches' there and a salt is not given? - if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches'))) && (empty($salt))) { + if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) && (empty($salt))) { // Extension sql_patches is missing/outdated so we hash the plain text with MD5 return md5($plainText); } // END - if @@ -2074,8 +2078,15 @@ function generateHash ($plainText, $salt = '') { //* DEBUG: */ outputHtml($salt." (".strlen($salt).")
"); } else { // Use given salt + //* DEBUG: */ print 'salt=' . $salt . '
'; $salt = substr($salt, 0, getConfig('salt_length')); - //* DEBUG: */ outputHtml("GIVEN={$salt}
"); + //* DEBUG: */ print 'salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ')
'; + + // Sanity check on salt + if (strlen($salt) != getConfig('salt_length')) { + // Not the same! + debug_report_bug(__FUNCTION__.': salt length mismatch! ('.strlen($salt).'/'.getConfig('salt_length').')'); + } // END - if } // Return hash @@ -2168,7 +2179,7 @@ function generatePassString ($passHash) { $ret = $passHash; // Is a secret key and master salt already initialized? - if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { + if ((isExtensionInstalled('sql_patches')) && (isExtensionInstalledAndNewer('other', '0.2.5')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) { // Only calculate when the secret key is generated $newHash = ''; $start = 9; for ($idx = 0; $idx < 10; $idx++) { @@ -2180,16 +2191,17 @@ function generatePassString ($passHash) { } elseif ($part2 > $part1) { $mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi())); } - $mod = substr(round($mod), 0, 4); - $mod = str_repeat(0, 4-strlen($mod)) . $mod; - //* DEBUG: */ outputHtml("*" . $start.'=' . $mod."*
"); + $mod = substr($mod, 0, 4); + //* DEBUG: */ outputHtml('part1='.$part1.'/part2='.$part2.'/mod=' . $mod . '('.strlen($mod).')
'); + $mod = str_repeat(0, (4 - strlen($mod))) . $mod; + //* DEBUG: */ outputHtml('*' . $start . '=' . $mod . '*
'); $start += 4; $newHash .= $mod; } // END - for - //* DEBUG: */ print($passHash."
" . $newHash." (".strlen($newHash).')'); + //* DEBUG: */ print($passHash.'
' . $newHash." (".strlen($newHash).')
'); $ret = generateHash($newHash, getConfig('master_salt')); - //* DEBUG: */ print($ret."
"); + //* DEBUG: */ print('ret='.$ret.'
'); } else { // Hash it simple //* DEBUG: */ outputHtml("--" . $passHash."--
"); @@ -2310,7 +2322,7 @@ function getCurrentTheme () { $ret = 'default'; // Load default theme if not empty from configuration - if (getConfig('default_theme') != '') $ret = getConfig('default_theme'); + if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme'); if (!isSessionVariableSet('mxchange_theme')) { // Set default theme @@ -2422,12 +2434,12 @@ function generateErrorCodeFromUserStatus ($status) { // Function to search for the last modifified file function searchDirsRecursive ($dir, &$last_changed) { // Get dir as array - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):dir=" . $dir."
"); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):dir=" . $dir.'
'); // Does it match what we are looking for? (We skip a lot files already!) // RegexPattern to exclude ., .., .revision, .svn, debug.log or .cache in the filenames $excludePattern = '@(\.revision|debug\.log|\.cache|config\.php)$@'; $ds = getArrayFromDirectory($dir, '', true, false, array(), '.php', $excludePattern); - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):ds[]=".count($ds)."
"); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):ds[]=".count($ds).'
'); // Walk through all entries foreach ($ds as $d) { @@ -2440,7 +2452,7 @@ function searchDirsRecursive ($dir, &$last_changed) { // $FQFN is a directory so also crawl into this directory $newDir = $d; if (!empty($dir)) $newDir = $dir . '/'. $d; - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):DESCENT: " . $newDir."
"); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):DESCENT: " . $newDir.'
'); searchDirsRecursive($newDir, $last_changed); } elseif (isFileReadable($FQFN)) { // $FQFN is a filename and no directory @@ -2619,6 +2631,17 @@ function debug_get_printable_backtrace () { // Output a debug backtrace to the user function debug_report_bug ($message = '') { + // Is this already called? + if (isset($GLOBALS[__FUNCTION__])) { + // Other backtrace + print 'Message:'.$message.'
Backtrace:
';
+		debug_print_backtrace();
+		die('
'); + } // END - if + + // Set this function as called + $GLOBALS[__FUNCTION__] = true; + // Init message $debug = ''; @@ -2844,7 +2867,7 @@ function isUrlValidSimple ($url) { // @TODO Are these convertions still required? $pat = str_replace('.', "\.", $pat); $pat = str_replace('@', "\@", $pat); - //* DEBUG: */ outputHtml($key."= " . $pat . "
"); + //* DEBUG: */ outputHtml($key."= " . $pat . '
'); } // END - if // Check if expression matches @@ -2954,7 +2977,7 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) { // Log this message away, we better don't call app_die() here to prevent an endless loop $fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or die(__FUNCTION__.'['.__LINE__.']: Cannot write logfile debug.log!'); - fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule() . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n"); + fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n"); fclose($fp); } // END - if } @@ -2995,6 +3018,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) { // Converts timestamp selections into a timestamp function convertSelectionsToTimestamp (&$postData, &$DATA, &$id, &$skip) { // Init test variable + $skip = false; $test2 = ''; // Get last three chars @@ -3007,21 +3031,20 @@ function convertSelectionsToTimestamp (&$postData, &$DATA, &$id, &$skip) { if ((isset($postData[$test.'_ye'])) && (isset($postData[$test.'_mo'])) && (isset($postData[$test.'_we'])) && (isset($postData[$test.'_da'])) && (isset($postData[$test.'_ho'])) && (isset($postData[$test.'_mi'])) && (isset($postData[$test.'_se'])) && ($test != $test2)) { // Generate timestamp $postData[$test] = createTimestampFromSelections($test, $postData); - $DATA[] = sprintf("%s='%s'", $test, $postData[$test]); + $DATA[] = sprintf("`%s`='%s'", $test, $postData[$test]); + $GLOBALS['skip_config'][$test] = true; // Remove data from array foreach (array('ye', 'mo', 'we', 'da', 'ho', 'mi', 'se') as $rem) { - unset($postData[$test.'_' . $rem]); + unset($postData[$test . '_' . $rem]); } // END - foreach // Skip adding - unset($id); $skip = true; $test2 = $test; + unset($id); + $skip = true; + $test2 = $test; } // END - if - } else { - // Process this entry - $skip = false; - $test2 = ''; - } + } // END - if } // Reverts the german decimal comma into Computer decimal dot @@ -3198,12 +3221,12 @@ function determineReferalId () { // Set default refid as refid in URL $GLOBALS['refid'] = getConfig('def_refid'); } else { - // No default ID when sql_patches is not installed or none set + // No default id when sql_patches is not installed or none set $GLOBALS['refid'] = 0; } // Set cookie when default refid > 0 - if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == 0) && (getConfig('def_refid') > 0))) { + if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == 0) && (isConfigEntrySet('def_refid')) && (getConfig('def_refid') > 0))) { // Set cookie setSession('refid', $GLOBALS['refid']); } // END - if @@ -3392,7 +3415,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad // Exclude '.', '..' and entries in $excludeArray automatically if (in_array($baseFile, $excludeArray, true)) { // Exclude them - //* DEBUG: */ outputHtml('excluded=' . $baseFile . "
"); + //* DEBUG: */ outputHtml('excluded=' . $baseFile . '
'); continue; } // END - if @@ -3406,9 +3429,9 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad // Check if the base filename matches an exclusion pattern and if the pattern is not empty if ((!empty($excludePattern)) && (preg_match($excludePattern, $baseFile, $match))) { // These Lines are only for debugging!! - //* DEBUG: */ outputHtml('baseDir:' . $baseDir . "
"); - //* DEBUG: */ outputHtml('baseFile:' . $baseFile . "
"); - //* DEBUG: */ outputHtml('FQFN:' . $FQFN . "
"); + //* DEBUG: */ outputHtml('baseDir:' . $baseDir . '
'); + //* DEBUG: */ outputHtml('baseFile:' . $baseFile . '
'); + //* DEBUG: */ outputHtml('FQFN:' . $FQFN . '
'); // Exclude this one continue; @@ -3491,8 +3514,25 @@ function mapModuleToTable ($moduleName) { // Add SQL debug data to array for later output function addSqlToDebug ($result, $sqlString, $timing, $F, $L) { - // Don't execute anything here if we don't need - if (getConfig('display_debug_sqls') != 'Y') return; + // Already executed? + if (isset($GLOBALS['debug_sqls'][$F][$L][$sqlString])) { + // Then abort here, we don't need to profile a query twice + return; + } // END - if + + // Remeber this as profiled (or not, but we don't care here) + $GLOBALS['debug_sqls'][$F][$L][$sqlString] = true; + + // Do we have cache? + if (!isset($GLOBALS['debug_sql_available'])) { + // Check it and cache it in $GLOBALS + $GLOBALS['debug_sql_available'] = ((isConfigurationLoaded()) && (isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y')); + } // END - if + + // Don't execute anything here if we don't need or ext-other is missing + if ($GLOBALS['debug_sql_available'] === false) { + return; + } // END - if // Generate record $record = array( @@ -3517,7 +3557,7 @@ function initCacheInstance () { $GLOBALS['cache_instance'] = new CacheSystem(); if ($GLOBALS['cache_instance']->getStatus() != 'done') { // Failed to initialize cache sustem - addFatalMessage(__FILE__, __LINE__, "(".__LINE__."): ".getMessage('CACHE_CANNOT_INITIALIZE')); + addFatalMessage(__FILE__, __LINE__, '(' . __LINE__ . '): ' . getMessage('CACHE_CANNOT_INITIALIZE')); } // END - if } @@ -3563,6 +3603,62 @@ function convertReceivers ($old) { return str_replace(';', ', ', $old); } +// Determines the right page title +function determinePageTitle () { + // Config and database connection valid? + if ((isConfigLocalLoaded()) && (isConfigurationLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) { + // Init title + $TITLE = ''; + + // Title decoration enabled? + if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left'))." "; + + // Do we have some extra title? + if (isExtraTitleSet()) { + // Then prepent it + $TITLE .= getExtraTitle() . ' by '; + } // END - if + + // Add main title + $TITLE .= getConfig('MAIN_TITLE'); + + // Add title of module? (middle decoration will also be added!) + if ((getConfig('enable_mod_title') == 'Y') || ((!isWhatSet()) && (!isActionSet())) || (getModule() == 'admin')) { + $TITLE .= ' ' . trim(getConfig('title_middle')) . ' ' . getModuleTitle(getModule()); + } // END - if + + // Add title from what file + $mode = ''; + if (getModule() == 'login') $mode = 'member'; + elseif (getModule() == 'index') $mode = 'guest'; + if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($mode, getWhat()); + + // Add title decorations? (right) + if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= " ".trim(getConfig('title_right')); + + // Remember title in constant for the template + $pageTitle = $TITLE; + } elseif ((isInstalled()) && (isAdminRegistered())) { + // Installed, admin registered but no ext-sql_patches + $pageTitle = '[-- ' . getConfig('MAIN_TITLE').' - '.getModuleTitle(getModule()) . ' --]'; + } elseif ((isInstalled()) && (!isAdminRegistered())) { + // Installed but no admin registered + $pageTitle = sprintf(getMessage('SETUP_OF_MXCHANGE'), getConfig('MAIN_TITLE')); + } elseif ((!isInstalled()) || (!isAdminRegistered())) { + // Installation mode + $pageTitle = getMessage('INSTALLATION_OF_MXCHANGE'); + } else { + // Configuration not found! + $pageTitle = getMessage('NO_CONFIG_FOUND_TITLE'); + + // Do not add the fatal message in installation mode + if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND')); + } + + // Return title + return $pageTitle; +} + ////////////////////////////////////////////////// // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // ////////////////////////////////////////////////// @@ -3576,5 +3672,29 @@ if (!function_exists('html_entity_decode')) { } } // END - if +if (!function_exists('http_build_query')) { + // Taken from documentation on www.php.net, credits to Marco K. (Germany) + function http_build_query($data, $prefix='', $sep='', $key='') { + $ret = array(); + foreach ((array)$data as $k => $v) { + if (is_int($k) && $prefix != null) { + $k = urlencode($prefix . $k); + } // END - if + + if ((!empty($key)) || ($key === 0)) $k = $key.'['.urlencode($k).']'; + + if (is_array($v) || is_object($v)) { + array_push($ret, http_build_query($v, '', $sep, $k)); + } else { + array_push($ret, $k.'='.urlencode($v)); + } + } // END - foreach + + if (empty($sep)) $sep = ini_get('arg_separator.output'); + + return implode($sep, $ret); + } +}// // END - if + // [EOF] ?>