X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=7b074a4a556feeb40c14ad00ef90e2e90e04129f;hb=5b2627141a2053159372f717bd4717600d60d369;hp=c7064dccf77d16a91138714a7e402e26674855cd;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git diff --git a/inc/functions.php b/inc/functions.php index c7064dccf7..7b074a4a55 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1742,10 +1742,25 @@ function extractHostnameFromUrl (&$script) { } // Send a GET request -function sendGetRequest ($script) { +function sendGetRequest ($script, $data = array()) { // Extract host name from script $host = extractHostnameFromUrl($script); + // Add data + $scriptData = http_build_query($data, '', '&'); + + // Do we have a question-mark in the script? + if (strpos($script, '?') === false) { + // No, so first char must be question mark + $scriptData = '?' . $scriptData; + } else { + // Ok, add & + $scriptData = '&' . $scriptData; + } + + // Add script data + $script .= $scriptData; + // Generate GET request header $request = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL'); $request .= 'Host: ' . $host . getConfig('HTTP_EOL'); @@ -1782,7 +1797,7 @@ function sendPostRequest ($script, $postData) { $host = extractHostnameFromUrl($script); // Construct request - $data = http_build_query($postData, '','&'); + $data = http_build_query($postData, '', '&'); // Generate POST request header $request = 'POST /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL'); @@ -3521,91 +3536,6 @@ function getMessageFromIndexedArray ($message, $pos, $array) { return $ret; } -// Handles fatal errors -function handleFatalErrors () { - // Do we have errors to handle and right output mode? - if ((getTotalFatalErrors() == 0) || (getOutputMode() != 0)) { - // Abort executing here - return false; - } // END - if - - // Set content type - setContentType('text/html'); - - // Load config here - loadIncludeOnce('inc/load_config.php'); - - // Set unset variable - if (empty($check)) $check = ''; - - // Default is none - $content = ''; - - // Installation phase or regular mode? - if ((isInstallationPhase())) { - // While we are installing ouput other header than while it is installed... :-) - $OUT = ''; - foreach (getFatalArray() as $key => $value) { - // Prepare content for the template - $content = array( - 'key' => ($key + 1), - 'value' => $value - ); - - // Load row template - $OUT .= loadTemplate('install_fatal_row', true, $content); - } - - // Load main template - $content = loadTemplate('install_fatal_table', true, $OUT); - } elseif (isInstalled()) { - // Display all runtime fatal errors - $OUT = ''; - foreach (getFatalArray() as $key => $value) { - // Prepare content for the template - $content = array( - 'key' => ($key + 1), - 'value' => $value - ); - - // Load row template - $OUT .= loadTemplate('runtime_fatal_row', true, $content); - } - - // Load main template - $content = loadTemplate('runtime_fatal_table', true, $OUT); - } - - // Message to regular users (non-admin) - $CORR = getMessage('FATAL_REPORT_ERRORS'); - - // PHP warnings fixed - if ($check == 'done') { - if (isAdmin()) $CORR = getMessage('FATAL_CORRECT_ERRORS'); - } // END - if - - // Remember all in array - $content = array( - 'rows' => $content, - 'corr' => $CORR - ); - - // Load footer - loadIncludeOnce('inc/header.php'); - - // Load main template - loadTemplate('fatal_errors', false, $content); - - // Delete all to prevent double-display - initFatalMessages(); - - // Load footer - loadIncludeOnce('inc/footer.php'); - - // Abort here - shutdown(); -} - // Print code with line numbers function linenumberCode ($code) { if (!is_array($code)) $codeE = explode("\n", $code); else $codeE = $code;