Typo in function name fixed, double->single quotes, some HTML fixes

[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 2714604717be46b7c8bbb6d974684acfab568dfa..70d433eb40e1c04d0102118d95fcd1c9c458cb52 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -38,7 +38,7 @@
  
  // 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);
  }
  
@@ -46,47 +46,47 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
  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') {
                 $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);
         }
         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);
@@ -100,14 +100,14 @@ if ((!empty($FQFN)) && (FILE_READABLE($FQFN))) {
         $content = str_replace("usage_", "{!URL!}/modules.php?module=admin&amp;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&amp;url=http://", $content);
+       //$content = str_replace("HREF=\'http://', "href=\"{!URL!}/modules.php?module=loader&amp;url=http://", $content);
         $test = strtolower($content);
  
         // Do we need to strip out above and including <body> plus trailing </html> tag?
-       if ((strpos($test, "<body") > 0) && (strpos($test, "</body>") > 0)) {
+       if ((strpos($test, '<body') > 0) && (strpos($test, '</body>') > 0)) {
                 // Okay, then do so.
                 $content = substr(substr($content, 0, $body_end), $body_start);
-               $content = substr($content, strpos($content, ">") + 1);
+               $content = substr($content, strpos($content, '>') + 1);
         } // END - if
  
         // Output code