Hotfix

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

diff --git a/inc/extensions/ext-earning.php b/inc/extensions/ext-earning.php
index a4b61dddd433bdd5e7ea892d2e42a216d600ef60..43f9924f368791c745da7c733923cb3978e5c3ac 100644 (file)
--- a/inc/extensions/ext-earning.php
+++ b/inc/extensions/ext-earning.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -52,20 +52,20 @@ enableExtensionProductive(false);
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
                // Add member menu
-               addMemberMenuSql('earn', 'earnings', 'Zusatzverdienste', 2);
+               addMemberMenuSql('earn', 'earning', 'Zusatzverdienste', 2);
 
                // Admin menu
-               addAdminMenuSql('setup', 'list_earnings', 'Zusatzverdienste...', 'Veralten Sie hier bequem alle Zusatzverdienste (wie z.B. vergütete PopUps usw.).', 6);
+               addAdminMenuSql('setup', 'list_earning', 'Zusatzverdienste...', 'Veralten Sie hier bequem alle Zusatzverdienste (wie z.B. vergütete PopUps usw.).', 6);
 
                // Earning data table
                addDropTableSql('earning_data');
                addCreateTableSql('earning_data', "
 `earning_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `earning_group` VARCHAR(255) NOT NULL DEFAULT 'INVALID',
-`earning_name` VARCHAR(255) NOT NULL DEFAULT 'INVALID',
+`earning_provider` VARCHAR(255) NOT NULL DEFAULT 'INVALID',
 `earning_sorting` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`earning_id`),
-UNIQUE `earning_group_name` (`earning_group`,`earning_name`)",
+UNIQUE INDEX `earning_group_name` (`earning_group`,`earning_provider`)",
                        'Registered (extra) earnings');
 
                // User->earnings connection table
@@ -76,13 +76,17 @@ UNIQUE `earning_group_name` (`earning_group`,`earning_name`)",
 `earning_userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `earning_active` ENUM('Y','N') NOT NULL DEFAULT 'Y',
 `earning_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-`earning_cancelled` TIMESTAMP NULL DEFAULT NULL,
+`earning_canceled` TIMESTAMP NULL DEFAULT NULL,
 `earning_daily_amount` SMALLINT(7) NOT NULL DEFAULT 0,
+`earning_current_amount` SMALLINT(7) NOT NULL DEFAULT 0,
 `earning_points` FLOAT(20,5) NOT NULL DEFAULT 0.00000,
 PRIMARY KEY (`id`),
-UNIQUE `user_earning` (`earning_id`,`earning_userid`),
+UNIQUE INDEX `user_earning` (`earning_id`,`earning_userid`),
 INDEX (`earning_userid`)",
                        'User->Earning connections');
+
+               // Register filter
+               registerFilter('member_footer_extras', 'ADD_EARNING_GROUP_POPUP', false, true, isExtensionDryRun());
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -91,18 +95,21 @@ INDEX (`earning_userid`)",
                addDropTableSql('user_earning');
 
                // Delete entries in menus
-               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='earnings' LIMIT 1");
-               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='list_earnings' LIMIT 1");
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='earning' LIMIT 1");
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='list_earning' LIMIT 1");
+
+               // Unregister filter
+               unregisterFilter(__FUNCTION__, __LINE__, 'member_footer_extras', 'ADD_EARNING_GROUP_POPUP', true, isExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension
                // SQL commands to run
-               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='earnings' LIMIT 1");
+               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='earning' LIMIT 1");
                break;
 
        case 'deactivate': // Do stuff when admin deactivates this extension
                // SQL commands to run
-               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='earnings' LIMIT 1");
+               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='earning' LIMIT 1");
                break;
 
        case 'update': // Update an extension