From 02926f5327b32cae01d13b3db3fdfad971393982 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 24 Nov 2012 23:14:38 +0000 Subject: [PATCH] Some menu points renamed to not conflict with configuration menus: - Renamed config_cats to list_cats, config_mods to list_mods and config_rallye_prices to list_rallye_prices as "config" is only for configuration table "config" - In all configuration files "save_config" is now the submit button's name - TODOs.txt updated --- .gitattributes | 3 + DOCS/TODOs.txt | 12 +- inc/extensions/ext-mods.php | 13 +- inc/extensions/ext-rallye.php | 14 +- inc/extensions/ext-sql_patches.php | 11 +- inc/extensions/ext-user.php | 13 +- inc/modules/admin/what-add_rallye.php | 2 +- inc/modules/admin/what-config_ | 2 +- inc/modules/admin/what-config_active.php | 2 +- inc/modules/admin/what-config_admin.php | 2 +- inc/modules/admin/what-config_autopurge.php | 2 +- inc/modules/admin/what-config_beg.php | 2 +- inc/modules/admin/what-config_birthday.php | 2 +- inc/modules/admin/what-config_bonus.php | 2 +- inc/modules/admin/what-config_cats.php | 178 +---------- inc/modules/admin/what-config_coupon.php | 2 +- inc/modules/admin/what-config_doubler.php | 2 +- inc/modules/admin/what-config_extensions.php | 2 +- inc/modules/admin/what-config_holiday.php | 2 +- inc/modules/admin/what-config_home.php | 2 +- inc/modules/admin/what-config_imprint.php | 2 +- inc/modules/admin/what-config_mediadata.php | 4 +- inc/modules/admin/what-config_menu.php | 2 +- inc/modules/admin/what-config_mods.php | 154 +--------- inc/modules/admin/what-config_newsletter.php | 2 +- inc/modules/admin/what-config_nickname.php | 2 +- inc/modules/admin/what-config_order.php | 2 +- inc/modules/admin/what-config_other.php | 2 +- inc/modules/admin/what-config_points.php | 2 +- inc/modules/admin/what-config_proxy.php | 2 +- .../admin/what-config_rallye_prices.php | 278 +---------------- inc/modules/admin/what-config_refback.php | 2 +- inc/modules/admin/what-config_refid.php | 2 +- inc/modules/admin/what-config_register.php | 2 +- inc/modules/admin/what-config_register2.php | 2 +- inc/modules/admin/what-config_removeip.php | 2 +- inc/modules/admin/what-config_rewrite.php | 2 +- inc/modules/admin/what-config_secure.php | 2 +- inc/modules/admin/what-config_session.php | 2 +- inc/modules/admin/what-config_sponsor.php | 2 +- inc/modules/admin/what-config_stats.php | 2 +- inc/modules/admin/what-config_surfbar.php | 2 +- inc/modules/admin/what-config_timezone.php | 2 +- inc/modules/admin/what-config_title.php | 3 +- inc/modules/admin/what-config_top10.php | 2 +- inc/modules/admin/what-config_transfer.php | 2 +- inc/modules/admin/what-config_user.php | 2 +- inc/modules/admin/what-config_user_subid.php | 2 +- inc/modules/admin/what-config_validator.php | 2 +- inc/modules/admin/what-config_wernis.php | 2 +- inc/modules/admin/what-config_yoomedia.php | 2 +- inc/modules/admin/what-list_cats.php | 192 ++++++++---- inc/modules/admin/what-list_mods.php | 155 ++++++++++ inc/modules/admin/what-list_rallye_prices.php | 279 ++++++++++++++++++ inc/modules/admin/what-list_user.php | 2 +- inc/modules/admin/what-list_user_cats.php | 109 +++++++ install/menu-de.sql | 2 +- install/menu-en.sql | 2 +- templates/de/html/admin/admin_add_cat.tpl | 2 +- .../de/html/admin/admin_add_rallye_prices.tpl | 2 +- .../de/html/admin/admin_config_active.tpl | 2 +- .../de/html/admin/admin_config_admin.tpl | 2 +- .../de/html/admin/admin_config_autopurge.tpl | 2 +- templates/de/html/admin/admin_config_beg.tpl | 2 +- .../de/html/admin/admin_config_birthday.tpl | 2 +- .../de/html/admin/admin_config_bonus.tpl | 2 +- .../de/html/admin/admin_config_coupon.tpl | 2 +- .../de/html/admin/admin_config_doubler.tpl | 2 +- .../de/html/admin/admin_config_extensions.tpl | 2 +- .../de/html/admin/admin_config_holiday.tpl | 2 +- templates/de/html/admin/admin_config_home.tpl | 2 +- .../de/html/admin/admin_config_mediadata.tpl | 2 +- templates/de/html/admin/admin_config_menu.tpl | 2 +- .../html/admin/admin_config_network_api.tpl | 2 +- .../de/html/admin/admin_config_newsletter.tpl | 2 +- .../de/html/admin/admin_config_nickname.tpl | 2 +- .../de/html/admin/admin_config_order.tpl | 2 +- .../de/html/admin/admin_config_other.tpl | 2 +- .../admin/admin_config_point_settings.tpl | 2 +- .../de/html/admin/admin_config_proxy.tpl | 2 +- .../de/html/admin/admin_config_refback.tpl | 2 +- .../de/html/admin/admin_config_refid.tpl | 2 +- .../de/html/admin/admin_config_register.tpl | 2 +- .../de/html/admin/admin_config_register2.tpl | 2 +- .../de/html/admin/admin_config_removeip.tpl | 2 +- .../de/html/admin/admin_config_rewrite.tpl | 2 +- .../de/html/admin/admin_config_secure.tpl | 2 +- .../de/html/admin/admin_config_session.tpl | 2 +- .../de/html/admin/admin_config_sponsor.tpl | 2 +- .../de/html/admin/admin_config_stats.tpl | 2 +- .../de/html/admin/admin_config_sub_points.tpl | 2 +- .../de/html/admin/admin_config_surfbar.tpl | 2 +- .../de/html/admin/admin_config_timezone.tpl | 2 +- .../de/html/admin/admin_config_title.tpl | 2 +- .../de/html/admin/admin_config_top10.tpl | 2 +- .../de/html/admin/admin_config_transfer.tpl | 2 +- templates/de/html/admin/admin_config_user.tpl | 2 +- .../de/html/admin/admin_config_user_subid.tpl | 2 +- .../de/html/admin/admin_config_validator.tpl | 2 +- .../de/html/admin/admin_config_wernis.tpl | 2 +- .../de/html/admin/admin_config_yoomedia.tpl | 2 +- templates/de/html/admin/admin_delete_cats.tpl | 2 +- .../html/admin/admin_delete_rallye_prices.tpl | 2 +- templates/de/html/admin/admin_edit_cats.tpl | 2 +- templates/de/html/admin/admin_edit_mods.tpl | 5 +- .../html/admin/admin_edit_rallye_prices.tpl | 2 +- templates/de/html/admin/admin_list_cats.tpl | 2 +- templates/de/html/admin/admin_list_mods.tpl | 5 +- .../admin/admin_list_rallye_prices_row.tpl | 2 +- .../admin/admin_list_rallye_prices_simple.tpl | 2 +- .../de/html/admin/admin_list_rallyes_row.tpl | 4 +- 111 files changed, 833 insertions(+), 785 deletions(-) create mode 100644 inc/modules/admin/what-list_mods.php create mode 100644 inc/modules/admin/what-list_rallye_prices.php create mode 100644 inc/modules/admin/what-list_user_cats.php diff --git a/.gitattributes b/.gitattributes index a431b8c82b..699a56da53 100644 --- a/.gitattributes +++ b/.gitattributes @@ -569,6 +569,7 @@ inc/modules/admin/what-list_forced_costs.php svneol=native#text/plain inc/modules/admin/what-list_grade_data.php svneol=native#text/plain inc/modules/admin/what-list_holiday.php svneol=native#text/plain inc/modules/admin/what-list_links.php svneol=native#text/plain +inc/modules/admin/what-list_mods.php svneol=native#text/plain inc/modules/admin/what-list_network_array_translation.php svneol=native#text/plain inc/modules/admin/what-list_network_data.php svneol=native#text/plain inc/modules/admin/what-list_network_request_params.php svneol=native#text/plain @@ -580,6 +581,7 @@ inc/modules/admin/what-list_norefs.php -text inc/modules/admin/what-list_notifications.php svneol=native#text/plain inc/modules/admin/what-list_payouts.php svneol=native#text/plain inc/modules/admin/what-list_point_accounts.php svneol=native#text/plain +inc/modules/admin/what-list_rallye_prices.php svneol=native#text/plain inc/modules/admin/what-list_rallyes.php svneol=native#text/plain inc/modules/admin/what-list_referral_levels.php svneol=native#text/plain inc/modules/admin/what-list_refs.php svneol=native#text/plain @@ -595,6 +597,7 @@ inc/modules/admin/what-list_transfer.php svneol=native#text/plain inc/modules/admin/what-list_unconfirmed.php svneol=native#text/plain inc/modules/admin/what-list_user.php svneol=native#text/plain inc/modules/admin/what-list_user_amounts.php svneol=native#text/plain +inc/modules/admin/what-list_user_cats.php svneol=native#text/plain inc/modules/admin/what-list_user_subid.php svneol=native#text/plain inc/modules/admin/what-list_wernis.php svneol=native#text/plain inc/modules/admin/what-list_yoomedia_tm.php svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index ec42d004cf..331f588e2f 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -43,7 +43,6 @@ ./inc/extensions/ext-network.php:43: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * ./inc/extensions/ext-newsletter.php:218: // @TODO Move these into configuration ./inc/extensions/ext-nickname.php:52: // @TODO NOT NULL DEFAULT '' is bad practice, use NULL -./inc/extensions/ext-rallye.php:94: // @TODO Fix config_rallye_prices to list_rallye_prices ./inc/extensions/ext-yoomedia.php:121: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); ./inc/extensions-functions.php:2172:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' @@ -123,9 +122,7 @@ ./inc/modules/admin/what-adminedit.php:56: // @TODO Kill all constants in this file ./inc/modules/admin/what-admins_mails.php:58: // @TODO Can this be rewritten to an API function? ./inc/modules/admin/what-bonus.php:46:// @TODO Unused at the moment -./inc/modules/admin/what-config_mods.php:55: // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function ./inc/modules/admin/what-config_points.php:90: // @TODO Rewrite these two lines for new user_points columns (e.g. locked_order_points) with a filter -./inc/modules/admin/what-config_rallye_prices.php:222: // @TODO Rewrite these two constants ./inc/modules/admin/what-config_register.php:75: // @TODO Move this HTML code into a template ./inc/modules/admin/what-del_email.php:61: // @TODO Unused: cat_id, payment_id ./inc/modules/admin/what-edit_user.php:18: * @TODO Add support for ext-country * @@ -138,13 +135,15 @@ ./inc/modules/admin/what-list_admins_acls.php:126: // @TODO Rewrite this to filter 'run_sqls' ./inc/modules/admin/what-list_autopurge.php:47:// @TODO Rewrite those lines to filter ./inc/modules/admin/what-list_bonus.php:137: // @TODO Can't this be moved into our expression language? -./inc/modules/admin/what-list_cats.php:54: // @TODO No longer needed? define('__CATEGORIES_BASE' , '{?_MYSQL_PREFIX?}_config ist."); + break; } // END - switch break; diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 75a03c1891..da987bb239 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.3.7'); +setThisExtensionVersion('0.3.8'); // 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', '0.3.5', '0.3.6', '0.3.7')); +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', '0.3.7', '0.3.8')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running @@ -91,8 +91,7 @@ INDEX (`userid`)", // Admin menu addAdminMenuSql('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.',9); addAdminMenuSql('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.',1); - // @TODO Fix config_rallye_prices to list_rallye_prices - addAdminMenuSql('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.',2); + addAdminMenuSql('rallye','list_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.',2); addAdminMenuSql('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.',3); // Guest menu @@ -342,6 +341,13 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu // Update notes setExtensionUpdateNotes("Weitere Filter hinzugefügt."); break; + + case '0.3.8': // SQL queries for v0.3.8 + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='list_rallye_prices' WHERE `action`='rallye' AND `what`='config_rallye_prices' LIMIT 1"); + + // Update notes + setExtensionUpdateNotes("Menü umbenannt, da "config" nur für die Konfigurationstabelle {?_MYSQL_PREFIX?}_config ist."); + break; } // END - switch break; diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 5c16659989..aff3816022 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.9.4'); +setThisExtensionVersion('0.9.5'); // 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', '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', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.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', '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', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -983,6 +983,13 @@ PRIMARY KEY (`server_name_id`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Auflisten (usw.) von Referral-Ebenen ausgelagert in eigenen Menüpunkt. Referral-Prozente dürfen nun auch 5 Stellen hinter dem Komma haben."); break; + + case '0.9.5': // SQL queries for v0.9.5 + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='list_cats' WHERE `action`='setup' AND `what`='config_cats' LIMIT 1"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Menüpunkt umbenannt, da "config" nur für die Konfigurationstabelle {?_MYSQL_PREFIX?}_config ist."); + break; } // END - switch break; diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 97568175d7..38bdeab834 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.5.9'); +setThisExtensionVersion('0.6.0'); // 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', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9')); +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', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -167,7 +167,7 @@ INDEX (`stats_type`)", addAdminMenuSql('user', 'edit_user', 'Account editieren', 'Daten eines Mitglieder-Accountes ändern.', 6); addAdminMenuSql('user', 'list_refs', 'Referrals anzeigen', 'Mit diesem Menüpunkt können Sie die generierten Referrals eines Mitgliedes auflisten.', 7); addAdminMenuSql('user', 'list_links', 'Unbestätigte Mails', 'Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.', 8); - addAdminMenuSql('user', 'list_cats', 'Kategorien anzeigen', 'Listet die ausgewählten Kategorien eines Mitgliedes auf.', 9); + addAdminMenuSql('user', 'list_user_cats', 'Kategorien anzeigen', 'Listet die ausgewählten Kategorien eines Mitgliedes auf.', 9); break; case 'remove': // Do stuff when removing extension @@ -688,6 +688,13 @@ INDEX (`subid`)", // Update notes (these will be set as task text!) setExtensionUpdateNotes("Besser NULL anstelle 0."); break; + + case '0.6.0': // SQL queries for v0.6.0 + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='list_user_cats' WHERE `action`='user' AND `what`='list_cats' LIMIT 1"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Menüpunkt umbenannt um Platz für Konflikt mit what-config_cats.php zu schaffen."); + break; } // END - switch break; diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php index c55700b9e5..431d4ccf31 100644 --- a/inc/modules/admin/what-add_rallye.php +++ b/inc/modules/admin/what-add_rallye.php @@ -100,7 +100,7 @@ if (isFormSent()) { if (!empty($id)) { // Reload to prices... - redirectToUrl('modules.php?module=admin&what=config_rallye_prices&rallye_id=' . bigintval($id)); + redirectToUrl('modules.php?module=admin&what=list_rallye_prices&rallye_id=' . bigintval($id)); } else { // Problem detected... displayMessage('{--ADMIN_RALLYE_PROBLEM_CREATE--}'); diff --git a/inc/modules/admin/what-config_ b/inc/modules/admin/what-config_ index dec9005dcc..bb9e82452c 100644 --- a/inc/modules/admin/what-config_ +++ b/inc/modules/admin/what-config_ @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_active.php b/inc/modules/admin/what-config_active.php index c75c29dafb..27098e4059 100644 --- a/inc/modules/admin/what-config_active.php +++ b/inc/modules/admin/what-config_active.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_admin.php b/inc/modules/admin/what-config_admin.php index 4b9622a2d6..92f1b16690 100644 --- a/inc/modules/admin/what-config_admin.php +++ b/inc/modules/admin/what-config_admin.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save configuration adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php index c06ffecd89..fb4d44811e 100644 --- a/inc/modules/admin/what-config_autopurge.php +++ b/inc/modules/admin/what-config_autopurge.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Data was submitted so we store it adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php index 3da037dfce..f202e78c29 100644 --- a/inc/modules/admin/what-config_beg.php +++ b/inc/modules/admin/what-config_beg.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Replace german decimal comma with computer decimal dot convertCommaToDotInPostDataArray(array('beg_points', 'beg_points_max', 'beg_notify_bonus')); diff --git a/inc/modules/admin/what-config_birthday.php b/inc/modules/admin/what-config_birthday.php index d42f8d9088..dfe0b244f3 100644 --- a/inc/modules/admin/what-config_birthday.php +++ b/inc/modules/admin/what-config_birthday.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save configuration adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php index 63fcbeecc0..048e7b6196 100644 --- a/inc/modules/admin/what-config_bonus.php +++ b/inc/modules/admin/what-config_bonus.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Replace german decimal comma with computer decimal dot convertCommaToDotInPostDataArray(array('login_bonus', 'turbo_bonus', 'bonus_ref', 'bonus_order', 'bonus_notify_points')); diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php index 2f50fa4f88..f551ef47b7 100644 --- a/inc/modules/admin/what-config_cats.php +++ b/inc/modules/admin/what-config_cats.php @@ -1,179 +1,3 @@ {--CATEGORY_ALREADY_EXISTS--}'; - } - - // Free memory - SQL_FREERESULT($result); - - // Display message - displayMessage($content); -} elseif ((isFormSent()) && (ifPostContainsSelections('id'))) { - // Change or delete categories... - $TEXT = ''; - foreach (postRequestElement('id') as $id => $cat) { - // Secure id - $id = bigintval($id); - - // Is the entry set? - if (!empty($cat)) { - switch (getRequestElement('do')) { - case 'edit': // Change categories - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s',`visible`='%s',`sort`=%s WHERE `id`=%s LIMIT 1", - array( - $cat, - postRequestElement('visible', $id), - postRequestElement('sort', $id), - $id - ), __FILE__, __LINE__); - $TEXT = '{--ADMIN_CATEGORIES_SAVED--}'; - break; - - case 'delete': // Delete categories - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1", - array($id), __FILE__, __LINE__); - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s", - array($id), __FILE__, __LINE__); - $TEXT = '{--ADMIN_CATEGORIES_DELETED--}'; - break; - } // END - switch - } else { - // Entry not saved - $TEXT .= '{%message,ADMIN_CATEGORY_NOT_SAVED=' . $id . '%}'; - } - } // END - foreach - - if (isset($TEXT)) { - // Display message - displayMessage($TEXT); - } // END - if -} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) { - // Delete categories - $OUT = ''; - foreach (postRequestElement('sel') as $id => $value) { - // Load row template and switch colors - $OUT .= loadTemplate('admin_delete_cats_row', TRUE, $id); - } // END - foreach - - // Load main template - loadTemplate('admin_delete_cats', FALSE, $OUT); -} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) { - // Edit categories - $OUT = ''; - foreach (postRequestElement('sel') as $id => $value) { - // Load data from the category - $result = SQL_QUERY_ESC("SELECT `id`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - $content = SQL_FETCHARRAY($result); - - // Free result - SQL_FREERESULT($result); - - // Prepare data for the row template - $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']); - - // Load row template and switch colors - $OUT .= loadTemplate('admin_edit_cats_row', TRUE, $content); - } // END - foreach - - // Load main template - loadTemplate('admin_edit_cats', FALSE, $OUT); -} else { - // Init variable here - $CATS = ''; - - // Load all categories - $result = SQL_QUERY("SELECT `id`, `cat`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__); - if (!SQL_HASZERONUMS($result)) { - // Init variables - $OUT = ''; - - // List already existing categories for editing - while ($content = SQL_FETCHARRAY($result)) { - // Put cat descriptions into variable for the selection box - $cat = $content['cat']; - if (strlen($cat) > 40) $cat = substr($cat, 0, 37) . '...'; - $CATS .= ''; - - // Load row template and switch color - $OUT .= loadTemplate('admin_list_cats_row', TRUE, $content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Load main template - loadTemplate('admin_list_cats', FALSE, $OUT); - } // END - if - - // Remember in array - $content['cats'] = $CATS; - - // Form to add a new category - loadTemplate('admin_add_cat', FALSE, $content); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/modules/admin/what-config_coupon.php b/inc/modules/admin/what-config_coupon.php index b0a0abea87..31bc22eee3 100644 --- a/inc/modules/admin/what-config_coupon.php +++ b/inc/modules/admin/what-config_coupon.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Replace German comma with computer's version convertCommaToDotInPostData('coupon_default_points'); diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php index fee6cfea01..53b3cee752 100644 --- a/inc/modules/admin/what-config_doubler.php +++ b/inc/modules/admin/what-config_doubler.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Replace german decimal comma with computer decimal dot convertCommaToDotInPostDataArray(array('doubler_charge', 'doubler_ref', 'doubler_min', 'doubler_max', 'doubler_left')); diff --git a/inc/modules/admin/what-config_extensions.php b/inc/modules/admin/what-config_extensions.php index bbcbf61230..89cfc763c4 100644 --- a/inc/modules/admin/what-config_extensions.php +++ b/inc/modules/admin/what-config_extensions.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save configuration adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_holiday.php b/inc/modules/admin/what-config_holiday.php index e84e61db9d..b03ce7aef0 100644 --- a/inc/modules/admin/what-config_holiday.php +++ b/inc/modules/admin/what-config_holiday.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php index d224da9f40..e667473d89 100644 --- a/inc/modules/admin/what-config_home.php +++ b/inc/modules/admin/what-config_home.php @@ -51,7 +51,7 @@ if (isGetRequestElementSet('sub')) { switch ($sub) { case 'settings': // Settings related to the index page - if (isFormSent()) { + if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); diff --git a/inc/modules/admin/what-config_imprint.php b/inc/modules/admin/what-config_imprint.php index 525fc2a5c9..1779042b54 100644 --- a/inc/modules/admin/what-config_imprint.php +++ b/inc/modules/admin/what-config_imprint.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); // Form sent? -if (isFormSent()) { +if (isFormSent('save_config')) { // Handle form ... } else { // Query for all imprint data rows diff --git a/inc/modules/admin/what-config_mediadata.php b/inc/modules/admin/what-config_mediadata.php index aba503e0c9..5a94024dd3 100644 --- a/inc/modules/admin/what-config_mediadata.php +++ b/inc/modules/admin/what-config_mediadata.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Test timestamp $STAMP = mktime(0, 0, 0, bigintval(postRequestElement('month')), bigintval(postRequestElement('day')), bigintval(postRequestElement('year'))); if ($STAMP > time()) { @@ -67,7 +67,7 @@ if (isFormSent()) { } // END - if } // END - if -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_menu.php b/inc/modules/admin/what-config_menu.php index 0d7f41dc97..97c1f6b7fb 100644 --- a/inc/modules/admin/what-config_menu.php +++ b/inc/modules/admin/what-config_menu.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php index db87cf99b9..f551ef47b7 100644 --- a/inc/modules/admin/what-config_mods.php +++ b/inc/modules/admin/what-config_mods.php @@ -1,155 +1,3 @@ $sel) { - // Load module data - // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function - $result = SQL_QUERY_ESC("SELECT `id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - - // Load data - $content = SQL_FETCHARRAY($result); - - // Free result - SQL_FREERESULT($result); - - // Prepare array for the template - $content['locked'] = addSelectionBox('yn', $content['locked'] , 'locked', $id); - $content['hidden'] = addSelectionBox('yn', $content['hidden'] , 'hidden', $id); - $content['admin_only'] = addSelectionBox('yn', $content['admin_only'], 'admin' , $id); - $content['mem_only'] = addSelectionBox('yn', $content['mem_only'] , 'member', $id); - - // Load row template - $OUT .= loadTemplate('admin_edit_mods_row', TRUE, $content); - } // END - foreach - - // Load main template - loadTemplate('admin_edit_mods', FALSE, $OUT); - } else { - // Nothing selected - displayMessage('{--ADMIN_MODS_NOTHING_SELECTED--}'); - - // Remove maybe confusing data - unsetPostRequestElement('edit'); - unsetPostRequestElement('do_edit'); - } -} elseif (isFormSent('do_edit')) { - // Init SQLs - initSqls(); - - // Change modules - foreach (postRequestElement('sel') as $id => $sel) { - // Secure id number - $id = bigintval($id); - - // Update module - addSql(SQL_QUERY_ESC("UPDATE - `{?_MYSQL_PREFIX?}_mod_reg` -SET - `title`='%s', - `locked`='%s', - `hidden`='%s', - `admin_only`='%s', - `mem_only`='%s' -WHERE - `id`=%s -LIMIT 1", - array( - postRequestElement('title', $id), - postRequestElement('locked', $id), - postRequestElement('hidden', $id), - postRequestElement('admin', $id), - postRequestElement('member', $id), - $id - ), __FILE__, __LINE__, FALSE)); - } - - // Run all sqls - runFilterChain('run_sqls'); - - // Remove cache file if version matches - rebuildCache('modules', 'modules'); - - // Entries updated - displayMessage('{--ADMIN_MODS_CHANGED--}'); -} - -if (!ifPostContainsSelections()) { - // Load module data (We do not need to check if there's at least one...) - $result = SQL_QUERY('SELECT - `id`, `module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only` -FROM - `{?_MYSQL_PREFIX?}_mod_reg` -ORDER BY - `module` ASC', __FILE__, __LINE__); - - $OUT = ''; - while ($content = SQL_FETCHARRAY($result)) { - // Reset title to --- if it is NULL - if (($content['module'] == 'index') || ($content['module'] == 'login')) { - // Add link to detail statistics - $content['module'] = '' . $content['module'] . ''; - } // END - if - - // Load row template - $OUT .= loadTemplate('admin_list_mods_row', TRUE, $content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Load main template - loadTemplate('admin_list_mods', FALSE, $OUT); -} // END - if - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/modules/admin/what-config_newsletter.php b/inc/modules/admin/what-config_newsletter.php index 7bc1cdd86d..2e7a17a30a 100644 --- a/inc/modules/admin/what-config_newsletter.php +++ b/inc/modules/admin/what-config_newsletter.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_nickname.php b/inc/modules/admin/what-config_nickname.php index 0815ab941e..936f0e60f7 100644 --- a/inc/modules/admin/what-config_nickname.php +++ b/inc/modules/admin/what-config_nickname.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php index b98e1db125..0f6fd825f0 100644 --- a/inc/modules/admin/what-config_order.php +++ b/inc/modules/admin/what-config_order.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php index 30509c2edf..81aac69a10 100644 --- a/inc/modules/admin/what-config_other.php +++ b/inc/modules/admin/what-config_other.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); // Stop saving data if one input field is !isset -if (isFormSent()) { +if (isFormSent('save_config')) { // Calculate stamps and set calculated stamps setPostRequestElement('online_timeout' , createEpocheTimeFromSelections('online_timeout' , postRequestArray())); setPostRequestElement('url_tlock' , createEpocheTimeFromSelections('url_tlock' , postRequestArray())); diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index 036d3e9c4a..e44120d876 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -62,7 +62,7 @@ if (isGetRequestElementSet('sub')) { } // Is a form sent? -if ((isFormSent('do_delete')) || (isFormSent('do_edit')) || (isFormSent('do_add'))) { +if ((isFormSent('do_delete')) || (isFormSent('do_edit')) || (isFormSent('do_add')) || (isFormSent('save_config'))) { // Init SQLs initSqls(); switch (getRequestElement('sub')) { diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php index b83af2ffd2..713a5fdfd9 100644 --- a/inc/modules/admin/what-config_proxy.php +++ b/inc/modules/admin/what-config_proxy.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Test proxy settings if (adminTestProxySettings(postRequestArray())) { // Save configuration diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php index c3c160ab39..f551ef47b7 100644 --- a/inc/modules/admin/what-config_rallye_prices.php +++ b/inc/modules/admin/what-config_rallye_prices.php @@ -1,279 +1,3 @@ $sel) { - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - } // END - foreach - - // Output message - displayMessage('{--ADMIN_RALLYE_PRICES_DELETED--}'); - } else { - displayMessage('{--ADMIN_RALLYE_PRICES_NOT_DELETED--}'); - } - } elseif (isFormSent('do_edit')) { - // Change entries - foreach (postRequestElement('level') as $id => $level) { - // Secure id - $id = bigintval($id); - - // Update entry - SQL_QUERY_ESC("UPDATE - `{?_MYSQL_PREFIX?}_rallye_prices` -SET - `rallye_id`=%s, - `price_level`=%d, - `points`=%s, - `info`='%s' -WHERE - `id`=%s -LIMIT 1", - array( - postRequestElement('rallye_id', $id), - bigintval($level), - convertCommaToDot(postRequestElement('points', $id)), - postRequestElement('info', $id), - $id - ), __FILE__, __LINE__); - } - - // Output message - displayMessage('{--ADMIN_RALLYE_PRICES_CHANGED--}'); - } - - if (isFormSent('edit')) { - // Check if at last one line is selected - if (ifPostContainsSelections()) { - // Make selected editable - $OUT = ''; - foreach (postRequestElement('sel') as $id => $sel) { - // Load data to selected rallye - $result = SQL_QUERY_ESC("SELECT - `id`, - `rallye_id`, - `price_level`, - `points`, - `info` -FROM - `{?_MYSQL_PREFIX?}_rallye_prices` -WHERE - `id`=%s -LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - - // Fetch data - $content = SQL_FETCHARRAY($result); - - // Free result - SQL_FREERESULT($result); - - // Add more content - $content['rallye_content'] = generateOptions('rallye_data', 'id', 'title', $content['rallye_id']); - - // Load row template and switch color - $OUT .= loadTemplate('admin_edit_rallye_prices_row', TRUE, $content); - } // END - foreach - - // Remember row content - $content['rows'] = $OUT; - - // Prepare data for the main template - $content['rallye_id'] = bigintval(getRequestElement('rallye_id')); - - // Load main template - loadTemplate('admin_edit_rallye_prices', FALSE, $content); - } else { - // Nothing selected - displayMessage('{%message,ADMIN_RALLYE_NO_PRICES_SELECTED=' . getRequestElement('rallye_id') . '%}'); - } - } elseif (isFormSent('delete')) { - // Check if at last one line is selected - if (ifPostContainsSelections()) { - // List all prices - $OUT = ''; - foreach (postRequestElement('sel') as $id => $sel) { - // Load data to selected rallye - $result = SQL_QUERY_ESC("SELECT - `id`, - `rallye_id`, - `price_level`, - `points`, - `info` -FROM - `{?_MYSQL_PREFIX?}_rallye_prices` -WHERE - `id`=%s -LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - - // Fetch data - $content = SQL_FETCHARRAY($result); - - // Free result - SQL_FREERESULT($result); - - // Load row template and switch color - $OUT .= loadTemplate('admin_delete_rallye_prices_row', TRUE, $content); - } // END - foreach - $content['rows'] = $OUT; - - // Prepare data for the main template - $content['rallye_id'] = bigintval(getRequestElement('rallye_id')); - - // Load main template - loadTemplate('admin_delete_rallye_prices', FALSE, $content); - } else { - // Nothing selected - $content = '{--RALLYE_NO_PRICES_SELECTED_1--}{--RALLYE_NO_PRICES_SELECTED_2--}{--RALLYE_NO_PRICES_SELECTED_3--}'; - displayMessage($content); - } - } else { - // A rallye was selected, so check if there are already prices assigned... - $result = SQL_QUERY_ESC("SELECT `id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY `price_level` ASC", - array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__); - - if (!SQL_HASZERONUMS($result)) { - // Load all prices for the selected rallye - $OUT = ''; - while ($content = SQL_FETCHARRAY($result)) { - // Load row template and switch color - $OUT .= loadTemplate('admin_list_rallye_prices_simple_row', TRUE, $content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // @TODO Rewrite these two constants - $content['rows'] = $OUT; - - // Prepare data for the main template - $content['rallye_id'] = bigintval(getRequestElement('rallye_id')); - - // Load main template - loadTemplate('admin_list_rallye_prices_simple', FALSE, $content); - } // END - if - } - - // Add form for adding new price level - if ((!isFormSent('edit')) && (!isFormSent('delete'))) { - loadTemplate('admin_add_rallye_prices', FALSE, getRequestElement('rallye_id')); - } // END - if -} else { - // No rallye selected so display all available without prices - $result = SQL_QUERY("SELECT - d.id AS `rallye_id`, - d.admin_id, - d.start_time, - d.end_time, - d.title, - a.login, - d.is_active -FROM - `{?_MYSQL_PREFIX?}_rallye_data` AS d -LEFT JOIN - `{?_MYSQL_PREFIX?}_admins` AS a -ON - d.admin_id=a.id -ORDER BY - d.start_time DESC", __FILE__, __LINE__); - if (!SQL_HASZERONUMS($result)) { - // List found rallyes - $OUT = ''; - while ($content = SQL_FETCHARRAY($result)) { - // Prepare data for the row template - $content['start_time'] = generateDateTime($content['start_time'], '3'); - $content['end_time'] = generateDateTime($content['end_time'] , '3'); - - // Load row template and switch color - $OUT .= loadTemplate('admin_list_rallye_prices_row', TRUE, $content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Load main template - loadTemplate('admin_list_rallye_prices', FALSE, $OUT); - } else { - // No rallyes setup so far - displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SETUP--}'); - } -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/modules/admin/what-config_refback.php b/inc/modules/admin/what-config_refback.php index b064ea0c8e..1105d4fef4 100644 --- a/inc/modules/admin/what-config_refback.php +++ b/inc/modules/admin/what-config_refback.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Replace german decimal comma with computer decimal dot convertCommaToDotInPostDataArray(array('refback_min_perc', 'refback_max_perc')); diff --git a/inc/modules/admin/what-config_refid.php b/inc/modules/admin/what-config_refid.php index ca521c2e58..b6585858dc 100644 --- a/inc/modules/admin/what-config_refid.php +++ b/inc/modules/admin/what-config_refid.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php index f4970baea3..eec09e7723 100644 --- a/inc/modules/admin/what-config_register.php +++ b/inc/modules/admin/what-config_register.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); // Do we want to save changes? -if (isFormSent()) { +if (isFormSent('save_config')) { // Begin counting $count = 0; diff --git a/inc/modules/admin/what-config_register2.php b/inc/modules/admin/what-config_register2.php index 209a75e89c..30aac7adc9 100644 --- a/inc/modules/admin/what-config_register2.php +++ b/inc/modules/admin/what-config_register2.php @@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Calculate timestamp from selections... setPostRequestElement('ip_timeout', createEpocheTimeFromSelections('ip_timeout', postRequestArray())); setPostRequestElement('least_cats', round(postRequestElement('least_cats'))); diff --git a/inc/modules/admin/what-config_removeip.php b/inc/modules/admin/what-config_removeip.php index 4f8f4236a3..357af09131 100644 --- a/inc/modules/admin/what-config_removeip.php +++ b/inc/modules/admin/what-config_removeip.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save configuration adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php index 10eee72f0a..8a64f7081b 100644 --- a/inc/modules/admin/what-config_rewrite.php +++ b/inc/modules/admin/what-config_rewrite.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Generate string $MODs = array(); foreach (postRequestElement('mod') as $mod => $sel) { diff --git a/inc/modules/admin/what-config_secure.php b/inc/modules/admin/what-config_secure.php index 934acac81b..f1ab636e60 100644 --- a/inc/modules/admin/what-config_secure.php +++ b/inc/modules/admin/what-config_secure.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // If salt length is empty or null then we shall generate new passwords if (!isPostRequestElementSet('salt_length') || (postRequestElement('salt_length') == '0')) { // Generate new passwords for all! diff --git a/inc/modules/admin/what-config_session.php b/inc/modules/admin/what-config_session.php index d0c87d9626..bbe3e6af1c 100644 --- a/inc/modules/admin/what-config_session.php +++ b/inc/modules/admin/what-config_session.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Test Path if ((!isPostRequestElementSet('session_save_path')) || ((isDirectory(postRequestElement('session_save_path'))) && (is_writeable(postRequestElement('session_save_path'))))) { // Save configuration diff --git a/inc/modules/admin/what-config_sponsor.php b/inc/modules/admin/what-config_sponsor.php index 2dfb880e6d..cc82a1a701 100644 --- a/inc/modules/admin/what-config_sponsor.php +++ b/inc/modules/admin/what-config_sponsor.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_stats.php b/inc/modules/admin/what-config_stats.php index 467a3996a6..62f16db396 100644 --- a/inc/modules/admin/what-config_stats.php +++ b/inc/modules/admin/what-config_stats.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); // Was the form submitted? -if (isFormSent()) { +if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php index 27f4b0cfd5..dc9533b057 100644 --- a/inc/modules/admin/what-config_surfbar.php +++ b/inc/modules/admin/what-config_surfbar.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); // Was the form submitted? -if (isFormSent()) { +if (isFormSent('save_config')) { // Replace german decimal comma with computer decimal dot convertCommaToDotInPostDataArray(array('surfbar_static_reward', 'surfbar_static_costs', 'surfbar_dynamic_percent')); diff --git a/inc/modules/admin/what-config_timezone.php b/inc/modules/admin/what-config_timezone.php index cbd48fa65f..9c620c21f6 100644 --- a/inc/modules/admin/what-config_timezone.php +++ b/inc/modules/admin/what-config_timezone.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_title.php b/inc/modules/admin/what-config_title.php index 9be866ab30..654c6e969e 100644 --- a/inc/modules/admin/what-config_title.php +++ b/inc/modules/admin/what-config_title.php @@ -43,7 +43,8 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config') +) { // Save settings adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_top10.php b/inc/modules/admin/what-config_top10.php index ad048afc37..e1c8266337 100644 --- a/inc/modules/admin/what-config_top10.php +++ b/inc/modules/admin/what-config_top10.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php index 1d94b0f0c2..931b1920fb 100644 --- a/inc/modules/admin/what-config_transfer.php +++ b/inc/modules/admin/what-config_transfer.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save settings... adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_user.php b/inc/modules/admin/what-config_user.php index a46218bacd..4cf8ef12ab 100644 --- a/inc/modules/admin/what-config_user.php +++ b/inc/modules/admin/what-config_user.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_user_subid.php b/inc/modules/admin/what-config_user_subid.php index bcc6051844..cbffdaf5fc 100644 --- a/inc/modules/admin/what-config_user_subid.php +++ b/inc/modules/admin/what-config_user_subid.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_validator.php b/inc/modules/admin/what-config_validator.php index b239445ad9..dd39d4df7c 100644 --- a/inc/modules/admin/what-config_validator.php +++ b/inc/modules/admin/what-config_validator.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // Save data adminSaveSettingsFromPostData(); } else { diff --git a/inc/modules/admin/what-config_wernis.php b/inc/modules/admin/what-config_wernis.php index 1b9fd7b9f8..7154bb32fe 100644 --- a/inc/modules/admin/what-config_wernis.php +++ b/inc/modules/admin/what-config_wernis.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (isFormSent()) { +if (isFormSent('save_config')) { // First merge temporarily the new API data into the current config mergeConfig(postRequestArray()); diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php index 4212561278..ffa82a272e 100644 --- a/inc/modules/admin/what-config_yoomedia.php +++ b/inc/modules/admin/what-config_yoomedia.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); // Was the form submitted? -if (isFormSent()) { +if (isFormSent('save_config')) { // Test Yoo!Media config if (YOOMEDIA_TEST_CONFIG(postRequestArray())) { // Save settings diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php index f1574fd561..48069a94b8 100644 --- a/inc/modules/admin/what-list_cats.php +++ b/inc/modules/admin/what-list_cats.php @@ -1,15 +1,15 @@ {%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ''; - - // Ok, list categories of this user - $result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__); - - if (!SQL_HASZERONUMS($result_cats)) { - // List categories - $count = 1; $OUT = ''; - while ($row = SQL_FETCHARRAY($result_cats)) { - // Merge both arrays - $content = merge_array($content, $row); - - // Check user's selection - // @TODO Rewrite this to countSum.....() function - $result_user = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s AND `cat_id`=%s LIMIT 1", - array(bigintval(getRequestElement('userid')), bigintval($content['id'])), __FILE__, __LINE__); - - // Set selection - $selection = '{--NO--}'; - if (SQL_NUMROWS($result_user) == 1) { - $selection = '{--YES--}'; - } // END - if - - // Add more elements - $content['count'] = $count; - $content['sel'] = $selection; - - // Load row template and count up - $OUT .= loadTemplate('admin_list_user_cats_row', TRUE, $content); - $count++; - } // END - while - - // Free memory - SQL_FREERESULT($result_cats); - - // Remember all rows in the array - $content['rows'] = $OUT; - - // Load main template - loadTemplate('admin_list_user_cats', FALSE, $content); - } else { - // No categories selected! :-( - loadTemplate('admin_list_user_cats_404', FALSE, $content); - } +// Init variable to avoid a notice +$CATS = ''; + +if (isFormSent('add')) { + // Add a new category + $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `cat`='%s' LIMIT 1", + array(postRequestElement('catname')), __FILE__, __LINE__); + if (SQL_HASZERONUMS($result)) { + // Category does not exists, we simply add it... + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('%s','%s','%s')", + array( + postRequestElement('catname'), + postRequestElement('visible'), + bigintval(postRequestElement('parent') + 1) + ), __FILE__, __LINE__); + $content = '{--CATEGORY_ADDED--}'; } else { - // User not found - displayMessage('{%message,ADMIN_MEMBER_404=' . $content['userid'] . '%}'); + // Category does already exists + $content = '{--CATEGORY_ALREADY_EXISTS--}'; } + + // Free memory + SQL_FREERESULT($result); + + // Display message + displayMessage($content); +} elseif ((isFormSent()) && (ifPostContainsSelections('id'))) { + // Change or delete categories... + $TEXT = ''; + foreach (postRequestElement('id') as $id => $cat) { + // Secure id + $id = bigintval($id); + + // Is the entry set? + if (!empty($cat)) { + switch (getRequestElement('do')) { + case 'edit': // Change categories + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s',`visible`='%s',`sort`=%s WHERE `id`=%s LIMIT 1", + array( + $cat, + postRequestElement('visible', $id), + postRequestElement('sort', $id), + $id + ), __FILE__, __LINE__); + $TEXT = '{--ADMIN_CATEGORIES_SAVED--}'; + break; + + case 'delete': // Delete categories + SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1", + array($id), __FILE__, __LINE__); + SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s", + array($id), __FILE__, __LINE__); + $TEXT = '{--ADMIN_CATEGORIES_DELETED--}'; + break; + } // END - switch + } else { + // Entry not saved + $TEXT .= '{%message,ADMIN_CATEGORY_NOT_SAVED=' . $id . '%}'; + } + } // END - foreach + + if (isset($TEXT)) { + // Display message + displayMessage($TEXT); + } // END - if +} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) { + // Delete categories + $OUT = ''; + foreach (postRequestElement('sel') as $id => $value) { + // Load row template and switch colors + $OUT .= loadTemplate('admin_delete_cats_row', TRUE, $id); + } // END - foreach + + // Load main template + loadTemplate('admin_delete_cats', FALSE, $OUT); +} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) { + // Edit categories + $OUT = ''; + foreach (postRequestElement('sel') as $id => $value) { + // Load data from the category + $result = SQL_QUERY_ESC("SELECT `id`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + $content = SQL_FETCHARRAY($result); + + // Free result + SQL_FREERESULT($result); + + // Prepare data for the row template + $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']); + + // Load row template and switch colors + $OUT .= loadTemplate('admin_edit_cats_row', TRUE, $content); + } // END - foreach + + // Load main template + loadTemplate('admin_edit_cats', FALSE, $OUT); } else { - // Output selection form with all confirmed user accounts listed - addMemberSelectionBox(); + // Init variable here + $CATS = ''; + + // Load all categories + $result = SQL_QUERY("SELECT `id`, `cat`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__); + if (!SQL_HASZERONUMS($result)) { + // Init variables + $OUT = ''; + + // List already existing categories for editing + while ($content = SQL_FETCHARRAY($result)) { + // Put cat descriptions into variable for the selection box + $cat = $content['cat']; + if (strlen($cat) > 40) $cat = substr($cat, 0, 37) . '...'; + $CATS .= ''; + + // Load row template and switch color + $OUT .= loadTemplate('admin_list_cats_row', TRUE, $content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Load main template + loadTemplate('admin_list_cats', FALSE, $OUT); + } // END - if + + // Remember in array + $content['cats'] = $CATS; + + // Form to add a new category + loadTemplate('admin_add_cat', FALSE, $content); } // [EOF] diff --git a/inc/modules/admin/what-list_mods.php b/inc/modules/admin/what-list_mods.php new file mode 100644 index 0000000000..16bc80d907 --- /dev/null +++ b/inc/modules/admin/what-list_mods.php @@ -0,0 +1,155 @@ + $sel) { + // Load module data + // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function + $result = SQL_QUERY_ESC("SELECT `id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `id`=%s LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + + // Load data + $content = SQL_FETCHARRAY($result); + + // Free result + SQL_FREERESULT($result); + + // Prepare array for the template + $content['locked'] = addSelectionBox('yn', $content['locked'] , 'locked', $id); + $content['hidden'] = addSelectionBox('yn', $content['hidden'] , 'hidden', $id); + $content['admin_only'] = addSelectionBox('yn', $content['admin_only'], 'admin' , $id); + $content['mem_only'] = addSelectionBox('yn', $content['mem_only'] , 'member', $id); + + // Load row template + $OUT .= loadTemplate('admin_edit_mods_row', TRUE, $content); + } // END - foreach + + // Load main template + loadTemplate('admin_edit_mods', FALSE, $OUT); + } else { + // Nothing selected + displayMessage('{--ADMIN_MODS_NOTHING_SELECTED--}'); + + // Remove maybe confusing data + unsetPostRequestElement('edit'); + unsetPostRequestElement('do_edit'); + } +} elseif (isFormSent('do_edit')) { + // Init SQLs + initSqls(); + + // Change modules + foreach (postRequestElement('sel') as $id => $sel) { + // Secure id number + $id = bigintval($id); + + // Update module + addSql(SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_mod_reg` +SET + `title`='%s', + `locked`='%s', + `hidden`='%s', + `admin_only`='%s', + `mem_only`='%s' +WHERE + `id`=%s +LIMIT 1", + array( + postRequestElement('title', $id), + postRequestElement('locked', $id), + postRequestElement('hidden', $id), + postRequestElement('admin', $id), + postRequestElement('member', $id), + $id + ), __FILE__, __LINE__, FALSE)); + } + + // Run all sqls + runFilterChain('run_sqls'); + + // Remove cache file if version matches + rebuildCache('modules', 'modules'); + + // Entries updated + displayMessage('{--ADMIN_MODS_CHANGED--}'); +} + +if (!ifPostContainsSelections()) { + // Load module data (We do not need to check if there's at least one...) + $result = SQL_QUERY('SELECT + `id`, `module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only` +FROM + `{?_MYSQL_PREFIX?}_mod_reg` +ORDER BY + `module` ASC', __FILE__, __LINE__); + + $OUT = ''; + while ($content = SQL_FETCHARRAY($result)) { + // Reset title to --- if it is NULL + if (($content['module'] == 'index') || ($content['module'] == 'login')) { + // Add link to detail statistics + $content['module'] = '' . $content['module'] . ''; + } // END - if + + // Load row template + $OUT .= loadTemplate('admin_list_mods_row', TRUE, $content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Load main template + loadTemplate('admin_list_mods', FALSE, $OUT); +} // END - if + +// [EOF] +?> diff --git a/inc/modules/admin/what-list_rallye_prices.php b/inc/modules/admin/what-list_rallye_prices.php new file mode 100644 index 0000000000..66487027e7 --- /dev/null +++ b/inc/modules/admin/what-list_rallye_prices.php @@ -0,0 +1,279 @@ + $sel) { + SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + } // END - foreach + + // Output message + displayMessage('{--ADMIN_RALLYE_PRICES_DELETED--}'); + } else { + displayMessage('{--ADMIN_RALLYE_PRICES_NOT_DELETED--}'); + } + } elseif (isFormSent('do_edit')) { + // Change entries + foreach (postRequestElement('level') as $id => $level) { + // Secure id + $id = bigintval($id); + + // Update entry + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_rallye_prices` +SET + `rallye_id`=%s, + `price_level`=%d, + `points`=%s, + `info`='%s' +WHERE + `id`=%s +LIMIT 1", + array( + postRequestElement('rallye_id', $id), + bigintval($level), + convertCommaToDot(postRequestElement('points', $id)), + postRequestElement('info', $id), + $id + ), __FILE__, __LINE__); + } + + // Output message + displayMessage('{--ADMIN_RALLYE_PRICES_CHANGED--}'); + } + + if (isFormSent('edit')) { + // Check if at last one line is selected + if (ifPostContainsSelections()) { + // Make selected editable + $OUT = ''; + foreach (postRequestElement('sel') as $id => $sel) { + // Load data to selected rallye + $result = SQL_QUERY_ESC("SELECT + `id`, + `rallye_id`, + `price_level`, + `points`, + `info` +FROM + `{?_MYSQL_PREFIX?}_rallye_prices` +WHERE + `id`=%s +LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + + // Fetch data + $content = SQL_FETCHARRAY($result); + + // Free result + SQL_FREERESULT($result); + + // Add more content + $content['rallye_content'] = generateOptions('rallye_data', 'id', 'title', $content['rallye_id']); + + // Load row template and switch color + $OUT .= loadTemplate('admin_edit_rallye_prices_row', TRUE, $content); + } // END - foreach + + // Remember row content + $content['rows'] = $OUT; + + // Prepare data for the main template + $content['rallye_id'] = bigintval(getRequestElement('rallye_id')); + + // Load main template + loadTemplate('admin_edit_rallye_prices', FALSE, $content); + } else { + // Nothing selected + displayMessage('{%message,ADMIN_RALLYE_NO_PRICES_SELECTED=' . getRequestElement('rallye_id') . '%}'); + } + } elseif (isFormSent('delete')) { + // Check if at last one line is selected + if (ifPostContainsSelections()) { + // List all prices + $OUT = ''; + foreach (postRequestElement('sel') as $id => $sel) { + // Load data to selected rallye + $result = SQL_QUERY_ESC("SELECT + `id`, + `rallye_id`, + `price_level`, + `points`, + `info` +FROM + `{?_MYSQL_PREFIX?}_rallye_prices` +WHERE + `id`=%s +LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + + // Fetch data + $content = SQL_FETCHARRAY($result); + + // Free result + SQL_FREERESULT($result); + + // Load row template and switch color + $OUT .= loadTemplate('admin_delete_rallye_prices_row', TRUE, $content); + } // END - foreach + $content['rows'] = $OUT; + + // Prepare data for the main template + $content['rallye_id'] = bigintval(getRequestElement('rallye_id')); + + // Load main template + loadTemplate('admin_delete_rallye_prices', FALSE, $content); + } else { + // Nothing selected + $content = '{--RALLYE_NO_PRICES_SELECTED_1--}{--RALLYE_NO_PRICES_SELECTED_2--}{--RALLYE_NO_PRICES_SELECTED_3--}'; + displayMessage($content); + } + } else { + // A rallye was selected, so check if there are already prices assigned... + $result = SQL_QUERY_ESC("SELECT `id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY `price_level` ASC", + array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__); + + if (!SQL_HASZERONUMS($result)) { + // Load all prices for the selected rallye + $OUT = ''; + while ($content = SQL_FETCHARRAY($result)) { + // Load row template and switch color + $OUT .= loadTemplate('admin_list_rallye_prices_simple_row', TRUE, $content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // @TODO Rewrite these two constants + $content['rows'] = $OUT; + + // Prepare data for the main template + $content['rallye_id'] = bigintval(getRequestElement('rallye_id')); + + // Load main template + loadTemplate('admin_list_rallye_prices_simple', FALSE, $content); + } // END - if + } + + // Add form for adding new price level + if ((!isFormSent('edit')) && (!isFormSent('delete'))) { + loadTemplate('admin_add_rallye_prices', FALSE, getRequestElement('rallye_id')); + } // END - if +} else { + // No rallye selected so display all available without prices + $result = SQL_QUERY("SELECT + d.id AS `rallye_id`, + d.admin_id, + d.start_time, + d.end_time, + d.title, + a.login, + d.is_active +FROM + `{?_MYSQL_PREFIX?}_rallye_data` AS d +LEFT JOIN + `{?_MYSQL_PREFIX?}_admins` AS a +ON + d.admin_id=a.id +ORDER BY + d.start_time DESC", __FILE__, __LINE__); + if (!SQL_HASZERONUMS($result)) { + // List found rallyes + $OUT = ''; + while ($content = SQL_FETCHARRAY($result)) { + // Prepare data for the row template + $content['start_time'] = generateDateTime($content['start_time'], '3'); + $content['end_time'] = generateDateTime($content['end_time'] , '3'); + + // Load row template and switch color + $OUT .= loadTemplate('admin_list_rallye_prices_row', TRUE, $content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Load main template + loadTemplate('admin_list_rallye_prices', FALSE, $OUT); + } else { + // No rallyes setup so far + displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SETUP--}'); + } +} + +// [EOF] +?> diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index c16f1787ec..2b2cfede10 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -114,7 +114,7 @@ LIMIT 1', $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]'; } // END - if if ($content['cats'] > 0) { - $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}]'; + $content['cats'] = $base . '&what=list_user_cats&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}]'; } // END - if // Calculate timestamp for birthday diff --git a/inc/modules/admin/what-list_user_cats.php b/inc/modules/admin/what-list_user_cats.php new file mode 100644 index 0000000000..f1574fd561 --- /dev/null +++ b/inc/modules/admin/what-list_user_cats.php @@ -0,0 +1,109 @@ +{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ''; + + // Ok, list categories of this user + $result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__); + + if (!SQL_HASZERONUMS($result_cats)) { + // List categories + $count = 1; $OUT = ''; + while ($row = SQL_FETCHARRAY($result_cats)) { + // Merge both arrays + $content = merge_array($content, $row); + + // Check user's selection + // @TODO Rewrite this to countSum.....() function + $result_user = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s AND `cat_id`=%s LIMIT 1", + array(bigintval(getRequestElement('userid')), bigintval($content['id'])), __FILE__, __LINE__); + + // Set selection + $selection = '{--NO--}'; + if (SQL_NUMROWS($result_user) == 1) { + $selection = '{--YES--}'; + } // END - if + + // Add more elements + $content['count'] = $count; + $content['sel'] = $selection; + + // Load row template and count up + $OUT .= loadTemplate('admin_list_user_cats_row', TRUE, $content); + $count++; + } // END - while + + // Free memory + SQL_FREERESULT($result_cats); + + // Remember all rows in the array + $content['rows'] = $OUT; + + // Load main template + loadTemplate('admin_list_user_cats', FALSE, $content); + } else { + // No categories selected! :-( + loadTemplate('admin_list_user_cats_404', FALSE, $content); + } + } else { + // User not found + displayMessage('{%message,ADMIN_MEMBER_404=' . $content['userid'] . '%}'); + } +} else { + // Output selection form with all confirmed user accounts listed + addMemberSelectionBox(); +} + +// [EOF] +?> diff --git a/install/menu-de.sql b/install/menu-de.sql index abad4aefb0..8f03d4aa34 100644 --- a/install/menu-de.sql +++ b/install/menu-de.sql @@ -6,7 +6,7 @@ INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup',NULL,'Einstellungen','Interessen ändern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','config_email','Versand, Empfang','Hier können Sie die maximal empfangbaren Mails usw. einstellen.',8); -INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','config_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7); +INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','list_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','refbanner','Referral-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','payments','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen','Fügen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen hinzu oder ändern / löschen Sie bestende.',11); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6); diff --git a/install/menu-en.sql b/install/menu-en.sql index ee7aa47d11..ce5e7aaa00 100644 --- a/install/menu-en.sql +++ b/install/menu-en.sql @@ -6,7 +6,7 @@ INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('email','email_details','Email-Details ansehen','Sehen Sie sich jedes Details bereits gebuchter Mails an.',5); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup',NULL,'Einstellungen','Interessen ändern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','config_email','Versand, Empfang','Hier können Sie die maximal empfangbaren Mails usw. einstellen.',8); -INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','config_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7); +INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','list_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','refbanner','Referral-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','payments','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen','Fügen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen hinzu oder ändern / löschen Sie bestende.',11); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6); diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl index 411b0189ea..57f1cbb8f2 100644 --- a/templates/de/html/admin/admin_add_cat.tpl +++ b/templates/de/html/admin/admin_add_cat.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_cats%} +{%form,formMethodPost=modules.php?module=admin&what=list_cats%}
diff --git a/templates/de/html/admin/admin_add_rallye_prices.tpl b/templates/de/html/admin/admin_add_rallye_prices.tpl index 0dbb3d2573..013eec58de 100644 --- a/templates/de/html/admin/admin_add_rallye_prices.tpl +++ b/templates/de/html/admin/admin_add_rallye_prices.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content%} +{%form,formMethodPost=modules.php?module=admin&what=list_rallye_prices&rallye_id=$content%}
diff --git a/templates/de/html/admin/admin_config_active.tpl b/templates/de/html/admin/admin_config_active.tpl index 74944e862d..bea3526cb3 100644 --- a/templates/de/html/admin/admin_config_active.tpl +++ b/templates/de/html/admin/admin_config_active.tpl @@ -15,7 +15,7 @@
- +
diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index c2e7ed2cc0..f4d3d3120e 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -36,7 +36,7 @@
- +
{%form_close%} diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index 3850941828..2489aacc1c 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -120,7 +120,7 @@
- +
{%form_close%} diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index e5945a8fe0..f533da498e 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -150,7 +150,7 @@
- +
diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index 8e8d0ad904..ebd821ae11 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -25,7 +25,7 @@ - + diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index 92e950e034..6b6022c28f 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -215,7 +215,7 @@ - + diff --git a/templates/de/html/admin/admin_config_coupon.tpl b/templates/de/html/admin/admin_config_coupon.tpl index fefab08ebf..fa99326427 100644 --- a/templates/de/html/admin/admin_config_coupon.tpl +++ b/templates/de/html/admin/admin_config_coupon.tpl @@ -34,7 +34,7 @@ - + diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index d7c8181659..fe7ae5af32 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -153,7 +153,7 @@ - + diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index 87dd723793..5ceab8a2de 100644 --- a/templates/de/html/admin/admin_config_extensions.tpl +++ b/templates/de/html/admin/admin_config_extensions.tpl @@ -17,7 +17,7 @@ - + diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 6d964566d3..1482a7b795 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -29,7 +29,7 @@ - + diff --git a/templates/de/html/admin/admin_config_home.tpl b/templates/de/html/admin/admin_config_home.tpl index bfdd03711b..fab850cfb6 100644 --- a/templates/de/html/admin/admin_config_home.tpl +++ b/templates/de/html/admin/admin_config_home.tpl @@ -40,7 +40,7 @@ - + diff --git a/templates/de/html/admin/admin_config_mediadata.tpl b/templates/de/html/admin/admin_config_mediadata.tpl index 0942f36612..2209c6a85a 100644 --- a/templates/de/html/admin/admin_config_mediadata.tpl +++ b/templates/de/html/admin/admin_config_mediadata.tpl @@ -19,7 +19,7 @@ - + diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl index 3d418df13a..874238a46e 100644 --- a/templates/de/html/admin/admin_config_menu.tpl +++ b/templates/de/html/admin/admin_config_menu.tpl @@ -25,7 +25,7 @@ - + diff --git a/templates/de/html/admin/admin_config_network_api.tpl b/templates/de/html/admin/admin_config_network_api.tpl index 7b1580e7d0..2bccdcb831 100644 --- a/templates/de/html/admin/admin_config_network_api.tpl +++ b/templates/de/html/admin/admin_config_network_api.tpl @@ -45,7 +45,7 @@ - + diff --git a/templates/de/html/admin/admin_config_newsletter.tpl b/templates/de/html/admin/admin_config_newsletter.tpl index e17e77d680..d68ba03d3a 100644 --- a/templates/de/html/admin/admin_config_newsletter.tpl +++ b/templates/de/html/admin/admin_config_newsletter.tpl @@ -9,7 +9,7 @@ - + diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index 2ef4a0d569..8cd51f2cc2 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -27,7 +27,7 @@ - + diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 226702d01e..92d3968e9f 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -109,7 +109,7 @@
- +
{%form_close%} diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index 9f42bc28bc..96059b36e0 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -290,7 +290,7 @@ - + diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl index c7a802dca2..40fba448f9 100644 --- a/templates/de/html/admin/admin_config_point_settings.tpl +++ b/templates/de/html/admin/admin_config_point_settings.tpl @@ -27,7 +27,7 @@ - + diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl index 8473d0408d..ac86210744 100644 --- a/templates/de/html/admin/admin_config_proxy.tpl +++ b/templates/de/html/admin/admin_config_proxy.tpl @@ -41,7 +41,7 @@ - + diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl index d8bc757dfd..4d958526ba 100644 --- a/templates/de/html/admin/admin_config_refback.tpl +++ b/templates/de/html/admin/admin_config_refback.tpl @@ -33,7 +33,7 @@ - + diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index 6606a604fd..b2dc3b9d7d 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -49,7 +49,7 @@
- +
{%form_close%} diff --git a/templates/de/html/admin/admin_config_register.tpl b/templates/de/html/admin/admin_config_register.tpl index 8a4b12f083..4acfd10b98 100644 --- a/templates/de/html/admin/admin_config_register.tpl +++ b/templates/de/html/admin/admin_config_register.tpl @@ -15,7 +15,7 @@ - + diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl index fe02483212..17fe99889f 100644 --- a/templates/de/html/admin/admin_config_register2.tpl +++ b/templates/de/html/admin/admin_config_register2.tpl @@ -35,7 +35,7 @@ - + diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index 330a001c99..785394f61c 100644 --- a/templates/de/html/admin/admin_config_removeip.tpl +++ b/templates/de/html/admin/admin_config_removeip.tpl @@ -85,7 +85,7 @@ - + diff --git a/templates/de/html/admin/admin_config_rewrite.tpl b/templates/de/html/admin/admin_config_rewrite.tpl index 28cb2d8c24..0956307d81 100644 --- a/templates/de/html/admin/admin_config_rewrite.tpl +++ b/templates/de/html/admin/admin_config_rewrite.tpl @@ -17,7 +17,7 @@ - + diff --git a/templates/de/html/admin/admin_config_secure.tpl b/templates/de/html/admin/admin_config_secure.tpl index dc80e13abc..1235f21da7 100644 --- a/templates/de/html/admin/admin_config_secure.tpl +++ b/templates/de/html/admin/admin_config_secure.tpl @@ -28,7 +28,7 @@ - + diff --git a/templates/de/html/admin/admin_config_session.tpl b/templates/de/html/admin/admin_config_session.tpl index a64ff5b10c..cce8f21d4b 100644 --- a/templates/de/html/admin/admin_config_session.tpl +++ b/templates/de/html/admin/admin_config_session.tpl @@ -26,7 +26,7 @@ - + diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl index 75fe947849..b6092c16de 100644 --- a/templates/de/html/admin/admin_config_sponsor.tpl +++ b/templates/de/html/admin/admin_config_sponsor.tpl @@ -25,7 +25,7 @@ - + diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl index 3655c36ff3..925a9d8b2c 100644 --- a/templates/de/html/admin/admin_config_stats.tpl +++ b/templates/de/html/admin/admin_config_stats.tpl @@ -44,7 +44,7 @@ - + diff --git a/templates/de/html/admin/admin_config_sub_points.tpl b/templates/de/html/admin/admin_config_sub_points.tpl index f8dcc4d0d5..d902f60632 100644 --- a/templates/de/html/admin/admin_config_sub_points.tpl +++ b/templates/de/html/admin/admin_config_sub_points.tpl @@ -21,7 +21,7 @@ - + diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index bf4d3fffe3..ef66d64eba 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -209,7 +209,7 @@ - + diff --git a/templates/de/html/admin/admin_config_timezone.tpl b/templates/de/html/admin/admin_config_timezone.tpl index bb6d863d02..37eccf7195 100644 --- a/templates/de/html/admin/admin_config_timezone.tpl +++ b/templates/de/html/admin/admin_config_timezone.tpl @@ -17,7 +17,7 @@ - + diff --git a/templates/de/html/admin/admin_config_title.tpl b/templates/de/html/admin/admin_config_title.tpl index e1c8c4078a..71b09fbdd6 100644 --- a/templates/de/html/admin/admin_config_title.tpl +++ b/templates/de/html/admin/admin_config_title.tpl @@ -44,7 +44,7 @@
- +
{%form_close%} diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl index 53527b568a..84857b98e6 100644 --- a/templates/de/html/admin/admin_config_top10.tpl +++ b/templates/de/html/admin/admin_config_top10.tpl @@ -15,7 +15,7 @@ - + diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index cd02d0764d..cc6cd8bfa7 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -45,7 +45,7 @@ - + diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl index a0e5eb4eec..5137f26b38 100644 --- a/templates/de/html/admin/admin_config_user.tpl +++ b/templates/de/html/admin/admin_config_user.tpl @@ -82,7 +82,7 @@
- +
{%form_close%} diff --git a/templates/de/html/admin/admin_config_user_subid.tpl b/templates/de/html/admin/admin_config_user_subid.tpl index fac41130ec..daa36271d7 100644 --- a/templates/de/html/admin/admin_config_user_subid.tpl +++ b/templates/de/html/admin/admin_config_user_subid.tpl @@ -25,7 +25,7 @@
- +
{%form_close%} diff --git a/templates/de/html/admin/admin_config_validator.tpl b/templates/de/html/admin/admin_config_validator.tpl index e14934da69..b87ce8f9c4 100644 --- a/templates/de/html/admin/admin_config_validator.tpl +++ b/templates/de/html/admin/admin_config_validator.tpl @@ -17,7 +17,7 @@ - + diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index 5d249920d4..00dbb59825 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -133,7 +133,7 @@ - + diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl index b94f8d378b..200b0eb830 100644 --- a/templates/de/html/admin/admin_config_yoomedia.tpl +++ b/templates/de/html/admin/admin_config_yoomedia.tpl @@ -77,7 +77,7 @@ - + diff --git a/templates/de/html/admin/admin_delete_cats.tpl b/templates/de/html/admin/admin_delete_cats.tpl index 517ed0e536..6dbe0f19b4 100644 --- a/templates/de/html/admin/admin_delete_cats.tpl +++ b/templates/de/html/admin/admin_delete_cats.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_cats&do=del%} +{%form,formMethodPost=modules.php?module=admin&what=list_cats&do=del%}
diff --git a/templates/de/html/admin/admin_delete_rallye_prices.tpl b/templates/de/html/admin/admin_delete_rallye_prices.tpl index 65f75f09b9..7b0f4b9cfe 100644 --- a/templates/de/html/admin/admin_delete_rallye_prices.tpl +++ b/templates/de/html/admin/admin_delete_rallye_prices.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content[rallye_id]%} +{%form,formMethodPost=modules.php?module=admin&what=list_rallye_prices&rallye_id=$content[rallye_id]%}
diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl index 0f1696b7b1..1ec7f76e19 100644 --- a/templates/de/html/admin/admin_edit_cats.tpl +++ b/templates/de/html/admin/admin_edit_cats.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_cats&do=edit%} +{%form,formMethodPost=modules.php?module=admin&what=list_cats&do=edit%}
diff --git a/templates/de/html/admin/admin_edit_mods.tpl b/templates/de/html/admin/admin_edit_mods.tpl index 0c015221ac..8aff7ac05d 100644 --- a/templates/de/html/admin/admin_edit_mods.tpl +++ b/templates/de/html/admin/admin_edit_mods.tpl @@ -1,11 +1,12 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_mods%} +{%form,formMethodPost=modules.php?module=admin&what=list_mods%} + @@ -14,7 +15,9 @@ + $content +
{--ADMIN_MODS_EDIT_TITLE--}
{--ADMIN_MODS_NAME--} {--ADMIN_MODS_TITLE--}{--ADMIN_MODS_IS_ADMIN--} {--ADMIN_MODS_IS_MEMBER--}
diff --git a/templates/de/html/admin/admin_edit_rallye_prices.tpl b/templates/de/html/admin/admin_edit_rallye_prices.tpl index 9e7abcdf45..f73d3c33aa 100644 --- a/templates/de/html/admin/admin_edit_rallye_prices.tpl +++ b/templates/de/html/admin/admin_edit_rallye_prices.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content[rallye_id]%} +{%form,formMethodPost=modules.php?module=admin&what=list_rallye_prices&rallye_id=$content[rallye_id]%}
diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl index a8f9cfdae2..37b1a4910a 100644 --- a/templates/de/html/admin/admin_list_cats.tpl +++ b/templates/de/html/admin/admin_list_cats.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_cats%} +{%form,formMethodPost=modules.php?module=admin&what=list_cats%}
diff --git a/templates/de/html/admin/admin_list_mods.tpl b/templates/de/html/admin/admin_list_mods.tpl index 50e0815d30..fb76fa0e3c 100644 --- a/templates/de/html/admin/admin_list_mods.tpl +++ b/templates/de/html/admin/admin_list_mods.tpl @@ -1,11 +1,12 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_mods%} +{%form,formMethodPost=modules.php?module=admin&what=list_mods%} + @@ -15,7 +16,9 @@ + $content + - + diff --git a/templates/de/html/admin/admin_list_rallye_prices_simple.tpl b/templates/de/html/admin/admin_list_rallye_prices_simple.tpl index 2a76082e84..fa35359aed 100644 --- a/templates/de/html/admin/admin_list_rallye_prices_simple.tpl +++ b/templates/de/html/admin/admin_list_rallye_prices_simple.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content[rallye_id]%} +{%form,formMethodPost=modules.php?module=admin&what=list_rallye_prices&rallye_id=$content[rallye_id]%}
{--ADMIN_LIST_MODS_TITLE--}
{--ID_SELECT--} {--ADMIN_MODS_NAME--}{--ADMIN_MODS_IS_ADMIN--} {--ADMIN_MODS_IS_MEMBER--}
diff --git a/templates/de/html/admin/admin_list_rallye_prices_row.tpl b/templates/de/html/admin/admin_list_rallye_prices_row.tpl index d3f185e365..efea691397 100644 --- a/templates/de/html/admin/admin_list_rallye_prices_row.tpl +++ b/templates/de/html/admin/admin_list_rallye_prices_row.tpl @@ -1,5 +1,5 @@
$content[title]$content[title] {%pipe,generateAdminLink=$content[admin_id]%} $content[start_time] $content[end_time]
diff --git a/templates/de/html/admin/admin_list_rallyes_row.tpl b/templates/de/html/admin/admin_list_rallyes_row.tpl index c578e82faa..d54281012c 100644 --- a/templates/de/html/admin/admin_list_rallyes_row.tpl +++ b/templates/de/html/admin/admin_list_rallyes_row.tpl @@ -2,7 +2,7 @@ $content[select] {--ADMIN_RALLYE_TITLE--}:
- $content[title] + $content[title] 		{--ADMIN_RALLYE_DESCRIPTION--}:
@@ -46,7 +46,7 @@
{--RALLYE_ASSIGNED_PRICES--}:
- {%pipe,translateComma=$content[prices_cnt]%} + {%pipe,translateComma=$content[prices_cnt]%} 		{--RALLYE_ASSIGNED_USERS--}:
-- 2.39.5