Several rewrites/renames, fixes for installation. Resolves #104

[mailer.git] / inc / databases.php

diff --git a/inc/databases.php b/inc/databases.php
index df92e0ae1f264bd93f5aea38eb9962a814df0b22..66d9282aef645d05e8241dd7161409aeb7bb31b9 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -78,7 +78,7 @@ define('CODE_UNHANDLED_STATUS' , 0x022);
 define('FULL_VERSION', "0.2.1-FINAL");
 
 // Replacement strings
-$REPLACER = array(
+$GLOBALS['replacer'] = array(
        'userid'  => "%uid%",           // User-ID
        'surname' => "%vorname%",       // Surname
        'family'  => "%nachname%",      // Family name
@@ -97,7 +97,8 @@ define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', getActualVersion(0));
+//define('CURR_SVN_REVISION', getActualVersion(0));
+define('CURR_SVN_REVISION', "805");
 define('CURR_SVN_DATE'    , getActualVersion(1));
 define('CURR_SVN_VERSION' , getActualVersion(2));
 
@@ -105,7 +106,7 @@ define('CURR_SVN_VERSION' , getActualVersion(2));
 define('_PRIME', 591623);
 
 // Calculate "entropy" with the prime number (for code generation)
-define('_ADD', (_PRIME * _PRIME / (pi() * getConfig('code_length') + 1)));
+define('_ADD', (constant('_PRIME') * constant('_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));