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 a431b8c..699a56d 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 ec42d00..331f588 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 6808540..b2507ad 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 75a03c1..da987bb 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 5c16659..aff3816 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 9756817..38bdeab 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 c55700b..431d4cc 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 dec9005..bb9e824 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 c75c29d..27098e4 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 4b9622a..92f1b16 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 c06ffec..fb4d448 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 3da037d..f202e78 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 d42f8d9..dfe0b24 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 63fcbee..048e7b6 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 2f50fa4..f551ef4 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 b0a0abe..31bc22e 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 fee6cfe..53b3cee 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 bbcbf61..89cfc76 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 e84e61d..b03ce7a 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 d224da9..e667473 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 525fc2a..1779042 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 aba503e..5a94024 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 0d7f41d..97c1f6b 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 db87cf9..f551ef4 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 7bc1cdd..2e7a17a 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 0815ab9..936f0e6 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 b98e1db..0f6fd82 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 30509c2..81aac69 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 036d3e9..e44120d 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 b83af2f..713a5fd 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 c3c160a..f551ef4 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 b064ea0..1105d4f 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 ca521c2..b658585 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 f4970ba..eec09e7 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 209a75e..30aac7a 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 4f8f423..357af09 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 10eee72..8a64f70 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 934acac..f1ab636 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 d0c87d9..bbe3e6a 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 2dfb880..cc82a1a 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 467a399..62f16db 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 27f4b0c..dc9533b 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 cbd48fa..9c620c2 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 9be866a..654c6e9 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 ad048af..e1c8266 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 1d94b0f..931b192 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 a46218b..4cf8ef1 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 bcc6051..cbffdaf 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 b239445..dd39d4d 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 1b9fd7b..7154bb3 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 4212561..ffa82a2 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 f1574fd..48069a9 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 c16f178..2b2cfed 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 abad4ae..8f03d4a 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 ee7aa47..ce5e7aa 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 411b018..57f1cbb 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 0dbb3d2..013eec5 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 74944e8..bea3526 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 c2e7ed2..f4d3d31 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 3850941..2489aac 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 e5945a8..f533da4 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 8e8d0ad..ebd821a 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 92e950e..6b6022c 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 fefab08..fa99326 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 d7c8181..fe7ae5a 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 87dd723..5ceab8a 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 6d96456..1482a7b 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 bfdd037..fab850c 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 0942f36..2209c6a 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 3d418df..874238a 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 7b1580e..2bccdcb 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 e17e77d..d68ba03 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 2ef4a0d..8cd51f2 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 226702d..92d3968 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 9f42bc2..96059b3 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 c7a802d..40fba44 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 8473d04..ac86210 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 d8bc757..4d95852 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 6606a60..b2dc3b9 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 8a4b12f..4acfd10 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 fe02483..17fe998 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 330a001..785394f 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 28cb2d8..0956307 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 dc80e13..1235f21 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 a64ff5b..cce8f21 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 75fe947..b6092c1 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 3655c36..925a9d8 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 f8dcc4d..d902f60 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 bf4d3ff..ef66d64 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 bb6d863..37eccf7 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 e1c8c40..71b09fb 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 53527b5..84857b9 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 cd02d07..cc6cd8b 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 a0e5eb4..5137f26 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 fac4113..daa3627 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 e14934d..b87ce8f 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 5d24992..00dbb59 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 b94f8d3..200b0eb 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 517ed0e..6dbe0f1 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 65f75f0..7b0f4b9 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 0f1696b..1ec7f76 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 0c01522..8aff7ac 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 9e7abcd..f73d3c3 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 a8f9cfd..37b1a49 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 50e0815..fb76fa0 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 d3f185e..efea691 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 2a76082..fa35359 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 c578e82..d542810 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 />