Caching of expensive PHP functions:

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

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 816f95cc5177777ff0701e90931cd491e31c1965..82c7fe91fb5a2f5ad3414a07fc9d17a4f2ad60ee 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -51,9 +51,9 @@ setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // SQL commands to run
-               addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`");
-               addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`");
-               addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`");
+               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`');
+               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`');
+               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_rallye_data` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -104,9 +104,9 @@ PRIMARY KEY (id)
 
        case 'remove': // Do stuff when removing extension
                // Drop tables
-               addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`");
-               addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`");
-               addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`");
+               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`');
+               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`');
+               addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`');
 
                // Remove menus
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='rallye'");
@@ -114,7 +114,7 @@ PRIMARY KEY (id)
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='rallyes'");
 
                // Unregister filter
-               unregisterFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, getExtensionDryRun());
+               unregisterFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, isExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension
@@ -312,7 +312,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                                addExtensionUpdateDependency('sql_patches');
 
                                // Register filter
-                               registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, getExtensionDryRun());
+                               registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, isExtensionDryRun());
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
@@ -331,11 +331,11 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                // @TODO Move this code into rallye_functions.php
                if (getOutputMode() != 1) {
                        // Get total member count
-                       $total = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+                       $total = getTotalConfirmedUser();
 
                        // Add more data on higher versions
                        $ADD1 = ''; $ADD2 = ''; $OR = '';
-                       if (getExtensionVersion('rallye') >= '0.2.0') {
+                       if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
                                $ADD1 = ", `min_users`, `min_prices`";
                                $ADD2 = ", d.min_users, d.min_prices";
                                $OR   = " OR (d.min_users <= ".$total." AND d.min_users > 0)";