config.php partly solved, see #117

[mailer.git] / inc / databases.php

diff --git a/inc/databases.php b/inc/databases.php
index 7aac6dd321c16590fffac3d0c691803bcb51ecad..d8ebad0b6f17f8d7ff6927cabb4f8523f47ffeac 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $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);
 } // END - if
 
@@ -80,14 +80,14 @@ addCode('UNHANDLED_STATUS' , 0x022);
 addCode('MODULE_MEM_ONLY'  , 0x023);
 
 // Server-URL (DO NOT CHANGE THIS OR YOU CANNOT CHECK FOR UPDATES/EXTENSIONS!)
-define('SERVER_URL', "http://www.mxchange.org");
+define('SERVER_URL', 'http://www.mxchange.org');
 
 // Replacement strings
 $GLOBALS['replacer'] = array(
-       'userid'  => "%uid%",           // User-ID
-       'surname' => "%vorname%",       // Surname
-       'family'  => "%nachname%",      // Family name
-       'gender'  => "%anrede%",                // Gender
+       'userid'  => '%uid%',           // User-ID
+       'surname' => '%vorname%',       // Surname
+       'family'  => '%nachname%',      // Family name
+       'gender'  => '%anrede%',        // Gender
 );
 
 // One day
@@ -95,23 +95,26 @@ setConfigEntry('one_day', (60*60*24));
 
 //
 // Timestamp for yesterday, today ... all at 00:00 am
-define('START_YDAY', MAKE_TIME(0, 0, 0, time() - getConfig('one_day')));
-define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
+setConfigEntry('START_YDAY', makeTime(0, 0, 0, time() - getConfig('one_day')));
+setConfigEntry('START_TDAY', makeTime(0, 0, 0, time()));
 
 // Take a prime number which is long (if you know a longer one please try it out!)
-define('_PRIME', 591623);
+setConfigEntry('_PRIME', 591623);
 
 // Calculate "entropy" with the prime number (for code generation)
-define('_ADD', (constant('_PRIME') * constant('_PRIME') / (pi() * getConfig('code_length') + 1)));
+setConfigEntry('_ADD', (getConfig('_PRIME') * getConfig('_PRIME') / (pi() * getConfig('code_length') + 1)));
 
 // Random number for e.g. the "cache-buster" used in OpenX script
 define('CACHE_BUSTER', mt_rand(1000000, 9999999));
 
 // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
-define('DEBUG_SQL', false);
+setConfigEntry('DEBUG_SQL', 'N');
+
+// CFG: ENCRYPT-SEPERATOR
+setConfigEntry('ENCRYPT_SEPERATOR', ':');
 
 // Extra title is empty by default
-$EXTRA_TITLE = "";
+setExtraTitle('');
 
 //
 ?>