Fixes for extension problems while installing/removing (still double-registration...

[mailer.git] / img.php

diff --git a/img.php b/img.php
index f1099706eab7efadc03e45713d6fb72369f828c5..adaa3e271e668cc8069d874cff7f418a7f181411 100644 (file)
--- a/img.php
+++ b/img.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'img';
 $GLOBALS['output_mode'] = -1;
@@ -51,36 +47,33 @@ $GLOBALS['output_mode'] = -1;
 require('inc/config-global.php');
 
 // Script installed?
-if (isInstalled()) {
-       // Load header
-       loadIncludeOnce('inc/header.php');
+if (!isInstalled()) {
+       // You have to install first!
+       redirectToUrl('install.php');
+} // END - if
 
-       // Code set?
-       if (REQUEST_ISSET_GET(('code'))) {
-               // Generate image
-               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",
-                       REQUEST_GET('tag')
-               );
+// Load header
+loadIncludeOnce('inc/header.php');
 
-               // Include is readable?
-               if (isIncludeReadable($INC)) {
-                       // Include it
-                       loadInclude($INC);
-               } // END - if
-       }
+// Code set?
+if (REQUEST_ISSET_GET(('code'))) {
+       // Generate image
+       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",
+       REQUEST_GET('tag')
+       );
 
-       // Finish generation here
-       loadIncludeOnce('inc/footer.php');
-} else {
-       // You have to install first!
-       redirectToUrl('install.php');
+       // Include is readable?
+       if (isIncludeReadable($INC)) {
+               // Include it
+               loadInclude($INC);
+       } // END - if
 }
 
-// Really all done here... ;-)
-shutdown();
+// Finish generation here
+loadIncludeOnce('inc/footer.php');
 
-//
+// [EOF]
 ?>