Fixes for auto-activation of extensions while registration phase

[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 718ec0adf604ec25707f19886b8ecc41f5e0dc5b..1ff86f45f9fc1816818da5a8987539ad87cfb4ef 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,13 +51,13 @@ $usage = getConfig('usage_base') . '/';
 if (isGetRequestParameterSet('image')) {
        if (getRequestParameter('type') == 'usage') {
                $FQFN = sprintf("%s%s/usage.png",
-                       getConfig('PATH'),
+                       getPath(),
                        getConfig('usage_base')
                );
        } else {
                if (strpos(getRequestParameter('image'), "\\") > 0) setGetRequestParameter('image', substr(getRequestParameter('image'), 0, strpos(getRequestParameter('image'), "\\")));
                $FQFN = sprintf("%s%s/%s_usage_%s.png",
-                       getConfig('PATH'),
+                       getPath(),
                        getConfig('usage_base'),
                        getRequestParameter('type'),
                        getRequestParameter('image')
@@ -72,12 +73,12 @@ if (isGetRequestParameterSet('image')) {
        shutdown();
 } elseif (!isGetRequestParameterSet('usage')) {
        $FQFN = sprintf("%s%s/index.html",
-               getConfig('PATH'),
+               getPath(),
                getConfig('usage_base')
        );
 } else {
        $FQFN = sprintf("%s%s/usage_%s.html",
-               getConfig('PATH'),
+               getPath(),
                getConfig('usage_base'),
                getRequestParameter('usage')
        );
@@ -85,7 +86,7 @@ if (isGetRequestParameterSet('image')) {
 
 if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
-       eval("\$content=\"".SQL_ESCAPE(readFromFile($FQFN))."\";");
+       eval('$content="' . SQL_ESCAPE(readFromFile($FQFN)) . '";');
        // Until here...
 
        // Replace URLs
@@ -107,7 +108,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        outputHtml($content);
 } else {
        // Nothing to load, then we have no directory 'usage'
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USAGE_DIRECTORY_404'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_USAGE_DIRECTORY_404--}');
 }
 
 // [EOF]