From 449139831a4780f563410e30d629c39bd1286c82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 14 Jul 2011 15:51:40 +0000 Subject: [PATCH] Menu entries moved to ext-user: - 'add_points' and 'sub_points' are user actions and should belong into ext-user - Some minor comment improvements --- inc/extensions/ext-admins.php | 4 ++-- inc/extensions/ext-bank.php | 2 +- inc/extensions/ext-birthday.php | 2 +- inc/extensions/ext-cache.php | 2 +- inc/extensions/ext-country.php | 2 +- inc/extensions/ext-coupon.php | 4 ++-- inc/extensions/ext-grade.php | 8 ++++---- inc/extensions/ext-holiday.php | 2 +- inc/extensions/ext-menu.php | 3 ++- inc/extensions/ext-newsletter.php | 2 +- inc/extensions/ext-nickname.php | 2 +- inc/extensions/ext-primera.php | 2 +- inc/extensions/ext-rallye.php | 4 ++-- inc/extensions/ext-register.php | 4 ++-- inc/extensions/ext-removeip.php | 2 +- inc/extensions/ext-sponsor.php | 6 +++--- inc/extensions/ext-sql_patches.php | 17 +++++++---------- inc/extensions/ext-surfbar.php | 10 +++++----- inc/extensions/ext-task.php | 2 +- inc/extensions/ext-theme.php | 2 +- inc/extensions/ext-transfer.php | 10 +++++----- inc/extensions/ext-user.php | 19 ++++++++++++++++--- inc/filters.php | 4 ++-- inc/functions.php | 2 +- inc/libs/register_functions.php | 2 +- inc/modules/member/what-transfer.php | 2 +- inc/referal-functions.php | 2 +- install/tables.sql | 2 +- 28 files changed, 68 insertions(+), 57 deletions(-) diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index c70d07f972..441307bbb5 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -110,7 +110,7 @@ switch (getExtensionMode()) { `what_menu` VARCHAR(255) NOT NULL DEFAULT '', `access_mode` ENUM('deny','allow') NOT NULL DEFAULT 'deny', PRIMARY KEY (`id`), -KEY (`admin_id`)", +INDEX (`admin_id`)", 'Access control lines (ACLs)'); // Update notes (these will be set as task text!) @@ -291,7 +291,7 @@ INDEX (`admin_id`)", break; case '0.7.1': // SQL queries for v0.7.1 - // Update depends on sql_patches + // Update depends on ext-sql_patches addExtensionDependency('sql_patches'); // Add filters diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index 3c12856dff..2a146ade0b 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -73,7 +73,7 @@ switch (getExtensionMode()) { `account_type` ENUM('CHECK','SAVING') NOT NULL DEFAULT 'CHECK', `overdraft_credit` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000, PRIMARY KEY (`id`), -UNIQUE KEY (`pin`), +UNIQUE (`pin`), INDEX `userid_type` (`userid`, `account_type`), INDEX (`account_created`), INDEX (`account_locked`), diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 223b85d70f..e2f2af4a72 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -84,7 +84,7 @@ switch (getExtensionMode()) { `points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `chk_value` VARCHAR(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), -KEY (`userid`)", +INDEX (`userid`)", 'Pending birthday codes'); // Admin menu diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index fe584e1459..b77955a9f6 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -184,7 +184,7 @@ switch (getExtensionMode()) { break; case '0.2.0': // SQL queries for v0.2.0 - // This update depends on sql_patches + // This update depends on ext-sql_patches addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php index a8a8fe7392..f7a229d83a 100644 --- a/inc/extensions/ext-country.php +++ b/inc/extensions/ext-country.php @@ -59,7 +59,7 @@ switch (getExtensionMode()) { `descr` VARCHAR(255) NOT NULL DEFAULT 'Deutschland', `is_active` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`id`), -UNIQUE KEY (`code`)", +UNIQUE (`code`)", 'Country codes and their full-length descriptions'); // Insert first (Germany) country diff --git a/inc/extensions/ext-coupon.php b/inc/extensions/ext-coupon.php index 7b532b0830..0e0b934bd4 100644 --- a/inc/extensions/ext-coupon.php +++ b/inc/extensions/ext-coupon.php @@ -77,8 +77,8 @@ PRIMARY KEY (`id`)", `coupon_code` VARCHAR(30) NULL DEFAULT NULL, `cashed_on` TIMESTAMP NULL DEFAULT NULL, PRIMARY KEY (`id`), -UNIQUE KEY `coupon_user` (`coupon_id`, `userid`), -UNIQUE KEY (`coupon_code`)", +UNIQUE `coupon_user` (`coupon_id`, `userid`), +UNIQUE (`coupon_code`)", 'Coupon->user connection'); // Configuration entries diff --git a/inc/extensions/ext-grade.php b/inc/extensions/ext-grade.php index c09535931c..5302dc70e6 100644 --- a/inc/extensions/ext-grade.php +++ b/inc/extensions/ext-grade.php @@ -59,7 +59,7 @@ switch (getExtensionMode()) { `grade_description` TINYTEXT NOT NULL, `grade_parent_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL, PRIMARY KEY (`id`), -UNIQUE KEY (`grade_name`), +UNIQUE (`grade_name`), INDEX (`grade_parent_id`)", 'Grade general data'); @@ -73,7 +73,7 @@ INDEX (`grade_parent_id`)", `reached_mails` BIGINT(20) UNSIGNED NULL DEFAULT NULL, `time_valid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`), -UNIQUE KEY (`grade_cash_name`)", +UNIQUE (`grade_cash_name`)", 'Grade data if the grade have been "cashed"'); // Connection grade<->cash data @@ -83,7 +83,7 @@ UNIQUE KEY (`grade_cash_name`)", `grade_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `grade_cash_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`), -UNIQUE KEY `grade_cash` (`grade_id`, `grade_cash_id`), +UNIQUE `grade_cash` (`grade_id`, `grade_cash_id`), INDEX (`grade_cash_id`)", 'Grade<->cash data connection'); @@ -95,7 +95,7 @@ INDEX (`grade_cash_id`)", `grade_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `grade_expired` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), -UNIQUE KEY (`userid`, `grade_id`), +UNIQUE (`userid`, `grade_id`), INDEX (`grade_id`)", 'Grade<->user connection'); diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index dedf0828dd..765fd276d7 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -191,7 +191,7 @@ INDEX (`userid`)", addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('member', '', 'del_holiday')"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('config', '', 'config_holiday')"); - // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin + // Depends on ext-sql_patches (or you have to execute these both SQL statements by phpMyAdmin addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-menu.php b/inc/extensions/ext-menu.php index c7e9681b92..67991a4b55 100644 --- a/inc/extensions/ext-menu.php +++ b/inc/extensions/ext-menu.php @@ -97,14 +97,15 @@ switch (getExtensionMode()) { // Change menu-string addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title`='Admin-Menü editieren' WHERE `what` = 'adminedit' LIMIT 1"); + // Update notes (these will be set as task text!) setExtensionUpdateNotes("Menüpunkt 'Vom Admin editieren' in 'Admin-Menü editieren' bei bereits bestehenden Installationen umändern."); break; case '0.0.4': // SQL queries for v0.0.4 // Change menu-string addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu` CHANGE `title` `title` VARCHAR(255) NOT NULL DEFAULT ''"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title`='{OPEN_TEMPLATE}DEFAULT_POINTS{CLOSE_TEMPLATE} gutschreiben' WHERE `what` = 'add_points' LIMIT 1"); + // Update notes (these will be set as task text!) setExtensionUpdateNotes("VARCHAR(50) ist zu kurz für Linktitel (wegen der dynamischen Anteile)."); break; } // END - switch diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php index f3ee17bd03..a6211df683 100644 --- a/inc/extensions/ext-newsletter.php +++ b/inc/extensions/ext-newsletter.php @@ -179,7 +179,7 @@ INDEX `newsletter_id` (`nl_id`)", `nl_order_placed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `nl_order_accepted` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`nl_order_id`), -UNIQUE KEY `sponsor_nl_topic` (`nl_sponsor_id`, `nl_id`, `nl_topic_id`), +UNIQUE `sponsor_nl_topic` (`nl_sponsor_id`, `nl_id`, `nl_topic_id`), INDEX `topic` (`nl_topic_id`)", 'Newsletter orders'); diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index 2de44ce775..473be77472 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -74,7 +74,7 @@ switch (getExtensionMode()) { case 'update': // Update an extension switch (getCurrentExtensionVersion()) { case '0.0.1': // SQL queries for v0.0.1 - // This update depends on sql_patches update! + // This update depends on ext-sql_patches update! addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php index 479be17bd6..9d7373da88 100644 --- a/inc/extensions/ext-primera.php +++ b/inc/extensions/ext-primera.php @@ -65,7 +65,7 @@ switch (getExtensionMode()) { `primera_api_message` TINYTEXT, `primera_api_status` VARCHAR(255) NULL DEFAULT NULL, PRIMARY KEY (`id`), -KEY (`userid`)", +INDEX (`userid`)", 'Transfers in Primera'); // Configuration diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 812197fd9e..54842a0d8d 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -63,7 +63,7 @@ switch (getExtensionMode()) { `send_notify` ENUM('Y','N') NOT NULL DEFAULT 'Y', `notified` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`id`), -KEY (`admin_id`)", +INDEX (`admin_id`)", 'Main rallye data'); addDropTableSql('rallye_prices'); @@ -308,7 +308,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu break; case '0.3.5': // SQL queries for 0.3.5 - // This update depends on sql_patches + // This update depends on ext-sql_patches addExtensionDependency('sql_patches'); // Register filter diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index 473c5195d0..5dbc85aaa2 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -99,7 +99,7 @@ PRIMARY KEY (`id`)", break; case '0.1.1': // SQL queries for v0.1.1 - // This update depends on sql_patches update! + // This update depends on ext-sql_patches update! addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) @@ -107,7 +107,7 @@ PRIMARY KEY (`id`)", break; case '0.1.3': // SQL queries for v0.1.3 - // This update depends on sql_patches update! + // This update depends on ext-sql_patches update! addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php index 274655c89f..8d6f633beb 100644 --- a/inc/extensions/ext-removeip.php +++ b/inc/extensions/ext-removeip.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'update': // Update an extension switch (getCurrentExtensionVersion()) { case '0.0.1': // SQL queries for v0.0.1 - // Update depends on sql_patches + // Update depends on ext-sql_patches addExtensionDependency('sql_patches'); // Add filters diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index ca5943df12..6de2f5d4e3 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -95,7 +95,7 @@ switch (getExtensionMode()) { `last_payment` FLOAT(7,2) UNSIGNED NOT NULL DEFAULT 0.00, `last_currency` VARCHAR(255) NOT NULL DEFAULT '€', PRIMARY KEY (`id`), -UNIQUE KEY (`hash`), +UNIQUE (`hash`), INDEX (`refid`), INDEX (`email`)", 'Main sponsor data'); @@ -155,8 +155,8 @@ INDEX (`ext_name`)", `active` ENUM('Y','N') NOT NULL DEFAULT 'N', `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -UNIQUE KEY `action_what` (`action`, `what`), -UNIQUE KEY (`what`), +UNIQUE `action_what` (`action`, `what`), +UNIQUE (`what`), INDEX (`action`)", 'Sponsor menu'); // diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 8cc9bbc63a..756e873e5b 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -73,7 +73,6 @@ IN ( 'list_unconfirmed', 'config_refid', 'config_title', - 'sub_points', 'config_admin', 'config_proxy', 'config_session', @@ -298,10 +297,8 @@ IN ( break; case '0.2.6': // SQL queries for v0.2.6 - addAdminMenuSql('user','sub_points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG} abziehen','Allen oder einem Mitglied {OPEN_CONFIG}POINTS{CLOSE_CONFIG} abziehen.', 8); - // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Abzug von {?POINTS?} nun möglich."); + setExtensionUpdateNotes("Verschoben nach ext-user."); break; case '0.2.7': // SQL queries for v0.2.7 @@ -338,13 +335,13 @@ IN ( break; case '0.3.1': // SQL queries for v0.3.1 - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_extensions` ADD UNIQUE KEY `ext_name` (`ext_name`)"); - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD UNIQUE KEY `login` (`login`)"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_extensions` ADD UNIQUE `ext_name` (`ext_name`)"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD UNIQUE `login` (`login`)"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_refbanner` ADD INDEX `visible` (`visible`)"); - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_refdepths` ADD UNIQUE KEY `level` (`level`)"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_refdepths` ADD UNIQUE `level` (`level`)"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` ADD INDEX `level` (`level`)"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_pool` ADD INDEX `data_type` (`data_type`)"); - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_mod_reg` ADD UNIQUE KEY `module` (`module`)"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_mod_reg` ADD UNIQUE `module` (`module`)"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu` ADD INDEX `action` (`action`)"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu` ADD INDEX `what` (`what`)"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_task_system` ADD INDEX `task_type` (`task_type`)"); @@ -366,7 +363,7 @@ IN ( addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_cats` ADD INDEX `sort` (`sort`)"); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Eindeutige Schlüssel (UNIQUE KEY) und normale Schlüssel (INDEX) gesetzt."); + setExtensionUpdateNotes("Eindeutige Schlüssel (UNIQUE) und normale Schlüssel (INDEX) gesetzt."); break; case '0.3.2': // SQL queries for v0.3.2 @@ -392,7 +389,7 @@ INDEX (`la_what`)", `la_posx` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `la_posy` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`), -UNIQUE KEY (`la_id`), +UNIQUE (`la_id`), INDEX (`la_posx`), INDEX (`la_posy`)", 'LAS position and title data'); diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index e0f0156358..3c1902ebff 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -68,7 +68,7 @@ switch (getExtensionMode()) { `url_reject_reason` VARCHAR(255) NOT NULL DEFAULT '', `url_fixed_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`url_id`), -UNIQUE KEY `userid_url` (`url_userid`, `url`), +UNIQUE `userid_url` (`url_userid`, `url`), INDEX `status_userid` (`url_status`, `url_userid`)", 'Surfbar URLs'); @@ -80,7 +80,7 @@ INDEX `status_userid` (`url_status`, `url_userid`)", `locks_url_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `locks_last_surfed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`locks_id`), -UNIQUE KEY `userid_url` (`locks_userid`, `locks_url_id`), +UNIQUE `userid_url` (`locks_userid`, `locks_url_id`), INDEX (`locks_url_id`)", 'Surfbar reload locks'); @@ -92,7 +92,7 @@ INDEX (`locks_url_id`)", `salts_url_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `salts_last_salt` VARCHAR(255) NOT NULL DEFAULT '', PRIMARY KEY (`salts_id`), -UNIQUE KEY `salts_userid_url` (`salts_userid`, `salts_url_id`), +UNIQUE `salts_userid_url` (`salts_userid`, `salts_url_id`), INDEX (`salts_url_id`)", 'Surfbar last used salts'); @@ -105,7 +105,7 @@ INDEX (`salts_url_id`)", `stats_count` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `stats_last_surfed` TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`stats_id`), -UNIQUE KEY `userid_url` (`stats_userid`, `stats_url_id`), +UNIQUE `userid_url` (`stats_userid`, `stats_url_id`), INDEX (`stats_url_id`)", 'Surfbar Statistics'); @@ -117,7 +117,7 @@ INDEX (`stats_url_id`)", `actions_action` ENUM('EDIT','DELETE','PAUSE','UNPAUSE','FRAMETEST','RETREAT','RESUBMIT','BOOKNOW') NULL DEFAULT NULL, `actions_new_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL, PRIMARY KEY (`actions_id`), -UNIQUE KEY `status_action` (`actions_status`, `actions_action`)", +UNIQUE `status_action` (`actions_status`, `actions_action`)", 'Surfbar Member Actions'); // Member actions diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index 32be949f68..056064b9a5 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -75,7 +75,7 @@ switch (getExtensionMode()) { case 'update': // Update an extension switch (getCurrentExtensionVersion()) { case '0.0.1': // SQL queries for v0.0.1 - // This update depends on sql_patches update! + // This update depends on ext-sql_patches update! addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index bd04098d27..8a379e0e13 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -128,7 +128,7 @@ switch (getExtensionMode()) { `theme_active` ENUM('Y','N') NOT NULL DEFAULT 'N', `theme_ver` VARCHAR(255) NOT NULL DEFAULT '0.0.0', PRIMARY KEY (`id`), -UNIQUE KEY (`theme_path`), +UNIQUE (`theme_path`), INDEX (`theme_active`)", 'Themes'); // Admin menu diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 200775833a..875901f0b6 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -59,8 +59,8 @@ switch (getExtensionMode()) { `time_trans` VARCHAR(14) NOT NULL DEFAULT 0, `trans_id` VARCHAR(12) NOT NULL DEFAULT '', PRIMARY KEY (`id`), -KEY (`userid`), -KEY (`from_userid`)", +INDEX (`userid`), +INDEX (`from_userid`)", 'Ingoing points transfers'); // Transfers to a member @@ -74,8 +74,8 @@ KEY (`from_userid`)", `time_trans` VARCHAR(14) NOT NULL DEFAULT 0, `trans_id` VARCHAR(12) NOT NULL DEFAULT '', PRIMARY KEY (`id`), -KEY (`userid`), -KEY (`to_userid`)", +INDEX (`userid`), +INDEX (`to_userid`)", 'Outgoing points transfers'); // Admin menu @@ -231,7 +231,7 @@ KEY (`to_userid`)", addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('member', '', 'del_transfer')"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('config', '', 'config_transfer')"); - // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin + // Depends on ext-sql_patches (or you have to execute these both SQL statements by phpMyAdmin addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index c6c7368f36..5fe28784b7 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.4.5'); +setThisExtensionVersion('0.4.6'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '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', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5')); +setExtensionVersionHistory(array('0.0.0', '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', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -207,7 +207,7 @@ INDEX (`stats_type`)", break; case '0.1.1': // SQL queries for v0.1.1 - // This update depends on sql_patches update! + // This update depends on ext-sql_patches update! addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) @@ -483,6 +483,19 @@ INDEX (`refid`)", // Update notes (these will be set as task text!) setExtensionUpdateNotes("Die Spalte link_type ist nun kein ENUM mehr, um weitere Mailtypen zu erlauben."); break; + + case '0.4.6': // SQL queries for v0.4.6 + // SQL commands to run + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title`='{OPEN_TEMPLATE}DEFAULT_POINTS{CLOSE_TEMPLATE} gutschreiben' WHERE `what` = 'add_points' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title`='{OPEN_TEMPLATE}DEFAULT_POINTS{CLOSE_TEMPLATE} abziehen' WHERE `what` = 'sub_points' LIMIT 1"); + addAdminMenuSql('user','sub_points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG} abziehen','Allen oder einem Mitglied {OPEN_CONFIG}POINTS{CLOSE_CONFIG} abziehen.', 8); + + // This update depends on ext-menu update + addExtensionDependency('menu'); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Abzug von {?POINTS?} sollte nun dabei sein und Hinzufügen gefixt (war zu kurze Spalte)."); + break; } // END - switch break; diff --git a/inc/filters.php b/inc/filters.php index d030621559..b0ed40a050 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -58,7 +58,7 @@ function FILTER_FLUSH_FILTERS () { return false; } // END - if - // Is the extension sql_patches updated? + // Is the extension ext-sql_patches updated? if ((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9'))) { // Abort silently here logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters, sql_patches might be missing. isExtensionInstalled()=' . isExtensionInstalled('sql_patches') . ',isExtensionInstalledAndOlder()=' . isExtensionInstalledAndOlder('sql_patches', '0.5.9')); @@ -825,7 +825,7 @@ function FILTER_CHECK_ADMIN_ACL () { // Init random number/cache buster function FILTER_INIT_RANDOM_NUMBER () { - // Is the extension sql_patches installed and at least 0.3.6? + // Is the extension ext-sql_patches installed and at least 0.3.6? if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) { // Generate random number setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), '')); diff --git a/inc/functions.php b/inc/functions.php index fdf4b97ecf..7c6659502f 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -868,7 +868,7 @@ function generateHash ($plainText, $salt = '', $hash = true) { // Is the required extension 'sql_patches' there and a salt is not given? // 123 4 43 3 4 432 2 3 32 2 3 32 2 3 3 21 if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) && (empty($salt))) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5')) || (strlen($salt) == 32)) { - // Extension sql_patches is missing/outdated so we hash the plain text with MD5 + // Extension ext-sql_patches is missing/outdated so we hash the plain text with MD5 if ($hash === true) { // Is plain password return md5($plainText); diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index c302d4742c..87ce569f5b 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -286,7 +286,7 @@ function doRegistration () { $countryRow = '`country`'; $countryData = substr(postRequestParameter('cntry'), 0, 2); - // Add design when extension sql_patches is v0.2.7 or greater + // Add design when extension ext-theme is v0.0.8 or greater // @TODO Rewrite these all to a single filter $GLOBALS['register_sql_columns'] = ''; $GLOBALS['register_sql_data'] = ''; diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index d003780249..26abac20f4 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -353,7 +353,7 @@ switch ($mode) { `reason` VARCHAR(255) NOT NULL DEFAULT '', `time_trans` VARCHAR(10) NOT NULL DEFAULT 0, `trans_type` ENUM('IN','OUT') NOT NULL DEFAULT 'IN', -KEY (`party_userid`) +INDEX (`party_userid`) ) ENGINE = HEAP COMMENT = 'Temporary transfer table'", array(getMemberId()), __FILE__, __LINE__); // Let's begin with the incoming list diff --git a/inc/referal-functions.php b/inc/referal-functions.php index 8868904ead..ac0299e6d9 100644 --- a/inc/referal-functions.php +++ b/inc/referal-functions.php @@ -412,7 +412,7 @@ ORDER BY // Get points data for given subject function getPointsDataArrayFromSubject ($subject) { - // Extension sql_patches must be up-to-date + // Extension ext-sql_patches must be up-to-date if (isExtensionInstalledAndOlder('sql_patches', '0.8.2')) { // Please update ext-sql_patches debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.2 to continue. subject=' . $subject); diff --git a/install/tables.sql b/install/tables.sql index f851b665d9..52cb6ba6d1 100644 --- a/install/tables.sql +++ b/install/tables.sql @@ -16,7 +16,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_admins` ( `password` VARCHAR(255) NOT NULL DEFAULT '', `email` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY (`login`) + UNIQUE (`login`) ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_cats`; -- 2.30.2