Fixes for broken installation routine

[mailer.git] / img.php

diff --git a/img.php b/img.php
index 0d68f14238004d7b17e01511c5e19f599af8ec50..db6512ae51338842312aeb142b1c4e0c900227fc 100644 (file)
--- a/img.php
+++ b/img.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Code-Bild fuer verschiedene Zwecke               *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -31,48 +36,51 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require("inc/libs/security_functions.php");
+// Load security stuff here
+require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
-$GLOBALS['what'] = "";
-$GLOBALS['action'] = "";
+$GLOBALS['what'] = '';
+$GLOBALS['action'] = '';
 
 // Set module
-$GLOBALS['module'] = "img";
+$GLOBALS['module'] = 'img';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require("inc/config.php");
+require('inc/config-global.php');
 
 // Script installed?
-if (isBooleanConstantAndTrue('mxchange_installed')) {
+if (isInstalled()) {
        // Load header
-       LOAD_INC_ONCE("inc/header.php");
+       loadIncludeOnce('inc/header.php');
 
        // Code set?
-       if (!empty($_GET['code'])) {
+       if (REQUEST_ISSET_GET(('code'))) {
                // Generate image
-               GENERATE_IMAGE(bigintval($_GET['code']));
-       } elseif (!empty($_GET['tag'])) {
+               GENERATE_IMAGE(bigintval(REQUEST_GET('code')));
+       } elseif (REQUEST_ISSET_GET('tag')) {
                // Tag set so create the IFN (Include-FileName)
                $INC = sprintf("inc/img/tag-%s.php",
-                       SQL_ESCAPE($_GET['tag'])
+               REQUEST_GET('tag')
                );
 
                // Include is readable?
-               if (INCLUDE_READABLE($INC)) {
+               if (isIncludeReadable($INC)) {
                        // Include it
-                       LOAD_INC($INC);
+                       loadInclude($INC);
                } // END - if
        }
 
        // Finish generation here
-       LOAD_INC_ONCE("inc/footer.php");
+       loadIncludeOnce('inc/footer.php');
 } else {
        // You have to install first!
-       LOAD_URL("install.php");
+       redirectToUrl('install.php');
 }
 
 // Really all done here... ;-)
+shutdown();
+
+//
 ?>