X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fextensions%2Fext-beg.php;h=daf32c404c875b702c753c8389efcfa548564b38;hb=15e0995f7a4a4b2c9b1b1a9273f785cf13605829;hp=744a08408cda33731c25d1d9c96dd41a70f5517a;hpb=596c8ab32594401ca84abfbfe35513ddfff31bec;p=mailer.git
diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 744a08408c..daf32c404c 100644
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -16,7 +16,7 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -41,13 +41,13 @@ if (!defined('__SECURITY')) {
} // END - if
// Version number
-setThisExtensionVersion('0.3.4');
+setThisExtensionVersion('0.3.6');
// Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6'));
switch (getExtensionMode()) {
- case 'register': // Do stuff when installation is running
+ case 'setup': // Do stuff when installation is running
// SQL commands to run
// - Menu systems
addAdminMenuSql('setup', 'config_beg', 'Bettel-Link', 'IP-Sperre, {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütung usw. können Sie hier einstellen.', 10);
@@ -57,7 +57,7 @@ switch (getExtensionMode()) {
addConfigAddSql('beg_timeout', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 600');
addConfigAddSql('beg_userid_timeout', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 1800');
addConfigAddSql('beg_points', 'FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00100');
- addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `beg_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
+ addExtensionAddTableColumnSql('user_data', 'beg_clicks', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
// Table for IP locks
addDropTableSql('beg_ips');
@@ -66,7 +66,6 @@ switch (getExtensionMode()) {
`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
`remote_ip` VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
`timeout` VARCHAR(10) NOT NULL DEFAULT '',
-`sid` VARCHAR(255) NOT NULL DEFAULT '',
PRIMARY KEY (`id`),
INDEX (`userid`)",
'IP lock data for beg links');
@@ -82,9 +81,7 @@ INDEX (`userid`)",
// Unregister points data
unregisterExtensionPointsData('beg');
- unregisterExtensionPointsData('beg_ref');
unregisterExtensionPointsData('monthly_beg');
- unregisterExtensionPointsData('monthly_beg_ref');
// Unregister module
addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='beg' LIMIT 1");
@@ -92,6 +89,7 @@ INDEX (`userid`)",
// Unregister filter
unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'BEG_RALLYE_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());
unregisterFilter(__FILE__, __LINE__, 'init', 'BEG_PURGE_IPS_NOTIFY_USER', TRUE, isExtensionDryRun());
+ unregisterFilter(__FILE__, __LINE__, 'config_userid_exclusion_sql', 'EXCLUDE_BEG_USERID', TRUE, isExtensionDryRun());
break;
case 'activate': // Do stuff when admin activates this extension
@@ -99,7 +97,6 @@ INDEX (`userid`)",
addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='beg' LIMIT 1");
addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what` IN ('beg','beg2')");
addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='beg' LIMIT 1");
- addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='beg' LIMIT 1");
break;
case 'deactivate': // Do stuff when admin deactivates this extension
@@ -107,270 +104,9 @@ INDEX (`userid`)",
addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='beg' LIMIT 1");
addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what` IN('beg','beg2')");
addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='beg' LIMIT 1");
- addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='beg' LIMIT 1");
break;
case 'update': // Update an extension
- switch (getCurrentExtensionVersion()) {
- case '0.0.1': // SQL queries for v0.0.1
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Design "Solid-Business" eingebaut.");
- break;
-
- case '0.0.2': // SQL queries for v0.0.2
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Seit Patch 340 überflüssige HTML-Tags entfernt.");
- break;
-
- case '0.0.3': // SQL queries for v0.0.3
- addConfigAddSql('beg_points_max', 'FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.10000');
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Maximale Obergrenze an {?POINTS?} einstellbar (Standard: 0,1 {?POINTS?})");
- break;
-
- case '0.0.4': // SQL queries for v0.0.4
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Überlange Kommastellen bei Punktangaben aus Bettellink und Gastbereich entfernt und Admin-Templates repariert ("Unbekannte Spalte beg_points_ma").");
- break;
-
- case '0.0.5': // SQL queries for v0.0.5
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Im Mitgliedsmenü wurde die Beschreibung aus dem Gastmenü verwendet.");
- break;
-
- case '0.0.6': // SQL queries for v0.0.6
- addConfigAddSql('beg_userid', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Ein Mitgliedsaccount (empfehlenswert ist Ihr eigenes!) kann zum Abbuchen der {?POINTS?} verwendet werden. Template admin_config_beg.tpl (und pro!) nicht vergessen, zu aktualisieren.");
- break;
-
- case '0.0.8': // SQL queries for v0.0.8
- addConfigAddSql('beg_ip_timeout', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 1800');
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Zeitsperre gegen die selbe IP-Nummer hinzugefügt.");
- break;
-
- case '0.0.9': // SQL queries for v0.0.9
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Bitte verschieben Sie die beg-Templates (Ordner: {?PATH?}/templates/".getLanguage()."/html/) in den neuen Order beg!");
- break;
-
- case '0.1.0': // SQL queries for v0.2.1
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
- break;
-
- case '0.1.1': // SQL queries for v0.1.1
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Vorbereitung auf die neue Mediendaten v0.0.4.");
- break;
-
- case '0.1.2':
- // SQL queries for v0.1.2
- addConfigAddSql('beg_ranks', 'TINYINT(3) UNSIGNED NOT NULL DEFAULT 10');
- addConfigAddSql('beg_active', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- 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");
-
- // Menu system
- addAdminMenuSql('user', 'list_beg', 'Bettel-Rallye', 'Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.', 12);
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Optionale Bettel-Rallye möglich. Und die erbettelten {?POINTS?} können entweder nur dem bettelndem Mitglied direkt oder auch seinem Werber gutgeschrieben werden können.");
- break;
-
- case '0.1.3': // SQL queries for v0.1.3
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Erbettelte {?POINTS?} werden nach Deaktivierung der Bettel-Rallye gelöscht.");
- break;
-
- case '0.1.4': // SQL queries for v0.1.4
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Rechtlichen Hinweis im Mitgliedsbereich vergessen (member_list_beg.tpl); Template member_beg_404.tpl fehlte!");
- break;
-
- case '0.1.5': // SQL queries for v0.1.5
- addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title`='Bettellink/-rallye', descr='IP-Sperre, {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütung und auch die Bettel-Rallye können Sie hier einstellen.' WHERE `what`='config_beg' LIMIT 1");
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Fehlendes Template im Admin-Bereich hinzugefügt. Im Admin-Bereich Hinweis hinzugefügt, wenn Bettel-Rallye inaktiv ist. Bitte Script inc/monthly_beg.php löschen!");
- break;
-
- case '0.1.6': // SQL queries for v0.1.6
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Es wurden immer dem ersten bettelndem Mitglied die {?POINTS?} gutgeschrieben.");
- break;
-
- case '0.1.7': // SQL queries for v0.1.7
- addConfigAddSql('beg_ral_en_notify', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- addConfigAddSql('beg_ral_di_notify', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- addConfigAddSql('beg_new_mem_notify', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- addConfigAddSql('beg_notify_bonus', 'FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000');
- addConfigAddSql('beg_notify_wait', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 30');
- addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `beg_ral_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
- addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `beg_ral_en_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
- addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `beg_ral_di_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Die Mitglieder können nun optional automatisch über eine aktivierte und/oder deaktivierte Bettel-Rallye informiert werden. Beide Benachrichtigungen können Sie unter Einstellungen --> Bettel-Link/-rallye seperat ein- und ausschalten! Zudem ist eine Sperre gegen eingeloggte Mitglieder eingebaut, die das Klicken auf den eigenen Bettel-Link etwas erschweren soll.");
- break;
-
- case '0.1.8': // SQL queries for v0.1.8
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Fehler im täglichen Reset beseitigt.");
- break;
-
- case '0.1.9': // SQL queries for v0.1.9
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("De-/Aktivieren des mit dieser Erweiterung verknüpften Modules eingebunden.");
- break;
-
- case '0.2.0': // SQL queries for v0.2.0
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Bei {?POINTS?}-Gleichstand wird als nächstes nach wer als letztes Online war umsortiert.");
- break;
-
- case '0.2.1': // SQL queries for v0.2.1
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Fehler unknown column 'userid' beseitigt.");
- break;
-
- case '0.2.2': // SQL queries for v0.2.2
- addConfigAddSql('beg_include_own', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Eigene Mitglied-Ids sind von der Bettel-Rallye nun ausschliessbar.");
- break;
-
- case '0.2.3': // SQL queries for v0.2.3
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Abfrage des Account-Status eingebaut. Es können nur bestätigte Accounts betteln.");
- break;
-
- case '0.2.4': // SQL queries for v0.2.4
- addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras',`sort`=1 WHERE `what`='beg' LIMIT 1");
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut.");
- break;
-
- case '0.2.5': // SQL queries for v0.2.5
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
- break;
-
- case '0.2.6': // SQL queries for v0.2.6
- addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_beg_ips` ADD `sid` VARCHAR(255) NOT NULL DEFAULT ''");
- addConfigAddSql('beg_pay_mode', "ENUM('IMG','JS','BOTH','NONE') DEFAULT 'NONE' NOT NULL ;");
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("IP-Lock mit Session-Id erweitert. Tracker-Script eingefügt, dass das Einbinden des Bettel-Links als Bild/Script/CSS verhindern soll.");
- break;
-
- case '0.2.7': // SQL queries for v0.2.7
- addConfigChangeSql('beg_ral_en_notify', 'beg_ral_enable_notify', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- addConfigChangeSql('beg_ral_di_notify', 'beg_ral_disable_notify', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- addConfigChangeSql('beg_new_mem_notify', 'beg_new_member_notify', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `beg_ral_en_notify` `beg_ral_enable_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
- addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `beg_ral_di_notify` `beg_ral_disable_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Umbenannt nach neuer Namenskonvention");
- break;
-
- case '0.2.8': // SQL queries for v0.2.8
- addConfigChangeSql('beg_ral_enable_notify', 'beg_rallye_enable_notify', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- addConfigChangeSql('beg_ral_disable_notify', 'beg_rallye_disable_notify', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
- addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `beg_ral_enable_notify` `beg_rallye_enable_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
- addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `beg_ral_disable_notify` `beg_rallye_disable_notify` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Umbenannt nach neuer Namenskonvention");
- break;
-
- case '0.2.9': // SQL queries for v0.2.9
- addDropTableSql('beg_referrals');
- addCreateTableSql('beg_referrals', "
-`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-`userid` BIGINT(20) UNSIGNED NULL DEFAULT NULL,
-`remote_ip` VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
-`timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-`referral_url` TINYTEXT NOT NULL,
-PRIMARY KEY (`id`),
-INDEX (`userid`)",
- 'Recorded referral URLs');
-
- // Add admin menu
- addAdminMenuSql('user','list_beg_referral_urls','Bettel-Referrals auflisten','Listet alle Bettellink-Aufrufe inklusive Referral-URL auf.','13');
-
- // Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Loggen der Referral-URLs hinzugefügt.");
- break;
-
- case '0.3.0': // SQL queries for v0.3.0
- addConfigDropSql('beg_mode');
-
- // Register points data
- registerExtensionPointsData('beg' , 'points', 'LOCKED', 'DIRECT');
- registerExtensionPointsData('monthly_beg', 'points', 'LOCKED', 'DIRECT');
-
- // This depends on ext-sql_patches
- addExtensionDependency('sql_patches');
-
- // Update notes
- setExtensionUpdateNotes("Monatliche Bettelrallye und die erbettelten {?POINTS?} werden nun über die Tabelle {OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data verwaltet.");
- break;
-
- case '0.3.1': // SQL queries for v0.3.1
- // Add/move menu
- addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='beg2'");
- addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `action`='members',`sort`=3 WHERE `what`='beg' LIMIT 1");
- addMemberMenuSql('rals', 'beg2', 'Bettel-Rallye', 3);
-
- // Update notes
- setExtensionUpdateNotes("Bettel-Rallye re-hinzugefügt.");
- break;
-
- case '0.3.2': // SQL queries for v0.3.2
- // Add module entry
- addModuleSql('beg', '{OPEN_TEMPLATE}MODULE_BEG_TITLE{CLOSE_TEMPLATE}', 'Y', 'Y', 'N', 'N');
-
- // Set module title
- addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Betteln bei {OPEN_CONFIG}MAIN_TITLE{CLOSE_CONFIG}' WHERE `module`='beg' AND `title`='' LIMIT 1");
-
- // Update notes
- setExtensionUpdateNotes("Modul registriert und bei leerem Titel mit einem Standardtitel versehen.");
- break;
-
- case '0.3.3': // SQL queries for v0.3.3
- // Register a filter
- registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'BEG_RALLYE_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());
- registerFilter(__FILE__, __LINE__, 'init', 'BEG_PURGE_IPS_NOTIFY_USER', FALSE, TRUE, isExtensionDryRun());
-
- // This depends on ext-register
- addExtensionDependency('register');
-
- // Update notes
- setExtensionUpdateNotes("Filter für Anmeldeformular und Aufrämen der IPs hinzugefügt.");
- break;
-
- case '0.3.4': // SQL queries for v0.3.4
- // Register points data
- registerExtensionPointsData('beg_ref' , 'points', 'LOCKED', 'DIRECT');
- registerExtensionPointsData('monthly_beg_ref', 'points', 'LOCKED', 'DIRECT');
-
- // SQL queries (renaming)
- addRenameTableSql('beg_referrals', 'referrals');
- addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_beg_referrals` CHANGE `referal_url` `referral_url` TINYTEXT NOT NULL");
- addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='list_beg_referral_urls' WHERE `what`='list_beg_referal_urls' LIMIT 1");
-
- // Update notes
- setExtensionUpdateNotes("Verwendungszwecke für Referralgutgschriften registriert.");
- break;
- } // END - switch
break;
case 'modify': // When the extension got modified
@@ -383,7 +119,7 @@ INDEX (`userid`)",
break;
default: // Unknown extension mode
- logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
+ reportBug(__FILE__, __LINE__, sprintf('Unknown extension mode %s in extension %s detected.', getExtensionMode(), getCurrentExtensionName()));
break;
} // END - switch