Removed unneccessary eval() command in overview-inc.php, internal TODO closed

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 57f39e1de7c81fb2dd613cf0bfb9fafb50c90e0d..5cfb8c432b93c2638d7c1f133af0a4148e2a90b2 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -38,9 +38,8 @@
 ./inc/mails/birthday_mails.php:80:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/modules/admin/admin-inc.php:338:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:381:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:446: // @TODO Is this eval longer needed?
-./inc/modules/admin/admin-inc.php:500:         // @TODO Rewrite these both constants
-./inc/modules/admin/admin-inc.php:526:         // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
+./inc/modules/admin/admin-inc.php:494:         // @TODO Rewrite these both constants
+./inc/modules/admin/admin-inc.php:520:         // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
 ./inc/modules/admin/overview-inc.php:225:                              // @TODO Rewrite this to something with include files
 ./inc/modules/admin/overview-inc.php:264:                                      // @TODO This may also be rewritten to include files
 ./inc/modules/admin/overview-inc.php:267:                                      default: // @TODO Unknown support mode

diff --git a/inc/config.php b/inc/config.php
index 5f54475e2f2412ff824a90cf323f4c47eca27b61..1e15553ff1df4e151bf94a3f3d5a6749747b165c 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -79,10 +79,10 @@ define('WRITE_FOOTER', true);
 define('OUTPUT_MODE', "render");
 
 // CFG: MAIN_TITLE
-define('MAIN_TITLE', "Your mail-exchanger title");
+define('MAIN_TITLE', "Firebox-Tauscher");
 
 // CFG: SLOGAN
-define('SLOGAN', "Your cool slogan here");
+define('SLOGAN', "Development-Mailer zum Testen");
 
 // Auto-detection... (patched by "Stelzi" aka. profi-concept, thanks again!)
 $URL = "http://".getenv('SERVER_NAME') . str_replace("\\", "/", dirname($_SERVER['PHP_SELF']));
@@ -96,19 +96,19 @@ define('URL', $URL);
 define('PATH', $PATH);
 
 // CFG: WEBMASTER
-define('WEBMASTER', "you@some-hoster.tld.invalid");
+define('WEBMASTER', "quix0r@firebox.lan");
 
 // CFG: INSTALLED
-define('mxchange_installed', false);
+define('mxchange_installed', true);
 
 // CFG: ADMIN-SETUP
-define('admin_registered', false);
+define('admin_registered', true);
 
 // CFG: FRAMESET
 define('frameset_active', false);
 
 // CFG: DEBUG-MODE (if enabled all mails will be *displayed* and *not* send!)
-define('DEBUG_MODE', false);
+define('DEBUG_MODE', true);
 
 // CFG: DEBUG-MAIL (turn this on if you need to debug mails, only affects if DEBUG_MODE is true)
 //define('DEBUG_MAIL', true);
@@ -130,18 +130,18 @@ $MySQL = array(
        // CFG: MYSQL-HOST
        'host'     => "localhost",
        // CFG: MYSQL-DBASE
-       'dbase'    => "db",
+       'dbase'    => "mxchange",
        // CFG: MYSQL-LOGIN
-       'login'    => "user",
+       'login'    => "root",
        // CFG: MYSQL-PASSWORD
-       'password' => "pass",
+       'password' => "ab57dk90",
 );
 
 // CFG: MYSQL-PREIFX
 define('_MYSQL_PREFIX', "mxchange");
 
 // CFG: TABLE-TYPE
-define('_TABLE_TYPE', "MyISAM");
+define('_TABLE_TYPE', "InnoDB");
 
 // CFG: DATABASE-TYPE
 define('_DB_TYPE', "mysql3");
@@ -154,7 +154,7 @@ define('LEAD_EXPIRY_TIME' , (30*24*60*60)); // == 30 days
 // CFG: SMTP-HOSTNAME
 define('SMTP_HOSTNAME', "");
 // CFG: SMTP-USER
-define('SMTP_USER'    , "");
+define('SMTP_USER', "");
 // CFG: SMTP-PASSWORD
 define('SMTP_PASSWORD', "");
 

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 8944acf39beed156254e481af0e53123615d6e1f..776c0014473a9321f0e6a1fca58b4d22c9f9e8c4 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -441,12 +441,6 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                $OUT .= "</table>\n";
        }
 
-       // Compile and run the code here. This inserts all constants into the
-       // HTML output. Costs me some time to figure this out... *sigh* Quix0r
-       // @TODO Is this eval longer needed?
-       $eval = "\$OUT = \"".COMPILE_CODE(smartAddSlashes($OUT))."\";";
-       eval($eval);
-
        // Is there a cache instance again?
        if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) {
                // Init cache