LOAD_CONFIGURED_URL() added, bug #66 resolved

diff --git a/admin.php b/admin.php
index 5a04fc8eb97b136e1424f1733c71cea8cc801d0a..20476586610b4be6447f9dad38ae7960f5292dcb 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -47,10 +47,9 @@ require("inc/config.php");
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Simply redirect... :-)
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Simply redirect... :-)

-       LOAD_URL("modules.php?module=admin&action=login");
-       // Redirection should be done here
+       LOAD_URL("modules.php?module=admin");

 } else {
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/agb.php b/agb.php
index 7f020fcd608852c8f032b901ef4e9c05149e1eea..be4e7dca8cdeeb66d291b382f810a2d68c5356ad 100644 (file)
--- a/agb.php
+++ b/agb.php
@@ -45,16 +45,13 @@ $GLOBALS['module'] = "agb"; $CSS = -1;
 require("inc/config.php");
 
 // Is the script installed?
 require("inc/config.php");
 
 // Is the script installed?

-if (isBooleanConstantAndTrue('mxchange_installed'))
-{
+if (isBooleanConstantAndTrue('mxchange_installed')) {

        // Simply redirect... :-)
        LOAD_URL("modules.php?module=index&what=agb");
        // Simply redirect... :-)
        LOAD_URL("modules.php?module=index&what=agb");

-       // Redirection should be done here
-}
- else
-{
-       // You have to configure first!
+} else {
+       // You have to install first!

        LOAD_URL("install.php");
 }
        LOAD_URL("install.php");
 }

+

 // Really all done here... ;-)
 ?>
 // Really all done here... ;-)
 ?>

diff --git a/beg.php b/beg.php
index b0ecebb6ded9eed8b3c43fac0beee4d3c482c32e..f76da26f194e0a9a8b0721ec9ce240b7c9f41015 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -235,7 +235,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                LOAD_URL("modules.php?module=index");
        }
 } else {
                LOAD_URL("modules.php?module=index");
        }
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 1c71ee60db0d2fd8876519f463266abe2307d3cc..6ec854571816472422208628fd950a71b33ade12 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -130,7 +130,7 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
        // Include footer
        include(PATH."inc/footer.php");
 } else {
        // Include footer
        include(PATH."inc/footer.php");
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 // Really all done here... ;-)
        LOAD_URL("install.php");
 }
 // Really all done here... ;-)

diff --git a/confirm.php b/confirm.php
index 49197dcc2b3317a8dd7aff21858ddccaf47d89ff..612d3480fd066daf3c14c5183cb42ef39bee4953 100644 (file)
--- a/confirm.php
+++ b/confirm.php
@@ -58,10 +58,8 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 
        // Load the URL
        LOAD_URL($URL);
 
        // Load the URL
        LOAD_URL($URL);

-
-       // Redirection should be done here

 } else {
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/doubler.php b/doubler.php
index 09d00fba02e5c7bab6c2772547509a44fb2a52e2..f328e4235afa8d36698539788d21ce1809fdbe3a 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -274,7 +274,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Output footer
        include(PATH."inc/footer.php");
 } else {
        // Output footer
        include(PATH."inc/footer.php");
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/img.php b/img.php
index 09cafe5146de8bc60609fdd19009d34073a20158..15fb090ac9e17093263964bd3753af22ed47e5ee 100644 (file)
--- a/img.php
+++ b/img.php
@@ -70,7 +70,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Finish generation here
        require_once(PATH."inc/footer.php");
 } else {
        // Finish generation here
        require_once(PATH."inc/footer.php");
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index a24b4c7cdc120b4dfd47def0d447b4c162b5d12f..d133ca7a7cd88fa469165e58d404c2f89bb7ddf0 100644 (file)
--- a/inc/autopurge/purge-general.php
+++ b/inc/autopurge/purge-general.php
@@ -46,11 +46,7 @@ if ((!EXT_IS_ACTIVE("autopurge")) || (getConfig('auto_purge_active') == "N")) {
 
 if ((getConfig('auto_purge_active') == "Y") && (getConfig('auto_purge') > 0)) {
        // First calculate the timestamp
 
 if ((getConfig('auto_purge_active') == "Y") && (getConfig('auto_purge') > 0)) {
        // First calculate the timestamp

-       if (function_exists('CREATE_TIME_SELECTIONS')) {
-               $PURGE = getConfig('auto_purge');
-       } else {
-               $PURGE = getConfig('auto_purge') * getConfig('one_day');
-       }
+       $PURGE = getConfig('auto_purge');

 
        // Init variables
        $admin_points = 0;
 
        // Init variables
        $admin_points = 0;

diff --git a/inc/databases.php b/inc/databases.php
index ae2d16ee633e1dc087ca03e41c9b8c12449beb93..5001bc3f0d8ec1e1eb65a6e3ec62e1ca44f8f970 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -97,7 +97,7 @@ define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision

-define('CURR_SVN_REVISION', "717");
+define('CURR_SVN_REVISION', "718");

 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index e889278f6b1bda92f5a0c441cf8987afb50c63ef..f41591f0ee3dc6957f371a4a37701ef10817c6e0 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -226,13 +226,15 @@ function SQL_FREERESULT($result) {
 function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        global $link;
 
 function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        global $link;
 

+       // Init variable
+       $query = "failed";
+

        if ($strip) {
                $strip = "true";
        } else {
                $strip = "false";
        }
 
        if ($strip) {
                $strip = "true";
        } else {
                $strip = "false";
        }
 

-       $query = "";

        $eval = "\$query = sprintf(\"".$qstring."\"";
        foreach ($data as $var) {
                if ((!empty($var)) || ($var === 0)) {
        $eval = "\$query = sprintf(\"".$qstring."\"";
        foreach ($data as $var) {
                if ((!empty($var)) || ($var === 0)) {


@@ -250,10 +252,10 @@ function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        //* DEBUG: */ fclose($fp);
 
        // Run the code
        //* DEBUG: */ fclose($fp);
 
        // Run the code

-       @eval($eval);
+       eval($eval);

 
        // Was the eval() command fine?
 
        // Was the eval() command fine?

-       if (empty($query)) {
+       if ($query == "failed") {

                // Something went wrong?
                print "eval=".htmlentities($eval)."<pre>";
                debug_print_backtrace();
                // Something went wrong?
                print "eval=".htmlentities($eval)."<pre>";
                debug_print_backtrace();

diff --git a/inc/functions.php b/inc/functions.php
index e25fce111139915ff13934aeaf5e26894a8bb0f5..de39d07278994a3e38fc4bd79703fa06b081af24 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -144,18 +144,15 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
                        // Log this error
                        DEBUG_LOG(__FUNCTION__, __LINE__, "Headers already sent! We need debug backtrace here.");
 
                        // Log this error
                        DEBUG_LOG(__FUNCTION__, __LINE__, "Headers already sent! We need debug backtrace here.");
 

-                       // Output debug trace
-                       print("<stron>Headers are already sent!</strong><br />\n");
-                       print("Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>");
-                       debug_print_backtrace();
-                       die("</pre>Thank you for your help finding bugs.");
+                       // Trigger an user error
+                       trigger_error("Headers are already sent!");

                } // END - if
 
                // Output cached HTML code
                $OUTPUT = ob_get_contents();
 
                // Clear output buffer for later output
                } // END - if
 
                // Output cached HTML code
                $OUTPUT = ob_get_contents();
 
                // Clear output buffer for later output

-               ob_end_clean();
+               clearOutputBuffer();

 
                // Send HTTP header
                header("HTTP/1.1 200");
 
                // Send HTTP header
                header("HTTP/1.1 200");


@@ -171,7 +168,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
                header("Connection: Close");
 
                // Extension "rewrite" installed?
                header("Connection: Close");
 
                // Extension "rewrite" installed?

-               if ((EXT_IS_ACTIVE("rewrite")) && (function_exists('REWRITE_LINKS')) && ($CSS != "1") && ($CSS != "-1")) {
+               if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) {

                        $OUTPUT = REWRITE_LINKS($OUTPUT);
                } // END - if
 
                        $OUTPUT = REWRITE_LINKS($OUTPUT);
                } // END - if
 


@@ -194,7 +191,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
                OUTPUT_RAW($OUTPUT);
        } elseif ((OUTPUT_MODE == "render") && (!empty($OUTPUT))) {
                // Rewrite links when rewrite extension is active
                OUTPUT_RAW($OUTPUT);
        } elseif ((OUTPUT_MODE == "render") && (!empty($OUTPUT))) {
                // Rewrite links when rewrite extension is active

-               if ((EXT_IS_ACTIVE("rewrite")) && (function_exists('REWRITE_LINKS')) && ($CSS != "1") && ($CSS != "-1")) {
+               if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) {

                        $OUTPUT = REWRITE_LINKS($OUTPUT);
                } // END - if
 
                        $OUTPUT = REWRITE_LINKS($OUTPUT);
                } // END - if
 


@@ -817,12 +814,9 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        if (getConfig('auto_purge') == 0) {
                // Will never expire!
                $EXPIRATION = MAIL_WILL_NEVER_EXPIRE;
        if (getConfig('auto_purge') == 0) {
                // Will never expire!
                $EXPIRATION = MAIL_WILL_NEVER_EXPIRE;

-       } elseif (function_exists('CREATE_FANCY_TIME')) {
+       } else {

                // Create nice date string
                $EXPIRATION = CREATE_FANCY_TIME(getConfig('auto_purge'));
                // Create nice date string
                $EXPIRATION = CREATE_FANCY_TIME(getConfig('auto_purge'));

-       } else {
-               // Display days only
-               $EXPIRATION = round(getConfig('auto_purge')/60/60/24)." "._DAYS;

        }
 
        // Is content an array?
        }
 
        // Is content an array?


@@ -926,6 +920,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        if (empty($newContent)) {
                // Compiling failed
                $newContent = "Compiler error for template {$template}!\nUncompiled content:\n".$tmpl_file;
        if (empty($newContent)) {
                // Compiling failed
                $newContent = "Compiler error for template {$template}!\nUncompiled content:\n".$tmpl_file;

+               // Add last error if the required function exists

                if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
        } // END - if
 
                if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
        } // END - if
 


@@ -969,7 +964,7 @@ function LOAD_URL($URL, $addUrlData=true) {
 
        // Clear it only if there is content
        if (!empty($OUTPUT)) {
 
        // Clear it only if there is content
        if (!empty($OUTPUT)) {

-               ob_end_clean();
+               clearOutputBuffer();

        } // END - if
 
        // Add some data to URL if cookies are not accepted
        } // END - if
 
        // Add some data to URL if cookies are not accepted


@@ -989,7 +984,7 @@ function LOAD_URL($URL, $addUrlData=true) {
                debug_print_backtrace();
                die("</pre>URL={$URL}");
                */
                debug_print_backtrace();
                die("</pre>URL={$URL}");
                */

-               @header ("Location: ".str_replace("&amp;", "&", $URL));
+               header ("Location: ".str_replace("&amp;", "&", $URL));

        } else {
                // Output error message
                include(PATH."inc/header.php");
        } else {
                // Output error message
                include(PATH."inc/header.php");


@@ -998,6 +993,22 @@ function LOAD_URL($URL, $addUrlData=true) {
        }
        exit();
 }
        }
        exit();
 }

+
+// Wrapper for LOAD_URL but URL comes from a configuration entry
+function LOAD_CONFIGURED_URL ($configEntry) {
+       // Get the URL
+       $URL = getConfig($configEntry);
+
+       // Is this URL set?
+       if (is_null($URL)) {
+               // Then abort here
+               trigger_error(sprintf("Configuration entry %s is not set!", $configEntry);
+       } // END - if
+
+       // Load the URL
+       LOAD_URL($URL);
+}
+

 //
 function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
        global $SEC_CHARS, $URL_CHARS;
 //
 function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
        global $SEC_CHARS, $URL_CHARS;


@@ -3059,6 +3070,15 @@ function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
        return $ERROR;
 }
 
        return $ERROR;
 }
 

+// Clears the output buffer. This function does *NOT* backup sent content.
+function clearOutputBuffer () {
+       // Trigger an error on failure
+       if (!ob_end_clean()) {
+               // Failed!
+               trigger_error(__FUNCTION__.": Failed to clean output buffer.");
+       } // END - if
+}
+

 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 31cd556dad86d66bc612700a326ae6912c2677d8..cdb46c8e7745386056baacf29230dc836cb6978d 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -1481,7 +1481,7 @@ function SURFBAR_RELOAD_TO_STOP_PAGE($page="stop") {
                LOAD_URL("surfbar.php?frame=".$page);
        } else {
                // Reload to external page
                LOAD_URL("surfbar.php?frame=".$page);
        } else {
                // Reload to external page

-               LOAD_URL(getConfig('surfbar_pause_url'));
+               LOAD_CONFIGURED_URL('surfbar_pause_url');

        }
 }
 
        }
 }
 

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index fd534b8128a0d334ecba765c7842bee976f9669e..38b9cc52c3a35706ff4e4b1658905da7606800f4 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add links for selecting some users
 }
 
 // Add links for selecting some users

-function alpha($sortby, $colspan, $return=false) {
+function alpha ($sortby, $colspan, $return=false) {

        global $_CONFIG;
        if (empty($_GET['offset'])) $_GET['offset'] = 0;
        $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']);
        global $_CONFIG;
        if (empty($_GET['offset'])) $_GET['offset'] = 0;
        $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']);

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 5d3b3b19a465495c239ef469e8ea56c2775ab545..58fe215f3a2d2e36e79eab00869efcb5495dae10 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -46,14 +46,12 @@ ADD_DESCR("admin", __FILE__);
 
 // Stop saving data if one input field is !isset
 if (isset($_POST['ok'])) {
 
 // Stop saving data if one input field is !isset
 if (isset($_POST['ok'])) {

-       if (function_exists('CREATE_TIME_SELECTIONS')) {
-               // Calculate stamps and set calculated stamps
-               $_POST['online_timeout']        = CREATE_TIMESTAMP_FROM_SELECTIONS("ip_timeout"           , $_POST);
-               $_POST['url_tlock']             = CREATE_TIMESTAMP_FROM_SELECTIONS("url_tlock"            , $_POST);
-               $_POST['profile_lock']          = CREATE_TIMESTAMP_FROM_SELECTIONS("profile_lock"         , $_POST);
-               $_POST['profile_update']        = CREATE_TIMESTAMP_FROM_SELECTIONS("profile_update"       , $_POST);
-               $_POST['resend_profile_update'] = CREATE_TIMESTAMP_FROM_SELECTIONS("resend_profile_update", $_POST);
-       }
+       // Calculate stamps and set calculated stamps
+       $_POST['online_timeout']        = CREATE_TIMESTAMP_FROM_SELECTIONS("ip_timeout"           , $_POST);
+       $_POST['url_tlock']             = CREATE_TIMESTAMP_FROM_SELECTIONS("url_tlock"            , $_POST);
+       $_POST['profile_lock']          = CREATE_TIMESTAMP_FROM_SELECTIONS("profile_lock"         , $_POST);
+       $_POST['profile_update']        = CREATE_TIMESTAMP_FROM_SELECTIONS("profile_update"       , $_POST);
+       $_POST['resend_profile_update'] = CREATE_TIMESTAMP_FROM_SELECTIONS("resend_profile_update", $_POST);

 
        // Online-Timeout shall be > 0 or your database will crow and crow and crow...
        if (!isset($_POST['online_timeout']))        { unset($_POST['ok']); }
 
        // Online-Timeout shall be > 0 or your database will crow and crow and crow...
        if (!isset($_POST['online_timeout']))        { unset($_POST['ok']); }


@@ -81,22 +79,12 @@ if (isset($_POST['ok'])) {
        define('_CFG_REJECT_URL' , getConfig('reject_url'));
        define('_CFG_MIN_AGE'    , getConfig('min_age'));
 
        define('_CFG_REJECT_URL' , getConfig('reject_url'));
        define('_CFG_MIN_AGE'    , getConfig('min_age'));
 

-       // Is there the pro-version function avaiable to create selection boxes instead of input boxes?
-       if (function_exists('CREATE_TIME_SELECTIONS')) {
-               // Only pro versions: time selection boxes
-               define('_CFG_ONLINE_TIMEOUT', CREATE_TIME_SELECTIONS(getConfig('online_timeout'), "ip_timeout"           , "ms"));
-               define('_CFG_URL_TLOCK'     , CREATE_TIME_SELECTIONS(getConfig('url_tlock')     , "url_tlock"            , "WDh"));
-               define('_CFG_PROFILE_LOCK'  , CREATE_TIME_SELECTIONS(getConfig('profile_lock')  , "profile_lock"         , "WDh"));
-               define('_CFG_PROFILE_UPDATE', CREATE_TIME_SELECTIONS(getConfig('profile_update'), "profile_update"       , "YM"));
-               define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS(getConfig('resend_profile_update') , "resend_profile_update", "MWD"));
-       } else {
-               // Normal input boxes
-               define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('online_timeout')."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-               define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('url_tlock')     ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-               define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('profile_lock')  ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-               define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".getConfig('profile_update')."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-               define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('resend_profile_update') ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-       }
+       // Time selection boxes
+       define('_CFG_ONLINE_TIMEOUT', CREATE_TIME_SELECTIONS(getConfig('online_timeout'), "ip_timeout"           , "ms"));
+       define('_CFG_URL_TLOCK'     , CREATE_TIME_SELECTIONS(getConfig('url_tlock')     , "url_tlock"            , "WDh"));
+       define('_CFG_PROFILE_LOCK'  , CREATE_TIME_SELECTIONS(getConfig('profile_lock')  , "profile_lock"         , "WDh"));
+       define('_CFG_PROFILE_UPDATE', CREATE_TIME_SELECTIONS(getConfig('profile_update'), "profile_update"       , "YM"));
+       define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS(getConfig('resend_profile_update') , "resend_profile_update", "MWD"));

 
        if (getConfig('order_multi_page') == "N") {
                define('_CFG_ORDER_MULTI_N', " checked=\"checked\"");
 
        if (getConfig('order_multi_page') == "N") {
                define('_CFG_ORDER_MULTI_N', " checked=\"checked\"");

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index ddec04ffa8202d3b63f03eedcc2d953027d573bb..80215936949c48f59ca5a5ced36c092d490b6a08 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -264,13 +264,9 @@ LIMIT 1",
                define('__COLSPAN2'  , ($colspan + 2));
                define('__USER_CNT'  , $user_count);
 
                define('__COLSPAN2'  , ($colspan + 2));
                define('__USER_CNT'  , $user_count);
 

-               if ((function_exists('alpha')) && (function_exists('SortLinks'))) {
-                       define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true));
-                       define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true));
-               } else {
-                       define('__ALPHA_SORT', "");
-                       define('__SORT_LINKS', "");
-               }
+               // Sorting links
+               define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true));
+               define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true));

 
                if ($PAGES > 1) {
                        define('__PAGE_NAV', ADD_PAGENAV($PAGES, getConfig('user_limit'), true, $colspan, true));
 
                if ($PAGES > 1) {
                        define('__PAGE_NAV', ADD_PAGENAV($PAGES, getConfig('user_limit'), true, $colspan, true));

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index a5ce46945d6df2bd49cd4bc291a4646534fdf84e..b8d50bfbc748e2ae949c5863f09837757660985a 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -54,7 +54,7 @@ if (!empty($_GET['access'])) {
                $OUTPUT = ob_get_contents();
 
                // Clean content
                $OUTPUT = ob_get_contents();
 
                // Clean content

-               ob_end_clean();
+               clearOutputBuffer();

 
                // Set header
                if (substr($access, -3, 3) == "log") {
 
                // Set header
                if (substr($access, -3, 3) == "log") {

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 83e1660d255c88f8a0b98f6f407330ade4fa5a39..208c3773da15594f890d41a5f7f382e6379d8d17 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -48,7 +48,7 @@ $taskExt = false; // Default is that "task" is not installed
 
 // When the admin is logging in check several things first (new jobs to complete and so on)
 if ($GLOBALS['action'] == "login") {
 
 // When the admin is logging in check several things first (new jobs to complete and so on)
 if ($GLOBALS['action'] == "login") {

-       if ((EXT_IS_ACTIVE("task")) && (function_exists('OUTPUT_ADVANCED_OVERVIEW'))) {
+       if (EXT_IS_ACTIVE("task")) {

                // When task extension is registered output advanced overview page
                $JOBS_DONE = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
                $taskExt = true;
                // When task extension is registered output advanced overview page
                $JOBS_DONE = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
                $taskExt = true;

diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php
index d61d0d067122c8d156bc5a5e91e4d31567e4a354..71ab1bd55acc5bfe49487eef93149cb73b8b3ac5 100644 (file)
--- a/inc/modules/guest/what-beg.php
+++ b/inc/modules/guest/what-beg.php
@@ -54,13 +54,9 @@ if ($GLOBALS['refid'] > 0) {
        define('__BEG_UID'       , getConfig('def_refid'));
 }
 
        define('__BEG_UID'       , getConfig('def_refid'));
 }
 

-if (function_exists('CREATE_FANCY_TIME')) {
-       define('__BEG_TIMEOUT'    , CREATE_FANCY_TIME(getConfig('beg_timeout')));
-       define('__BEG_UID_TIMEOUT', CREATE_FANCY_TIME(getConfig('beg_uid_timeout')));
-} else {
-       define('__BEG_TIMEOUT '   , round(getConfig('beg_timeout')     / 60)." ".MINUTES);
-       define('__BEG_UID_TIMEOUT', round(getConfig('beg_uid_timeout') / 60)." ".MINUTES);
-}
+// Selection boxes are now the default
+define('__BEG_TIMEOUT'    , CREATE_FANCY_TIME(getConfig('beg_timeout')));
+define('__BEG_UID_TIMEOUT', CREATE_FANCY_TIME(getConfig('beg_uid_timeout')));

 
 // Load final template
 LOAD_TEMPLATE("guest_".substr(basename(__FILE__), 5, -4));
 
 // Load final template
 LOAD_TEMPLATE("guest_".substr(basename(__FILE__), 5, -4));

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index 56c36548f701c0b2586e544314f5c5ecb660b6c8..fe843213db647fe0712c00790e61580d30fa6c26 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -44,18 +44,25 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("guest", __FILE__);
 
 //// TOP logins
 ADD_DESCR("guest", __FILE__);
 
 //// TOP logins

-$ADD = "userid";
-if (EXT_IS_ACTIVE("nickname")) $ADD = "nickname";
-$result = SQL_QUERY_ESC("SELECT userid, ".$ADD.", total_logins, last_online
-FROM "._MYSQL_PREFIX."_user_data
-WHERE total_logins>0 AND status='CONFIRMED' ORDER BY total_logins DESC LIMIT %s",
- array(getConfig('top10_max')), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("
+SELECT
+       userid, total_logins, last_online
+FROM
+       "._MYSQL_PREFIX."_user_data
+WHERE
+       total_logins > 0 AND
+       status='CONFIRMED'
+ORDER BY
+       total_logins DESC
+LIMIT %s",
+       array(getConfig('top10_max')), __FILE__, __LINE__);

 
 $OUT = ""; $SW = 2; $cnt = 1;
 
 $OUT = ""; $SW = 2; $cnt = 1;

-while(list($uid, $nick, $logins, $last) = SQL_FETCHROW($result))
-{
+while (list($uid, $logins, $last) = SQL_FETCHROW($result)) {

        $nick2 = "---";
        $nick2 = "---";

-       if (($nick != $uid) && (!empty($nick))) $nick2 = $nick;
+
+       // Get nickname
+       if (EXT_IS_ACTIVE("nickname")) $nick2 = NICKNAME_GET_NICK($uid);

 
        // Prepare data for template
        $content = array(
 
        // Prepare data for template
        $content = array(


@@ -74,11 +81,10 @@ while(list($uid, $nick, $logins, $last) = SQL_FETCHROW($result))
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
 }
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
 }

-if ($cnt < getConfig('top10_max'))
-{
+
+if ($cnt < getConfig('top10_max')) {

        // Add more "blank" rows
        // Add more "blank" rows

-       for ($i = $cnt; $i <= getConfig('top10_max'); $i++)
-       {
+       for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {

                // Prepare data for template
                $content = array(
                        'sw'  => $SW,
                // Prepare data for template
                $content = array(
                        'sw'  => $SW,


@@ -92,22 +98,38 @@ if ($cnt < getConfig('top10_max'))
 }
 define('__TOP_LOGINS_ROWS', $OUT);
 
 }
 define('__TOP_LOGINS_ROWS', $OUT);
 

+// Free result
+SQL_FREERESULT($result);
+

 //// TOP earners
 //// TOP earners

-$result = SQL_QUERY_ESC("SELECT DISTINCT p.userid, d.".$ADD.", (SUM(p.points) - d.used_points) AS tpoints, d.last_online
-FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
-ON p.userid=d.userid
-WHERE p.points > 0 AND d.status='CONFIRMED'
-GROUP BY p.userid
-ORDER BY tpoints DESC, d.last_online DESC
+$result = SQL_QUERY_ESC("
+SELECT DISTINCT
+       d.userid,
+       (SUM(p.points) - d.used_points) AS tpoints,
+       d.last_online
+FROM
+       `"._MYSQL_PREFIX."_user_data` AS d
+LEFT JOIN
+       "._MYSQL_PREFIX."_user_points AS p
+ON
+       p.userid=d.userid
+WHERE
+       p.points > 0 AND
+       d.status='CONFIRMED'
+GROUP BY
+       p.userid
+ORDER BY
+       tpoints DESC,
+       d.last_online DESC

 LIMIT %s",
 LIMIT %s",

- array(getConfig('top10_max')), __FILE__, __LINE__);
+       array(getConfig('top10_max')), __FILE__, __LINE__);

 
 $OUT = ""; $SW = 2; $cnt = 1;
 
 $OUT = ""; $SW = 2; $cnt = 1;

-while(list($uid, $nick, $points, $last) = SQL_FETCHROW($result))
-{
+while (list($uid, $points, $last) = SQL_FETCHROW($result)) {

        $nick2 = "---";
        $nick2 = "---";

-       if (($nick != $uid) && (!empty($nick))) $nick2 = $nick;
+
+       // Get nickname
+       if (EXT_IS_ACTIVE("nickname")) $nick2 = NICKNAME_GET_NICK($uid);

 
        // Prepare data for template
        $content = array(
 
        // Prepare data for template
        $content = array(


@@ -125,11 +147,10 @@ while(list($uid, $nick, $points, $last) = SQL_FETCHROW($result))
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
 }
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
 }

-if ($cnt < getConfig('top10_max'))
-{
+
+if ($cnt < getConfig('top10_max')) {

        // Add more "blank" rows
        // Add more "blank" rows

-       for ($i = $cnt; $i <= getConfig('top10_max'); $i++)
-       {
+       for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {

                // Prepare data for template
                $content = array(
                        'sw'  => $SW,
                // Prepare data for template
                $content = array(
                        'sw'  => $SW,


@@ -143,22 +164,38 @@ if ($cnt < getConfig('top10_max'))
 }
 define('__TOP_POINTS_ROWS', $OUT);
 
 }
 define('__TOP_POINTS_ROWS', $OUT);
 

+// Free result
+SQL_FREERESULT($result);
+

 //// TOP referal "hunter"
 //// TOP referal "hunter"

-$result = SQL_QUERY_ESC("SELECT DISTINCT r.userid, d.".$ADD.", SUM(r.counter) AS refs, d.last_online
-FROM "._MYSQL_PREFIX."_refsystem AS r
-LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
-ON r.userid=d.userid
-WHERE r.counter > 0 AND d.status='CONFIRMED'
-GROUP BY r.userid
-ORDER BY refs DESC, d.last_online DESC
+$result = SQL_QUERY_ESC("
+SELECT DISTINCT
+       d.userid,
+       SUM(r.counter) AS refs,
+       d.last_online
+FROM
+       `"._MYSQL_PREFIX."_user_data` AS d
+LEFT JOIN
+       "._MYSQL_PREFIX."_refsystem AS r
+ON
+       r.userid=d.userid
+WHERE
+       r.counter > 0 AND
+       d.status='CONFIRMED'
+GROUP BY
+       r.userid
+ORDER BY
+       refs DESC,
+       d.last_online DESC

 LIMIT %s",
 LIMIT %s",

- array(getConfig('top10_max')), __FILE__, __LINE__);
+       array(getConfig('top10_max')), __FILE__, __LINE__);

 
 $OUT = ""; $SW = 2; $cnt = 1;
 
 $OUT = ""; $SW = 2; $cnt = 1;

-while(list($uid, $nick, $refs, $last) = SQL_FETCHROW($result))
-{
+while (list($uid, $refs, $last) = SQL_FETCHROW($result)) {

        $nick2 = "---";
        $nick2 = "---";

-       if (($nick != $uid) && (!empty($nick))) $nick2 = $nick;
+
+       // Get nickname
+       if (EXT_IS_ACTIVE("nickname")) $nick2 = NICKNAME_GET_NICK($uid);

 
        // Prepare data for template
        $content = array(
 
        // Prepare data for template
        $content = array(


@@ -177,11 +214,10 @@ while(list($uid, $nick, $refs, $last) = SQL_FETCHROW($result))
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
 }
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
 }

-if ($cnt < getConfig('top10_max'))
-{
+
+if ($cnt < getConfig('top10_max')) {

        // Add more "blank" rows
        // Add more "blank" rows

-       for ($i = $cnt; $i <= getConfig('top10_max'); $i++)
-       {
+       for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {

                // Prepare data for template
                $content = array(
                        'sw'  => $SW,
                // Prepare data for template
                $content = array(
                        'sw'  => $SW,


@@ -195,6 +231,9 @@ if ($cnt < getConfig('top10_max'))
 }
 define('__TOP_REFERRAL_ROWS', $OUT);
 
 }
 define('__TOP_REFERRAL_ROWS', $OUT);
 

+// Free result
+SQL_FREERESULT($result);
+

 // Remember other values in constants
 define('__TOP10_MAX', getConfig('top10_max'));
 
 // Remember other values in constants
 define('__TOP10_MAX', getConfig('top10_max'));
 

diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index f97690f2f74bd3a2b35b4b5d52a9ae4137412df7..51a2efa60658cf13e431947d993c3edca908a92e 100644 (file)
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -47,10 +47,10 @@ require_once(PATH."inc/rdf.class.php");
 ADD_DESCR("guest", __FILE__);
 
 OUTPUT_HTML("<div style=\"padding-left: 10px; padding-right: 10px\">");
 ADD_DESCR("guest", __FILE__);
 
 OUTPUT_HTML("<div style=\"padding-left: 10px; padding-right: 10px\">");

-$rdf = new fase4_rdf;
+$rdf = new fase4_rdf();

 $rdf->use_dynamic_display(false);
 $rdf->set_CacheDir(PATH."inc/cache/");
 $rdf->use_dynamic_display(false);
 $rdf->set_CacheDir(PATH."inc/cache/");

-$rdf->set_salt(SITE_KEY);
+$rdf->set_salt(md5(SITE_KEY));

 $rdf->set_max_item(10);
 $rdf->set_Options(
        array(
 $rdf->set_max_item(10);
 $rdf->set_Options(
        array(

diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php
index e9a2d6404b8a234815156f8acbc0fceeab6d2d58..bf048dcac099f0ce4f530969feba1555fcc0792b 100644 (file)
--- a/inc/modules/member/what-beg.php
+++ b/inc/modules/member/what-beg.php
@@ -70,21 +70,12 @@ $nickname = true;
 if (empty($uid)) { $uid = $GLOBALS['userid']; $nickname = false; }
 
 // Prepare constants
 if (empty($uid)) { $uid = $GLOBALS['userid']; $nickname = false; }
 
 // Prepare constants

-define('__BEG_UID'       , $uid);
-define('__BEG_CLICKS'    , $clicks);
-define('__BEG_POINTS'    , TRANSLATE_COMMA(getConfig('beg_points')));
-define('__BEG_POINTS_MAX', TRANSLATE_COMMA(getConfig('beg_points_max')));
-
-if (function_exists('CREATE_FANCY_TIME'))
-{
-       define('__BEG_TIMEOUT'    , CREATE_FANCY_TIME(getConfig('beg_timeout')));
-       define('__BEG_UID_TIMEOUT', CREATE_FANCY_TIME(getConfig('beg_uid_timeout')));
-}
- else
-{
-       define('__BEG_TIMEOUT '   , round(getConfig('beg_timeout')     / 60)." ".MINUTES);
-       define('__BEG_UID_TIMEOUT', round(getConfig('beg_uid_timeout') / 60)." ".MINUTES);
-}
+define('__BEG_UID'        , $uid);
+define('__BEG_CLICKS'     , $clicks);
+define('__BEG_POINTS'     , TRANSLATE_COMMA(getConfig('beg_points')));
+define('__BEG_POINTS_MAX' , TRANSLATE_COMMA(getConfig('beg_points_max')));
+define('__BEG_TIMEOUT'    , CREATE_FANCY_TIME(getConfig('beg_timeout')));
+define('__BEG_UID_TIMEOUT', CREATE_FANCY_TIME(getConfig('beg_uid_timeout')));

 
 // Load template
 LOAD_TEMPLATE("member_".substr(basename(__FILE__), 5, -4));
 
 // Load template
 LOAD_TEMPLATE("member_".substr(basename(__FILE__), 5, -4));

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index e1516ea15251bd8b1e339d2a81600553e8bc7c2e..a615d259e71b7b59cce8e965aa1fa609f424e2c4 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -162,11 +162,7 @@ case "new": // Start new transfer
 
                        // Remember transfer reason and fancy date/time in constants
                        define('__TRANSFER_REASON', $_POST['reason']);
 
                        // Remember transfer reason and fancy date/time in constants
                        define('__TRANSFER_REASON', $_POST['reason']);

-                       if (function_exists('CREATE_FANCY_TIME')) {
-                               define('__TRANSFER_EXPIRES', CREATE_FANCY_TIME(getConfig('transfer_age')));
-                       } else {
-                               define('__TRANSFER_EXPIRES', round(getConfig('transfer_age')/60/60/24)." ".DAYS);
-                       }
+                       define('__TRANSFER_EXPIRES', CREATE_FANCY_TIME(getConfig('transfer_age')));

 
                        // Generate tranafer id
                        define('__TRANS_ID', bigintval(GEN_RANDOM_CODE("10", mt_rand(0, 99999), $GLOBALS['userid'], $_POST['reason'])));
 
                        // Generate tranafer id
                        define('__TRANS_ID', bigintval(GEN_RANDOM_CODE("10", mt_rand(0, 99999), $GLOBALS['userid'], $_POST['reason'])));

diff --git a/index.php b/index.php
index 312719aa9317d0ee3d0ccb217c6b5e11a5becbc0..d5ee879dcd5e69862a39dacf9cc35f2c82978537 100644 (file)
--- a/index.php
+++ b/index.php
@@ -83,7 +83,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Footer
        require(PATH."inc/footer.php");
 } else {
        // Footer
        require(PATH."inc/footer.php");
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/lead-confirm.php b/lead-confirm.php
index c5cab5847bd97a513a6aadcd76f80c338faaabd8..7bcd9100eba9dc71265d207ffd2859446aa7061b 100644 (file)
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -85,7 +85,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Footer
        require(PATH."inc/footer.php");
 } else {
        // Footer
        require(PATH."inc/footer.php");
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/login.php b/login.php
index 575533ed9264585cc29b805c72404e1bf24e788c..27537535c73151ea252ba2906d4315449c02bb52 100644 (file)
--- a/login.php
+++ b/login.php
@@ -46,11 +46,16 @@ require("inc/config.php");
 
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
 
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {

-       // Simply redirect... :-)
-       LOAD_URL("modules.php?module=index&what=login");
-       // Redirection should be done here
+       // Is this a member?
+       if (IS_MEMBER()) {
+               // Then redirect into login area
+               LOAD_URL("modules.php?module=login");
+       } else {
+               // Guests will be redirected to login form
+               LOAD_URL("modules.php?module=index&what=login");
+       }

 } else {
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/mailid.php b/mailid.php
index 5bca0bab23565d0a33353965f4b9e7fb69e80e56..3fb1eaafab8b25fef84e5b702206972939a6853e 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -206,7 +206,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                break;
 
                        case "REJECT": // Redirect to rejection page
                                break;
 
                        case "REJECT": // Redirect to rejection page

-                               LOAD_URL(getConfig('reject_url'));
+                               LOAD_CONFIGURED_URL('reject_url');

                                break;
 
                        default:
                                break;
 
                        default:


@@ -219,7 +219,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                require_once(PATH."inc/footer.php");
        }
 } else {
                require_once(PATH."inc/footer.php");
        }
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/mailid_top.php b/mailid_top.php
index 42465556895e657870b04891aec7b339a62d42e5..2136361822a3784dfd2c0777a0e7510b4e2634f0 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -240,7 +240,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                                ADD_POINTS_REFSYSTEM("mailid_okay", $url_uid, $payment, false, "0", $locked);
 
                                                                                // Shall I add bonus points for "turbo clickers" ?
                                                                                ADD_POINTS_REFSYSTEM("mailid_okay", $url_uid, $payment, false, "0", $locked);
 
                                                                                // Shall I add bonus points for "turbo clickers" ?

-                                                                               if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (function_exists('BONUS_ADD_TURBO_POINTS'))) {
+                                                                               if (GET_EXT_VERSION("bonus") >= "0.2.2") {

                                                                                        // Is an active-rallye running and this is not a notification mail?
                                                                                        if ((getConfig('bonus_active') == "Y") && ($notify == "N")) {
                                                                                                // Shall I exclude the webmaster's own userid from the active-rallye?
                                                                                        // Is an active-rallye running and this is not a notification mail?
                                                                                        if ((getConfig('bonus_active') == "Y") && ($notify == "N")) {
                                                                                                // Shall I exclude the webmaster's own userid from the active-rallye?


@@ -352,7 +352,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                } // END - if
        }
 } elseif ($mode != "img") {
                } // END - if
        }
 } elseif ($mode != "img") {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/ref.php b/ref.php
index 7f9202725661bbfff87cdb14b4274b3950ca65e7..7adf9ae91a50a7b1339f868042277699a90cdd4e 100644 (file)
--- a/ref.php
+++ b/ref.php
@@ -104,7 +104,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Load the URL
        LOAD_URL($URL);
 } else {
        // Load the URL
        LOAD_URL($URL);
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/show_bonus.php b/show_bonus.php
index 61e8ce264adacd49e9992bea202fd7b667fbc612..7ef2fa027e34d4425e28c6221c01ca19982d9cb9 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -135,7 +135,7 @@ LIMIT 1",
        // Include footer
        include(PATH."inc/footer.php");
 } else {
        // Include footer
        include(PATH."inc/footer.php");
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/sponsor_confirm.php b/sponsor_confirm.php
index c3aadaa205b8504c2257a66c1341f8c18162158d..5b601d88cad27cefbec0b8aceaa336267d738051 100644 (file)
--- a/sponsor_confirm.php
+++ b/sponsor_confirm.php
@@ -50,10 +50,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
        // Load the URL
        LOAD_URL($URL);
 
        // Load the URL
        LOAD_URL($URL);

-
-       // Redirection should be done here

 } else {
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/sponsor_ref.php b/sponsor_ref.php
index bbcb00a7f2dbfce00c5db9cc03e106e96d648975..065aef68686dd7f7fa04808821f62196cffb82a4 100644 (file)
--- a/sponsor_ref.php
+++ b/sponsor_ref.php
@@ -56,10 +56,8 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue(mxchange_installe
 
        // Load the URL
        LOAD_URL($URL);
 
        // Load the URL
        LOAD_URL($URL);

-
-       // Redirection should be done here

 } else {
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }
 

diff --git a/surfbar.php b/surfbar.php
index dfc8d8717527f630aecc9bb9db743a12999621c5..02d12ccf14e960d173056b05761b3c2247616e25 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -194,7 +194,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Load footer
        require_once(PATH."inc/footer.php");
 } else {
        // Load footer
        require_once(PATH."inc/footer.php");
 } else {

-       // You have to configure first!
+       // You have to install first!

        LOAD_URL("install.php");
 }
 
        LOAD_URL("install.php");
 }