X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=28748b0e569b1c1118ecf8c35d5d86e92110b472;hb=2eef921aeac777e1306bea94f498f1618f02832b;hp=ad2b5a25d1e3433a6e3fff2211c4e3fc46969a31;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index ad2b5a25d1..28748b0e56 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -10,7 +10,7 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) *
* -------------------------------------------------------------------- *
- * $Revision:: 856 $ *
+ * $Revision:: $ *
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
@@ -191,6 +191,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);
@@ -661,8 +662,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;
@@ -699,7 +699,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;
}
@@ -2040,8 +2040,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
@@ -2353,8 +2351,6 @@ function getMessage ($messageId) {
// Get current theme name
function GET_CURR_THEME() {
- global $INC_POOL;
-
// The default theme is 'default'... ;-)
$ret = "default";
@@ -2395,10 +2391,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;
@@ -2525,27 +2521,43 @@ function clearOutputBuffer () {
} // END - if
}
-// Function to search for the last modifikated file
-function searchDirsRecoursive ($dir, &$last_changed) {
- $ds = scandir($dir); // Needs adjustment for PHP < 5.0.0!!
+// Function to search for the last modifified file
+function searchDirsRecursive ($dir, &$last_changed) {
+ // Get dir as array
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):dir=".$dir."
\n";
+ $ds = GET_DIR_AS_ARRAY($dir, "", true, false);
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):ds[]=".count($ds)."
\n";
+
+ // Walk through all entries
foreach ($ds as $d) {
- $f_name = $dir.'/'.$d; // makes a proper Filename
- if (!preg_match('@(\.|\.\.|\.revision|\.svn|debug\.log|\.cache)$@',$d)) { // no . or .. or .revision or .svn in the filename
- $is_dir = is_dir($f_name);
- if (!$is_dir) { // $f_name is a filename and no directory
- $time = filemtime($f_name);
- if ($last_changed['time'] < $time) { // This file is newer as the file before
- $last_changed['path_name'] = $f_name;
+ // Generate proper FQFN
+ $FQFN = str_replace("//", "/", constant('PATH') . $dir. "/". $d);
+
+ // Does it match what we are looking for? (We skip a lot files already!)
+ if (!preg_match('@(\.|\.\.|\.revision|\.svn|debug\.log|\.cache)$@', $d)) { // no . or .. or .revision or .svn in the filename
+ // Is it a file and readable?
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):FQFN={$FQFN}
\n";
+ if (isDirectory($FQFN)) {
+ // $FQFN is a directory so also crawl into this directory
+ $newDir = $d;
+ if (!empty($dir)) $newDir = $dir . "/". $d;
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):DESCENT: ".$newDir."
\n";
+ searchDirsRecursive($newDir, $last_changed);
+ } elseif (FILE_READABLE($FQFN)) {
+ // $FQFN is a filename and no directory
+ $time = filemtime($FQFN);
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):File: ".$d." found. (".($last_changed['time'] - $time).")
\n";
+ if ($last_changed['time'] < $time) {
+ // This file is newer as the file before
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__.") - NEWER!
\n";
+ $last_changed['path_name'] = $FQFN;
$last_changed['time'] = $time;
- }
- } elseif ($is_dir) { // $f_name is a directory so also crawl into this directory
- searchDirsRecoursive($f_name, $last_changed);
+ } // END - if
}
- }
- }
+ } // END - if
+ } // END - foreach
}
-
// "Getter" for revision/version data
function getActualVersion ($type = 'Revision') {
// By default nothing is new... ;-)
@@ -2558,28 +2570,30 @@ function getActualVersion ($type = 'Revision') {
|| count($GLOBALS['cache_array']['revision']) < 3
|| !$GLOBALS['cache_instance']->loadCacheFile("revision")) $new = true;
- if ($new){
-
+ // Is the cache file outdated/invalid?
+ if ($new === true){
$GLOBALS['cache_instance']->destroyCacheFile(); // @TODO isn't it better to do $GLOBALS['cache_instance']->destroyCacheFile('revision')?
// @TODO shouldn't do the unset and the reloading $GLOBALS['cache_instance']->destroyCacheFile() Or a new methode like forceCacheReload('revision')?
unset($GLOBALS['cache_array']['revision']);
+
// Reload load_cach-revison.php
- LOAD_INC('inc/loader/load_cache-revision.php');
- }
+ LOAD_INC("inc/loader/load_cache-revision.php");
+ } // END - if
+ // Return found value
return $GLOBALS['cache_array']['revision'][$type][0];
} else {
- // old Version without ext-cache aktive (depricated ?)
+ // Old Version without ext-cache active (deprecated ?)
// FQFN of revision file
$FQFN = sprintf("%sinc/cache/.revision", constant('PATH'));
// Check if $_GET['check_revision_data'] is setted (switch for manually rewrite the .revision-File)
- if (isset($_GET['check_revision_data']) && $_GET['check_revision_data'] == 'yes') {
+ if ((isset($_GET['check_revision_data'])) && ($_GET['check_revision_data'] == 'yes')) {
+ // Has changed!
$new = true;
-
} else {
// Check for revision file
if (!FILE_READABLE($FQFN)) {
@@ -2589,62 +2603,83 @@ function getActualVersion ($type = 'Revision') {
// Revision file found
$ins_vers = explode("\n", READ_FILE($FQFN));
+ // Get array for mapping information
+ $mapper = array_flip(getSearchFor());
+ //* DEBUG: */ print("
".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[$type])) || (trim($ins_vers[$type]) == '') || ($ins_vers[0]) == "new") { + 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 { - // Revision-File has valid Data and isn't 'new' so return the Rev-Number - $ttype = array_search ($type,array_keys(getSearchFor())); - if ($ttype || $ttype != null) return trim($ins_vers[$ttype]); - else return false; + // 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 } } +// Repares an array we are looking for function getSearchFor () { - $searchFor[] = 'Revision'; - $searchFor[] = 'Date'; - $searchFor[] = 'Tag'; - $searchFor[] = 'Author'; + // Add Revision, Date, Tag and Author + $searchFor = array('Revision', 'Date', 'Tag', 'Author'); + // Return the created array return $searchFor; } function getAkt_vers () { - $next_dir = '.'; - $last_changed['path_name'] = ''; - $last_changed['time'] = 0; + // Init variables + $next_dir = ""; + $last_changed = array( + 'path_name' => "", + 'time' => 0 + ); $akt_vers = array(); - searchDirsRecoursive($next_dir, $last_changed); //Searches all Files and there date of the last modifikation and puts the newest File in $last_changed. + $res = 0; + + // Searches all Files and there date of the last modifikation and puts the newest File in $last_changed. + searchDirsRecursive($next_dir, $last_changed); + + // Get file $last_file = READ_FILE($last_changed['path_name']); - $ergeb = 0; $searchFor = getSearchFor(); + // @TODO What does this loop/regex do? Document it, please. foreach ($searchFor as $search) { - $ergeb += preg_match('@\$'.$search.'(:|::) (.*) \$@U', $last_file, $t); + $res += preg_match('@\$'.$search.'(:|::) (.*) \$@U', $last_file, $t); if (isset($t[2])) $akt_vers[$search] = trim($t[2]); - } + } // END - foreach - if ($ergeb && $ergeb >= 3) { + if ($res && $res >= 3) { // Prepare content - 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]); - if (isset($akt_vers['Author']) && $akt_vers['Author'] != 'quix0r') $akt_vers['Tag'] .= '-'.strtoupper($akt_vers['Author']); + preg_match('@(....)-(..)-(..) (..):(..):(..)@', $akt_vers['Date'], $match_d); + + // Prepare timestamp for date + $akt_vers['Date'] = mktime($match_d[4], $match_d[5], $match_d[6], $match_d[2], $match_d[3], $match_d[1]); + + // Add 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. FallbackSolution!! Could be removed I think. + // No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Could be removed I think. $version = GET_URL("check-updates3.php"); + // Prepare content $akt_vers['Revision'] = trim($version[10]); - $akt_vers['Date'] = trim($version[9]); - $akt_vers['Tag'] = trim($version[8]); + $akt_vers['Date'] = trim($version[9]); + $akt_vers['Tag'] = trim($version[8]); + $akt_vers['Author'] = "quix0r"; } + + // Return prepared array return $akt_vers; } @@ -2714,11 +2749,12 @@ 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 error at bugs.mxchange.org:
"; + $debug .= debug_get_printable_backtrace(); + $debug .= "Thank you for finding bugs."; // And abort here + // @TODO This cannot be rewritten to mxchange_die(), try to find a solution for this. die($debug); } @@ -2760,7 +2796,15 @@ function convertCodeToMessage ($code) { case getCode('COOKIES_DISABLED') : $msg = getMessage('LOGIN_NO_COOKIES'); break; case getCode('BEG_SAME_AS_OWN') : $msg = getMessage('BEG_SAME_UID_AS_OWN'); break; case getCode('LOGIN_FAILED') : $msg = getMessage('LOGIN_FAILED_GENERAL'); break; - default : $msg = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code); break; + case getCode('MODULE_MEM_ONLY') : $msg = sprintf(getMessage('MODULE_MEM_ONLY'), REQUEST_GET('mod')); break; + + default: + // Missing/invalid code + $msg = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code); + + // Log it + DEBUG_LOG(__FUNCTION__, __LINE__, $msg); + break; } // END - switch // Return the message @@ -3039,6 +3083,9 @@ function merge_array ($array1, $array2) { function DEBUG_LOG ($funcFile, $line, $message, $force=true) { // Is debug mode enabled? if ((isDebugModeEnabled()) || ($force === true)) { + // Remove CRLF + $message = str_replace("\r", "", str_replace("\n", "", $message)); + // Log this message away $fp = fopen(constant('PATH')."inc/cache/debug.log", 'a') or mxchange_die("Cannot write logfile debug.log!"); fwrite($fp, date("d.m.Y|H:i:s", time())."|".basename($funcFile)."|".$line."|".strip_tags($message)."\n"); @@ -3047,7 +3094,8 @@ function DEBUG_LOG ($funcFile, $line, $message, $force=true) { } // Reads a directory with PHP files in and gets only files back -function GET_DIR_AS_ARRAY ($baseDir, $prefix) { +function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true) { + // Init includes $INCs = array(); // Open directory @@ -3055,13 +3103,13 @@ function GET_DIR_AS_ARRAY ($baseDir, $prefix) { // Read all entries while ($baseFile = readdir($dirPointer)) { - // Load file only if extension is active - $INC = $baseDir.$baseFile; + // Construct include filename and FQFN + $INC = $baseDir . "/" . $baseFile; $FQFN = constant('PATH') . $INC; // Is this a valid reset file? //* DEBUG: */ print __FUNCTION__."(".__LINE__."):baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}