New naming convention applied to many functions, see #118 for details

[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 c9785a6d924bb914a4ca8f759b6ff6b7b787fe8c..7041ee31bfb6e4c234f7de3238c0027643c991ae 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Base directory (should be moved to database)
 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_ISSET_GET(('image'))) {
        if (REQUEST_GET('type') == 'usage') {


@@ -64,7 +64,7 @@ if (REQUEST_ISSET_GET(('image'))) {
                );
        }
 
                );
        }
 

-       if (FILE_READABLE($FQFN)) {
+       if (isFileReadable($FQFN)) {

                $image = imagecreatefrompng($FQFN);
                header("Content-type: image/png");
                imagepng($image);
                $image = imagecreatefrompng($FQFN);
                header("Content-type: image/png");
                imagepng($image);


@@ -84,9 +84,9 @@ if (REQUEST_ISSET_GET(('image'))) {
        );
 }
 
        );
 }
 

-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
        // @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);
        $tmpl_file = SQL_ESCAPE($tmpl_file);
        $tmpl_file = "\$content=\"".$tmpl_file."\";";
        eval($tmpl_file);