Fix for SQL_FREERESULT()

[mailer.git] / inc / databases.php

diff --git a/inc/databases.php b/inc/databases.php
index 4e453ed9a0a7ed70d4fa713d700f9ab366396216..6793b0f1d3adcfa7f1c845d353af6edb6e0c9ea4 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -32,45 +32,44 @@
  ************************************************************************/
 
 // 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);
 }
 
 // System-wide return codes
-define('CODE_WRONG_PASS'       ,  "1");
-define('CODE_WRONG_ID'         ,  "2");
-define('CODE_ID_LOCKED'        ,  "3");
-define('CODE_ID_UNCONFIRMED'   ,  "4");
-define('CODE_UNKNOWN_STATUS'   ,  "5");
-define('CODE_NO_COOKIES'       ,  "6");
-define('CODE_CNTR_FAILED'      ,  "8");
-define('CODE_LOGOUT_DONE'      ,  "8");
-define('CODE_LOGOUT_FAILED'    ,  "9");
-define('CODE_URL_TLOCK'        , "10");
-define('CODE_URL_FOUND'        , "11");
-define('CODE_OVERLENGTH'       , "12");
-define('CODE_SUBJ_URL'         , "13");
-define('CODE_BLIST_URL'        , "14");
-define('CODE_NO_RECS_LEFT'     , "15");
-define('CODE_INVALID_TAGS'     , "16");
-define('CODE_MORE_POINTS'      , "18");
-define('CODE_COOKIES_DISABLED' , "18");
-define('CODE_DATA_INVALID'     , "19");
-define('CODE_POSSIBLE_INVALID' , "20");
-define('CODE_ACCOUNT_LOCKED'   , "21");
-define('CODE_USER_404'         , "22");
-define('CODE_STATS_404'        , "23");
-define('CODE_ALREADY_CONFIRMED', "24");
-define('CODE_ERROR_MAILID'     , "25");
-define('CODE_EXTENSION_PROBLEM', "26");
-define('CODE_MORE_RECEIVERS1'  , "28");
-define('CODE_MORE_RECEIVERS2'  , "28");
-define('CODE_MORE_RECEIVERS3'  , "29");
-define('CODE_INVALID_URL'      , "30");
-define('CODE_MENU_NOT_VALID'   , "31");
-define('CODE_LOGIN_FAILED'     , "32");
+define('CODE_WRONG_PASS'       ,  1);
+define('CODE_WRONG_ID'         ,  2);
+define('CODE_ID_LOCKED'        ,  3);
+define('CODE_ID_UNCONFIRMED'   ,  4);
+define('CODE_UNKNOWN_STATUS'   ,  5);
+define('CODE_NO_COOKIES'       ,  6);
+define('CODE_CNTR_FAILED'      ,  8);
+define('CODE_LOGOUT_DONE'      ,  8);
+define('CODE_LOGOUT_FAILED'    ,  9);
+define('CODE_URL_TLOCK'        , 10);
+define('CODE_URL_FOUND'        , 11);
+define('CODE_OVERLENGTH'       , 12);
+define('CODE_SUBJ_URL'         , 13);
+define('CODE_BLIST_URL'        , 14);
+define('CODE_NO_RECS_LEFT'     , 15);
+define('CODE_INVALID_TAGS'     , 16);
+define('CODE_MORE_POINTS'      , 18);
+define('CODE_COOKIES_DISABLED' , 18);
+define('CODE_DATA_INVALID'     , 19);
+define('CODE_POSSIBLE_INVALID' , 20);
+define('CODE_ACCOUNT_LOCKED'   , 21);
+define('CODE_USER_404'         , 22);
+define('CODE_STATS_404'        , 23);
+define('CODE_ALREADY_CONFIRMED', 24);
+define('CODE_ERROR_MAILID'     , 25);
+define('CODE_EXTENSION_PROBLEM', 26);
+define('CODE_MORE_RECEIVERS1'  , 28);
+define('CODE_MORE_RECEIVERS2'  , 28);
+define('CODE_MORE_RECEIVERS3'  , 29);
+define('CODE_INVALID_URL'      , 30);
+define('CODE_MENU_NOT_VALID'   , 31);
+define('CODE_LOGIN_FAILED'     , 32);
 
 // Full version string: /([0-9]){1}\.([0-9]){1}\.([0-9]){1}(-(alpha|beta|pre|rc([1-3]))([0-9]+))?/
 // If you understand regular expressions ^^^ you may know how I versionize... ;-)
@@ -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,19 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_PATCH_LEVEL', "514");
+define('CURR_SVN_REVISION', "381");
 
 // 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)));
+
+// Random number for e.g. "cache-buster" used in OpenX script
+define('CACHE_BUSTER', mt_rand(1000000, 9999999));
+
+// Extra title is empty by default
+$EXTRA_TITLE = "";
 
 //
 ?>