mailer project continued:

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index 04aef4c0fddccc49b610aaa88dcf2073874d4504..6b2ee7bc89faeb5bac20aa584966a987140d3e99 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -18,7 +18,7 @@
  * @TODO Merge this script with mailid.php                              *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,18 +41,21 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['startTime'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(true);
 
 // Tell everyone we are in this module
-$GLOBALS['__module'] = 'mailid';
-$GLOBALS['output_mode'] = '0';
+$GLOBALS['__module']      = 'mailid';
+$GLOBALS['__output_mode'] = '0';
+
+// Disable copyright footer which would be to large for the upper frame
+$GLOBALS['__copyright_enabled'] = 'N';
 
 // Load the required file(s)
 require('inc/config-global.php');
 
 // Set content type and HTTP status
 setContentType('text/html');
-setHttpStatus('404 NOT FOUND');
+setHttpStatus('404 Not Found');
 
 // Is the extension mailid active?
 redirectOnUninstalledExtension('mailid');
@@ -115,7 +118,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                break;
 
                        default: // Unknown type
-                               debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
+                               reportBug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
                                break;
                }
 
@@ -125,7 +128,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                        list($pool, $sender, $notify) = SQL_FETCHROW($result_mailid);
 
                        // Correct notification switch in non-bonus mails
-                       if (($notify != 'Y') && ($notify != 'N')) {
+                       if (!in_array($notify, array('Y', 'N'))) {
                                $notify = 'N';
                        } // END - if
 
@@ -172,9 +175,9 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        break;
 
                                                default: // Unknown type
-                                                       debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
+                                                       reportBug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
                                                        break;
-                                       }
+                                       } // END - switch
 
                                        // Is this entry valid?
                                        if ($isValid === true) {
@@ -220,7 +223,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                        break;
 
                                                                                default: // Unknown type
-                                                                                       debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
+                                                                                       reportBug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
                                                                                        break;
                                                                        } // END - switch
 
@@ -337,7 +340,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                $content['banner'] = loadTemplate('mailid_banner', true);
                                                                                if (getCodeLength() > 0) {
                                                                                        // Generate Code
-                                                                                       $content['image'] = generateCaptchaCode($realCode, $type, $urlId, $userId);
+                                                                                       $content['image'] = generateCaptchaCode($code, $type, $urlId, $userId);
                                                                                        $templ = 'mailid_enter_code';
                                                                                } else {
                                                                                        // Disabled code
@@ -349,7 +352,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                loadTemplate($templ, false, $content);
                                                                        } else {
                                                                                // Cannot confirm!
-                                                                               debug_report_bug(__FILE__, __LINE__, 'No code given.');
+                                                                               reportBug(__FILE__, __LINE__, 'No code given.');
                                                                        }
                                                                        break;
 
@@ -361,7 +364,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        $content['userid'] = $userId;
                                                                        $content['type']   = $type;
                                                                        $content['data']   = $urlId;
-                                                                       $content['rand']   = mt_rand(0, 99999);
+                                                                       $content['rand']   = getRandomTan();
                                                                        $content['banner'] = loadTemplate('mailid_banner', true);
 
                                                                        // Load template
@@ -369,7 +372,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        break;
 
                                                                default: // Unknown mode
-                                                                       debug_report_bug(__FILE__, __LINE__, 'Unknown mode ' . $do . ' detected.');
+                                                                       reportBug(__FILE__, __LINE__, 'Unknown mode ' . $do . ' detected.');
                                                                        break;
                                                        } // END - switch
                                                } else {
@@ -411,7 +414,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 }
 
 // Really all done here... ;-)
-shutdown();
+doShutdown();
 
 // [EOF]
 ?>