Tons of rewrites (SQL queries), surfbar nearly finished (working: surfing with static...

[mailer.git] / inc / extensions / ext-beg.php

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index d30facebfcfb4b9a74ff64cb046f6db5e3e61706..ab6b8826f8212f1e95be39a8214ec4c2233f0211 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -260,7 +260,7 @@ case "update": // Update an extension
 
 default: // Do stuff when extension is loaded
        $dummy = LOAD_CONFIG();
-       $_CONFIG = array_merge($_CONFIG, $dummy);
+       $_CONFIG = merge_array($_CONFIG, $dummy);
        unset($dummy);
 
        // Remove old entries
@@ -268,18 +268,18 @@ default: // Do stuff when extension is loaded
        if ($_CONFIG['beg_uid_timeout'] > $OLD) $OLD = $_CONFIG['beg_uid_timeout'];
        $result_ext = SQL_QUERY("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_beg_ips WHERE timeout < ".(time() - $OLD - 60*60), __FILE__, __LINE__);
 
-       if (defined('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
+       if (isBooleanConstantAndTrue('__DAILY_RESET') && (!DEBUG_MODE) && ($CSS != 1))
        {
                // Daily reset was run so let's check if begging rallye is active
                if ($_CONFIG['beg_rallye'] == "Y")
                {
                        // Check for our winers
-                       $INC_POOL[] = PATH."inc/monthly/monthly_beg.php";
+                       $INC_POOL[] = sprintf("%sinc/monthly/monthly_beg.php", PATH);
                }
                 else
                {
                        // Reset begging points
-                       $INC_POOL[] = PATH."inc/reset/reset_beg.php";
+                       $INC_POOL[] = sprintf("inc/reset/reset_beg.php", PATH);
                }
        }
 
@@ -287,7 +287,7 @@ default: // Do stuff when extension is loaded
        if (($_CONFIG['beg_rallye'] == "Y") && ($_CONFIG['beg_new_mem_notify'] == "Y"))
        {
                // Include file for sending out mails
-               $INC_POOL[] = PATH."inc/mails/beg_mails.php";
+               $INC_POOL[] = sprintf("%sinc/mails/beg_mails.php", PATH);
        }
 
        // Return code for the URL