Countless fixes, ext-grade started:

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

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 069bd9de865aa6f6d2a3c73877c5a41f0405eca0..59a28de5a8564de2714ce37cf5d0fdf94dff3735 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -159,11 +159,9 @@ PRIMARY KEY (`id`)
                                addConfigAddSql('beg_rallye', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `beg_points` FLOAT(21,5) UNSIGNED NOT NULL DEFAULT 0.00000");
 
-                               $visible = 'N'; $locked = 'Y';
-                               if (isExtensionActive('beg')) {
-                                       $visible = 'Y';
-                                       $locked = 'N';
-                               } // END - if
+                               // Determine if menu entries are locked and/or visible to the user
+                               $visible = convertBooleanToYesNo(isExtensionActive('beg'));
+                               $locked = convertBooleanToYesNo(!isExtensionActive('beg'));
 
                                addMemberMenuSql('main','beg2','Bettel-Rallye', $visible, $locked, 7);
                                addAdminMenuSql('user','list_beg','Bettel-Rallye','Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.','12');
@@ -311,7 +309,9 @@ INDEX (`userid`)
        case 'init': // When extension is initialized
                // Remove old entries
                $OLD = getBegTimeout();
-               if (getBegUseridTimeout() > $OLD) $OLD = getBegUseridTimeout();
+               if (getBegUseridTimeout() > $OLD) {
+                       $OLD = getBegUseridTimeout();
+               } // END - if
                SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_beg_ips` WHERE (UNIX_TIMESTAMP() - `timeout`) >= ' . ($OLD + 60*60) . '', __FILE__, __LINE__);
 
                // Check for beg rallye is active and send mails out