X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=9daec4f80d97259f60a72dbff68ea501694d0143;hb=3f96fb4deadc0f967980e855d3541224057606b2;hp=7d3046be596c4891d1aa95c5900c0904d5925379;hpb=0dd611ed8215672a6e0ed72b51e2bbf6e22fd5b5;p=mailer.git diff --git a/inc/functions.php b/inc/functions.php index 7d3046be59..9daec4f80d 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -30,27 +35,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * * MA 02110-1301 USA * ************************************************************************/ - // Some security stuff... if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } -// Check if our config file is writeable or not -function IS_INC_WRITEABLE ($inc) { - // Generate FQFN - $FQFN = sprintf("%sinc/%s.php", constant('PATH'), $inc); - - // Abort by simple test - if ((FILE_READABLE($FQFN)) && (!is_writeable($FQFN))) { - return false; - } // END - if - - // Test write-access on directory - return is_writeable(dirname($FQFN)); -} - // Output HTML code directly or "render" it. You addionally switch the new-line character off function OUTPUT_HTML ($HTML, $newLine = true) { // Some global variables @@ -90,7 +80,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) { default: // Huh, something goes wrong or maybe you have edited config.php ??? DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE'))); - mxchange_die("{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}"); + app_die(__FUNCTION__, __LINE__, "{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}"); break; } } elseif ((constant('_OB_CACHING') == "on") && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) { @@ -139,7 +129,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) { // Was that eval okay? if (empty($newContent)) { // Something went wrong! - mxchange_die("Evaluation error:
".htmlentities($eval).""); + app_die(__FUNCTION__, __LINE__, "Evaluation error:
".htmlentities($eval).""); } // END - if $OUTPUT = $newContent; } // END - while @@ -187,6 +177,7 @@ function getFatalArray () { // Add a fatal error message to the queue array function addFatalMessage ($F, $L, $message, $extra="") { + debug_report_bug($message); if (is_array($extra)) { // Multiple extras for a message with masks $message = call_user_func_array('sprintf', $extra); @@ -241,7 +232,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) { if ($template == "member_support_form") { // Support request of a member $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", - array($GLOBALS['userid']), __FUNCTION__, __LINE__); + array(getUserId()), __FUNCTION__, __LINE__); // Is content an array? if (is_array($content)) { @@ -381,68 +372,68 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) { } // Send mail out to an email address -function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") { - //* DEBUG: */ print __FUNCTION__."(".__LINE__."):TO={$TO},SUBJECT={$SUBJECT}
-".htmlentities(trim($FROM))." -To : ".$TO." -Subject : ".$SUBJECT." -Message : ".$MSG." +".htmlentities(trim($mailHeader))." +To : ".$toEmail." +Subject : ".$subject." +Message : ".$message."\n"); } elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail"))) { // Send mail as HTML away - SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM); - } elseif (!empty($TO)) { + SEND_HTML_EMAIL($toEmail, $subject, $message, $mailHeader); + } elseif (!empty($toEmail)) { // Send Mail away - SEND_RAW_EMAIL($TO, $SUBJECT, $MSG, $FROM); + SEND_RAW_EMAIL($toEmail, $subject, $message, $mailHeader); } elseif ($HTML == "N") { // Problem found! - SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$SUBJECT, $MSG, $FROM); + SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$subject, $message, $mailHeader); } } @@ -477,7 +468,7 @@ function CHECK_PHPMAILER_USAGE() { /* * Send out a raw email with PHPMailer class or legacy mail() command */ -function SEND_RAW_EMAIL ($to, $subject, $msg, $from) { +function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) { // Shall we use PHPMailer class or legacy mode? if (CHECK_PHPMAILER_USAGE()) { // Use PHPMailer class with SMTP enabled @@ -509,14 +500,14 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) { } else { $mail->Body = decodeEntities($msg); } - $mail->AddAddress($to, ""); + $mail->AddAddress($toEmail, ""); $mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE')); $mail->AddCustomHeader("Errors-To:".constant('WEBMASTER')); $mail->AddCustomHeader("X-Loop:".constant('WEBMASTER')); $mail->Send(); } else { // Use legacy mail() command - @mail($to, $subject, decodeEntities($msg), $from); + @mail($toEmail, $subject, decodeEntities($msg), $from); } } // @@ -657,8 +648,7 @@ function TRANSLATE_GENDER ($gender) { // function FRAMETESTER ($URL) { // Prepare frametester URL - $frametesterUrl = sprintf("%s/modules.php?module=frametester&url=%s", - URL, + $frametesterUrl = sprintf("{!URL!}/modules.php?module=frametester&url=%s", encodeString(compileUriCode($URL)) ); return $frametesterUrl; @@ -695,7 +685,7 @@ function TRANSLATE_STATUS ($status) { default: DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status)); - $ret = sprintf(getMessage('UNKNOWN_STATUS"'), $status); + $ret = sprintf(getMessage('UNKNOWN_STATUS'), $status); break; } @@ -946,7 +936,7 @@ function LOAD_URL ($URL, $addUrlData=true) { LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL)); LOAD_INC("inc/footer.php"); } - exit; + shutdown(); } // Wrapper for LOAD_URL but URL comes from a configuration entry @@ -972,13 +962,14 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true) return $code; } // END - if - $ARRAY = $GLOBALS['security_chars']; + // Init replacement-array with full security characters + $secChars = $GLOBALS['security_chars']; // Select smaller set of chars to replace when we e.g. want to compile URLs - if (!$full) $ARRAY = $GLOBALS['url_chars']; + if (!$full) $secChars = $GLOBALS['url_chars']; // Compile constants - if ($constants) { + if ($constants === true) { // BEFORE 0.2.1 : Language and data constants // WITH 0.2.1+ : Only language constants $code = str_replace('{--','".', str_replace('--}','."', $code)); @@ -989,16 +980,16 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true) } // END - if // Compile QUOT and other non-HTML codes - foreach ($ARRAY['to'] as $k => $to) { + foreach ($secChars['to'] as $k => $to) { // Do the reversed thing as in inc/libs/security_functions.php - $code = str_replace($to, $ARRAY['from'][$k], $code); + $code = str_replace($to, $secChars['from'][$k], $code); } // END - foreach // But shall I keep simple quotes for later use? if ($simple) $code = str_replace("'", '{QUOT}', $code); // Find $content[bla][blub] entries - @preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches); + preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches); // Are some matches found? if ((count($matches) > 0) && (count($matches[0]) > 0)) { @@ -1253,7 +1244,7 @@ function generateRandomCodde ($length, $code, $uid, $DATA="") { // Add more additional data if (isSessionVariableSet('u_hash')) $data .= ":".get_session('u_hash'); - if (isset($GLOBALS['userid'])) $data .= ":".$GLOBALS['userid']; + if (isUserIdSet()) $data .= ":".getUserId(); if (isSessionVariableSet('mxchange_theme')) $data .= ":".get_session('mxchange_theme'); if (isSessionVariableSet('mx_lang')) $data .= ":".GET_LANGUAGE(); if (isset($GLOBALS['refid'])) $data .= ":".$GLOBALS['refid']; @@ -1773,7 +1764,11 @@ function GET_URL ($script) { $request = "GET /" . trim($script) . " HTTP/1.1\r\n"; $request .= "Host: " . $host . "\r\n"; $request .= "Referer: " . constant('URL') . "/admin.php\r\n"; - $request .= "User-Agent: " . constant('TITLE') . "/" . constant('FULL_VERSION') . "\r\n"; + if (defined('FULL_VERSION')) { + $request .= "User-Agent: " . constant('TITLE') . "/" . constant('FULL_VERSION') . "\r\n"; + } else { + $request .= "User-Agent: " . constant('TITLE') . "/?.?.?\r\n"; + } $request .= "Content-Type: text/plain\r\n"; $request .= "Cache-Control: no-cache\r\n"; $request .= "Connection: Close\r\n\r\n"; @@ -2032,8 +2027,6 @@ function CREATE_EMAIL_LINK ($email, $table = "admins") { // Generate a hash for extra-security for all passwords function generateHash ($plainText, $salt = "") { - global $_SERVER; - // Is the required extension "sql_patches" there and a salt is not given? if (((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (!EXT_IS_ACTIVE("sql_patches"))) && (empty($salt))) { // Extension sql_patches is missing/outdated so we hash the plain text with MD5 @@ -2165,7 +2158,7 @@ function genScrambleString ($len) { // normally be stored in cookies function ADD_URL_DATA ($URL) { // Init add - $ADD = ""; + $add = ""; // Determine URL binder $BIND = "?"; @@ -2175,15 +2168,15 @@ function ADD_URL_DATA ($URL) { // Cookies are not accepted if ((REQUEST_ISSET_GET(('refid'))) && (strpos($URL, "refid=") == 0)) { // Cookie found in URL - $ADD .= $BIND."refid=".bigintval(REQUEST_GET('refid')); + $add .= $BIND."refid=".bigintval(REQUEST_GET('refid')); } elseif ((GET_EXT_VERSION("sql_patches") != '') && (getConfig('def_refid') > 0)) { // Not found! So let's set default here - $ADD .= $BIND."refid=".getConfig('def_refid'); + $add .= $BIND."refid=".getConfig('def_refid'); } } // END - if // Add all together and return it - return $URL . $ADD; + return $URL . $add; } // Generate an PGP-like encrypted hash of given hash for e.g. cookies @@ -2240,10 +2233,13 @@ function FIX_DELETED_COOKIES ($cookies) { } // Output error messages in a fasioned way and die... -function mxchange_die ($msg) { +function app_die ($F, $L, $msg) { // Load header LOAD_INC_ONCE("inc/header.php"); + // Prepare message for output + $msg = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $msg); + // Load the message template LOAD_TEMPLATE("admin_settings_saved", false, $msg); @@ -2251,7 +2247,7 @@ function mxchange_die ($msg) { LOAD_INC_ONCE("inc/footer.php"); // Exit explicitly - exit; + shutdown(); } // Display parsing time and number of SQL queries in footer @@ -2345,8 +2341,6 @@ function getMessage ($messageId) { // Get current theme name function GET_CURR_THEME() { - global $INC_POOL; - // The default theme is 'default'... ;-) $ret = "default"; @@ -2387,10 +2381,10 @@ function GET_CURR_THEME() { } // Add (maybe) found theme.php file to inclusion list - $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($ret)); + $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($ret)); // Try to load the requested include file - if (FILE_READABLE($theme)) $INC_POOL[] = $theme; + if (INCLUDE_READABLE($INC)) ADD_INC_TO_POOL($INC); // Return theme value return $ret; @@ -2475,7 +2469,7 @@ function WRITE_FILE ($FQFN, $content) { $return = file_put_contents($FQFN, $content); } else { // Write it with fopen - $fp = fopen($FQFN, 'w') or mxchange_die("Cannot write file ".basename($FQFN)."!"); + $fp = fopen($FQFN, 'w') or app_die(__FUNCTION__, __LINE__, "Cannot write file ".basename($FQFN)."!"); fwrite($fp, $content); fclose($fp); @@ -2490,15 +2484,15 @@ function WRITE_FILE ($FQFN, $content) { // Generates an error code from given account status function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) { // Default error code if unknown account status - $ERROR = constant('CODE_UNKNOWN_STATUS'); + $ERROR = getCode('UNKNOWN_STATUS'); // Generate constant name - $constantName = sprintf("CODE_ID_%s", $status); + $constantName = sprintf("ID_%s", $status); // Is the constant there? - if (defined($constantName)) { + if (isCodeSet($constantName)) { // Then get it! - $ERROR = constant($constantName); + $ERROR = getCode($constantName); } else { // Unknown status DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown error status %s detected.", $status)); @@ -2517,57 +2511,190 @@ function clearOutputBuffer () { } // END - if } +// Function to search for the last modifified file +function searchDirsRecursive ($dir, &$last_changed) { + // Get dir as array + //* DEBUG: */ print __FUNCTION__."(".__LINE__."):dir=".$dir."
".print_r($mapper, true).print_r($ins_vers, true).""); + + // Is the content valid? + if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == "") || ($ins_vers[0]) == "new") { + // File needs update! + $new = true; + } else { + // Return found value + return trim($ins_vers[$mapper[$type]]); + } + } } + + // Has it been updated? + if ($new === true) { + WRITE_FILE($FQFN, implode("\n", getAkt_vers())); + } // END - if } +} - // Has it been updated? - if ($new === true) { - // No Revision-File or has no valid Data so read the Revision from the Server. - $version = GET_URL("check-updates3.php"); +// Repares an array we are looking for +// The returned Array is needed twice (in getAkt_vers() and in getActualVersion() in the old .revision-fallback) so I puted it in an extra function to not polute the global namespace +function getSearchFor () { + // Add Revision, Date, Tag and Author + $searchFor = array('Revision', 'Date', 'Tag', 'Author'); - // Prepare content - $akt_vers[] = trim($version[10]); - $akt_vers[] = trim($version[9]); - $akt_vers[] = trim($version[8]); + // Return the created array + return $searchFor; +} + +function getAkt_vers () { + // Init variables + $next_dir = ""; // Directory to start with search + $last_changed = array( + 'path_name' => "", + 'time' => 0 + ); + $akt_vers = array(); // Init return array + $res = 0; // Init value for counting the founded keywords + + // Searches all Files and there date of the last modifikation and puts the newest File in $last_changed. + searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); + + // Get file + $last_file = READ_FILE($last_changed['path_name']); - // Write file - WRITE_FILE($FQFN, implode("\n", $akt_vers)); + // Get all the keywords to search for + $searchFor = getSearchFor(); - // Return requested content - return trim($akt_vers[$type]); + // This foreach loops the $searchFor-Tags (array('Revision', 'Date', 'Tag', 'Author') --> could easaly extended in the future) + foreach ($searchFor as $search) { + //Searches for "$search-tag:VALUE$" or "$search-tag::VALUE$"(the stylish keywordversion ;-)) in the lates modified file + $res += preg_match('@\$'.$search.'(:|::) (.*) \$@U', $last_file, $t); + // This trimms the search-result and puts it in the $akt_vers-return array + if (isset($t[2])) $akt_vers[$search] = trim($t[2]); + } // END - foreach + + // Save the last-changed filename for debugging + $akt_vers['File'] = $last_changed['path_name']; + + // at least 3 keyword-Tags are needed for propper values + if ($res && $res >= 3 + && isset($akt_vers['Revision']) && $akt_vers['Revision'] != '' + && isset($akt_vers['Date']) && $akt_vers['Date'] != '' + && isset($akt_vers['Tag']) && $akt_vers['Tag'] != '') { + // Prepare content witch need special treadment + + // Prepare timestamp for date + preg_match('@(....)-(..)-(..) (..):(..):(..)@', $akt_vers['Date'], $match_d); + $akt_vers['Date'] = mktime($match_d[4], $match_d[5], $match_d[6], $match_d[2], $match_d[3], $match_d[1]); + + // Add author to the Tag if the author is set and is not quix0r (lead coder) + if ((isset($akt_vers['Author'])) && ($akt_vers['Author'] != "quix0r")) { + $akt_vers['Tag'] .= '-'.strtoupper($akt_vers['Author']); + } // END - if + + } else { + // No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Should not be removed I think. + $version = GET_URL("check-updates3.php"); + + // Prepare content + // Only sets not setted or not proper values to the Online-Server-Fallback-Solution + if (!isset($akt_vers['Revision']) || $akt_vers['Revision'] == '') $akt_vers['Revision'] = trim($version[10]); + if (!isset($akt_vers['Date']) || $akt_vers['Date'] == '') $akt_vers['Date'] = trim($version[9]); + if (!isset($akt_vers['Tag']) || $akt_vers['Tag'] == '') $akt_vers['Tag'] = trim($version[8]); + if (!isset($akt_vers['Author']) || $akt_vers['Author'] == '') $akt_vers['Author'] = "quix0r"; } + + // Return prepared array + return $akt_vers; } + // Loads an include file and logs any missing files for debug purposes function LOAD_INC ($INC) { // Add the path. This is why we need a trailing slash in config.php $FQFN = constant('PATH') . $INC; // Is the include file there? - if (!FILE_READABLE($FQFN)) { + if (!INCLUDE_READABLE($INC)) { // Not there so log it debug_report_bug(sprintf("Include file %s not found.", $INC)); return false; @@ -2626,11 +2753,13 @@ function debug_report_bug ($message = "") { } // END - if // Add output - $debug .= ("Please report this error at bugs.mxchange.org:
"); - $debug .= (debug_get_printable_backtrace()); - $debug .= ("Thank you for your help finding bugs."); + $debug .= "Please report this bug at bugs.mxchange.org:
"; + $debug .= debug_get_printable_backtrace(); + $debug .= "Request-URI: ".$_SERVER['REQUEST_URI']."