Fixes for wrong config entries

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index fb96fc0f1fab1a293219bb45963151dab8cf84ad..b1d5bc92f8015bcb87cdc279fcc5197f71ab9fc4 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -44,7 +44,7 @@ if ((!EXT_IS_ACTIVE("autopurge")) || ($_CONFIG['auto_purge_active'] == "N")) {
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?
 } // END - if
 
 // Shall I look for inactive accounts and autopurge inactive accounts?

-if ($_CONFIG['ap_inactive'] == "Y") {
+if ($_CONFIG['autopurge_inactive'] == "Y") {

        // Ok, let's have a look...
        $since = bigintval($_CONFIG['ap_inactive_since']);
        $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid'];
        // Ok, let's have a look...
        $since = bigintval($_CONFIG['ap_inactive_since']);
        $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid'];

diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index 65219b2d7357a487c9cd533380187fa5fabc4266..7e997f2a2c3a852a2a0595f81b5ce70a609c87ea 100644 (file)
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -44,7 +44,7 @@ if ((!EXT_IS_ACTIVE("autopurge")) || ($_CONFIG['auto_purge_active'] == "N")) {
 } // END - if
 
 // Shall I auto-purge unconfirmed accounts?
 } // END - if
 
 // Shall I auto-purge unconfirmed accounts?

-if ($_CONFIG['ap_unconfirmed'] == "Y") {
+if ($_CONFIG['autopurge_unconfirmed'] == "Y") {

        // Init variables and find unconfirmed accounts which I shall auto-purge
        $time = bigintval($_CONFIG['ap_un_time']);
        $result_uncon = SQL_QUERY_ESC("SELECT userid, email, joined
        // Init variables and find unconfirmed accounts which I shall auto-purge
        $time = bigintval($_CONFIG['ap_un_time']);
        $result_uncon = SQL_QUERY_ESC("SELECT userid, email, joined

diff --git a/inc/databases.php b/inc/databases.php
index 3af828913ac8ace85b924a6388cff1405da6006d..d6cbc5cba45b3a62b3c1fa512918f51143f7c9b2 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level

-define('CURR_SVN_REVISION', "400");
+define('CURR_SVN_REVISION', "402");

 
 // 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/libs/task_functions.php b/inc/libs/task_functions.php
index 7437043b4634d4f9dbb9daf20794a252386888bd..2d06f6575f124ec9454982684fb77a4cd272314b 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -354,7 +354,7 @@ ORDER BY d.userid";
 
                // Autopurge installed?
                $LAST = "";
 
                // Autopurge installed?
                $LAST = "";

-               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {

                        // Use last online timestamp to keep inactive members away from here
                        $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
                }
                        // Use last online timestamp to keep inactive members away from here
                        $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
                }


@@ -372,7 +372,7 @@ ORDER BY active_bonus DESC, userid";
 
                // Autopurge installed?
                $LAST = "";
 
                // Autopurge installed?
                $LAST = "";

-               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+               if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {

                        // Use last online timestamp to keep inactive members away from here
                        $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
                }
                        // Use last online timestamp to keep inactive members away from here
                        $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
                }

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 1fa6a0c5a1caca6121a52ead2017b18877cc6f05..e4b9716e8318e8d643e17229185448007a0c1483 100644 (file)
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -50,7 +50,7 @@ $YEAR  = date('Y', time());
 
 // Shall I include only active members?
 $ADD = "%s"; $VALUE = "";
 
 // Shall I include only active members?
 $ADD = "%s"; $VALUE = "";

-if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {

        $ADD = " AND last_online >= (UNIX_TIMESTAP() - %s)";
        $VALUE = $_CONFIG['ap_inactive_since'];
 }
        $ADD = " AND last_online >= (UNIX_TIMESTAP() - %s)";
        $VALUE = $_CONFIG['ap_inactive_since'];
 }

diff --git a/inc/modules/admin/what-autopurge.php b/inc/modules/admin/what-autopurge.php
index cb1e91f1d9d7a90e05aec04e1a4ecc9e362cbe6b..54d22e21a3c2c27cd2268dd2412d45df476720b3 100644 (file)
--- a/inc/modules/admin/what-autopurge.php
+++ b/inc/modules/admin/what-autopurge.php
@@ -45,12 +45,12 @@ if (isset($_POST['ok'])) {
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Setup constants for the template
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Setup constants for the template

-       switch ($_CONFIG['ap_inactive'])
+       switch ($_CONFIG['autopurge_inactive'])

        {
                case 'Y': define('__YES_IN', " checked"); define('__NO_IN', "");         break;
                case 'N': define('__YES_IN', "");         define('__NO_IN', " checked"); break;
        }
        {
                case 'Y': define('__YES_IN', " checked"); define('__NO_IN', "");         break;
                case 'N': define('__YES_IN', "");         define('__NO_IN', " checked"); break;
        }

-       switch ($_CONFIG['ap_unconfirmed'])
+       switch ($_CONFIG['autopurge_unconfirmed'])

        {
                case 'Y': define('__YES_UN', " checked"); define('__NO_UN', "");         break;
                case 'N': define('__YES_UN', "");         define('__NO_UN', " checked"); break;
        {
                case 'Y': define('__YES_UN', " checked"); define('__NO_UN', "");         break;
                case 'N': define('__YES_UN', "");         define('__NO_UN', " checked"); break;

diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php
index 064151e00a172fc3cf09110faab5a19730e051ab..686e6f3a8ba27b45f0c9b2c214bdca963ecd57c9 100644 (file)
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -45,23 +45,23 @@ if (isset($_POST['ok'])) {
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Output de-/activation selections
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Output de-/activation selections

-       define('__AP_INACTIVE_SELECTION'   , ADD_SELECTION("yn", $_CONFIG['ap_inactive']   , "autopurge_inactive"));
-       define('__AP_UNCONFIRMED_SELECTION', ADD_SELECTION("yn", $_CONFIG['ap_unconfirmed'], "autopurge_unconfirmed"));
-       define('__AP_TASKS_SELECTION'      , ADD_SELECTION("yn", $_CONFIG['ap_tasks']      , "autopurge_tasks"));
-       define('__AP_DEL_MAILS_SELECTION'  , ADD_SELECTION("yn", $_CONFIG['ap_del_mails']  , "ap_del_mails"));
+       define('__AP_INACTIVE_SELECTION'   , ADD_SELECTION("yn", $_CONFIG['autopurge_inactive']   , "autopurge_inactive"));
+       define('__AP_UNCONFIRMED_SELECTION', ADD_SELECTION("yn", $_CONFIG['autopurge_unconfirmed'], "autopurge_unconfirmed"));
+       define('__AP_TASKS_SELECTION'      , ADD_SELECTION("yn", $_CONFIG['ap_tasks']             , "autopurge_tasks"));
+       define('__AP_DEL_MAILS_SELECTION'  , ADD_SELECTION("yn", $_CONFIG['ap_del_mails']         , "ap_del_mails"));

 
        // Output notification selections
 
        // Output notification selections

-       define('__AP_NOTIFY_INACTIVE'      , ADD_SELECTION("yn", $_CONFIG['ap_in_mail']    , "ap_in_notify"));
-       define('__AP_NOTIFY_UNCONFIRMED'   , ADD_SELECTION("yn", $_CONFIG['ap_un_mail']    , "ap_un_notify"));
-       define('__AP_NOTIFY_TASKS'         , ADD_SELECTION("yn", $_CONFIG['ap_tasks_mail'] , "ap_tasks_notify"));
-       define('__AP_NOTIFY_DEL_MAILS'     , ADD_SELECTION("yn", $_CONFIG['ap_dm_notify']  , "ap_dm_notify"));
+       define('__AP_NOTIFY_INACTIVE'      , ADD_SELECTION("yn", $_CONFIG['ap_in_mail']   , "ap_in_notify"));
+       define('__AP_NOTIFY_UNCONFIRMED'   , ADD_SELECTION("yn", $_CONFIG['ap_un_mail']   , "ap_un_notify"));
+       define('__AP_NOTIFY_TASKS'         , ADD_SELECTION("yn", $_CONFIG['ap_tasks_mail'], "ap_tasks_notify"));
+       define('__AP_NOTIFY_DEL_MAILS'     , ADD_SELECTION("yn", $_CONFIG['ap_dm_notify'] , "ap_dm_notify"));

 
        // Output time selection boxes
 
        // Output time selection boxes

-       define('__AP_IN_SINCE'      , CREATE_TIME_SELECTIONS($_CONFIG['ap_inactive_since']  , "ap_inactive_since"  , "MWDh"));
-       define('__AP_IN_TIME'       , CREATE_TIME_SELECTIONS($_CONFIG['ap_in_time']   , "ap_inactive_time"   , "MWDh"));
-       define('__AP_UN_TIME'       , CREATE_TIME_SELECTIONS($_CONFIG['ap_un_time']   , "ap_unconfirmed_time", "MWDh"));
-       define('__AP_TASK_TIME'     , CREATE_TIME_SELECTIONS($_CONFIG['ap_tasks_time'], "ap_tasks_time"      , "MWDh"));
-       define('__AP_DEL_MAILS_TIME', CREATE_TIME_SELECTIONS($_CONFIG['ap_dm_timeout'], "ap_dm_timeout"      , "MWDh"));
+       define('__AP_IN_SINCE'      , CREATE_TIME_SELECTIONS($_CONFIG['ap_inactive_since'], "ap_inactive_since"  , "MWDh"));
+       define('__AP_IN_TIME'       , CREATE_TIME_SELECTIONS($_CONFIG['ap_in_time']       , "ap_inactive_time"   , "MWDh"));
+       define('__AP_UN_TIME'       , CREATE_TIME_SELECTIONS($_CONFIG['ap_un_time']       , "ap_unconfirmed_time", "MWDh"));
+       define('__AP_TASK_TIME'     , CREATE_TIME_SELECTIONS($_CONFIG['ap_tasks_time']    , "ap_tasks_time"      , "MWDh"));
+       define('__AP_DEL_MAILS_TIME', CREATE_TIME_SELECTIONS($_CONFIG['ap_dm_timeout']    , "ap_dm_timeout"      , "MWDh"));

 
        // Mail confirmation links
        define('_CFG_AUTO_PURGE', CREATE_TIME_SELECTIONS($_CONFIG['auto_purge'], "auto_purge", "MWD"));
 
        // Mail confirmation links
        define('_CFG_AUTO_PURGE', CREATE_TIME_SELECTIONS($_CONFIG['auto_purge'], "auto_purge", "MWD"));

diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php
index 5e947fd406c2b271f55f00c8e1833e1532811cae..ff966af9a8c54cafcb442b60f1ff2c3ff233ec42 100644 (file)
--- a/inc/modules/admin/what-config_transfer.php
+++ b/inc/modules/admin/what-config_transfer.php
@@ -52,7 +52,7 @@ define('__TRANS_BALANCE_VALUE', $_CONFIG['transfer_balance']);
 define('__TRANS_CODE_VALUE'   , $_CONFIG['transfer_code']);
 
 // Autppurge expired transfer entries?
 define('__TRANS_CODE_VALUE'   , $_CONFIG['transfer_code']);
 
 // Autppurge expired transfer entries?

-switch ($_CONFIG['ap_inactive'])
+switch ($_CONFIG['autopurge_inactive'])

 {
        case 'Y': define('__YES_AP', " selected=\"selected\""); define('__NO_AP', "");          break;
        case 'N': define('__YES_AP', "");          define('__NO_AP', " selected=\"selected\""); break;
 {
        case 'Y': define('__YES_AP', " selected=\"selected\""); define('__NO_AP', "");          break;
        case 'N': define('__YES_AP', "");          define('__NO_AP', " selected=\"selected\""); break;

diff --git a/templates/de/html/member/member_surfbar_start_dynamic.tpl b/templates/de/html/member/member_surfbar_start_dynamic.tpl
index f5b21710ef401f7a87a0e97e90c65df25bc7186f..5b36bb0439b1eb8badf2089f12ecd4e686eb43a2 100644 (file)
--- a/templates/de/html/member/member_surfbar_start_dynamic.tpl
+++ b/templates/de/html/member/member_surfbar_start_dynamic.tpl
@@ -11,7 +11,8 @@
                m&uuml;ssen Sie mindestens <strong>$content[surfbar_min_time]</strong>
                und maximal <strong>$content[surfbar_max_time]</strong> zus&auml;tzlich
                zur Basiszeit angesehen haben und k&ouml;nnen die selbe Seite erst nach
                m&uuml;ssen Sie mindestens <strong>$content[surfbar_min_time]</strong>
                und maximal <strong>$content[surfbar_max_time]</strong> zus&auml;tzlich
                zur Basiszeit angesehen haben und k&ouml;nnen die selbe Seite erst nach

-               <strong>$content[surfbar_dynamic_lock]</strong> wieder aufrufen.
+               zus&auml;tzlichen <strong>$content[surfbar_dynamic_lock]</strong> wieder
+               aufrufen.

        </div>
 
        <div style="padding:5px">
        </div>
 
        <div style="padding:5px">