Fix for fatal error and naming convention applied

[mailer.git] / inc / modules / admin / what-usage.php

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index 334b7915d0b026bfa4c602228b62f20af223ee07..c776c2c24874fe49420e02f18176d65213900b06 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Automatische Erkennung der Aufrufstatistiken     *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $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!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -38,55 +38,55 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // Base directory (should be moved to database)
-$usage = getConfig('usage_base')."/";
+$usage = getConfig('usage_base') . '/';
 
 if (REQUEST_ISSET_GET(('image'))) {
-       if (REQUEST_GET('type') == "usage") {
+       if (REQUEST_GET('type') == 'usage') {
                $FQFN = sprintf("%s%s/usage.png",
-                       constant('PATH'),
-                       getConfig('usage_base')
+               constant('PATH'),
+               getConfig('usage_base')
                );
        } else {
                if (strpos(REQUEST_GET('image'), "\\") > 0) REQUEST_SET_GET('image', substr(REQUEST_GET('image'), 0, strpos(REQUEST_GET('image'), "\\")));
                $FQFN = sprintf("%s%s/%s_usage_%s.png",
-                       constant('PATH'),
-                       getConfig('usage_base'),
-                       REQUEST_GET(('type')),
-                       REQUEST_GET(('image'))
+               constant('PATH'),
+               getConfig('usage_base'),
+               REQUEST_GET(('type')),
+               REQUEST_GET(('image'))
                );
        }
 
-       if (FILE_READABLE($FQFN)) {
+       if (isFileReadable($FQFN)) {
                $image = imagecreatefrompng($FQFN);
-               header("Content-type: image/png");
+               sendHeader("Content-type: image/png");
                imagepng($image);
                imagedestroy($image);
        }
-       exit;
+       shutdown();
 } elseif (!REQUEST_ISSET_GET(('usage'))) {
        $FQFN = sprintf("%s%s/index.html",
-               constant('PATH'),
-               getConfig('usage_base')
+       constant('PATH'),
+       getConfig('usage_base')
        );
 } else {
        $FQFN = sprintf("%s%s/usage_%s.html",
-               constant('PATH'),
-               getConfig('usage_base'),
-               REQUEST_GET(('usage'))
+       constant('PATH'),
+       getConfig('usage_base'),
+       REQUEST_GET(('usage'))
        );
 }
 
-if ((!empty($FQFN)) && (FILE_READABLE($FQFN))) {
+if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        // @TODO This code is double, see LOAD_TEMPLATE and LOAD_EMAIL_TEMPLATE in functions.php
-       $tmpl_file = READ_FILE($FQFN);
+       $tmpl_file = readFromFile($FQFN);
        $tmpl_file = SQL_ESCAPE($tmpl_file);
        $tmpl_file = "\$content=\"".$tmpl_file."\";";
        eval($tmpl_file);
@@ -97,10 +97,10 @@ if ((!empty($FQFN)) && (FILE_READABLE($FQFN))) {
        $content = str_replace("daily_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=daily&image=", $content);
        $content = str_replace("hourly_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=hourly&image=", $content);
        $content = str_replace("ctry_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=ctry&image=", $content);
-       $content = str_replace("usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", "", $content));
+       $content = str_replace("usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", '', $content));
 
        // Disabled due to too much trouble
-       //$content = str_replace("HREF=\"http://", "href=\"{!URL!}/modules.php?module=loader&url=http://", $content);
+       //$content = str_replace("HREF=\'http://', "href=\"{!URL!}/modules.php?module=loader&url=http://", $content);
        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?
@@ -115,8 +115,8 @@ if ((!empty($FQFN)) && (FILE_READABLE($FQFN))) {
   ".$content."
 </div>");
 } else {
-       // Nothing to load, then we have no directory "usage"
-       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_USAGE_DIRECTORY_404'), getConfig('usage_base')));
+       // Nothing to load, then we have no directory 'usage'
+       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_USAGE_DIRECTORY_404'), getConfig('usage_base')));
 }
 
 //