Fixed first-time registration of sql_patches and possible fix for 'Cannot resolve...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 9a1f4e1cd983c53720e2a7e750e64d7be57ac55e..66b0c63e190892a6e095c919f5eabb0edf6bed47 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -134,7 +134,7 @@ function sendHttpHeaders () {
        $now = gmdate('D, d M Y H:i:s') . ' GMT';
 
        // Send HTTP header
-       sendHeader('HTTP/1.1 200');
+       sendHeader('HTTP/1.1 200 OK');
 
        // General headers for no caching
        sendHeader('Expires: ' . $now); // RFC2616 - Section 14.21
@@ -149,19 +149,21 @@ function sendHttpHeaders () {
 // Compiles the final output
 function compileFinalOutput () {
        // Init counter
-       $cnt = '0';
+       $cnt = 0;
 
        // Add page header and footer
        addPageHeaderFooter();
 
        // Compile all out
-       while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) {
+       while (((strpos($GLOBALS['output'], '{--') !== false) || (strpos($GLOBALS['output'], '{!') !== false) || (strpos($GLOBALS['output'], '{?') !== false) || (strpos($GLOBALS['output'], '{%') !== false)) && ($cnt < 3)) {
                // Init common variables
                $content = array();
                $newContent = '';
 
                // Compile it
-               $eval = "\$newContent = \"".compileCode(escapeQuotes($GLOBALS['output']))."\";";
+               //* DEBUG: */ print '<pre>'.htmlentities($GLOBALS['output']).'</pre>';
+               $eval = '$newContent = "' . compileCode(escapeQuotes($GLOBALS['output'])) . '";';
+               //* DEBUG: */ die('<pre>'.htmlentities($eval).'</pre>');
                eval($eval);
 
                // Was that eval okay?
@@ -169,6 +171,8 @@ function compileFinalOutput () {
                        // Something went wrong!
                        debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', false);
                } // END - if
+
+               // Use it again
                $GLOBALS['output'] = $newContent;
 
                // Count round
@@ -785,6 +789,9 @@ function translatePoolType ($type) {
 
 // Translates the american decimal dot into a german comma
 function translateComma ($dotted, $cut = true, $max = '0') {
+       // First, cast all to double, due to PHP changes
+       $dotted = (double) $dotted;
+
        // Default is 3 you can change this in admin area "Misc -> Misc Options"
        if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', 3);
 
@@ -1194,7 +1201,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
                        $year = date('Y', time());
 
                        // Use configured min age or fixed?
-                       if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
+                       if (isExtensionInstalledAndNewer('order', '0.2.1')) {
                                // Configured
                                $startYear = $year - getConfig('min_age');
                        } else {
@@ -1222,7 +1229,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
                                // Get current year and subtract the configured minimum age
                                $OUT .= "<option value=\"".($minYear - 1)."\">&lt;" . $minYear."</option>\n";
                                // Calculate earliest year depending on extension version
-                               if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
+                               if (isExtensionInstalledAndNewer('order', '0.2.1')) {
                                        // Use configured minimum age
                                        $year = date('Y', time()) - getConfig('min_age');
                                } else {
@@ -1779,11 +1786,9 @@ function sendGetRequest ($script, $data = array()) {
        } else {
                $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('VERSION') . getConfig('HTTP_EOL');
        }
-       $request .= 'Accept: text/plain;q=0.8' . getConfig('HTTP_EOL');
+       $request .= 'Accept: image/png,image/*;q=0.8,text/plain,text/html,*/*;q=0.5' . getConfig('HTTP_EOL');
        $request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL');
-       $request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL');
-       $request .= 'Content-Type: text/plain' . getConfig('HTTP_EOL');
-       $request .= 'Content-Length: 0' . getConfig('HTTP_EOL');
+       $request .= 'Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0' . getConfig('HTTP_EOL');
        $request .= 'Connection: close' . getConfig('HTTP_EOL');
        $request .= getConfig('HTTP_EOL');
 
@@ -1810,7 +1815,7 @@ function sendPostRequest ($script, $postData) {
        $body = http_build_query($postData, '', '&');
 
        // Generate POST request header
-       $request  = 'POST /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+       $request  = 'POST /' . trim($script) . ' HTTP/1.0' . getConfig('HTTP_EOL');
        $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
        $request .= 'Referer: ' . getConfig('URL') . '/admin.php' . getConfig('HTTP_EOL');
        $request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('FULL_VERSION') . getConfig('HTTP_EOL');
@@ -1987,7 +1992,7 @@ function setupProxyTunnel ($host, $resource) {
        $response = array('', '', '');
 
        // Generate CONNECT request header
-       $proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.1' . getConfig('HTTP_EOL');
+       $proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.0' . getConfig('HTTP_EOL');
        $proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
 
        // Use login data to proxy? (username at least!)
@@ -2106,7 +2111,7 @@ function generateEmailLink ($email, $table = 'admins') {
        if ((isExtensionActive('admins')) && ($table == 'admins')) {
                // Create email link for contacting admin in guest area
                $EMAIL = generateAdminEmailLink($email);
-       } elseif ((isExtensionActive('user')) && (getExtensionVersion('user') >= '0.3.3') && ($table == 'user_data')) {
+       } elseif ((isExtensionInstalledAndNewer('user', '0.3.3')) && ($table == 'user_data')) {
                // Create email link for contacting a member within admin area (or later in other areas, too?)
                $EMAIL = generateUserEmailLink($email, 'admin');
        } elseif ((isExtensionActive('sponsor')) && ($table == 'sponsor_data')) {
@@ -3080,7 +3085,7 @@ function determineReferalId () {
        } elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid') == 'Y')) {
                // Select a random user which has confirmed enougth mails
                $GLOBALS['refid'] = determineRandomReferalId();
-       } elseif ((isExtensionInstalled('sql_patches')) && (getConfig('def_refid') > 0)) {
+       } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (getConfig('def_refid') > 0)) {
                // Set default refid as refid in URL
                $GLOBALS['refid'] = getConfig('def_refid');
        } else {
@@ -3947,6 +3952,28 @@ function fixNullEmptyToDashes ($str, $num) {
        return $return;
 }
 
+// Handles the braces [] of a field (e.g. value of 'name' attribute)
+function handleFieldWithBraces ($field) {
+       // Are there braces [] at the end?
+       if (substr($field, -2, 2) == '[]') {
+               // Try to find one and replace it. I do it this way to allow easy
+               // extending of this code.
+               foreach (array('admin_list_builder_id_value') as $key) {
+                       // Is the cache entry set?
+                       if (isset($GLOBALS[$key])) {
+                               // Insert it
+                               $field = str_replace('[]', '[' . $GLOBALS[$key] . ']', $field);
+
+                               // And abort
+                               break;
+                       } // END - if
+               } // END - foreach
+       } // END - if
+
+       // Return it
+       return $field;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////