Simplified some more code:

[mailer.git] / inc / modules / order.php

diff --git a/inc/modules/order.php b/inc/modules/order.php
index b856528aa3b49fbc6e5af8db05381d5eebad1720..e70a2b03f15e02aadcdfc3e05186b239111b4b86 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -38,7 +38,7 @@
  ************************************************************************/
 
 // Some security stuff...
-$URL = '';
+$url = '';
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('order')) && (!isAdmin())) {
@@ -46,14 +46,14 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isMember()) {
        // Sorry, no guest access!
-       $URL = 'modules.php?module=index';
+       $url = 'modules.php?module=index';
 } elseif (!isGetRequestParameterSet('order')) {
        // You cannot call this module directly!
-       $URL = 'modules.php?module=login&what=order';
+       $url = 'modules.php?module=login&what=order';
 }
 
 // When URL is empty nothing bad happend here
-if (empty($URL)) {
+if (empty($url)) {
        // Is the auto-send mechanism active or inactive?
        if (getConfig('autosend_active') == 'Y') {
                // Auto-send is active
@@ -77,8 +77,14 @@ if (empty($URL)) {
                // Load mail again...              0         1          2             3            4         5       6            7
                $result = SQL_QUERY_ESC("SELECT `subject`, `text`, `receivers`, `payment_id`, `timestamp`, `url`, `cat_id`, `target_send` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s AND `sender`=%s LIMIT 1",
                        array(bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+
+               // Merge arrays
                $content = merge_array($content, SQL_FETCHARRAY($result));
+
+               // Free result
                SQL_FREERESULT($result);
+
+               // Fix empty subject line
                if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
 
                // Calculate used points
@@ -118,7 +124,7 @@ if (empty($URL)) {
        }
 } else {
        // Redirect...
-       redirectToUrl($URL);
+       redirectToUrl($url);
 }
 
 // [EOF]