Made mails debugable without messing the output, fixes for forced sponsor registratio...

diff --git a/inc/functions.php b/inc/functions.php
index 0bff2a6abc57dfe89a0ba14a8ff8e2e1ee1162d0..df6bbe1ab084c0080609ccfa4fbeb74606a468ab 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -151,10 +151,10 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
        if (isDebugModeEnabled()) {
                // In debug mode we want to display the mail instead of sending it away so we can debug this part
                outputHtml('<pre>
-Headers : ' . encodeEntities(utf8_decode(trim($mailHeader))) . '
-To      : ' . encodeEntities(utf8_decode($toEmail)) . '
-Subject : ' . encodeEntities(utf8_decode($subject)) . '
-Message : ' . encodeEntities(utf8_decode($message)) . '
+Headers : ' . htmlentities(utf8_decode(trim($mailHeader))) . '
+To      : ' . htmlentities(utf8_decode($toEmail)) . '
+Subject : ' . htmlentities(utf8_decode($subject)) . '
+Message : ' . htmlentities(utf8_decode($message)) . '
 </pre>');
 
                // This is always fine

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 1d883513c0e56fbd82444a0a0ad4eb566fd14af2..a0260fd742205ad5a1bc2ef5cb37f707e1e5b641 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 //
 function handleSponsorRequest ($postData, $update=false, $messageArray=array(), $RET_STATUS=false) {
@@ -49,7 +49,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
        $UPDATE = false;
        $skip = false;
        $ALREADY = false;
-       $ret = "unused";
+       $ret = 'unused';
 
        // Skip these entries
        $SKIPPED = array(
@@ -161,6 +161,13 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
                                        $DATA['values'][] = detectRemoteAddr();
                                }
 
+                               // Search the entry
+                               $key = array_search('force', $DATA['keys']);
+
+                               // Remove force from both arrays
+                               unset($DATA['keys'][$key]);
+                               unset($DATA['values'][$key]);
+
                                // Implode all data into strings
                                $keyArray   = implode('`, `'  , $DATA['keys']);
                                $valueArray = str_repeat("%s', '", count($DATA['values']) - 1);
@@ -198,19 +205,14 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
                                // Run SQL command
                                $result = SQL_QUERY_ESC($sql, $DATA['values'], __FUNCTION__, __LINE__);
                        } // END - if
-
-                       // Output message
-                       if (($update === true) && (isAdmin())) {
-                               loadTemplate('admin_settings_saved', false, $message);
-                       } // END - if
                } else {
                        // Error found!
                        $message = getMessageFromIndexedArray('{--SPONSOR_DATA_NOT_SAVED--}', 'failed', $messageArray);
                        loadTemplate('admin_settings_saved', false, $message);
                }
 
-               // Shall we return the status?
-               if ($RET_STATUS === true) return $ret;
+       // Always return the status
+       return $ret;
 }
 
 //
@@ -224,9 +226,12 @@ function sponsorTranslateUserStatus ($status) {
                $ret = getMessage($constantName);
        } else {
                // Not found!
+               /* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
                $ret = getMaskedMessage('ACCOUNT_STATUS_UNKNOWN_STATUS', $status);
        }
+
+       // Return status
        return $ret;
 }
 

diff --git a/inc/modules/admin/what-add_sponsor.php b/inc/modules/admin/what-add_sponsor.php
index 9c607709933871099b40f2eb2288702a9262ee07..4cb26dd0bbf4de9aee11fd6195310a2e74dbd853 100644 (file)
--- a/inc/modules/admin/what-add_sponsor.php
+++ b/inc/modules/admin/what-add_sponsor.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Save sponsor in database
-       doProcessSponsorFormRequest();
+       loadTemplate('admin_settings_saved', false, doProcessSponsorFormRequest());
 } else {
        // Output form
        loadTemplate('admin_add_sponsor');

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index d8e0a2dcf82ff253d19af19f24f19ce9b9163665..a4fc62e3bb82da2899158a4635a54810a73337c0 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -1814,6 +1814,18 @@ function getIndexHome () {
        return $GLOBALS['index_home'];
 }
 
+// "Getter" for one_day
+function getOneDay () {
+       // Do we have cache?
+       if (!isset($GLOBALS['one_day'])) {
+               // Determine it
+               $GLOBALS['one_day'] = getConfig('ONE_DAY');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['one_day'];
+}
+
 // Checks wether proxy configuration is used
 function isProxyUsed () {
        // Do we have cache?

diff --git a/templates/de/html/admin/admin_add_sponsor_already.tpl b/templates/de/html/admin/admin_add_sponsor_already.tpl
index 2b3d9cd5cc72faa3d64e951136af0e29a5440d73..815a69c58cde20f9ad9f0cf359296358ab21a91d 100644 (file)
--- a/templates/de/html/admin/admin_add_sponsor_already.tpl
+++ b/templates/de/html/admin/admin_add_sponsor_already.tpl
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_sponsor&amp;force=1%}" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_sponsor%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td class="admin_title bottom" align="center">
@@ -15,6 +15,7 @@
 <tr>
        <td align="center" class="admin_footer">
                $content[hidden]
+               <input type="hidden" name="force" value="1" />
                <input type="submit" name="ok" class="admin_submit" value="{--ADD_SPONSOR--}" />
        </td>
 </tr>