Fixes for broken installation routine

[mailer.git] / img.php

diff --git a/img.php b/img.php
index c150e17c15f40eaf835786e693a83b93a81c966a..db6512ae51338842312aeb142b1c4e0c900227fc 100644 (file)
--- a/img.php
+++ b/img.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Code-Bild fuer verschiedene Zwecke               *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Code-Bild fuer verschiedene Zwecke               *
  * -------------------------------------------------------------------- *

- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *

  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *

- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *

  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *


@@ -36,48 +36,51 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
  * 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"
 
 // Init "action" and "what"

-$GLOBALS['what'] = "";
-$GLOBALS['action'] = "";
+$GLOBALS['what'] = '';
+$GLOBALS['action'] = '';

 
 // Set module
 
 // Set module

-$GLOBALS['module'] = "img";
+$GLOBALS['module'] = 'img';

 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)

-require("inc/config.php");
+require('inc/config-global.php');

 
 // Script installed?
 if (isInstalled()) {
        // Load header
 
 // Script installed?
 if (isInstalled()) {
        // Load header

-       LOAD_INC_ONCE("inc/header.php");
+       loadIncludeOnce('inc/header.php');

 
        // Code set?
        if (REQUEST_ISSET_GET(('code'))) {
                // Generate image
                GENERATE_IMAGE(bigintval(REQUEST_GET('code')));
 
        // Code set?
        if (REQUEST_ISSET_GET(('code'))) {
                // Generate image
                GENERATE_IMAGE(bigintval(REQUEST_GET('code')));

-       } elseif (REQUEST_ISSET_GET(('tag'))) {
+       } elseif (REQUEST_ISSET_GET('tag')) {

                // Tag set so create the IFN (Include-FileName)
                $INC = sprintf("inc/img/tag-%s.php",
                // Tag set so create the IFN (Include-FileName)
                $INC = sprintf("inc/img/tag-%s.php",

-                       REQUEST_GET(('tag'))
+               REQUEST_GET('tag')

                );
 
                // Include is readable?
                );
 
                // Include is readable?

-               if (INCLUDE_READABLE($INC)) {
+               if (isIncludeReadable($INC)) {

                        // Include it
                        // Include it

-                       LOAD_INC($INC);
+                       loadInclude($INC);

                } // END - if
        }
 
        // Finish generation here
                } // END - if
        }
 
        // Finish generation here

-       LOAD_INC_ONCE("inc/footer.php");
+       loadIncludeOnce('inc/footer.php');

 } else {
        // You have to install first!
 } else {
        // You have to install first!

-       LOAD_URL("install.php");
+       redirectToUrl('install.php');

 }
 
 // Really all done here... ;-)
 }
 
 // Really all done here... ;-)

+shutdown();
+
+//

 ?>
 ?>