Old config.php is now automatically updated to new config-local.php format, several...

[mailer.git] / img.php

diff --git a/img.php b/img.php
index cac96c66482c8a305e8c7f9734658af0f7be18a2..db6512ae51338842312aeb142b1c4e0c900227fc 100644 (file)
--- a/img.php
+++ b/img.php
@@ -36,7 +36,7 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
@@ -48,35 +48,35 @@ $GLOBALS['module'] = 'img';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 // 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')));
-       } 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",
-                       REQUEST_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... ;-)