More bugs resolved, thanks to profi-concept

[mailer.git] / inc / modules / guest / what-beg.php

diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php
index 36ba9831d5f937ccd372a441ac589675b84a4b62..71ab1bd55acc5bfe49487eef93149cb73b8b3ac5 100644 (file)
--- a/inc/modules/guest/what-beg.php
+++ b/inc/modules/guest/what-beg.php
@@ -35,8 +35,8 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif (!EXT_IS_ACTIVE("beg"))
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
+} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
        return;
 }
 
@@ -44,23 +44,19 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("guest", __FILE__);
 
 // Prepare constants
-define('__BEG_POINTS'    , TRANSLATE_COMMA($_CONFIG['beg_points']));
-define('__BEG_POINTS_MAX', TRANSLATE_COMMA($_CONFIG['beg_points_max']));
+define('__BEG_POINTS'    , TRANSLATE_COMMA(getConfig('beg_points')));
+define('__BEG_POINTS_MAX', TRANSLATE_COMMA(getConfig('beg_points_max')));
 if ($GLOBALS['refid'] > 0) {
        // Take referal ID from URL/Cookie
        define('__BEG_UID'       , $GLOBALS['refid']);
 } else {
        // Take default referal ID
-       define('__BEG_UID'       , $_CONFIG['def_refid']);
+       define('__BEG_UID'       , getConfig('def_refid'));
 }
 
-if (function_exists('CREATE_FANCY_TIME')) {
-       define('__BEG_TIMEOUT'    , CREATE_FANCY_TIME($_CONFIG['beg_timeout']));
-       define('__BEG_UID_TIMEOUT', CREATE_FANCY_TIME($_CONFIG['beg_uid_timeout']));
-} else {
-       define('__BEG_TIMEOUT '   , round($_CONFIG['beg_timeout']     / 60)." ".MINUTES);
-       define('__BEG_UID_TIMEOUT', round($_CONFIG['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));