Fixes for wernis extension

[mailer.git] / inc / databases.php

diff --git a/inc/databases.php b/inc/databases.php
index fb6ab7ef2f02b9e795b2a4d7dc576a138fae4f2d..539b50a663407a43935509b692e8ccf5e3c88b28 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -78,12 +77,12 @@ define('FULL_VERSION', "0.2.1-FINAL");
 
 // Replacement strings
 $REPLACER = array(
-       10 => "%uid%",                  // User-ID
-       11 => "%vorname%",              // Surname
-       12 => "%nachname%",             // Family name
-       13 => "%anrede%",               // Salutation
+       'userid'  => "%uid%",                   // User-ID
+       'surname' => "%vorname%",               // Surname
+       'family'  => "%nachname%",              // Family name
+       'gender'  => "%anrede%",                // Gender
 );
-//
+
 // One day
 define('ONE_DAY', 60*60*24);
 
@@ -93,13 +92,10 @@ define('START_YDAY', MAKE_TIME(0, 0, 0, time() - ONE_DAY));
 define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
 
 $COOKIES = substr(URL, strpos(substr(URL, 8), "/") + 8);
-if ((strpos($COOKIES, "/") == "0") && (strpos(substr(URL, 8), "/") > 0))
-{
+if ((strpos($COOKIES, "/") == "0") && (strpos(substr(URL, 8), "/") > 0)) {
        // Script was installed into a sub directory
        if (substr($COOKIES, -1) != "/") $COOKIES .= "/";
-}
- else
-{
+} else {
        // No more sub directories added to URL
        $COOKIES = "/";
 }
@@ -117,13 +113,16 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_PATCH_LEVEL', "514");
+define('CURR_SVN_REVISION', "365");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
-// Calculate with the prime number (for code generation)
-define('_ADD', (_PRIME * _PRIME / (pi() * $CONFIG['code_length'] + 1)));
+// Calculate "entropy" with the prime number (for code generation)
+define('_ADD', (_PRIME * _PRIME / (pi() * $_CONFIG['code_length'] + 1)));
+
+// Extra title is empty by default
+$EXTRA_TITLE = "";
 
 //
 ?>