fooRequestElementBar() functions renamed, adding of request parameters added:

[mailer.git] / img.php

diff --git a/img.php b/img.php
index 444b1b96f590f6842bda1cdeb13d77e7d99e03de..baf24ea834bd65a4c118d230fcb20bfb234c019c 100644 (file)
--- a/img.php
+++ b/img.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/12/2003 *
- * ===============                              Last change: 10/16/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 10/12/2003 *
+ * ===================                          Last change: 10/16/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : img.php                                          *
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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;
@@ -50,29 +46,23 @@ $GLOBALS['output_mode'] = -1;
 // Load the required file(s)
 require('inc/config-global.php');
 
-// Script installed?
-if (!isInstalled()) {
-       // You have to install first!
-       redirectToUrl('install.php');
-} // END - if
-
 // Load header
 loadIncludeOnce('inc/header.php');
 
 // Code set?
-if (REQUEST_ISSET_GET(('code'))) {
+if (isGetRequestParameterSet('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')
+       generateImageOrCode(bigintval(getRequestParameter('code')));
+} elseif (isGetRequestParameterSet('img')) {
+       // 'img' set so create the IFN (Include-FileName)
+       $inc = sprintf("inc/img/tag-%s.php",
+               getRequestParameter('img')
        );
 
        // Include is readable?
-       if (isIncludeReadable($INC)) {
+       if (isIncludeReadable($inc)) {
                // Include it
-               loadInclude($INC);
+               loadInclude($inc);
        } // END - if
 }