]> git.mxchange.org Git - mailer.git/commitdiff
Some menu points renamed to not conflict with configuration menus:
authorRoland Häder <roland@mxchange.org>
Sat, 24 Nov 2012 23:14:38 +0000 (23:14 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 24 Nov 2012 23:14:38 +0000 (23:14 +0000)
- 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

111 files changed:
.gitattributes
DOCS/TODOs.txt
inc/extensions/ext-mods.php
inc/extensions/ext-rallye.php
inc/extensions/ext-sql_patches.php
inc/extensions/ext-user.php
inc/modules/admin/what-add_rallye.php
inc/modules/admin/what-config_
inc/modules/admin/what-config_active.php
inc/modules/admin/what-config_admin.php
inc/modules/admin/what-config_autopurge.php
inc/modules/admin/what-config_beg.php
inc/modules/admin/what-config_birthday.php
inc/modules/admin/what-config_bonus.php
inc/modules/admin/what-config_cats.php
inc/modules/admin/what-config_coupon.php
inc/modules/admin/what-config_doubler.php
inc/modules/admin/what-config_extensions.php
inc/modules/admin/what-config_holiday.php
inc/modules/admin/what-config_home.php
inc/modules/admin/what-config_imprint.php
inc/modules/admin/what-config_mediadata.php
inc/modules/admin/what-config_menu.php
inc/modules/admin/what-config_mods.php
inc/modules/admin/what-config_newsletter.php
inc/modules/admin/what-config_nickname.php
inc/modules/admin/what-config_order.php
inc/modules/admin/what-config_other.php
inc/modules/admin/what-config_points.php
inc/modules/admin/what-config_proxy.php
inc/modules/admin/what-config_rallye_prices.php
inc/modules/admin/what-config_refback.php
inc/modules/admin/what-config_refid.php
inc/modules/admin/what-config_register.php
inc/modules/admin/what-config_register2.php
inc/modules/admin/what-config_removeip.php
inc/modules/admin/what-config_rewrite.php
inc/modules/admin/what-config_secure.php
inc/modules/admin/what-config_session.php
inc/modules/admin/what-config_sponsor.php
inc/modules/admin/what-config_stats.php
inc/modules/admin/what-config_surfbar.php
inc/modules/admin/what-config_timezone.php
inc/modules/admin/what-config_title.php
inc/modules/admin/what-config_top10.php
inc/modules/admin/what-config_transfer.php
inc/modules/admin/what-config_user.php
inc/modules/admin/what-config_user_subid.php
inc/modules/admin/what-config_validator.php
inc/modules/admin/what-config_wernis.php
inc/modules/admin/what-config_yoomedia.php
inc/modules/admin/what-list_cats.php
inc/modules/admin/what-list_mods.php [new file with mode: 0644]
inc/modules/admin/what-list_rallye_prices.php [new file with mode: 0644]
inc/modules/admin/what-list_user.php
inc/modules/admin/what-list_user_cats.php [new file with mode: 0644]
install/menu-de.sql
install/menu-en.sql
templates/de/html/admin/admin_add_cat.tpl
templates/de/html/admin/admin_add_rallye_prices.tpl
templates/de/html/admin/admin_config_active.tpl
templates/de/html/admin/admin_config_admin.tpl
templates/de/html/admin/admin_config_autopurge.tpl
templates/de/html/admin/admin_config_beg.tpl
templates/de/html/admin/admin_config_birthday.tpl
templates/de/html/admin/admin_config_bonus.tpl
templates/de/html/admin/admin_config_coupon.tpl
templates/de/html/admin/admin_config_doubler.tpl
templates/de/html/admin/admin_config_extensions.tpl
templates/de/html/admin/admin_config_holiday.tpl
templates/de/html/admin/admin_config_home.tpl
templates/de/html/admin/admin_config_mediadata.tpl
templates/de/html/admin/admin_config_menu.tpl
templates/de/html/admin/admin_config_network_api.tpl
templates/de/html/admin/admin_config_newsletter.tpl
templates/de/html/admin/admin_config_nickname.tpl
templates/de/html/admin/admin_config_order.tpl
templates/de/html/admin/admin_config_other.tpl
templates/de/html/admin/admin_config_point_settings.tpl
templates/de/html/admin/admin_config_proxy.tpl
templates/de/html/admin/admin_config_refback.tpl
templates/de/html/admin/admin_config_refid.tpl
templates/de/html/admin/admin_config_register.tpl
templates/de/html/admin/admin_config_register2.tpl
templates/de/html/admin/admin_config_removeip.tpl
templates/de/html/admin/admin_config_rewrite.tpl
templates/de/html/admin/admin_config_secure.tpl
templates/de/html/admin/admin_config_session.tpl
templates/de/html/admin/admin_config_sponsor.tpl
templates/de/html/admin/admin_config_stats.tpl
templates/de/html/admin/admin_config_sub_points.tpl
templates/de/html/admin/admin_config_surfbar.tpl
templates/de/html/admin/admin_config_timezone.tpl
templates/de/html/admin/admin_config_title.tpl
templates/de/html/admin/admin_config_top10.tpl
templates/de/html/admin/admin_config_transfer.tpl
templates/de/html/admin/admin_config_user.tpl
templates/de/html/admin/admin_config_user_subid.tpl
templates/de/html/admin/admin_config_validator.tpl
templates/de/html/admin/admin_config_wernis.tpl
templates/de/html/admin/admin_config_yoomedia.tpl
templates/de/html/admin/admin_delete_cats.tpl
templates/de/html/admin/admin_delete_rallye_prices.tpl
templates/de/html/admin/admin_edit_cats.tpl
templates/de/html/admin/admin_edit_mods.tpl
templates/de/html/admin/admin_edit_rallye_prices.tpl
templates/de/html/admin/admin_list_cats.tpl
templates/de/html/admin/admin_list_mods.tpl
templates/de/html/admin/admin_list_rallye_prices_row.tpl
templates/de/html/admin/admin_list_rallye_prices_simple.tpl
templates/de/html/admin/admin_list_rallyes_row.tpl

index a431b8c82b49cdbe660c39dec81edc147fa51897..699a56da5398a7f39616e08e0f249e1b65b8e98e 100644 (file)
@@ -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
index ec42d004cf3c019bd67acbdfccf03ee30aee4a91..331f588e2ffd7e04f2a8a89eaf7adc1f6732497d 100644 (file)
@@ -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'
 ./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                                    *
 ./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'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-./inc/modules/admin/what-list_cats.php:68:                             // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_links.php:96:                                    // @TODO Rewrite this to includes/filter
+./inc/modules/admin/what-list_mods.php:55:                     // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
+./inc/modules/admin/what-list_rallye_prices.php:222:                   // @TODO Rewrite these two constants
 ./inc/modules/admin/what-list_refs.php:101:                                                    // @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_unconfirmed.php:114:     // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
 ./inc/modules/admin/what-list_unconfirmed.php:84:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
 ./inc/modules/admin/what-list_unconfirmed.php:87:      // @TODO `id` has been used two times???
+./inc/modules/admin/what-list_user_cats.php:54:                // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+./inc/modules/admin/what-list_user_cats.php:68:                                // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_user.php:104:            // @TODO Refacture these old link generation to functions
 ./inc/modules/admin/what-list_user.php:121:            // @TODO Refacture birth_foo to avoid uni* timetstamps as older members cannot be greeded correctly
 ./inc/modules/admin/what-list_user.php:291:            // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-admins_contact.php:2:// @DEPRECATED
 ./inc/modules/admin/what-autopurge.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_cache.php:2:// @DEPRECATED
+./inc/modules/admin/what-config_cats.php:2:// @DEPRECATED
+./inc/modules/admin/what-config_mods.php:2:// @DEPRECATED
+./inc/modules/admin/what-config_rallye_prices.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_reg.php:2:// @DEPRECATED
 ./inc/modules/admin/what-del_task.php:2:// @DEPRECATED
 ./inc/modules/admin/what-list_newsletter.php:2:// @DEPRECATED
index 6808540e8b62a6100585c686844147db1a4f2058..b2507ad0ac054b6e136dce834702d1fae9029124 100644 (file)
@@ -41,16 +41,16 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.0.9');
+setThisExtensionVersion('0.1.0');
 
 // 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'));
+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'));
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
                // SQL commands to run
                addAdminMenuSql('mods', NULL, 'Modul-Management','Verwalten Sie die Basis-Module index, login, admin usw.', 4);
-               addAdminMenuSql('mods','config_mods','Module &auml;ndern','&Auml;ndern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1);
+               addAdminMenuSql('mods','list_mods','Module &auml;ndern','&Auml;ndern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1);
                addAdminMenuSql('mods','stats_mods','Modul-Statistiken','Sehen Sie sich hier die Statistiken der Module und die damit verkn&uuml;pften action- und what-Dateien an. Bei einigen Modulen gibt es allerdings keine verkn&uuml;pften Dateien und somit keine Extra-Statistik.', 2);
                break;
 
@@ -124,6 +124,13 @@ switch (getExtensionMode()) {
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Standardnamen gesetzt, diese &uuml;berschreiben nicht Ihre bereits gespeicherten Modulnamen.");
                                break;
+
+                       case '0.1.0': // SQL queries for v0.1.0
+                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='list_mods' WHERE `action`='mods' AND `what`='config_mods' LIMIT 1");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Men&uuml; umbenannt, da &quot;config&quot; nur f&uuml;r die Konfigurationstabelle <strong>{?_MYSQL_PREFIX?}_config</strong> ist.");
+                               break;
                } // END - switch
                break;
 
index 75a03c1891eb08b055acd11c55f416d080c4e07a..da987bb239942969ccf97eae61296d203ce854c3 100644 (file)
@@ -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&ouml;hren. Dabei wird alles weitere automatisch geregelt.',9);
                addAdminMenuSql('rallye','add_rallye','Neue Rallye hinzuf&uuml;gen','Neue Ref-Rallye hinzuf&uuml;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&ouml;schen usw.',3);
 
                // Guest menu
@@ -342,6 +341,13 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                                // Update notes
                                setExtensionUpdateNotes("Weitere Filter hinzugef&uuml;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&uuml; umbenannt, da &quot;config&quot; nur f&uuml;r die Konfigurationstabelle <strong>{?_MYSQL_PREFIX?}_config</strong> ist.");
+                               break;
                } // END - switch
                break;
 
index 5c166599899805cf6c7facab5819df5fb68454c5..aff38160221eddf3e71716b243f838b53cfbadd7 100644 (file)
@@ -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&uuml;punkt. Referral-Prozente d&uuml;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&uuml;punkt umbenannt, da &quot;config&quot; nur f&uuml;r die Konfigurationstabelle <strong>{?_MYSQL_PREFIX?}_config</strong> ist.");
+                               break;
                } // END - switch
                break;
 
index 97568175d711fc002e3f61d9a28fb825a09a48ec..38bdeab834e52cbe7219463fabc9b4f07da0656a 100644 (file)
@@ -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 &auml;ndern.', 6);
                addAdminMenuSql('user', 'list_refs', 'Referrals anzeigen', 'Mit diesem Men&uuml;punkt k&ouml;nnen Sie die generierten Referrals eines Mitgliedes auflisten.', 7);
                addAdminMenuSql('user', 'list_links', 'Unbest&auml;tigte Mails', 'Mit diesem Men&uuml;punkt k&ouml;nnen Sie die vom Mitglied nicht best&auml;tigten Mails anzeigen.', 8);
-               addAdminMenuSql('user', 'list_cats', 'Kategorien anzeigen', 'Listet die ausgew&auml;hlten Kategorien eines Mitgliedes auf.', 9);
+               addAdminMenuSql('user', 'list_user_cats', 'Kategorien anzeigen', 'Listet die ausgew&auml;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&uuml;punkt umbenannt um Platz f&uuml;r Konflikt mit <strong>what-config_cats.php</strong> zu schaffen.");
+                               break;
                } // END - switch
                break;
 
index c55700b9e53b038b525a87c36b3c636d2cd03321..431d4ccf31d078acf17185d1f0ef838d98da2d76 100644 (file)
@@ -100,7 +100,7 @@ if (isFormSent()) {
 
                if (!empty($id)) {
                        // Reload to prices...
-                       redirectToUrl('modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=' . bigintval($id));
+                       redirectToUrl('modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=' . bigintval($id));
                } else {
                        // Problem detected...
                        displayMessage('{--ADMIN_RALLYE_PROBLEM_CREATE--}');
index dec9005dcccef2eaf3f8b6e8af629932368205ce..bb9e82452c3b8f81129aa057569069cff0fe7747 100644 (file)
@@ -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 {
index c75c29dafbf9f3da07db82067ce666839673a449..27098e40597653c5be0df21b7adecde181f7b460 100644 (file)
@@ -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 {
index 4b9622a2d69bdf24d89f0d9d758af391af5aaaa4..92f1b16690b74e2264689bf2c1cd2a09957504fb 100644 (file)
@@ -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 {
index c06ffecd8983df306f610dd8b7907e1a5d9508b9..fb4d44811eee0f48f0725fad277ee85a904ec68f 100644 (file)
@@ -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 {
index 3da037dfce9e41b9cd60f9278863fd12f869576a..f202e78c296081dc6358cc719ef31030b29ae49b 100644 (file)
@@ -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'));
 
index d42f8d90882e4e584efb44d85ec7e6663131097a..dfe0b244f37430e4fc475ecd93149d750107bc2b 100644 (file)
@@ -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 {
index 63fcbeecc06c94dc049a46b59d35ff1f26f9182f..048e7b61966d78af33d14a22d259ca8d5b5cffd0 100644 (file)
@@ -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'));
 
index 2f50fa4f883388ca981c9b9b64b926e76f496b80..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
@@ -1,179 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 10/10/2003 *
- * ===================                          Last change: 07/04/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-config_cats.php                             *
- * -------------------------------------------------------------------- *
- * Short description : Add new categories and edit / delete existing    *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Neue Kategorien hinzufuegen und bestehende       *
- *                     editieren / loeschen                             *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
- * For more information visit: http://mxchange.org                      *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if ((!defined('__SECURITY')) || (!isAdmin())) {
-       die();
-} // END - if
-
-// Add description as navigation point
-addYouAreHereLink('admin', __FILE__);
-
-// 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 {
-               // Category does already exists
-               $content = '<span class="bad">{--CATEGORY_ALREADY_EXISTS--}</span>';
-       }
-
-       // 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 .= '<option value="' . $content['sort'] . '">' . $cat . '</option>';
-
-                       // 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
 ?>
index b0a0abea87b0188def59b8a6c2e6156852a6c1c0..31bc22eee320018bbde27c49787f3bc0dcf83488 100644 (file)
@@ -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');
 
index fee6cfea01ac94bd1f934ca5d36c4805d3a35c97..53b3cee7524c88cb860470efac3fd9cba5840092 100644 (file)
@@ -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'));
 
index bbcbf612309327fd928374aa5efb817c95a5d0d4..89cfc763c4d612b0b3287907e5ab67c016705f50 100644 (file)
@@ -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 {
index e84e61db9d5f7c8992b38cde029619de5236a20b..b03ce7aef0fed0cfe8036f757f56d4855fd15b09 100644 (file)
@@ -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 {
index d224da9f40262fdda7ccf735315d656fe06d447e..e667473d89fd628f61058264b37f55e244cb4309 100644 (file)
@@ -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();
 
index 525fc2a5c959cac72711a11befc3470961c69d6d..1779042b54d34396f22e0b21d7f41e96e911cf2a 100644 (file)
@@ -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
index aba503e0c9ec1cb5ad1e3bfccc17c6757a7d2a54..5a94024dd3be2ac6fefca8ad06eec2fbfbbe9383 100644 (file)
@@ -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 {
index 0d7f41dc97ef19ed71f50e913bdaaa5d84d268b3..97c1f6b7fbb1c3ca15553682c68737e645029478 100644 (file)
@@ -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 {
index db87cf99b9b0f15a065dedf761c63c530a5119f8..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
@@ -1,155 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 08/27/2004 *
- * ===================                          Last change: 08/27/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-config_mods.php                             *
- * -------------------------------------------------------------------- *
- * Short description : Module configuration                             *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Modul-Konfiguration                              *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
- * For more information visit: http://mxchange.org                      *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if ((!defined('__SECURITY')) || (!isAdmin())) {
-       die();
-} // END - if
-
-// Add description as navigation point
-addYouAreHereLink('admin', __FILE__);
-
-if (isFormSent('edit')) {
-       // Check if at least one module is selected
-       if (ifPostContainsSelections()) {
-               // Output header
-               $OUT = '';
-
-               // Edit selected modules
-               foreach (postRequestElement('sel') as $id => $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'] = '<strong><a href="{%url=modules.php?module=admin&amp;what=stats_mods&amp;mod=' . $content['module'] . '%}">' . $content['module'] . '</a></strong>';
-               } // 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
 ?>
index 7bc1cdd86dcc0f94bbbd2bbf7b978d3f048913a5..2e7a17a30a348f1277b4c4b2745c6a839bc45405 100644 (file)
@@ -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 {
index 0815ab941e79e1dbe932093ed8f445ab6ae90791..936f0e60f7d452254ccf922a934786e00966c17e 100644 (file)
@@ -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 {
index b98e1db125592e2f302f646a4daa9defa7132382..0f6fd825f0385cd1f33d37d2da4873544cb20a82 100644 (file)
@@ -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 {
index 30509c2edf6fe755e4810ff9a2a9a7b98f30cb81..81aac69a10179601fa455f47259e437509155745 100644 (file)
@@ -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()));
index 036d3e9c4ad42c46ed7d427019033990a4958457..e44120d876c36adf60176ca1bd22563866bdcd90 100644 (file)
@@ -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')) {
index b83af2ffd234c65b280840f744fa70614ce646b6..713a5fdfd93687e369006d57c9f17b10b2607ca3 100644 (file)
@@ -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
index c3c160ab39fd7ea0fb65f9061f3aa52073c2882a..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
@@ -1,279 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 07/03/2004 *
- * ===================                          Last change: 08/22/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-config_rallye_prices.php                    *
- * -------------------------------------------------------------------- *
- * Short description : Setup rallye prices                              *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Rallye-Preise einrichten                         *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
- * For more information visit: http://mxchange.org                      *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if ((!defined('__SECURITY')) || (!isAdmin())) {
-       exit();
-} // END - if
-
-// Add description as navigation point
-addYouAreHereLink('admin', __FILE__);
-
-if (isGetRequestElementSet('rallye_id')) {
-       // Price submitted?
-       if (isFormSent('add')) {
-               if ((isPostRequestElementSet('level')) && ((isPostRequestElementSet('points')) || (isPostRequestElementSet('info')))) {
-                       // Submitted data is valid, but maybe we already have this price level?
-                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s AND `price_level`='%s' LIMIT 1",
-                       array(bigintval(getRequestElement('rallye_id')), bigintval(postRequestElement('level'))), __FILE__, __LINE__);
-
-                       if (SQL_HASZERONUMS($result)) {
-                               // Ok, new price level entered!
-                               SQL_QUERY_ESC("INSERT INTO
-       `{?_MYSQL_PREFIX?}_rallye_prices`
-(`rallye_id`, `price_level`, `points`, `info`)
-       VALUES
-(%s, %s, '%s', '%s')",
-                               array(
-                                       bigintval(getRequestElement('rallye_id')),
-                                       bigintval(postRequestElement('level')),
-                                       convertCommaToDot(postRequestElement('points')),
-                                       postRequestElement('info')
-                               ), __FILE__, __LINE__);
-                               displayMessage('{--ADMIN_RALLYE_PRICE_LEVEL_SAVED--}');
-                       } else {
-                               // Free memory
-                               SQL_FREERESULT($result);
-
-                               // Price level found
-                               displayMessage('{--ADMIN_RALLYE_PRICE_ALREADY_FOUND--}');
-                       }
-               }
-       } elseif (isFormSent('do_delete')) {
-               // Check if at last one line is selected
-               if (ifPostContainsSelections()) {
-                       // Delete selected entries
-                       foreach (postRequestElement('sel') as $id => $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--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=' . getRequestElement('rallye_id') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--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
 ?>
index b064ea0c8e51dddb93cdc37c51dd21bca8a55f0a..1105d4fef473618e14bee0561eba72d183592377 100644 (file)
@@ -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'));
 
index ca521c2e58f275d5b84657ea2e98f9bdba413813..b6585858dc024be7fb8a59645f8e8701848a8f4f 100644 (file)
@@ -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 {
index f4970baea360036eb519873c4f7185478e3a6e89..eec09e7723e895ae0c34eb6c7ac6b2967ad33f91 100644 (file)
@@ -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;
 
index 209a75e89c2830560f00f6d4cfbe192377bcc2bb..30aac7adc97c09e8739ce415dc3c33771ed2065b 100644 (file)
@@ -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')));
index 4f8f4236a3f67f335201a6619a015eca5e73fccf..357af091318d933dbf027b98cc6c39dda480f1e7 100644 (file)
@@ -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 {
index 10eee72f0a4011b8b74b6c148f040494d9cbb171..8a64f7081b12a96ff459accff55def91ba622eb4 100644 (file)
@@ -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) {
index 934acac81b154bc6e350468d673cc1ce807fb638..f1ab636e60fe2880d53f1955727d5a99b113d30f 100644 (file)
@@ -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!
index d0c87d962627c3d3e6d9211c6bd8f7aa10d98847..bbe3e6af1c565614ba2e40ec9760e4b2b336d3d8 100644 (file)
@@ -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
index 2dfb880e6d619aad74730ca7abe157bda685e24c..cc82a1a7015ba648dfc15ebcd543826541f64311 100644 (file)
@@ -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 {
index 467a3996a6fb8fd9c295d8f98c06705f3ae8f569..62f16db3962d8f94904125c13a208811581eb9f1 100644 (file)
@@ -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 {
index 27f4b0cfd5cc1dcad90a4705fddfd0aa89b19b7f..dc9533b057a8a930646a38562d96890fdbbf15eb 100644 (file)
@@ -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'));
 
index cbd48fa65fef7fc30fbdc1ecc1d198bd5567e0ff..9c620c21f6bfbe31a15df29d69392b0fc44207e5 100644 (file)
@@ -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 {
index 9be866ab30914d54beb47de778a1c673f901a3e3..654c6e969e68de13321366c0521724b7b2ed7278 100644 (file)
@@ -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 {
index ad048afc37eb2b7d1be3d3736ff3077cfbd6dc95..e1c8266337135e202f76cdb673c5a0f4f0d6d865 100644 (file)
@@ -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 {
index 1d94b0f0c290a311a3942b00c68f633e7239cb3b..931b1920fb043e174786e7bf4ff807d2dd7d058c 100644 (file)
@@ -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 {
index a46218bacd7b9aeede4b5852239d34143557afa0..4cf8ef12abfc87c85bca9800684f16db1a2af101 100644 (file)
@@ -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 {
index bcc60518443dcfe219f8ca09320c6af3f49a0047..cbffdaf5fc1cbb83b8064d34a5900ab9034f4cba 100644 (file)
@@ -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 {
index b239445ad923033c30cb02f157d12fdef5fd3bf7..dd39d4df7cdbd420a2387d9aec9d485df0e8368e 100644 (file)
@@ -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 {
index 1b9fd7b9f8efed326946a85d33a4eb0fe2893235..7154bb32fe00f400a1c2b81fd2ea32389e51358b 100644 (file)
@@ -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());
 
index 4212561278fb00aec0e18177ac619adf82a2093e..ffa82a272ed03fdc1c19ffeb755d5b9478ad7e95 100644 (file)
@@ -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
index f1574fd56168f17a956a15a66161049ff71dbec8..48069a94b8185ed3801d9f30ce978bbd456e1003 100644 (file)
@@ -1,15 +1,15 @@
 <?php
 /************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 01/27/2004 *
- * ===================                          Last change: 07/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/10/2003 *
+ * ===================                          Last change: 07/04/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_cats.php                               *
  * -------------------------------------------------------------------- *
- * Short description : List selected categories from users              *
+ * Short description : Add new categories and edit / delete existing    *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Ausgewaehlte Kategorien eines Mitgliedes         *
- *                     auflisten                                        *
+ * Kurzbeschreibung  : Neue Kategorien hinzufuegen und bestehende       *
+ *                     editieren / loeschen                             *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -44,65 +44,135 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (isGetRequestElementSet('userid')) {
-       // Check if the user already exists
-       if (fetchUserData(getRequestElement('userid'))) {
-               // Loads surname, family's name and the email address
-               $content = getUserDataArray();
-
-               // Prepare constants
-               // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-               $content['email']  = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>';
-
-               // 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 = '<font color="#ee0000">{--NO--}</div>';
-                               if (SQL_NUMROWS($result_user) == 1) {
-                                       $selection = '<font color="#00ee00">{--YES--}</div>';
-                               } // 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 = '<span class="bad">{--CATEGORY_ALREADY_EXISTS--}</span>';
        }
+
+       // 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 .= '<option value="' . $content['sort'] . '">' . $cat . '</option>';
+
+                       // 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 (file)
index 0000000..16bc80d
--- /dev/null
@@ -0,0 +1,155 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 11/24/2012 *
+ * ===================                          Last change: 11/24/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_mods.php                               *
+ * -------------------------------------------------------------------- *
+ * Short description : Module configuration                             *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Modul-Konfiguration                              *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+if (isFormSent('edit')) {
+       // Check if at least one module is selected
+       if (ifPostContainsSelections()) {
+               // Output header
+               $OUT = '';
+
+               // Edit selected modules
+               foreach (postRequestElement('sel') as $id => $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'] = '<strong><a href="{%url=modules.php?module=admin&amp;what=stats_mods&amp;mod=' . $content['module'] . '%}">' . $content['module'] . '</a></strong>';
+               } // 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 (file)
index 0000000..6648702
--- /dev/null
@@ -0,0 +1,279 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 07/03/2004 *
+ * ===================                          Last change: 08/22/2004 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_rallye_prices.php                    *
+ * -------------------------------------------------------------------- *
+ * Short description : Setup rallye prices                              *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Rallye-Preise einrichten                         *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       exit();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+if (isGetRequestElementSet('rallye_id')) {
+       // Price submitted?
+       if (isFormSent('add')) {
+               if ((isPostRequestElementSet('level')) && ((isPostRequestElementSet('points')) || (isPostRequestElementSet('info')))) {
+                       // Submitted data is valid, but maybe we already have this price level?
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s AND `price_level`='%s' LIMIT 1",
+                       array(bigintval(getRequestElement('rallye_id')), bigintval(postRequestElement('level'))), __FILE__, __LINE__);
+
+                       if (SQL_HASZERONUMS($result)) {
+                               // Ok, new price level entered!
+                               SQL_QUERY_ESC("INSERT INTO
+       `{?_MYSQL_PREFIX?}_rallye_prices`
+(`rallye_id`, `price_level`, `points`, `info`)
+       VALUES
+(%s, %s, '%s', '%s')",
+                               array(
+                                       bigintval(getRequestElement('rallye_id')),
+                                       bigintval(postRequestElement('level')),
+                                       convertCommaToDot(postRequestElement('points')),
+                                       postRequestElement('info')
+                               ), __FILE__, __LINE__);
+                               displayMessage('{--ADMIN_RALLYE_PRICE_LEVEL_SAVED--}');
+                       } else {
+                               // Free memory
+                               SQL_FREERESULT($result);
+
+                               // Price level found
+                               displayMessage('{--ADMIN_RALLYE_PRICE_ALREADY_FOUND--}');
+                       }
+               }
+       } elseif (isFormSent('do_delete')) {
+               // Check if at last one line is selected
+               if (ifPostContainsSelections()) {
+                       // Delete selected entries
+                       foreach (postRequestElement('sel') as $id => $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--}<a href="{%url=modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=' . getRequestElement('rallye_id') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--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]
+?>
index c16f1787ec1a0ae8cfc838636496138170170784..2b2cfede104c404cdb7cfa65942fb23396521676 100644 (file)
@@ -114,7 +114,7 @@ LIMIT 1',
                        $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
                } // END - if
                if ($content['cats']  > 0) {
-                       $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}</a>]';
+                       $content['cats']  = $base . '&amp;what=list_user_cats&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}</a>]';
                } // 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 (file)
index 0000000..f1574fd
--- /dev/null
@@ -0,0 +1,109 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 01/27/2004 *
+ * ===================                          Last change: 07/13/2004 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_cats.php                               *
+ * -------------------------------------------------------------------- *
+ * Short description : List selected categories from users              *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Ausgewaehlte Kategorien eines Mitgliedes         *
+ *                     auflisten                                        *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+if (isGetRequestElementSet('userid')) {
+       // Check if the user already exists
+       if (fetchUserData(getRequestElement('userid'))) {
+               // Loads surname, family's name and the email address
+               $content = getUserDataArray();
+
+               // Prepare constants
+               // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+               $content['email']  = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>';
+
+               // 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 = '<font color="#ee0000">{--NO--}</div>';
+                               if (SQL_NUMROWS($result_user) == 1) {
+                                       $selection = '<font color="#00ee00">{--YES--}</div>';
+                               } // 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]
+?>
index abad4aefb06772d107923099d2aeb4e967c6922a..8f03d4aa3434ac7623492387b999e90fefe078d3 100644 (file)
@@ -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 &auml;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&ouml;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','&Auml;ndern oder l&ouml;schen Sie bereits bestehende Kategorien oder f&uuml;gen Sie weitere hinzu.',7);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','list_cats','Kategorien einrichten','&Auml;ndern oder l&ouml;schen Sie bereits bestehende Kategorien oder f&uuml;gen Sie weitere hinzu.',7);
 INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','refbanner','Referral-Banner','F&uuml;gen Sie neue Banner hinzu, die dann die Mitglieder verlinken k&ouml;nnen, um neue Mitglieder zu werben. Oder editieren / l&ouml;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&uuml;tungen','F&uuml;gen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Verg&uuml;tungen hinzu oder &auml;ndern / l&ouml;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);
index ee7aa47d11a0518adf01d874c733c382ebe7047d..ce5e7aaa00cfefbc3d1a1c5a5ee97f5c3fdb38ea 100644 (file)
@@ -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 &auml;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&ouml;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','&Auml;ndern oder l&ouml;schen Sie bereits bestehende Kategorien oder f&uuml;gen Sie weitere hinzu.',7);
+INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','list_cats','Kategorien einrichten','&Auml;ndern oder l&ouml;schen Sie bereits bestehende Kategorien oder f&uuml;gen Sie weitere hinzu.',7);
 INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('setup','refbanner','Referral-Banner','F&uuml;gen Sie neue Banner hinzu, die dann die Mitglieder verlinken k&ouml;nnen, um neue Mitglieder zu werben. Oder editieren / l&ouml;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&uuml;tungen','F&uuml;gen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Verg&uuml;tungen hinzu oder &auml;ndern / l&ouml;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);
index 411b0189ea47dd537399d5294aabdbe1416935c0..57f1cbb8f275ac0f212533195e034b55ab76198d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_cats%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_cats%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" align="center" colspan="2">
index 0dbb3d257330b3dcb2775acfb686a2e3bd5d3d59..013eec58de500b87a769cebc6f0ebfa05e211890 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=$content%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
index 74944e862dfe7556d273d92561d69f4ccb2408de..bea3526cb331911b28f5cdd5495d97bf34a6ebb1 100644 (file)
@@ -15,7 +15,7 @@
        <tr>
                <td class="table_footer" colspan="2" align="center">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index c2e7ed2cc01bb163109eddfb785bda19411ab056..f4d3d3120e8872f09cfb29495ed02d28c6877b71 100644 (file)
@@ -36,7 +36,7 @@
 
        <div class="table_footer top">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
 {%form_close%}
index 385094182809250f471c5b2dd8b76829e3b47be9..2489aacc1ce075bf88fe9f65427fee100f777b57 100644 (file)
 
        <div class="table_footer top">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
 {%form_close%}
index e5945a8fe0d5c7dd0bacdcb56b3448ce4baaa2fc..f533da498ed656166d0287f2a021c6030d96238e 100644 (file)
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 8e8d0ad904ae135c9d33e48c515c891892cc163d..ebd821ae11a22be11fa86671407e3924dc43bbef 100644 (file)
@@ -25,7 +25,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 92e950e0344397ed8296bf2fdc6b1472be6ed1c8..6b6022c28fdac5dea54a12078f84ad1510926e28 100644 (file)
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index fefab08ebfe41f6b6bc4d5bbe53dfe5839eea0b3..fa99326427bbcbd6a95059218cca21659c1f39ec 100644 (file)
@@ -34,7 +34,7 @@
        <tr>
                <td class="table_footer" colspan="2" align="center">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index d7c8181659ca02d1c1c1951e05c9d32cfdc10ddc..fe7ae5af32f36f0cdb14e1d5b2637d1684f97ec4 100644 (file)
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 87dd723793cf925a0c42aacf5d25ce233b9b9c9d..5ceab8a2de3e16abdabc2930416f2302529cf4bc 100644 (file)
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 6d964566d3fb96ef91b53b6e601f7452bc049986..1482a7b7952898ac43e013811b518b77e3a50bda 100644 (file)
@@ -29,7 +29,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index bfdd03711b23fe80a64b4f7d16b2c573b1d82db7..fab850cfb6a1490a8a608897ab773184bc95f56a 100644 (file)
@@ -40,7 +40,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 0942f36612e446901f782fbaabd23d49a7a328cc..2209c6a85a8756971f10a1e468b2d3baa274c1ee 100644 (file)
@@ -19,7 +19,7 @@
        <tr>
                <td class="table_footer" colspan="2" align="center">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 3d418df13a3693d86b547b1a2c68f8148c149ae1..874238a46ec962c31f2c2692481b8759dc9fc3e2 100644 (file)
@@ -25,7 +25,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 7b1580e7d07881ffa18d8f4faab53306670bad21..2bccdcb8311c06b6fc8e2d6472e182c008675a9e 100644 (file)
@@ -45,7 +45,7 @@
 <tr>
        <td class="table_footer" colspan="2" align="center">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--ADMIN_CONFIG_NETWORK_API_SAVE_BUTTON--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--ADMIN_CONFIG_NETWORK_API_SAVE_BUTTON--}" />
        </td>
 </tr>
 </table>
index e17e77d68051d5d6296a190d64542b7e56378015..d68ba03d3a79c2c4f7fb451d00d0a3b0cccea49e 100644 (file)
@@ -9,7 +9,7 @@
        <tr>
                <td class="table_footer" colspan="2" align="center">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 2ef4a0d569b9355f65c60e5ea0fc0097d814accc..8cd51f2cc29fe836f0a0c246a207061794dafe96 100644 (file)
@@ -27,7 +27,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 226702d01e8e73ccb79d8b2ab17dde5a94c9b1f1..92d3968e9fc515822262b1795a548e31ab6b1417 100644 (file)
 
        <div class="table_footer top">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
 {%form_close%}
index 9f42bc28bcd2c5378aacecd3b2281c7b9577c56d..96059b36e06be2ccdaea455bae67f1965182340e 100644 (file)
        <tr>
                <td colspan="2" align="center" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index c7a802dca20752f2d8c6cf62a3d27d10b1c18955..40fba448f98627f30b80027c0a6616abc6bf701e 100644 (file)
@@ -27,7 +27,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 8473d0408d0b4e15713301192fa45f3481a03e01..ac86210744d1afb5a2938e7dbe9308721c0e5824 100644 (file)
@@ -41,7 +41,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index d8bc757dfd55fd53bca3c90ef1d0c7c0ad6b88aa..4d958526ba4f3edc231f88abc25218e86262df35 100644 (file)
@@ -33,7 +33,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 6606a604fdce27ca078e50e1fd09c0e6ef6997d9..b2dc3b9d7da541f8eaf839316c85cb3bbb0aca28 100644 (file)
@@ -49,7 +49,7 @@
 
        <div class="table_footer top">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
 {%form_close%}
index 8a4b12f0839fb559f1c373eaa9971413b03e4a7c..4acfd10b98389469642ece0dc722200feedb30b5 100644 (file)
@@ -15,7 +15,7 @@
        <tr>
                <td colspan="3" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" name="ok" value="{--ADMIN_SAVE_REGISTER_MUST--}" />
+                       <input type="submit" name="save_config" value="{--ADMIN_SAVE_REGISTER_MUST--}" />
                </td>
        </tr>
 </table>
index fe024832127e2c2894e09b0d66f7eb02a604d9eb..17fe99889f7d21fc3700c09e71cfc7783f7a2bf9 100644 (file)
@@ -35,7 +35,7 @@
        <tr>
                <td class="table_footer" colspan="2" align="center">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 330a001c99475939bae7ac98816d5d0ecfbc2880..785394f61c84d59c2578c385a80152f67f5bca39 100644 (file)
@@ -85,7 +85,7 @@
 <tr>
        <td colspan="2" class="table_footer">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </td>
 </tr>
 </table>
index 28cb2d8c24f865bcb0c9cbfc7f3d9f341671f68f..0956307d81eb2d728edd1bf44c4cee942e86ccc8 100644 (file)
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="3" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index dc80e13abc7f15bb8f656dca02c7ca78d662cb91..1235f21da773d67ccbb9ecdf80bd2001556c680b 100644 (file)
@@ -28,7 +28,7 @@
        <tr>
                <td class="table_footer" colspan="3" align="center">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index a64ff5b10c1864c5d2455ff4cdbf0b56a787a13b..cce8f21d4b34f21e77e3dec696c4ef9d47cdb551 100644 (file)
@@ -26,7 +26,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 75fe947849dacf7b858b25fecc214684d71c9e7d..b6092c16deda6de0da4cc90583fc3b018f9216a7 100644 (file)
@@ -25,7 +25,7 @@
 <tr>
        <td colspan="2" class="table_footer">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </td>
 </tr>
 </table>
index 3655c36ff3154e5fbec268fb913759aa8e8bfb62..925a9d8b2c7df1ec8fe8b9bd747d393a2cb6905d 100644 (file)
@@ -44,7 +44,7 @@
        <tr>
                <td colspan="2" align="center" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index f8dcc4d0d5f719f5dfb2f111231f3ff47d9ad0db..d902f606326aaa471ebd237564028f10fc3a385e 100644 (file)
@@ -21,7 +21,7 @@
        <tr>
                <td class="table_footer" colspan="2" align="center">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index bf4d3fffe3da163d2fe05b85dd5b44af33af8932..ef66d64ebae16fcf3e5ffd793636c5140b49603d 100644 (file)
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index bb6d863d02f13916bea0da30222581448fd824f2..37eccf719524a8a02a73c344ecf00e7ad723ea84 100644 (file)
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index e1c8c4078a63ceeb9ffe5943e320e64d25301892..71b09fbdd6c1152a97b1b06c03702768c14f5bea 100644 (file)
@@ -44,7 +44,7 @@
 
        <div class="table_footer top">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
 {%form_close%}
index 53527b568a0a310a2d7a9243828b12dfa9bc82bd..84857b98e6b9b1cf74aa2250bac9c5d304529a5a 100644 (file)
@@ -15,7 +15,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index cd02d0764d7c9376049c9d381e360129111fa357..cc6cd8bfa7ae8460d50079f73259c4de3bc6e507 100644 (file)
@@ -45,7 +45,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index a0e5eb4eecaddbf7dcf7d0d9ed77310fe86c999a..5137f26b3869a94b5a82dfd6009ddcbedb70cdd8 100644 (file)
@@ -82,7 +82,7 @@
 
        <div class="table_footer top">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
 {%form_close%}
index fac41130eceb7ca3db863368f08192a374fb8355..daa36271d7d60c7e203d2c3c0fef16e9adeec6ff 100644 (file)
@@ -25,7 +25,7 @@
 
        <div class="table_footer top">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
 {%form_close%}
index e14934da69746bfd50f4f25abf8b5db74e9c09b3..b87ce8f9c42e205fab7beb00d90ed8894faf200f 100644 (file)
@@ -17,7 +17,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index 5d249920d4388777d6c0a7a336e4f7f99b8468e0..00dbb5982543f11447add87f46f633cfa724f4a3 100644 (file)
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+                       <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
                </td>
        </tr>
 </table>
index b94f8d378bbd3baff5ca2e881969028005ac59ec..200b0eb830f5b4aa19ab78f7aea03409483997af 100644 (file)
@@ -77,7 +77,7 @@
 <tr>
        <td colspan="2" class="table_footer">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
+               <input type="submit" class="form_submit" name="save_config" value="{--SAVE_SETTINGS--}" />
        </td>
 </tr>
 </table>
index 517ed0e5360f4c707407f40230f01c4da0b07927..6dbe0f19b41b78a284166c3b1337f553e7b1c071 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_cats&amp;do=del%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_cats&amp;do=del%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom">
index 65f75f09b9261ecd58791aecc6d01b5b2e9fe6c9..7b0f4b9cfe0fb578cc449c0a3a927859897f1c2e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=$content[rallye_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="4" align="center" class="table_header">
index 0f1696b7b16f162c0670515400ba400d81f2dcce..1ec7f76e1969bade850a40e84394a6ec50c69f53 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_cats&amp;do=edit%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_cats&amp;do=edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="2" class="table_header bottom">
index 0c015221ace0a5f351c2597babc60033d398377f..8aff7ac05d95d657a2c5651a1347b540b1905e52 100644 (file)
@@ -1,11 +1,12 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_mods%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_mods%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="6" class="table_header bottom" height="40">
                <strong>{--ADMIN_MODS_EDIT_TITLE--}</strong>
        </td>
 </tr>
+
 <tr>
        <td align="center" class="header_column bottom right" height="25"><strong>{--ADMIN_MODS_NAME--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_TITLE--}</strong></td>
@@ -14,7 +15,9 @@
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_ADMIN--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_MEMBER--}</strong></td>
 </tr>
+
 $content
+
 <tr>
        <td colspan="6" class="table_footer">
                <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
index 9e7abcdf458b39febd38398666bfa46987c88f9b..f73d3c33aa43e78fea3431340d845f4a01699fec 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=$content[rallye_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header">
index a8f9cfdae2856089f026938662adc25ed7532b82..37b1a4910acb0a32f2b6a06920bccfa352342fe5 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_cats%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_cats%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="4" class="table_header bottom">
index 50e0815d306136e8985bb4f4ccd8a242b911e192..fb76fa0e3c3bbab8a45f413bca52484fa1cd8cab 100644 (file)
@@ -1,11 +1,12 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_mods%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_mods%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="7" class="table_header bottom" align="center">
                <strong>{--ADMIN_LIST_MODS_TITLE--}</strong>
        </td>
 </tr>
+
 <tr>
        <td align="center" class="header_column bottom right" height="25" width="30"><strong>{--ID_SELECT--}</strong></td>
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_NAME--}</strong></td>
@@ -15,7 +16,9 @@
        <td align="center" class="header_column bottom right"><strong>{--ADMIN_MODS_IS_ADMIN--}</strong></td>
        <td align="center" class="header_column bottom"><strong>{--ADMIN_MODS_IS_MEMBER--}</strong></td>
 </tr>
+
 $content
+
 <tr>
        <td colspan="7" class="table_footer">
                <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
index d3f185e3650d74c6477b0660e9db036b84249eb4..efea691397aefe17da6f771cc27a5c0f45819453 100644 (file)
@@ -1,5 +1,5 @@
 <tr>
-       <td align="center" class="{%template,ColorSwitch%} bottom right"><a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}">$content[title]</a></td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right"><a href="{%url=modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=$content[rallye_id]%}">$content[title]</a></td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">{%pipe,generateAdminLink=$content[admin_id]%}</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[start_time]</td>
        <td align="center" class="{%template,ColorSwitch%} bottom">$content[end_time]</td>
index 2a76082e848beaf1f821195caa4e21ffc0db00c6..fa35359aed38bca0e083ec57c226005dc69f4b4b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-{%form,formMethodPost=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=$content[rallye_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header">
index c578e82faa2e574b59dea1dd1d873b9d97df9819..d54281012c619baee49e40cd60526fb58d37cb2d 100644 (file)
@@ -2,7 +2,7 @@
        <td align="center" class="{%template,ColorSwitch%} bottom right" rowspan="5">$content[select]</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                <strong>{--ADMIN_RALLYE_TITLE--}:</strong><br />
-               <a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}">$content[title]</a>
+               <a href="{%url=modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=$content[rallye_id]%}">$content[title]</a>
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                <strong>{--ADMIN_RALLYE_DESCRIPTION--}:</strong><br />
@@ -46,7 +46,7 @@
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom right" colspan="3">
                <strong>{--RALLYE_ASSIGNED_PRICES--}:</strong><br />
-               <a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}">{%pipe,translateComma=$content[prices_cnt]%}</a>
+               <a href="{%url=modules.php?module=admin&amp;what=list_rallye_prices&amp;rallye_id=$content[rallye_id]%}">{%pipe,translateComma=$content[prices_cnt]%}</a>
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom" colspan="2">
                <strong>{--RALLYE_ASSIGNED_USERS--}:</strong><br />