X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdatabases.php;h=768f9b62647e58e055a7d79399e33776b34fe521;hp=bfae15619835f7dbefcf0d4e9529e7ae66c7276e;hb=3daede4c904e23905c3e48dd6749019deca0a0e0;hpb=3b85bd5030ad591b0c5cb038ca534a7b50e1b319

diff --git a/inc/databases.php b/inc/databases.php
index bfae156198..768f9b6264 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -38,39 +38,40 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // 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_BEG_SAME_AS_OWN'  , 33);
+define('CODE_WRONG_PASS'       , 0x001);
+define('CODE_WRONG_ID'         , 0x002);
+define('CODE_ID_LOCKED'        , 0x003);
+define('CODE_ID_UNCONFIRMED'   , 0x004);
+define('CODE_UNKNOWN_STATUS'   , 0x005);
+define('CODE_NO_COOKIES'       , 0x006);
+define('CODE_CNTR_FAILED'      , 0x008);
+define('CODE_LOGOUT_DONE'      , 0x008);
+define('CODE_LOGOUT_FAILED'    , 0x009);
+define('CODE_URL_TLOCK'        , 0x00a);
+define('CODE_URL_FOUND'        , 0x00b);
+define('CODE_OVERLENGTH'       , 0x00c);
+define('CODE_SUBJ_URL'         , 0x00d);
+define('CODE_BLIST_URL'        , 0x00e);
+define('CODE_NO_RECS_LEFT'     , 0x00f);
+define('CODE_INVALID_TAGS'     , 0x010);
+define('CODE_MORE_POINTS'      , 0x011);
+define('CODE_COOKIES_DISABLED' , 0x012);
+define('CODE_DATA_INVALID'     , 0x013);
+define('CODE_POSSIBLE_INVALID' , 0x014);
+define('CODE_ACCOUNT_LOCKED'   , 0x015);
+define('CODE_USER_404'         , 0x016);
+define('CODE_STATS_404'        , 0x017);
+define('CODE_ALREADY_CONFIRMED', 0x018);
+define('CODE_ERROR_MAILID'     , 0x019);
+define('CODE_EXTENSION_PROBLEM', 0x01a);
+define('CODE_MORE_RECEIVERS1'  , 0x01b);
+define('CODE_MORE_RECEIVERS2'  , 0x01c);
+define('CODE_MORE_RECEIVERS3'  , 0x01d);
+define('CODE_INVALID_URL'      , 0x01e);
+define('CODE_MENU_NOT_VALID'   , 0x01f);
+define('CODE_LOGIN_FAILED'     , 0x020);
+define('CODE_BEG_SAME_AS_OWN'  , 0x021);
+define('CODE_UNHANDLED_STATUS' , 0x022);
 
 // 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... ;-)
@@ -89,40 +90,22 @@ $_CONFIG['one_day'] = 60*60*24;
 
 //
 // Timestamp for yesterday, today ... all at 00:00 am
-define('START_YDAY', MAKE_TIME(0, 0, 0, time() - $_CONFIG['one_day']));
+define('START_YDAY', MAKE_TIME(0, 0, 0, time() - getConfig('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)) {
-	// Script was installed into a sub directory
-	if (substr($COOKIES, -1) != "/") $COOKIES .= "/";
-} else {
-	// No more sub directories added to URL
-	$COOKIES = "/";
-}
-
-// Cookie-Path ( for lame servers... ;-) )
-define('COOKIE_PATH', $COOKIES);
-
-// Base directory for access logfiles
-define('LOGS_BASE', "logs");
-
-// Base directory for usage statistics
-define('USAGE_BASE', "usage");
-
 // Server-URL (DO NOT CHANGE THIS OR YOU CANNOT CHECK FOR UPDATES/EXTENSIONS!)
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "635");
+define('CURR_SVN_REVISION', "716");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Calculate "entropy" with the prime number (for code generation)
-define('_ADD', (_PRIME * _PRIME / (pi() * $_CONFIG['code_length'] + 1)));
+define('_ADD', (_PRIME * _PRIME / (pi() * getConfig('code_length') + 1)));
 
-// Random number for e.g. "cache-buster" used in OpenX script
+// Random number for e.g. the "cache-buster" used in OpenX script
 define('CACHE_BUSTER', mt_rand(1000000, 9999999));
 
 // Extra title is empty by default