Admin menu has now a JavaScript "effect":
authorRoland Häder <roland@mxchange.org>
Thu, 18 Aug 2011 02:18:18 +0000 (02:18 +0000)
committerRoland Häder <roland@mxchange.org>
Thu, 18 Aug 2011 02:18:18 +0000 (02:18 +0000)
- Admin menu system can now be JavaScript-enabled. You need to enable JavaScript
  in your browser to see the full "effect". If you leave it disabled, all menus
  are fully displayed
- The helping text in admin area won't work in JavaScript-enabled mode
- Generic word 'mode' replaced on all (!) places to make it everywhere more
  clear which "mode" I mean there
- TODOs.txt updated

79 files changed:
.gitattributes
DOCS/TODOs.txt
inc/expression-functions.php
inc/extensions/ext-admins.php
inc/extensions/ext-booking.php
inc/extensions/ext-network.php
inc/extensions/ext-sql_patches.php
inc/filter/bonus_filter.php
inc/filter/booking_filter.php
inc/filter/mediadata_filter.php
inc/filters.php
inc/functions.php
inc/language/de.php
inc/language/wernis_de.php
inc/libs/admins_functions.php
inc/libs/booking_functions.php
inc/libs/task_functions.php
inc/libs/user_functions.php
inc/libs/yoomedia_functions.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-adminedit.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-guestedit.php
inc/modules/admin/what-list_admins_acls.php
inc/modules/admin/what-list_country.php
inc/modules/admin/what-list_doubler.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-memedit.php
inc/modules/admin/what-refbanner.php
inc/modules/admin/what-send_bonus.php
inc/modules/admin/what-send_newsletter.php
inc/modules/guest/what-sponsor_login.php
inc/modules/guest/what-stats.php
inc/modules/member/what-primera.php
inc/modules/member/what-transfer.php
inc/modules/member/what-wernis.php
inc/mysql-manager.php
inc/referral-functions.php
inc/template-functions.php
inc/wrapper-functions.php
js/menu-common.js [new file with mode: 0644]
mailid_top.php
templates/de/html/admin/admin_add_refbanner.tpl
templates/de/html/admin/admin_config_admin.tpl
templates/de/html/admin/admin_delete_admins_row.tpl
templates/de/html/admin/admin_edit_admins_row.tpl
templates/de/html/admin/admin_edit_refbanner.tpl
templates/de/html/admin/admin_edit_sponsor_add_points.tpl
templates/de/html/admin/admin_edit_sponsor_edit.tpl
templates/de/html/admin/admin_edit_sponsor_sub_points.tpl
templates/de/html/admin/admin_list_admins_row.tpl
templates/de/html/admin/admin_list_country_form.tpl
templates/de/html/admin/admin_list_sponsor_details.tpl
templates/de/html/admin/admin_list_sponsor_row.tpl
templates/de/html/admin/admin_main.tpl [new file with mode: 0644]
templates/de/html/admin/admin_main_footer.tpl
templates/de/html/admin/admin_main_header.tpl
templates/de/html/admin/admin_menu_overview_row.tpl
templates/de/html/admin/admin_newsletter.tpl
templates/de/html/admin/admin_newsletter_nohtml.tpl
templates/de/html/admin/admin_send_bonus_form.tpl
templates/de/html/admin/admin_send_bonus_select.tpl
templates/de/html/guest/guest_sponsor_activate.tpl
templates/de/html/guest/guest_sponsor_login.tpl
templates/de/html/guest/guest_sponsor_lost.tpl
templates/de/html/guest/guest_stats_member.tpl
templates/de/html/guest/guest_stats_table.tpl
templates/de/html/js/js_admin_menu_onclick.tpl [new file with mode: 0644]
templates/de/html/mailid/mailid_confirm_buttom.tpl
templates/de/html/mailid/mailid_enter_code.tpl
templates/de/html/mailid/mailid_timer.tpl
templates/de/html/member/member_primera_mode_list.tpl
templates/de/html/member/member_primera_mode_pay.tpl
templates/de/html/member/member_transfer_new.tpl
templates/de/html/member/member_wernis_mode_list.tpl
templates/de/html/member/member_wernis_mode_payout.tpl
templates/de/html/member/member_wernis_mode_withdraw.tpl
templates/de/html/menu/menu_table.tpl
templates/de/html/page_header.tpl

index af3fd83..42fa148 100644 (file)
@@ -798,6 +798,7 @@ inc/xml-functions.php svneol=native#text/plain
 /install.php svneol=native#text/plain
 /js.php svneol=native#text/plain
 js/jquery.js svneol=native#text/plain
+js/menu-common.js svneol=native#text/plain
 /lead-confirm.php svneol=native#text/plain
 /login.php svneol=native#text/plain
 /mailid.php svneol=native#text/plain
@@ -1407,6 +1408,7 @@ templates/de/html/admin/admin_logout.tpl svneol=native#text/plain
 templates/de/html/admin/admin_logout_form.tpl svneol=native#text/plain
 templates/de/html/admin/admin_logout_sql_patches_install.tpl svneol=native#text/plain
 templates/de/html/admin/admin_logout_sql_patches_remove.tpl svneol=native#text/plain
+templates/de/html/admin/admin_main.tpl svneol=native#text/plain
 templates/de/html/admin/admin_main_footer.tpl svneol=native#text/plain
 templates/de/html/admin/admin_main_header.tpl svneol=native#text/plain
 templates/de/html/admin/admin_maintenance_form.tpl svneol=native#text/plain
@@ -1678,6 +1680,7 @@ templates/de/html/install/install_page3.tpl svneol=native#text/plain
 templates/de/html/install/install_page5.tpl svneol=native#text/plain
 templates/de/html/install/install_welcome.tpl svneol=native#text/plain
 templates/de/html/js/.htaccess svneol=native#text/plain
+templates/de/html/js/js_admin_menu_onclick.tpl svneol=native#text/plain
 templates/de/html/js/js_cookies_disabled.tpl svneol=native#text/plain
 templates/de/html/js/js_jquery.tpl svneol=native#text/plain
 templates/de/html/js/js_order_send.tpl svneol=native#text/plain
index 26b1617..1ff32ba 100644 (file)
@@ -7,7 +7,7 @@
 ./inc/config-functions.php:138:        // @TODO Make this all better... :-/
 ./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye
 ./inc/daily/daily_birthday.php:96:                     // @TODO 4 is hard-coded here, should we move it out in config?
-./inc/expression-functions.php:164:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
+./inc/expression-functions.php:166:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/expression-functions.php:46:     // @TODO is escapeQuotes() enougth for strings with single/double quotes?
 ./inc/extensions/ext-html_mail.php:136:                // @TODO Move these arrays into config
 ./inc/extensions/ext-menu.php:52:              // @TODO Convert menu-Id to one coding-standard. admin(edit|_add) => admin_menu_(edit|add), mem(edit|_add) => (edit|add)_(admin|guest|member)_menu
@@ -54,8 +54,8 @@
 ./inc/functions.php:2199:      // @TODO Rename column data_type to e.g. mail_status
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-./inc/language/de.php:1073:    // @TODO Rewrite these two constants
-./inc/language/de.php:1089:    // @TODO Rewrite these three constants
+./inc/language/de.php:1074:    // @TODO Rewrite these two constants
+./inc/language/de.php:1090:    // @TODO Rewrite these three constants
 ./inc/language/de.php:758:// @TODO Are these constants longer used?
 ./inc/language-functions.php:255:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function.
 ./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten to a filter?
 ./inc/module-functions.php:267:                        // @TODO Nothing helped???
 ./inc/module-functions.php:308:                        // @TODO Rewrite this to a filter
-./inc/modules/admin/admin-inc.php:1426:                                // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
+./inc/modules/admin/admin-inc.php:1442:                                // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
 ./inc/modules/admin/admin-inc.php:171:         // @TODO This and the next getCurrentAdminId() call might be moved into the templates?
 ./inc/modules/admin/admin-inc.php:242:         // @TODO This can be rewritten into a filter
-./inc/modules/admin/admin-inc.php:490:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+./inc/modules/admin/admin-inc.php:506:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
 ./inc/modules/admin/overview-inc.php:162:                              // @TODO Rewrite this to a filter
 ./inc/modules/admin/overview-inc.php:275:                              // @TODO Rewrite this to something with include files and/or filter
 ./inc/modules/admin/overview-inc.php:309:                                              // @TODO This may also be rewritten to include files
 ./inc/loader/load_cache-revision.php:2:// @DEPRECATED
 ./inc/loader/load_cache-them.php:2:// @DEPRECATED
 ./inc/loader/load-extensions.php:2:// @DEPRECATED
-./inc/modules/admin/admin-inc.php:491:// @DEPRECATED
+./inc/modules/admin/admin-inc.php:507:// @DEPRECATED
 ./inc/modules/admin/what-chk_regs.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_admins.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_email.php:2:// @DEPRECATED
 ./templates/de/html/admin/admin_list_network_config.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_refs2.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_user_sort_form.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_main_header.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_stats2_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_stats2.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_stats_row.tpl:1:<!-- @DEPRECATED //-->
index 1eee08b..3aa8026 100644 (file)
@@ -109,10 +109,12 @@ function doExpressionCode ($data) {
 // Expression call-back function for URLs
 function doExpressionUrl ($data) {
        // Do we have JS-mode?
-       if ($data['callback'] == 'js') $data['mode'] = 1;
+       if ($data['callback'] == 'js') {
+               $data['output_mode'] = 1;
+       } // END - if
 
        // Handle an URL here
-       $replacer = "{DQUOTE} . encodeUrl('" . $data['matches'][4][$data['key']] . "', " . $data['mode'] . ') . {DQUOTE}';
+       $replacer = "{DQUOTE} . encodeUrl('" . $data['matches'][4][$data['key']] . "', " . $data['output_mode'] . ') . {DQUOTE}';
 
        // Replace it
        $code = replaceExpressionCode($data, $replacer);
index 81b2234..e07e757 100644 (file)
@@ -316,7 +316,7 @@ INDEX (`admin_id`)",
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `expert_warning` ENUM('Y','N') NOT NULL DEFAULT 'Y'");
 
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Experten-Einstellungen sind nun hinzugekommen.");
+                               setExtensionUpdateNotes("Entwicklereinstellungen sind nun hinzugekommen.");
                                break;
 
                        case '0.7.4': // SQL queries for v0.7.4
index 34712f1..d77204c 100644 (file)
@@ -61,7 +61,7 @@ switch (getExtensionMode()) {
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `subject` VARCHAR(255) NOT NULL DEFAULT 'missing',
-`mode` ENUM('ADD','SUB') NOT NULL DEFAULT 'ADD',
+`points_mode` ENUM('ADD','SUB') NOT NULL DEFAULT 'ADD',
 `points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.0000,
 `comments` TINYTEXT NULL DEFAULT NULL,
 `recorded` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
index 98c8c00..a3d9dc5 100644 (file)
@@ -5158,11 +5158,11 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
                addAdminMenuSql('network', 'query_networks', 'APIs abfragen', 'Fragt alle eingestellten APIs ab. Die Ergebnisse werden dann f&uuml;r einen einstellbaren Zeitraum gecacht und nicht erneut angefordert.',3);
                addAdminMenuSql('network', 'config_network', 'Einstellungen', 'Stellen Sie generelle Einstellungen ein, die f&uuml;r alle Werbenetzwerke gelten, wie z.B. Cache-Erneuerungsinterval. Generell sind aber die Einstellungen in Ordnung, da z.B. sonst Ihre freien Abfragen beim Werbenetzwerk sich zu schnell abbauen.',4);
                addAdminMenuSql('network', 'list_network_reloads', 'Reload-Sperren', 'Listen oder l&ouml;schen Sie hier Reload-Sperren. <strong>Vorsicht:</strong> Die hier gespeicherten Reload-Sperren sind vom jeweiligen Werbenetzwerk &uuml;bernommen. Eventuell verdienen Sie nichts, wenn Sie z.B. eine Mail innerhalb der Reload-Sperre erneut versenden.',5);
-               addAdminMenuSql('network', 'list_networks', 'Auflisten/Verwalten', '<strong>Experten-Einstellungen!</strong> Hier &auml;ndern Sie die Einstellungen an den Grunddaten (Stammdaten) des jeweiligen Werbenetzwerks ab. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 6);
-               addAdminMenuSql('network', 'list_network_types', 'Werbearten-Handler', '<strong>Experten-Einstellungen!</strong> Hier &auml;ndern Sie die Einstellungen zu den Werbearten-Handler pro Werbenetzwerken. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 7);
-               addAdminMenuSql('network', 'list_network_params', 'Abfrageparameter', '<strong>Experten-Einstellungen!</strong> Hier stellen Sie die Abfrageparameter (wie sie genannt werden m&uuml;ssen, um das API-Script korrekt aufrufen zu k&ouml;nnen) ein, pro Werbenetzwerk. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 8);
-               addAdminMenuSql('network', 'list_network_api_translation', 'Antwort-Array', '<strong>Experten-Einstellungen!</strong> Hier stellen Sie die Zuweisungen der aus der analysierten API-Antwort Array-Elementen zu den Datenspalten ein. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 10);
-               addAdminMenuSql('network', 'list_network_error_codes', 'Fehlercodes', '<strong>Experten-Einstellungen!</strong> Hier stellen Sie die Fehlercodes ein, die im Falle eines Fehlers pro API-Script kommen k&ouml;nnen. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 11);
+               addAdminMenuSql('network', 'list_networks', 'Auflisten/Verwalten', '<strong>Entwicklereinstellungen!</strong> Hier &auml;ndern Sie die Einstellungen an den Grunddaten (Stammdaten) des jeweiligen Werbenetzwerks ab. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 6);
+               addAdminMenuSql('network', 'list_network_types', 'Werbearten-Handler', '<strong>Entwicklereinstellungen!</strong> Hier &auml;ndern Sie die Einstellungen zu den Werbearten-Handler pro Werbenetzwerken. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 7);
+               addAdminMenuSql('network', 'list_network_params', 'Abfrageparameter', '<strong>Entwicklereinstellungen!</strong> Hier stellen Sie die Abfrageparameter (wie sie genannt werden m&uuml;ssen, um das API-Script korrekt aufrufen zu k&ouml;nnen) ein, pro Werbenetzwerk. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 8);
+               addAdminMenuSql('network', 'list_network_api_translation', 'Antwort-Array', '<strong>Entwicklereinstellungen!</strong> Hier stellen Sie die Zuweisungen der aus der analysierten API-Antwort Array-Elementen zu den Datenspalten ein. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 10);
+               addAdminMenuSql('network', 'list_network_error_codes', 'Fehlercodes', '<strong>Entwicklereinstellungen!</strong> Hier stellen Sie die Fehlercodes ein, die im Falle eines Fehlers pro API-Script kommen k&ouml;nnen. Sie sollten hier generell nichts einstellen und <a href="http://forum.mxchange.org/forum-43.html" target="_blank" title="Direktlink zum Forum">im Forum</a> um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten m&ouml;chten.', 11);
 
                // Configuration entries
                addConfigAddSql('network_cache_refresh', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT ' . (60 * 15));
index a8ba9a1..fad4c45 100644 (file)
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.8.6');
+setThisExtensionVersion('0.8.7');
 
 // 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.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'));
+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.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'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
@@ -883,6 +883,13 @@ INDEX (`history_last_used` DESC)",
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Uralten Konfigurationseintrag entfernt.");
                                break;
+
+                       case '0.8.7': // SQL queries for v0.8.7
+                               addConfigAddSql('admin_menu_javascript', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Es kann ausgew&auml;hlt werden, ob das herk&ouml;mliche JavaScrit-lose Men&uuml; oder mit JavaScript aktiv sein soll. Das herk&ouml;mliche ist erstmal Standarteinstellung, bis das JavaScript-Men&uuml; funktioniert.");
+                               break;
                } // END - switch
                break;
 
index b0bfa46..09ed63f 100644 (file)
@@ -71,7 +71,7 @@ LIMIT 1',
                $bonus = (!SQL_HASZEROAFFECTED());
        } // END - if
 
-       if (($bonus === true) && (getRequestElement('mode') == 'bonus')) {
+       if (($bonus === true) && (getRequestElement('do') == 'bonus')) {
                // Output message with added points
                $GLOBALS['message'] .= '<div class="tiny">{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}</div>';
        } else {
index 0f957db..a5af21e 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function FILTER_ADD_BOOKING_RECORD ($filterData) {
        // Add a record
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       addBookingRecord($filterData['subject'], $filterData['userid'], $filterData['points'], $filterData['mode']);
+       addBookingRecord($filterData['subject'], $filterData['userid'], $filterData['points'], $filterData['points_mode']);
 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
index 0df8d99..4cebbee 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function FILTER_UPDATE_MEDIADATA_ENTRY ($filterData) {
        // Execute the filter function
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added[' . gettype($filterData['added']) . ']=' . intval($filterData['added']) . ' - Called!');
-       $filterData['added'] = ($filterData['added'] === true && updateMediadataEntry(array('total_points'), $filterData['mode'], $filterData['points']));
+       $filterData['added'] = ($filterData['added'] === true && updateMediadataEntry(array('total_points'), $filterData['points_mode'], $filterData['points']));
 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added[' . gettype($filterData['added']) . ']=' . intval($filterData['added']) . ' - Done!');
index 36ded83..35b17ee 100644 (file)
@@ -530,7 +530,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($filterData) {
                                $data = array(
                                        'matches'     => $matches,
                                        'key'         => $key,
-                                       'mode'        => getScriptOutputMode(),
+                                       'output_mode' => getScriptOutputMode(),
                                        'code'        => $filterData,
                                        'callback'    => $callback,
                                        'extra_func'  => $extraFunction,
index 1b6b5dc..25035b5 100644 (file)
@@ -1572,8 +1572,8 @@ function determineRealRemoteAddress ($remoteAddr = false) {
 // This is a high-level function!
 function addNewBonusMail ($data, $mode = '', $output = true) {
        // Use mode from data if not set and availble ;-)
-       if ((empty($mode)) && (isset($data['mode']))) {
-               $mode = $data['mode'];
+       if ((empty($mode)) && (isset($data['mail_mode']))) {
+               $mode = $data['mail_mode'];
        } // END - if
 
        // Generate receiver list
index f88b0af..20e45d2 100644 (file)
@@ -891,8 +891,9 @@ addMessages(array(
        'MEMBER_NO_MAILS_IN_POOL' => "Sie haben noch keine Mailbuchungen aufgegeben! Es k&ouml;nnen somit Ihnen auch keine angezeigt werden.",
        'ADMIN_CONFIG_ADMIN_MENU_TITLE' => "Einstellungen am Adminmen&uuml;",
        'ADMIN_CONFIG_SELECT_MENU_TYPE' => "Men&uuml;typ ausw&auml;hlen",
-       'ADMIN_MENU_NEW' => "Neues Men&uuml;system mit &quot;logischen Bereichen&quot;",
-       'ADMIN_MENU_OLD' => "Herk&ouml;mliches Men&uuml;system links im Browser",
+       'ADMIN_CONFIG_ADMIN_MENU_NEW' => "Neues Men&uuml;system mit &quot;logischen Bereichen&quot;",
+       'ADMIN_CONFIG_ADMIN_MENU_OLD' => "Herk&ouml;mliches Men&uuml;system links im Browser",
+       'ADMIN_CONFIG_ADMIN_MENU_JAVASCRIPT_ENABLED' => "Soll das mit JavaScript (&quot;interaktiv&quot;) gesteuerte Adminmen&uuml; eingeschaltet werden? (Dies ist noch sehr experimentell.)",
        'ADMIN_BACK_TO_GUEST_MENU' => "Zum Gastmen&uuml; zur&uuml;ck...",
        'ADMIN_LOGOUT_NOW' => "Aus dem Admin-Bereich ausloggen",
        'ADMIN_LOGOUT_NOTE' => "Loggen Sie sich immer aus dem Admin-Bereich aus, wenn Sie beabsichten, ihn nicht mehr zu benutzen. Auch sollten Sie dies <strong>auf jedem Fall</strong> in einem Internet-Cafe vor Verlassen des Platzes tun.",
@@ -1100,9 +1101,9 @@ addMessages(array(
        'ADMIN_LIST_STATUS_LOCKED_ACCOUNTS' => "Alle gesperrten Mitglieder-Accounts auflisten",
        'ADMIN_LIST_STATUS_CONFIRMED_ACCOUNTS' => "Alle best&auml;tigten Mitglieder-Accounts auflisten",
        'ADMIN_LIST_STATUS_UNCONFIRMED_ACCOUNTS' => "Alle unbest&auml;tigten Mitglieder-Accounts auflisten",
-       'ADMIN_LIST_MODE_CONFIRMED_ACCOUNTS' => "Alle best&auml;tigten Mitglieder-Accounts auflisten",
-       'ADMIN_LIST_MODE_NOREFS_ACCOUNTS' => "Alle Mitglieder-Accounts ohne Referrals auflisten",
-       'ADMIN_LIST_MODE_RANDOM_REFID_ACCOUNTS' => "Alle Mitglieder-Accounts f&uuml;r Zufallsreferral auflisten",
+       'ADMIN_LIST_DO_CONFIRMED_ACCOUNTS' => "Alle best&auml;tigten Mitglieder-Accounts auflisten",
+       'ADMIN_LIST_DO_NOREFS_ACCOUNTS' => "Alle Mitglieder-Accounts ohne Referrals auflisten",
+       'ADMIN_LIST_DO_RANDOM_REFID_ACCOUNTS' => "Alle Mitglieder-Accounts f&uuml;r Zufallsreferral auflisten",
 
        // Admin task lines
        'ADMIN_TASK_TYPE_MEMBER_SUPPORT' => "Support-Anfrage eines Mitgliedes",
@@ -1129,13 +1130,13 @@ addMessages(array(
        'CACHE_CANNOT_UNLINK' => "Kann nicht die Cache-Datei <strong><span class=\"data\">%s</span></strong> vom Server entfernen.",
 
        // Expert settings
-       'ADMIN_EXPERT_SETTINGS_STATUS_UPDATE' => "Ihr {?mt_word?} weisst nicht die n&ouml;tige Erweiterung <span class=\"data\">admins</span> mindestens in der Version <span class=\"data\">0.7.3</span> auf, um Experten-Einstellungen zu pr&uuml;fen. Bitte aktualisieren Sie Ihre {?mt_word?}-Installation.",
+       'ADMIN_EXPERT_SETTINGS_STATUS_UPDATE' => "Ihr {?mt_word?} weisst nicht die n&ouml;tige Erweiterung <span class=\"data\">admins</span> mindestens in der Version <span class=\"data\">0.7.3</span> auf, um Entwicklereinstellungen zu pr&uuml;fen. Bitte aktualisieren Sie Ihre {?mt_word?}-Installation.",
        'ADMIN_EXPERT_SETTINGS_STATUS_FAILED' => "Es ist ein allgemeiner Fehler beim Pr&uuml;fen der Experteneinstellungen aufgetreten f&uuml;r den Sie vermutlich nichts k&ouml;nnen.",
-       'ADMIN_EXPERT_SETTINGS_STATUS_FORBIDDEN' => "Sie haben nicht die Berechtigung, Experten-Einstellungen zu &auml;ndern.",
-       'ADMIN_EXPERT_SETTINGS_TITLE' => "&Auml;nderungen von Experten-Einstellungen",
+       'ADMIN_EXPERT_SETTINGS_STATUS_FORBIDDEN' => "Sie haben nicht die Berechtigung, Entwicklereinstellungen zu &auml;ndern.",
+       'ADMIN_EXPERT_SETTINGS_TITLE' => "&Auml;nderungen von Entwicklereinstellungen",
        'ADMIN_EXPERT_SETTINGS_NOTE' => "Sie sind im Begriff Einstellungen zu &auml;ndern, die sehr sensibel sind und sich auf die Funktionalit&auml;t Ihres {?mt_word2?} negativ auswirken k&ouml;nnen. Sie sollten daher hier nichts &auml;ndern, solange Sie nicht wissen, was Sie da tun.",
        'ADMIN_EXPERT_SETTINGS_MAKE_PERMANENT' => "Ja, ich weiss was ich tue und m&ouml;chte diesen Hinweis nicht mehr angezeigt bekommen.",
-       'ADMIN_EXPERT_SETTINGS_CONTINUE' => "Dennoch die Experten-Einstellungen aufrufen",
+       'ADMIN_EXPERT_SETTINGS_CONTINUE' => "Dennoch die Entwicklereinstellungen aufrufen",
 
        // Payment modes
        'ADMIN_CONFIG_PAYMENT_MODE_DIRECT' => "Nur direktem Mitglied gutschreiben.",
index 9c3d228..c85b1a6 100644 (file)
@@ -114,8 +114,8 @@ addMessages(array(
        'MEMBER_WERNIS_PAYOUT_MIN_POINTS' => "Mindestens auszuzahlendes Wernis-Guthaben",
        'MEMBER_WERNIS_PAYOUT_SUBMIT' => "Auszahlung durchf&uuml;hren",
        'MEMBER_WERNIS_PAYOUT_NOTE' => "Ihr Wernis-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Wernis-Betrag nur gerade Betr&auml;ge eingeben! &Uuml;berpr&uuml;fen Sie vor dem Absenden Ihren WDS66-Usernamen.",
-       'MEMBER_WERNIS_WDS66_ID' => "Username bei WDS66-Portal: [<a href=\"http://www.wds66.com/modules.php?module=wpass&amp;mode=new\" target=\"_blank\">Vergessen?</a>]",
-       'MEMBER_WERNIS_WDS66_PASSWORD' => "Wernis-Passwort (nicht Accountpasswort!): [<a href=\"http://www.wds66.com/modules.php?module=wpass&amp;mode=new\" target=\"_blank\">Vergessen?</a>]",
+       'MEMBER_WERNIS_WDS66_ID' => "Username bei WDS66-Portal: [<a href=\"http://www.wds66.com/modules.php?module=wpass\" target=\"_blank\">Vergessen?</a>]",
+       'MEMBER_WERNIS_WDS66_PASSWORD' => "Wernis-Passwort (nicht Accountpasswort!): [<a href=\"http://www.wds66.com/modules.php?module=wpass\" target=\"_blank\">Vergessen?</a>]",
        'MEMBER_WERNIS_WDS66_AMOUNT' => "Zu &uuml;berweisenden Betrag eingeben:",
        'MEMBER_WERNIS_MODE_INVALID' => "Ung&uuml;ltiger Modus <span class=\"data\">%s</span> erkannt! Bitte links im Men&uuml; fortfahren.",
        'MEMBER_WERNIS_EMPTY_USERNAME' => "Sie haben Ihren WDS66-Usernamen nicht eingegeben.",
index 2df52a1..3ac7769 100644 (file)
@@ -246,7 +246,7 @@ LIMIT 1",
                                        array(
                                                $login,
                                                $postData['email'][$id],
-                                               $postData['mode'][$id],
+                                               $postData['access_mode'][$id],
                                                $postData['la_mode'][$id],
                                                $id
                                        ), __FUNCTION__, __LINE__);
@@ -330,10 +330,10 @@ function adminsEditAdminAccount ($postData) {
                        // Shall we allow changing default ACL?
                        if ($currMode == 'allow') {
                                // Allow changing it
-                               $content['mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}';
+                               $content['access_mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}';
                        } else {
                                // Don't allow it
-                               $content['mode'] = '&nbsp;';
+                               $content['access_mode'] = '&nbsp;';
                        }
 
                        // Load row template and switch color
@@ -351,7 +351,7 @@ function adminsEditAdminAccount ($postData) {
 // Generate access mode selection box for given admin id
 function generateAdminAccessModeSelectionBox ($adminId = NULL) {
        // Start the selection box
-       $OUT = '<select name="mode[' . $adminId . ']" size="1" class="form_select">';
+       $OUT = '<select name="access_mode[' . $adminId . ']" size="1" class="form_select">';
 
        // Add option list
        $OUT .= generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}', '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'), getAdminDefaultAcl($adminId));
@@ -389,15 +389,15 @@ function adminsDeleteAdminAccount ($postData) {
                        $id = bigintval($id);
 
                        // Get the admin's data
-                       $result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS `mode`,`la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS `access_mode`,`la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
                                array($id), __FUNCTION__, __LINE__);
 
                        // Do we have an entry?
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found, so load data
                                $content = SQL_FETCHARRAY($result);
-                               $content['mode']    = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode'])    . '--}';
-                               $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
+                               $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode'])    . '--}';
+                               $content['la_mode']     = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                                // Prepare some more data
                                $content['id'] = $id;
@@ -449,7 +449,7 @@ function adminsListAdminAccounts() {
        `id`,
        `login`,
        `email`,
-       `default_acl` AS `mode`,
+       `default_acl` AS `access_mode`,
        `la_mode`
 FROM
        `{?_MYSQL_PREFIX?}_admins`
@@ -458,8 +458,8 @@ ORDER BY
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables
-               $content['mode']    = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode'])    . '--}';
-               $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
+               $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode'])    . '--}';
+               $content['la_mode']     = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                // Load row template and switch color
                $OUT .= loadTemplate('admin_list_admins_row', true, $content);
index 17f7251..4ef69c9 100644 (file)
@@ -40,8 +40,8 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
-// Add a record entry ("mode" can be add/sub!)
-function addBookingRecord ($subject, $userid, $points, $mode) {
+// Add a record entry ('pointsMode' can be add/sub!)
+function addBookingRecord ($subject, $userid, $points, $pointsMode) {
        // Is the sql_patches updated?
        if (isExtensionInstalledAndOlder('sql_patches', '0.5.7')) {
                // Abort here
@@ -49,11 +49,11 @@ function addBookingRecord ($subject, $userid, $points, $mode) {
        } // END - if
 
        // Add record entry here
-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_booking` (`userid`,`subject`,`mode`,`points`) VALUES (%s,'%s','%s',%s)",
+       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_booking` (`userid`,`subject`,`points_mode`,`points`) VALUES (%s,'%s','%s',%s)",
                array(
                        bigintval($userid),
                        $subject,
-                       $mode,
+                       strtoupper($pointsMode),
                        $points
                ), __FUNCTION__, __LINE__);
 }
index 2422785..5f705a0 100644 (file)
@@ -115,7 +115,7 @@ function outputAdvancedOverview (&$result_main) {
                // And random refid
                $value = getTotalRandomRefidUser();
                if ($value > 0) {
-                       $content['random_refid'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;mode=random_refid%}">' . $value . '</a>';
+                       $content['random_refid'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;do=random_refid%}">' . $value . '</a>';
                } // END - if
        } // END - if
 
@@ -277,7 +277,7 @@ ORDER BY
                addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 OR `refid` IS NULL ORDER BY `userid` ASC");
                $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL--}';
                $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL_TITLE--}';
-               $WHATs[]  = 'list_user&amp;mode=norefs';
+               $WHATs[]  = 'list_user&amp;do=norefs';
        } // END - if
 
        if (isExtensionActive('payout')) {
@@ -392,7 +392,7 @@ ORDER BY
        if (isExtensionActive('doubler')) {
                // List waiting payouts
                addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` WHERE `completed`='N' ORDER BY `id` ASC");
-               $WHATs[]  = 'list_doubler&amp;mode=waiting&amp;select=all';
+               $WHATs[]  = 'list_doubler&amp;do=waiting&amp;select=all';
                $DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING--}';
                $TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING_TITLE--}';
                addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` ORDER BY `id` ASC');
index 1241a87..2a4bc4f 100644 (file)
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Add links for selecting some users
 function alpha ($sortby) {
        $add = '';
-       foreach (array('page','offset','mode','status') as $param) {
+       foreach (array('page','offset','do','status') as $param) {
                if (isGetRequestElementSet($param)) {
                        $add .= '&amp;' . $param . '=' . getRequestElement($param);
                } // END - if
@@ -91,7 +91,7 @@ function addSortLinks ($letter, $sortby) {
        $add = '&amp;page=' . getRequestElement('page') . '&amp;offset=' . getRequestElement('offset');
 
        // Add status/ mode
-       foreach (array('mode','status') as $param) {
+       foreach (array('do','status') as $param) {
                if (isGetRequestElementSet($param)) {
                        $add .= '&amp;' . $param . '=' . getRequestElement($param);
                } // END - if
@@ -152,7 +152,7 @@ function addPageNavigation ($numPages) {
                                $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
                                // Add status/mode
-                               foreach (array('mode','status') as $param) {
+                               foreach (array('do','status') as $param) {
                                        if (isGetRequestElementSet($param)) {
                                                $OUT .= '&amp;' . $param . '=' . getRequestElement($param);
                                        } // END - if
@@ -361,10 +361,10 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                                // Procedure to checking for login data
                                                if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
                                                        // Bonus added (just displaying!)
-                                                       $url = 'modules.php?module=chk_login&amp;mode=bonus';
+                                                       $url = 'modules.php?module=chk_login&amp;do=bonus';
                                                } else {
                                                        // Bonus not added
-                                                       $url = 'modules.php?module=chk_login&amp;mode=login';
+                                                       $url = 'modules.php?module=chk_login&amp;do=login';
                                                }
                                        } else {
                                                // Use this URL
@@ -764,13 +764,13 @@ function doTemplateAdminListUserTitle ($template, $clear = false) {
        // Init title with "all accounts"
        $code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
 
-       // Do we have a 'status' or 'mode' set?
+       // Do we have a 'status' or 'do' set?
        if (isGetRequestElementSet('status')) {
                // Set title according to the 'status'
                $code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestElement('status')));
-       } elseif (isGetRequestElementSet('mode')) {
-               // Set title according to the "mode"
-               $code = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestElement('mode')));
+       } elseif (isGetRequestElementSet('do')) {
+               // Set title according to 'do'
+               $code = sprintf("{--ADMIN_LIST_DO_%s_ACCOUNTS--}", strtoupper(getRequestElement('do')));
        }
 
        // Return the code
index 8a9889d..f515b52 100644 (file)
@@ -221,7 +221,7 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
 }
 
 // Adds the mail to the bonus mail pool
-function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
+function YOOMEDIA_SEND_BONUS_MAIL ($data, $mailMode) {
        // Is this an admin?
        if (!isAdmin()) {
                // Abort here
@@ -236,7 +236,7 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
 
        // HTML or normal? (normal is default...)
        $type = 't';
-       if (($mode == 'html') && (isExtensionActive('html_mail'))) $type = 'h';
+       if (($mailMode == 'html') && (isExtensionActive('html_mail'))) $type = 'h';
 
        // Auto-generate URL
        $data['url'] = sprintf("http://www.yoomedia.de/code/%s-mail.php?id=%s&sid=%s",
@@ -246,23 +246,23 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
        );
 
        // Lock this mail for new delivery
-       YOOMEDIA_RELOAD_LOCK($data, $mode);
+       YOOMEDIA_RELOAD_LOCK($data, $mailMode);
 
        // Call the lower function
-       addNewBonusMail($data, $mode);
+       addNewBonusMail($data, $mailMode);
 }
 
 // Lockdown given id
-function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
+function YOOMEDIA_EXCLUDE_MAIL ($data, $mailMode) {
        // Search for the entry
-       if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mode) === false) {
+       if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === false) {
                // Convert mode for mails
-               $mode = YOOMEDIA_CONVERT_MODE($mode);
+               $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 
                // Add the entry
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
                        array(
-                               $mode,
+                               $mailMode,
                                bigintval($data['id']),
                                bigintval($data['reload'])
                        ), __FUNCTION__, __LINE__);
@@ -270,13 +270,13 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
 }
 
 // Remove lock of given mail
-function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
+function YOOMEDIA_UNLIST_MAIL ($data, $mailMode) {
        // Convert mode for mails
-       $mode = YOOMEDIA_CONVERT_MODE($mode);
+       $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 
        // Add the entry
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
-               array($mode, bigintval($data['id'])), __FUNCTION__, __LINE__);
+               array($mailMode, bigintval($data['id'])), __FUNCTION__, __LINE__);
 }
 
 // "Translates" the index number into an assosiative value
@@ -348,33 +348,33 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 }
 
 // Lock given mail down for reload lock
-function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
+function YOOMEDIA_RELOAD_LOCK ($data, $mailMode) {
        // Search for the entry
-       if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mode) === false) {
+       if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === false) {
                // Convert mode for mails
-               $mode = YOOMEDIA_CONVERT_MODE($mode);
+               $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 
                // Add the entry
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
-                       array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
+                       array($mailMode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
        } // END - if
 }
 
 // Convert mode for mails
-function YOOMEDIA_CONVERT_MODE ($mode) {
+function YOOMEDIA_CONVERT_MODE ($mailMode) {
        // Convert mode for normal/html
-       switch ($mode) {
+       switch ($mailMode) {
                case 'normal':
-                       $mode = 'textmail';
+                       $mailMode = 'textmail';
                        break;
 
                case 'html':
-                       $mode = 'htmlmail';
+                       $mailMode = 'htmlmail';
                        break;
        } // END - switch
 
        // Return result
-       return $mode;
+       return $mailMode;
 }
 
 // Extract code from response
index 44bd7de..29083fc 100644 (file)
@@ -177,10 +177,10 @@ function doAdminAction () {
        // Load header, footer, render menu
        $content['header'] = loadTemplate('admin_header' , true, $content);
        $content['footer'] = loadTemplate('admin_footer' , true, $content);
-       $content['menu']   = addAdminMenu($action, $what, true);
+       $content['menu']   = addAdminMenu($action, $what);
 
-       // Tableset header
-       loadTemplate('admin_main_header', false, $content);
+       // Load main template
+       loadTemplate('admin_main', false, $content);
 
        // Check if action/what pair is valid
        $result_action = SQL_QUERY_ESC("SELECT
@@ -289,7 +289,7 @@ ORDER BY
                                        $GLOBALS['menu']['title'][$mainContent['main_action']]       = $mainContent['main_title'];
                                        $GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];
                                } // END - if
-                               $OUT .= '<li class="admin_menu">
+                               $OUT .= '<li class="admin_menu"' . addJavaScriptMenuContent('admin', $mainContent['main_action'], $action, $what) . '>
 <div class="nobr"><strong>&middot;</strong>&nbsp;';
 
                                if ($readable === true) {
@@ -317,8 +317,29 @@ ORDER BY
                                $OUT .= '</div>
 </li>';
 
-                               // Check for menu entries
-                               $result_what = SQL_QUERY_ESC("SELECT
+                               // Add sub menu
+                               $OUT .= addAdminSubMenu($mainContent, $action, $what);
+                       } // END - if
+               } // END - while
+
+               // Close ul-tag
+               $OUT .= '</ul>';
+
+               // Free memory
+               SQL_FREERESULT($result_main);
+       } // END - if
+
+       // Return content
+       return $OUT;
+}
+
+// Add admin sub menu
+function addAdminSubMenu ($mainContent, $action, $what) {
+       // Init content
+       $OUT = '';
+
+       // Check for menu entries
+       $result_what = SQL_QUERY_ESC("SELECT
        `what` AS `sub_what`,
        `title` AS `sub_title`,
        `descr` AS `sub_descr`
@@ -331,76 +352,69 @@ WHERE
 ORDER BY
        `sort` ASC,
        `id` DESC",
-                                       array($mainContent['main_action']), __FUNCTION__, __LINE__);
-
-                               // Remember the count for later checks
-                               setAdminMenuHasEntries($mainContent['main_action'], ((!SQL_HASZERONUMS($result_what)) && ($action == $mainContent['main_action'])));
-
-                               // Start li-tag for sub menu content
-                               $OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '">';
-
-                               // Do we have entries?
-                               if (ifAdminMenuHasEntries($mainContent['main_action'])) {
-                                       // Sub menu has been called
-                                       $SUB = true;
-                                       $OUT .= '<ul class="admin_menu_sub">';
-
-                                       // Load all entries
-                                       while ($subContent = SQL_FETCHARRAY($result_what)) {
-                                               // Filename
-                                               $inc = sprintf("inc/modules/admin/what-%s.php", $subContent['sub_what']);
-
-                                               // Is the file readable?
-                                               $readable = isIncludeReadable($inc);
-
-                                               // Is the current admin allowed to access this 'what' menu?
-                                               if (isAdminAllowedAccessMenu(NULL, $subContent['sub_what'])) {
-                                                       // Insert compiled title and description
-                                                       $GLOBALS['menu']['title'][$subContent['sub_what']]       = $subContent['sub_title'];
-                                                       $GLOBALS['menu']['description'][$subContent['sub_what']] = $subContent['sub_descr'];
-                                                       $OUT .= '<li class="admin_menu">
+               array($mainContent['main_action']), __FUNCTION__, __LINE__);
+
+       // Remember the count for later checks
+       setAdminMenuHasEntries($mainContent['main_action'], ((!SQL_HASZERONUMS($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
+
+       // Start li-tag for sub menu content
+       $OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
+
+       // Do we have entries?
+       if (ifAdminMenuHasEntries($mainContent['main_action'])) {
+               // Sub menu has been called
+               $SUB = true;
+               $OUT .= '<ul class="admin_menu_sub">';
+
+               // Load all entries
+               while ($subContent = SQL_FETCHARRAY($result_what)) {
+                       // Filename
+                       $inc = sprintf("inc/modules/admin/what-%s.php", $subContent['sub_what']);
+
+                       // Is the file readable?
+                       $readable = isIncludeReadable($inc);
+
+                       // Is the current admin allowed to access this 'what' menu?
+                       if (isAdminAllowedAccessMenu(NULL, $subContent['sub_what'])) {
+                               // Insert compiled title and description
+                               $GLOBALS['menu']['title'][$subContent['sub_what']]       = $subContent['sub_title'];
+                               $GLOBALS['menu']['description'][$subContent['sub_what']] = $subContent['sub_descr'];
+                               $OUT .= '<li class="admin_menu">
 <div class="nobr"><strong>--&gt;</strong>&nbsp;';
-                                                       if ($readable === true) {
-                                                               if ($what == $subContent['sub_what']) {
-                                                                       $OUT .= '<strong>';
-                                                               } else {
-                                                                       $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $subContent['sub_what'] . '%}">';
-                                                               }
-                                                       } else {
-                                                               $OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $subContent['sub_what'] . '%}">';
-                                                       }
-
-                                                       $OUT .= $subContent['sub_title'];
-
-                                                       if ($readable === true) {
-                                                               if ($what == $subContent['sub_what']) {
-                                                                       $OUT .= '</strong>';
-                                                               } else {
-                                                                       $OUT .= '</a>]';
-                                                               }
-                                                       } else {
-                                                               $OUT .= '</span>';
-                                                       }
-                                                       $OUT .= '</div>
-</li>';
-                                               } // END - if
-                                       } // END - while
+                               if ($readable === true) {
+                                       if ($what == $subContent['sub_what']) {
+                                               $OUT .= '<strong>';
+                                       } else {
+                                               $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $subContent['sub_what'] . '%}">';
+                                       }
+                               } else {
+                                       $OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $subContent['sub_what'] . '%}">';
+                               }
 
-                                       // Free memory
-                                       SQL_FREERESULT($result_what);
-                                       $OUT .= '</ul>';
-                               } // END - if
+                               $OUT .= $subContent['sub_title'];
 
-                               // Close li-tag
-                               $OUT .= '</li>';
+                               if ($readable === true) {
+                                       if ($what == $subContent['sub_what']) {
+                                               $OUT .= '</strong>';
+                                       } else {
+                                               $OUT .= '</a>]';
+                                       }
+                               } else {
+                                       $OUT .= '</span>';
+                               }
+                               $OUT .= '</div>
+</li>';
                        } // END - if
                } // END - while
 
                // Free memory
-               SQL_FREERESULT($result_main);
+               SQL_FREERESULT($result_what);
                $OUT .= '</ul>';
        } // END - if
 
+       // Close li-tag
+       $OUT .= '</li>';
+
        // Return content
        return $OUT;
 }
@@ -418,7 +432,9 @@ function addAdminSelectionBox ($adminId = NULL, $special = '') {
 
        // Query all entries
        $result = SQL_QUERY('SELECT
-       `id`,`login`' . $ADD . '
+       `id`,
+       `login`
+       ' . $ADD . '
 FROM
        `{?_MYSQL_PREFIX?}_admins`
 ORDER BY
index 9b629ea..00764f8 100644 (file)
@@ -224,7 +224,7 @@ LIMIT 1",
                        }
 
                        // Add more data to $content
-                       $content['mode'] = 'admin';
+                       $content['do'] = 'admin';
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
index dacaab9..93d133e 100644 (file)
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if ((isGetRequestElementSet('id')) && (isGetRequestElementSet('mode'))) {
+if ((isGetRequestElementSet('id')) && (isGetRequestElementSet('do'))) {
        // Check for selected sponsor
        $result_main = SQL_QUERY_ESC("SELECT
        `id`,`company`,`position`,`gender`,`surname`,`family`,
@@ -65,13 +65,13 @@ LIMIT 1",
                $content['warning_interval'] = createTimeSelections($content['warning_interval'], 'warning_interval', 'MWDh');
 
                // Init variables here
-               $TPL = sprintf("admin_edit_sponsor_%s", getRequestElement('mode'));
+               $TPL = sprintf("admin_edit_sponsor_%s", getRequestElement('do'));
                initSqls();
 
                // Sponsor was found
                if ((isFormSent()) || (isFormSent('edit'))) {
                        // Perform action on mode
-                       switch (getRequestElement('mode')) {
+                       switch (getRequestElement('do')) {
                                case 'add_points': // Add points
                                        if (bigintval(postRequestElement('points')) > 0) {
                                                // Replace german decimal comma with computer's decimal dot
@@ -146,8 +146,8 @@ LIMIT 1",
                                        break;
 
                                default: // Unknown mode
-                                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mode %s detected.", getRequestElement('mode')));
-                                       $message = '{%message,ADMIN_SPONSOR_INVALID_MODE=' . getRequestElement('mode') . '%}';
+                                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mode %s detected.", getRequestElement('do')));
+                                       $message = '{%message,ADMIN_SPONSOR_INVALID_MODE=' . getRequestElement('do') . '%}';
                                        break;
                        }
 
@@ -163,7 +163,7 @@ LIMIT 1",
                        loadTemplate($TPL, false, $content);
                } else {
                        // Template not found
-                       displayMessage('{%message,ADMIN_SPONSOR_MODUS_TPL_404', getRequestElement('mode') . '%}');
+                       displayMessage('{%message,ADMIN_SPONSOR_MODUS_TPL_404', getRequestElement('do') . '%}');
                }
        } else {
                // Sponsor not found
index cb9f00d..4bfdc91 100644 (file)
@@ -230,7 +230,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                'what'   => $content['what'],
                                'title'  => $content['title'],
                                'navi'   => $NAVI,
-                               'mode'   => 'guest'
+                               'do'     => 'guest'
                        );
 
                        // Load row template
index 65c605e..559223c 100644 (file)
@@ -92,7 +92,7 @@ LIMIT 1",
                                postRequestElement('admin', $id),
                                postRequestElement('action_menu', $id),
                                postRequestElement('what_menu', $id),
-                               postRequestElement('mode', $id),
+                               postRequestElement('access_mode', $id),
                                $id
                        ),__FILE__, __LINE__);
        } // END - foreach
@@ -150,7 +150,7 @@ LIMIT 1",
                $ACL = isAdminsAllowedByAcl(getActionFromModuleWhat('admin', postRequestElement('what_menu')), '');
        } // END - if
 
-       if (($mode != postRequestElement('mode')) || (($ACL === true) && (postRequestElement('mode') == 'deny'))) {
+       if (($mode != postRequestElement('do')) || (($ACL === true) && (postRequestElement('do') == 'deny'))) {
                // Mode is fine
                $BOTH = ((isPostRequestElementSet('action_menu')) && (isPostRequestElementSet('what_menu')) && (postRequestElement('action_menu') != '') && (postRequestElement('what_menu') != ''));
 
@@ -171,7 +171,7 @@ VALUES (%s,'%s','%s','%s')",
                                        bigintval(postRequestElement('admin_id')),
                                        postRequestElement('action_menu'),
                                        postRequestElement('what_menu'),
-                                       postRequestElement('mode')
+                                       postRequestElement('do')
                                ), __FILE__, __LINE__);
                                $content = '{--ADMIN_ADMINS_ACL_SAVED--}';
 
index 069d2ea..2523a39 100644 (file)
@@ -83,7 +83,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
                if (isFormSent('edit')) {
                        // Edit template
                        $row    = 'admin_edit_country_row';
-                       $post   = 'modify';
+                       $do     = 'modify';
                        $class  = 'form_submit';
                        $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
                        $title  = '{--ADMIN_COUNTRY_EDIT_TITLE--}';
@@ -91,7 +91,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
                } else {
                        // Delete template
                        $row    = 'admin_delete_country_row';
-                       $post   = 'remove';
+                       $do     = 'remove';
                        $class  = 'form_delete';
                        $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
                        $title  = '{--ADMIN_COUNTRY_DELETE_TITLE--}';
@@ -122,7 +122,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
                // Prepare content for template
                $content = array(
                        'rows'   => $OUT,
-                       'mode'   => $post,
+                       'do'     => $do,
                        'class'  => $class,
                        'title'  => $title,
                        'submit' => $submit,
index 76b443d..4ede5ee 100644 (file)
@@ -43,9 +43,9 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isGetRequestElementSet('mode')) {
+if (!isGetRequestElementSet('do')) {
        // Chosse the overview page as default
-       setGetRequestElement('mode', 'overview');
+       setGetRequestElement('do', 'overview');
 } else {
        // Set table title automatically
        if (!isGetRequestElementSet('select')) {
@@ -53,11 +53,11 @@ if (!isGetRequestElementSet('mode')) {
        } // END - if
 
        // Prepare header
-       $content['list_' . strtolower(getRequestElement('mode'))] = strtoupper('{--ADMIN_DOUBLER_LIST_' . getRequestElement('mode') . '_' . getRequestElement('select') . '--}');
+       $content['list_' . strtolower(getRequestElement('do'))] = strtoupper('{--ADMIN_DOUBLER_LIST_' . getRequestElement('do') . '_' . getRequestElement('select') . '--}');
 }
 
 // Load data for the template
-switch (getRequestElement('mode')) {
+switch (getRequestElement('do')) {
        case 'already':  // Already payed out points
                break;
 
@@ -76,7 +76,7 @@ switch (getRequestElement('mode')) {
                if ($count > 0) {
                        // Something was payed out
                        $sumAlready += $count;
-                       $content['already_direct_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=direct%}">' . $count . '</a>';
+                       $content['already_direct_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=already&amp;select=direct%}">' . $count . '</a>';
                } // END - if
 
                $count = countSumTotalData('Y','doubler','id','completed',true, " AND `is_ref`='Y'");
@@ -84,7 +84,7 @@ switch (getRequestElement('mode')) {
                if ($count > 0) {
                        // Something was payed out
                        $sumAlready += $count;
-                       $content['already_ref_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=ref%}">' . $count . '</a>';
+                       $content['already_ref_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=already&amp;select=ref%}">' . $count . '</a>';
                } // END - if
 
                // And the same for waiting pouts (direct and referral)
@@ -93,7 +93,7 @@ switch (getRequestElement('mode')) {
                if ($count > 0) {
                        // Something was payed out
                        $sumWaiting += $count;
-                       $content['waiting_direct_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=direct%}">' . $count . '</a>';
+                       $content['waiting_direct_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=waiting&amp;select=direct%}">' . $count . '</a>';
                } // END - if
 
                $count = countSumTotalData('N','doubler','id','completed',true, " AND `is_ref`='Y'");
@@ -101,19 +101,19 @@ switch (getRequestElement('mode')) {
                if ($count > 0) {
                        // Something was payed out
                        $sumWaiting += $count;
-                       $content['waiting_ref_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=ref%}">' . $count . '</a>';
+                       $content['waiting_ref_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=waiting&amp;select=ref%}">' . $count . '</a>';
                } // END - if
 
                // Links for all
-               $content['already_all_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=all%}">' . $sumAlready . '</a>';
-               $content['waiting_all_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=all%}">' . $sumWaiting . '</a>';
+               $content['already_all_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=already&amp;select=all%}">' . $sumAlready . '</a>';
+               $content['waiting_all_link'] = '<a href="{%url=modules.php?module=admin&amp;what=list_doubler&amp;do=waiting&amp;select=all%}">' . $sumWaiting . '</a>';
 
                // All data is loaded here...
                break;
 } // END - switch
 
 // Load mode template
-loadTemplate('admin_list_doubler_' . getRequestElement('mode'), false, $content);
+loadTemplate('admin_list_doubler_' . getRequestElement('do'), false, $content);
 
 // [EOF]
 ?>
index feabe01..649aec6 100644 (file)
@@ -181,9 +181,9 @@ LIMIT 1",
                        // Start a new one
                        $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(secureString(strtoupper(getRequestElement('status')))));
                }
-       } elseif (isGetRequestElementSet('mode')) {
+       } elseif (isGetRequestElementSet('do')) {
                // Choose what we need to list
-               switch (getRequestElement('mode')) {
+               switch (getRequestElement('do')) {
                        case 'norefs': // Users w/o refs
                                if (!empty($whereStatement)) {
                                        // Add AND statement
@@ -205,7 +205,7 @@ LIMIT 1",
                                break;
 
                        default: // Invalid list mode
-                               debug_report_bug(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestElement('mode')));
+                               debug_report_bug(__FILE__, __LINE__, sprintf("Invalid do %s detected.", getRequestElement('do')));
                                break;
                } // END - switch
        } // END - if
index 2788c66..e2b878f 100644 (file)
@@ -217,7 +217,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                        }
 
                        // Add more entries
-                       $content['mode'] = 'mem';
+                       $content['do'] = 'mem';
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
index e8754f6..1a6d1dd 100644 (file)
@@ -49,10 +49,8 @@ if ((!isPostRequestElementSet('url')) || (!isPostRequestElementSet('alternate'))
 } // END - if
 
 if (isFormSent()) {
-       // Fix older calls from add-new-banner-form
-       if (!isGetRequestElementSet('mode')) setGetRequestElement('mode', 'add');
        $sql = '';
-       switch (getRequestElement('mode')) {
+       switch (getRequestElement('do')) {
                case 'add':
                        // Check if banner is already added
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `url`='%s' LIMIT 1",
index 765f304..a66c30f 100644 (file)
@@ -48,18 +48,24 @@ if (!isExtensionActive('order')) {
        return;
 } // END - if
 
-// 'mode' is not set by default
-if (!isGetRequestElementSet('mode')) {
-       // Set empty mode to "select"
-       setGetRequestElement('mode', 'select');
+// mail_mode is not set by default
+if (!isGetRequestElementSet('mail_mode')) {
+       // Is HTML extension enabled?
+       if (isExtensionInstalled('html_mail')) {
+               // Set empty mode to 'select'
+               setGetRequestElement('mail_mode', 'select');
+       } else {
+               // Set empty mode to 'normal'
+               setGetRequestElement('mail_mode', 'normal');
+       }
 } // END - if
 
 if (isFormSent()) {
        // Deliver bonus mail
-       addNewBonusMail(postRequestArray(), getRequestElement('mode'));
+       addNewBonusMail(postRequestArray(), getRequestElement('mail_mode'));
 } else {
        // Store send mode
-       $content['mode'] = getRequestElement('mode');
+       $content['mail_mode'] = getRequestElement('mail_mode');
 
        $content['html_select'] = '';
        if (isExtensionActive('html_mail')) {
@@ -67,8 +73,11 @@ if (isFormSent()) {
                $content['html_select'] = loadTemplate('admin_send_bonus_html', true);
        } // END - if
 
+       // Default template name is an invalid one
+       $template = 'admin_send_bonus_invalid';
+
        // Select template
-       switch(getRequestElement('mode')) {
+       switch(getRequestElement('mail_mode')) {
                case 'html':   // HTML mails
                case 'normal': // Normal mails
                        $template = 'admin_send_bonus_form';
index bbb7c17..d94191e 100644 (file)
@@ -59,10 +59,10 @@ ORDER BY
                        $template = 'newsletter';
 
                        // Check for extension and sending-mode
-                       if (!isExtensionActive('html_mail', true) && (postRequestElement('mode') == 'html')) {
+                       if (!isExtensionActive('html_mail', true) && (postRequestElement('mail_mode') == 'html')) {
                                // Set mode to text mode
-                               postRequestElement('mode') == 'text';
-                       } elseif (postRequestElement('mode') == 'html') {
+                               postRequestElement('mail_mode') == 'text';
+                       } elseif (postRequestElement('mail_mode') == 'html') {
                                // Set HTML templates
                                $template = 'newsletter_html';
                        }
@@ -74,7 +74,7 @@ ORDER BY
                        $message = loadEmailTemplate($template, array('text' => postRequestElement('text')), $content['userid']);
 
                        // ... and send it away!
-                       sendNewsletter($content['email'], postRequestElement('subject'), $message, postRequestElement('mode'));
+                       sendNewsletter($content['email'], postRequestElement('subject'), $message, postRequestElement('mail_mode'));
                } // END - while
 
                // Output message
index 82a49d2..165d912 100644 (file)
@@ -52,9 +52,9 @@ if ((!isExtensionActive('sponsor'))) {
 }
 
 $mode = '';
-if (isGetRequestElementSet('mode')) {
+if (isGetRequestElementSet('do')) {
        // A "special" mode of the login system was requested
-       switch (getRequestElement('mode')) {
+       switch (getRequestElement('do')) {
                case 'activate' : $mode = 'activate';  break; // Activation link requested
                case 'lost_pass': $mode = 'lost_pass'; break; // Request new password
        } // END - switch
index 33f1aae..0a0c4c2 100644 (file)
@@ -50,14 +50,14 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 } // END - if
 
 // Determine which stats we want and set mode and title for the link below stats block
-if (!isGetRequestElementSet('mode')) {
-       setGetRequestElement('mode', strtolower(getConfig('guest_stats')));
+if (!isGetRequestElementSet('do')) {
+       setGetRequestElement('do', strtolower(getConfig('guest_stats')));
 } // END - if
 
 // Set config temporarily
-setConfigEntry('guest_stats', strtoupper(getRequestElement('mode')));
+setConfigEntry('guest_stats', strtoupper(getRequestElement('do')));
 
-switch (getRequestElement('mode')) {
+switch (getRequestElement('do')) {
        case 'members' :
                $lmode = 'modules';
                break;
@@ -72,7 +72,7 @@ switch (getRequestElement('mode')) {
 
        default:
                // Unsupported mode
-               debug_report_bug(__FILE__, __LINE__, sprintf("Unsupported mode <span class=\"data\">%s</span> detected.", secureString(getRequestElement('mode'))));
+               debug_report_bug(__FILE__, __LINE__, sprintf("Unsupported mode <span class=\"data\">%s</span> detected.", secureString(getRequestElement('do'))));
                break;
 }
 
index d4ac40f..d044bbd 100644 (file)
@@ -64,11 +64,11 @@ $content = array();
 $points = false;
 
 // Is the mode set (payout only)
-if (!isGetRequestElementSet('mode')) {
+if (!isGetRequestElementSet('do')) {
        // Is there an id?
-       if ((!empty($content['primera_nickname'])) && (!isGetRequestElementSet('mode'))) {
-               // Then use an other "mode"
-               setGetRequestElement('mode', 'list');
+       if ((!empty($content['primera_nickname'])) && (!isGetRequestElementSet('do'))) {
+               // Then list all entries
+               setGetRequestElement('do', 'list');
 
                // And load all rows!
                $result = SQL_QUERY_ESC("SELECT `id`,`primera_account`,`primera_amount`,`primera_timestamp`,`primera_type` FROM `{?_MYSQL_PREFIX?}_user_primera` WHERE `userid`=%s ORDER BY `primera_timestamp` DESC",
@@ -88,11 +88,11 @@ if (!isGetRequestElementSet('mode')) {
                SQL_FREERESULT($result);
        } else {
                // Mode pay
-               setGetRequestElement('mode', 'pay');
+               setGetRequestElement('do', 'pay');
        }
 } // END - if
 
-if (getRequestElement('mode') == 'pay') {
+if (getRequestElement('do') == 'pay') {
        // Get total points and check if the user can request a payout
        $points = getTotalPoints(getMemberId());
 
@@ -114,14 +114,14 @@ if (getRequestElement('mode') == 'pay') {
        $content['points'] = $points;
 } else {
        // Invalid mode!
-       displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestElement('mode') . '%}');
+       displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestElement('do') . '%}');
        return;
 }
 
 // Is the formular sent?
-if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
+if ((isFormSent()) && (isGetRequestElementSet('do'))) {
        // Check input data depending on the mode and execute the requested mode
-       switch (getRequestElement('mode')) {
+       switch (getRequestElement('do')) {
                case 'pay': // Payout this exchange -> Primus
                        // Is the user id and password set?
                        if (!isPostRequestElementSet('primera_nickname')) {
@@ -176,14 +176,14 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
                        break;
 
                default: // Invalid mode!
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestElement('mode')));
-                       displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestElement('mode') . '%}');
+                       logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestElement('do')));
+                       displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestElement('do') . '%}');
                        return;
        }
 } // END - if
 
 // Prepare mode for template name
-$mode = sprintf("member_primera_mode_%s", getRequestElement('mode'));
+$mode = sprintf("member_primera_mode_%s", getRequestElement('do'));
 
 // Load the template
 loadTemplate($mode, false, $content);
index e9bd50b..56a3b14 100644 (file)
@@ -53,8 +53,8 @@ if ((!isExtensionActive('transfer')) && (!isAdmin())) {
 
 // Check for mode in GET
 $mode = '';
-if (isGetRequestElementSet('mode')) {
-       $mode = getRequestElement('mode');
+if (isGetRequestElementSet('do')) {
+       $mode = getRequestElement('do');
 } // END - if
 
 // Check for "faker"
@@ -443,7 +443,7 @@ INDEX (`party_userid`)
                $totalIn = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
                $content['in_link'] = $totalIn;
                if ($totalIn > 0) {
-                       $content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_in%}">' . $totalIn . '</a>';
+                       $content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_in%}">' . $totalIn . '</a>';
                } // END - if
 
                // Check outgoing transfers
@@ -451,7 +451,7 @@ INDEX (`party_userid`)
 
                $content['out_link'] = $totalOut;
                if ($totalOut > 0) {
-                       $content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_out%}">' . $totalOut . '</a>';
+                       $content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_out%}">' . $totalOut . '</a>';
                } // END - if
 
                // Add all to total amount
@@ -460,7 +460,7 @@ INDEX (`party_userid`)
                // Total transactions
                $content['all_link'] = $total;
                if ($total > 0) {
-                       $content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_all%}">{%pipe,translateComma=' . $total . '%}</a>';
+                       $content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_all%}">{%pipe,translateComma=' . $total . '%}</a>';
                } // END - if
 
                if (isFormSent()) {
@@ -483,7 +483,7 @@ INDEX (`party_userid`)
                // Set 'new transfer' link according to above option
                switch (getUserData('opt_in')) {
                        case 'Y':
-                               $content['new_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=new%}" title="{--TRANSFER_NOW_TITLE--}">{--TRANSFER_NOW_LINK--}</a>';
+                               $content['new_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=new%}" title="{--TRANSFER_NOW_TITLE--}">{--TRANSFER_NOW_LINK--}</a>';
                                break;
 
                        case 'N':
index 84a5cea..401b1c8 100644 (file)
@@ -62,14 +62,14 @@ if ((getWernisApiId() == '') || (getWernisApiMd5() == '')) {
 $content = array(); $points = false;
 
 // Is the mode set (withdraw or payout)
-if ((!isGetRequestElementSet('mode')) || (getRequestElement('mode') == 'choose')) {
+if ((!isGetRequestElementSet('do')) || (getRequestElement('do') == 'choose')) {
        // Let the user choose what he wants to do
        $content['wernis_userid'] = '0';
 
        // Is there an id?
-       if ((!empty($content['wernis_userid'])) && (!isGetRequestElementSet('mode'))) {
-               // Then use an other "mode"
-               setGetRequestElement('mode', 'list');
+       if ((!empty($content['wernis_userid'])) && (!isGetRequestElementSet('do'))) {
+               // Then list all entries
+               setGetRequestElement('do', 'list');
 
                // And load all rows!
                $result = SQL_QUERY_ESC("SELECT `id`,`wernis_account`,`wernis_amount`,`wernis_timestamp`,`wernis_type` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s ORDER BY `wernis_timestamp` DESC",
@@ -100,19 +100,19 @@ if ((!isGetRequestElementSet('mode')) || (getRequestElement('mode') == 'choose')
                // Is the payout mode active?
                if (getConfig('wernis_payout_active') == 'Y') {
                        // Add link
-                       $content['payout_link'] = '<a class="menu_blur" style="height: 40px" href="{%url=modules.php?module=login&amp;what=wernis&amp;mode=payout%}"><div style="padding-top: 10px">{--MEMBER_WERNIS_MODE_PAYOUT--}</div></a>';
+                       $content['payout_link'] = '<a class="menu_blur" style="height: 40px" href="{%url=modules.php?module=login&amp;what=wernis&amp;do=payout%}"><div style="padding-top: 10px">{--MEMBER_WERNIS_MODE_PAYOUT--}</div></a>';
                } // END - if
 
                // Is the withdraw mode active?
                if (isWernisWithdrawActive()) {
                        // Add link
-                       $content['withdraw_link'] = '<a class="menu_blur" style="height: 40px" href="{%url=modules.php?module=login&amp;what=wernis&amp;mode=withdraw%}"><div style="padding-top: 10px">{--MEMBER_WERNIS_MODE_WITHDRAW--}</div></a>';
+                       $content['withdraw_link'] = '<a class="menu_blur" style="height: 40px" href="{%url=modules.php?module=login&amp;what=wernis&amp;do=withdraw%}"><div style="padding-top: 10px">{--MEMBER_WERNIS_MODE_WITHDRAW--}</div></a>';
                } // END - if
 
                // Mode chooser! ;-)
-               setGetRequestElement('mode', 'choose');
+               setGetRequestElement('do', 'choose');
        }
-} elseif ((getRequestElement('mode') == 'payout') && (getConfig('wernis_payout_active') == 'Y')) {
+} elseif ((getRequestElement('do') == 'payout') && (getConfig('wernis_payout_active') == 'Y')) {
        // Get user's total points and remove the registration fee
        $points = getTotalPoints(getMemberId()) - getPointsRegister();
 
@@ -132,7 +132,7 @@ if ((!isGetRequestElementSet('mode')) || (getRequestElement('mode') == 'choose')
 
        // Add points to content array
        $content['points']     = $points;
-} elseif ((getRequestElement('mode') == 'withdraw') && (isWernisWithdrawActive())) {
+} elseif ((getRequestElement('do') == 'withdraw') && (isWernisWithdrawActive())) {
        // Prepare data for the template
        $content['points']        = getTotalPoints(getMemberId());
        $content['wernis_userid'] = '';
@@ -141,12 +141,12 @@ if ((!isGetRequestElementSet('mode')) || (getRequestElement('mode') == 'choose')
        $content['wernis_userid'] = getUserData('wernis_userid');
 } else {
        // Invalid mode!
-       displayMessage('{%message,MEMBER_WERNIS_MODE_INVALID=' . getRequestElement('mode') . '%}');
+       displayMessage('{%message,MEMBER_WERNIS_MODE_INVALID=' . getRequestElement('do') . '%}');
        return;
 }
 
 // Is the formular sent?
-if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
+if ((isFormSent()) && (isGetRequestElementSet('do'))) {
        // Is the user id and password set?
        if (!isPostRequestElementSet('wernis_userid')) {
                // Nothing entered in WDS66 user id
@@ -165,7 +165,7 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
                displayMessage('{--MEMBER_WERNIS_INVALID_AMOUNT--}');
        } else {
                // Check input data depending on the mode and execute the requested mode
-               switch (getRequestElement('mode')) {
+               switch (getRequestElement('do')) {
                        case 'withdraw': // Widthdraws WDS66 -> This exchange
                                if (postRequestElement('amount') < getConfig('wernis_min_withdraw')) {
                                        // Not enougth entered!
@@ -227,15 +227,15 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
                                break;
 
                        default: // Invalid mode!
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestElement('mode')));
-                               displayMessage('{%message,MEMBER_WERNIS_MODE_INVALID=' . getRequestElement('mode') . '%}');
+                               logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestElement('do')));
+                               displayMessage('{%message,MEMBER_WERNIS_MODE_INVALID=' . getRequestElement('do') . '%}');
                                return;
                } // END - switch
        }
 } // END - if
 
 // Prepare mode for template name
-$mode = sprintf("member_wernis_mode_%s", getRequestElement('mode'));
+$mode = sprintf("member_wernis_mode_%s", getRequestElement('do'));
 
 // Load the template
 loadTemplate($mode, false, $content);
index 52d051c..e8e897f 100644 (file)
@@ -368,8 +368,8 @@ ORDER BY
 
                // Prepare data
                $content = array(
-                       'rows' => $GLOBALS['rows'],
-                       'mode' => $mode
+                       'rows'      => $GLOBALS['rows'],
+                       'menu_mode' => $mode
                );
 
                // Load main template
index c66289a..7cc8b64 100644 (file)
@@ -176,17 +176,17 @@ function addPointsThroughReferralSystem ($subject, $userid, $points, $refid = NU
 
                        // Prepare data for the filter
                        $filterData = array(
-                               'subject'    => $subject,
-                               'userid'     => $userid,
-                               'points'     => $points,
-                               'ref_points' => $ref_points,
-                               'column'     => $pointsColumn,
-                               'notify'     => $sendNotify,
-                               'refid'      => $refid,
-                               'locked'     => $locked,
-                               'mode'       => 'add',
-                               'add_mode'   => $paymentMethod,
-                               'added'      => $added
+                               'subject'     => $subject,
+                               'userid'      => $userid,
+                               'points'      => $points,
+                               'ref_points'  => $ref_points,
+                               'column'      => $pointsColumn,
+                               'notify'      => $sendNotify,
+                               'refid'       => $refid,
+                               'locked'      => $locked,
+                               'points_mode' => 'add',
+                               'add_mode'    => $paymentMethod,
+                               'added'       => $added
                        );
 
                        // Filter it now
@@ -326,11 +326,11 @@ function subtractPoints ($subject, $userid, $points) {
 
        // Prepare filter data
        $filterData = array(
-               'subject' => $subject,
-               'userid'  => $userid,
-               'points'  => $points,
-               'mode'    => 'sub',
-               'added'   => (!SQL_HASZEROAFFECTED())
+               'subject'     => $subject,
+               'userid'      => $userid,
+               'points'      => $points,
+               'points_mode' => 'sub',
+               'added'       => (!SQL_HASZEROAFFECTED())
        );
 
        // Insert booking record
index 78e58e0..e13e09a 100644 (file)
@@ -325,7 +325,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
                        $ret = '';
                        if ((isInString('$', $GLOBALS['tpl_content'][$template])) || (isInString('{--', $GLOBALS['tpl_content'][$template])) || (isInString('{?', $GLOBALS['tpl_content'][$template])) || (isInString('{%', $GLOBALS['tpl_content'][$template]))) {
                                // Normal HTML output?
-                               if (isHtmlOutputMode()) {
+                               if ((isHtmlOutputMode()) && (substr($template, 0, 3) != 'js_')) {
                                        // Add surrounding HTML comments to help finding bugs faster
                                        $ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['tpl_content'][$template] . '<!-- Template ' . $template . ' - End //-->';
 
@@ -573,7 +573,7 @@ function getMenuCssClasses ($data) {
 
 // Generate XHTML code for the CAPTCHA
 function generateCaptchaCode ($code, $type, $type, $userid) {
-       return '<img border="0" alt="Code ' . $code . '" src="{%url=mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $type . '&amp;mode=img&amp;code=' . $code . '%}" />';
+       return '<img border="0" alt="Code ' . $code . '" src="{%url=mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $type . '&amp;do=img&amp;code=' . $code . '%}" />';
 }
 
 // Compiles the given HTML/mail code
@@ -1419,20 +1419,20 @@ function determinePageTitle () {
                } // END - if
 
                // Add title from what file
-               $mode = '';
+               $menuMode = '';
                if (getModule() == 'login') {
-                       $mode = 'member';
+                       $menuMode = 'member';
                } elseif (getModule() == 'index') {
-                       $mode = 'guest';
+                       $menuMode = 'guest';
                } elseif (getModule() == 'admin') {
-                       $mode = 'admin';
+                       $menuMode = 'admin';
                } elseif (getModule() == 'sponsor') {
-                       $mode = 'sponsor';
+                       $menuMode = 'sponsor';
                }
 
                // Add middle part (always in admin area!)
-               if ((!empty($mode)) && ((isWhatTitleEnabled()) || ($mode == 'admin'))) {
-                       $pageTitle .= ' {%config,trim=title_middle%} ' . getTitleFromMenu($mode, getWhat());
+               if ((!empty($menuMode)) && ((isWhatTitleEnabled()) || ($menuMode == 'admin'))) {
+                       $pageTitle .= ' {%config,trim=title_middle%} ' . getTitleFromMenu($menuMode, getWhat());
                } // END - if
 
                // Add title decorations? (right)
@@ -1793,6 +1793,43 @@ function generateGenderSelectionBox ($selectedGender = '') {
        return $out;
 }
 
+// Function to add style tag (wether display:none/block)
+function addStyleMenuContent ($menuMode, $mainAction, $action) {
+       // Do we have foo_menu_javascript enabled?
+       if (getConfig($menuMode . '_menu_javascript') == 'N') {
+               // Silently abort here, not enabled
+               return '';
+       } // END - if
+
+       // Is action=mainAction?
+       if ($action == $mainAction) {
+               // Add "menu open" style
+               return ' style="display:block"';
+       } else {
+               return ' style="display:none"';
+       }
+}
+
+// Function to add onclick attribute
+function addJavaScriptMenuContent ($menuMode, $mainAction, $action, $what) {
+       // Do we have foo_menu_javascript enabled?
+       if (getConfig($menuMode . '_menu_javascript') == 'N') {
+               // Silently abort here, not enabled
+               return '';
+       } // END - if
+
+       // Prepare content
+       $content = array(
+               'menu_mode'   => $menuMode,
+               'main_action' => $mainAction,
+               'action'      => $action,
+               'what'        => $what
+       );
+
+       // Return template
+       return loadTemplate('js_' . $menuMode . '_menu_onclick', true, $content);
+}
+
 //-----------------------------------------------------------------------------
 //                     Template helper functions for EL code
 //-----------------------------------------------------------------------------
index 7950dee..24a2f34 100644 (file)
@@ -2539,6 +2539,18 @@ function isDirectPaymentEnabled () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// Checks wether JavaScript-based admin menu is enabled
+function isAdminMenuJavascriptEnabled () {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.8.7')) && (getConfig('admin_menu_javascript') == 'Y'));
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // Wrapper to check if current task is for extension (not update)
 function isExtensionTask ($content) {
        // Do we have cache?
diff --git a/js/menu-common.js b/js/menu-common.js
new file mode 100644 (file)
index 0000000..76146fd
--- /dev/null
@@ -0,0 +1,117 @@
+/*
+ * JavaScript for folding/unfolding menus
+ * --------------------------------------------------------------------
+ * $Revision:: $
+ * $Date:: $
+ * $Tag:: 0.2.1-FINAL$
+ * $Author:: $
+ * --------------------------------------------------------------------
+ * Copyright (c) 2003 - 2009 by Roland Haeder
+ * Copyright (c) 2009 - 2011 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
+ */
+
+// Init variables
+var menuStates = [];
+var id = null;
+
+/**
+ * Function to fold all menus and unfold current (mainAction) one
+ *
+ * @param      mode                    Unused ATM, is the menu 'mode' and will be 'admin','guest','member' or 'sponsor')
+ * @param      currentAction   Currently selected (clicked) 'action'
+ * @param      action                  Unused ATM, 'action' of menu block
+ * @param      what                    Unused ATM, 'what' of menu entry
+ */
+function changeMenuFoldState (mode, currentAction, action, what) {
+       // Get all li-tags
+       var li = document.getElementsByTagName('li');
+
+       // Generate tag id
+       id = 'action_menu_' + currentAction;
+
+       // Get element
+       var current = document.getElementById(id);
+
+       // Is it displayed?
+       if (menuStates[id] == true) {
+               // Then hide it
+               hideMenu(current, id);
+       } else {
+               // Else display it
+               showMenu(current, id);
+       }
+
+       // Stop click
+       return false;
+}
+
+// Hide given menu
+function hideMenu (current, id) {
+       // Change CSS and state
+       current.style.cssText = 'display: none;';
+       menuStates[id] = false;
+}
+
+// Show given menu and hide all others
+function showMenu (current, id) {
+       // Hide all menus first
+       for (id2 in menuStates) {
+               // Hide this
+               hideMenu(document.getElementById(id2), id2);
+       } // END - for
+
+       // Last make given menu visible
+       current.style.cssText = 'display: visible;';
+       menuStates[id] = true;
+}
+
+// Init all folding states
+function initMenuFoldStates () {
+       // Init variables
+       var style  = null;
+       var style2 = null;
+
+       // Get all li-tags
+       var li = document.getElementsByTagName('li');
+
+       // Search for all menus
+       for (var i = 0; i < li.length; i++) {
+               // Skip login/logout
+               if ((li[i].id.substr(-5, 5) == 'login') || (li[i].id.substr(-6, 6) == 'logout')) {
+                       // Skip this entry
+                       continue;
+               } // END - if
+
+               // We only want to look for 'action_menu_foo'
+               if (li[i].id.substr(0, 12) == 'action_menu_') {
+                       // Okay, found one, so copy it
+                       style = li[i].style.cssText;
+
+                       // Is last char a semicolon
+                       if (style.substr(-1, 1) == ';') {
+                               // Then cut it off
+                               style = style.substr(0, (style.length - 1));
+                       } // END - if
+
+                       // Is first part 'display' and last 'none'?
+                       menuStates[li[i].id] = ((style.substr(0, 7) == 'display') && (style.substr((style.length - 4), 4) != 'none'));
+                       //* DEBUG */ document.write('DEBUG: id=' + li[i].id + ',style=' + style + ',' + style.substr(0, 7) + '/' + style.substr((style.length - 4), 4) + '=' + menuStates[li[i].id] + '<br />');
+               } // END - if
+       } // END - for
+}
index a3a4c0e..6df0ca9 100644 (file)
@@ -65,19 +65,19 @@ $userId = '0';
 $bonusId = '0';
 $mailId = '0';
 $code = '0';
-$mode = '';
+$do = '';
 
 // Secure all data
 if (isGetRequestElementSet('userid'))  $userId  = bigintval(getRequestElement('userid'));
 if (isGetRequestElementSet('mailid'))  $mailId  = bigintval(getRequestElement('mailid'));
 if (isGetRequestElementSet('bonusid')) $bonusId = bigintval(getRequestElement('bonusid'));
 if (isGetRequestElementSet('code'))    $code    = bigintval(getRequestElement('code'));
-if (isGetRequestElementSet('mode'))    $mode    = getRequestElement('mode');
+if (isGetRequestElementSet('do'))      $do    = getRequestElement('do');
 
 // 01             2       21    12           2    2            21    1                      2210
 if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
        // No image?
-       if ($mode != 'img') {
+       if ($do != 'img') {
                // ... then output header
                loadIncludeOnce('inc/header.php');
        } // END - fi
@@ -187,7 +187,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        } // END - if
 
                                                        // @TODO Rewrite this to a filter
-                                                       switch ($mode) {
+                                                       switch ($do) {
                                                                case 'add':
                                                                        // Init stats data
                                                                        $stats_data = '0';
@@ -369,42 +369,42 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        break;
 
                                                                default: // Unknown mode
-                                                                       debug_report_bug(__FILE__, __LINE__, 'Unknown mode ' . $mode . ' detected.');
+                                                                       debug_report_bug(__FILE__, __LINE__, 'Unknown mode ' . $do . ' detected.');
                                                                        break;
                                                        } // END - switch
                                                } else {
                                                        loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (6)');
-                                                       $mode = 'failed';
+                                                       $do = 'failed';
                                                }
                                        } else {
                                                loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (5)');
-                                               $mode = 'failed';
+                                               $do = 'failed';
                                        }
                                } else {
                                        loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (4)');
-                                       $mode = 'failed';
+                                       $do = 'failed';
                                }
                        } else {
                                loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (3)');
-                               $mode = 'failed';
+                               $do = 'failed';
                        }
                } else {
                        loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (2)');
-                       $mode = 'failed';
+                       $do = 'failed';
                }
 
                // Free result
                SQL_FREERESULT($result_mailid);
        } else {
                loadTemplate('admin_settings_unsaved', false, '{--MAIL_ALREADY_CONFIRMED--} (1)');
-               $mode = 'failed';
+               $do = 'failed';
        }
 
        // Free result
        SQL_FREERESULT($result_main);
 
        // Insert footer if no image
-       if ($mode != 'img') {
+       if ($do != 'img') {
                // Write footer
                loadIncludeOnce('inc/footer.php');
        } // END - if
index c10f6ea..91beb7c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=refbanner%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=refbanner%}&do=add" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="410">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
index a6d824b..0e0c9b2 100644 (file)
                <td align="right" valign="top" style="padding-top: 3px">
                        <input type="radio" class="form_field" name="admin_menu" value="NEW"$content[admin_menu_new] />
                </td>
-               <td>{--ADMIN_MENU_NEW--}</td>
+               <td>
+                       {--ADMIN_CONFIG_ADMIN_MENU_NEW--}
+               </td>
        </tr>
        <tr>
                <td class="bottom" colspan="2" align="right" valign="top" style="padding-top: 3px">
                        <input type="radio" class="form_field" name="admin_menu" value="OLD"$content[admin_menu_old] />
                </td>
-               <td class="bottom">{--ADMIN_MENU_OLD--}</td>
+               <td class="bottom">
+                       {--ADMIN_CONFIG_ADMIN_MENU_OLD--}
+               </td>
+       </tr>
+       <tr>
+               <td class="bottom" align="right" style="padding-right:5px">
+                       {--ADMIN_CONFIG_ADMIN_MENU_JAVASCRIPT_ENABLED--}
+               </td>
+               <td class="bottom" align="center" colspan="2">
+                       {%template,ConfigurationYesNoSelectionBox=admin_menu_javascript_enabled%}
+               </td>
        </tr>
        <tr>
                <td colspan="3" class="table_footer">
index d1ccf91..2ae9fea 100644 (file)
@@ -9,7 +9,7 @@
                $content[email]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[mode]
+               $content[access_mode]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
                $content[la_mode]
index e333f9b..eb3fe5a 100644 (file)
@@ -11,7 +11,7 @@
                <input type="password" class="form_field" name="pass2[$content[id]]" size="10" maxlength="255" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[mode]
+               $content[access_mode]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
                {%pipe,generateAdminMenuModeSelectionBox=$content[id]%}
index 09a032b..e0acd57 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=refbanner&amp;mode=edit%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=refbanner&amp;do=edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
index 05958e7..3d87141 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;mode=add_points&amp;id=$content[id]%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;do=add_points&amp;id=$content[id]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
index fee1ace..76b73b7 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=edit%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;do=edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
 <tr>
        <td colspan="2" align="center" class="table_header bottom">
index bc1212f..f91e691 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;mode=sub_points&amp;id=$content[id]%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;do=sub_points&amp;id=$content[id]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
index 3654267..601d48a 100644 (file)
@@ -9,7 +9,7 @@
                &nbsp;&nbsp;<a href="mailto:$content[email]">$content[email]</a>
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;&nbsp;$content[mode]
+               &nbsp;&nbsp;$content[access_mode]
        </td>
        <td class="{%template,ColorSwitch%} bottom">
                &nbsp;&nbsp;$content[la_mode]
index 6afd7fb..edea805 100644 (file)
@@ -15,7 +15,7 @@
        <tr>
                <td colspan="4" class="table_footer">
                        $content[reset]
-                       <input type="submit" name="$content[mode]" class="$content[class]" value="$content[submit]" />
+                       <input type="submit" name="$content[do]" class="$content[class]" value="$content[submit]" />
                </td>
        </tr>
 </table>
index ca8eaff..32ed3a8 100644 (file)
 <tr>
 <tr>
        <td align="right" class="bottom right">{--SPONSOR_POINTS_AMOUNT--}:</td>
-       <td align="center" class="bottom">[<a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points%}" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}"><strong>{%pipe,translateComma=$content[points_amount]%}</strong></a>]</td>
+       <td align="center" class="bottom">[<a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;do=add_points%}" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}"><strong>{%pipe,translateComma=$content[points_amount]%}</strong></a>]</td>
 </tr>
 <tr>
        <td align="right" class="bottom right">{--SPONSOR_POINTS_USED--}:</td>
-       <td align="center" class="bottom">[<a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=sub_points%}" title="{--ADMIN_SPONSOR_SUB_POINTS_LINK_TITLE--}"><strong>{%pipe,translateComma=$content[points_used]%}</strong></a>]</td>
+       <td align="center" class="bottom">[<a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;do=sub_points%}" title="{--ADMIN_SPONSOR_SUB_POINTS_LINK_TITLE--}"><strong>{%pipe,translateComma=$content[points_used]%}</strong></a>]</td>
 </tr>
 <tr>
        <td colspan="2" align="center" class="table_header bottom">
        <td colspan="2" class="table_footer">
                <div align="center"><strong>{--ADMIN_SPONSOR_ACTIONS--}:</strong></div>
                <ul>
-                       <li>[<a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=edit%}">{--ADMIN_SPONSOR_ACTION_EDIT--}</a>]</li>
+                       <li>[<a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;do=edit%}">{--ADMIN_SPONSOR_ACTION_EDIT--}</a>]</li>
                        <li>[<a href="{%url=modules.php?module=admin&amp;what=del_sponsor&amp;id=$content[id]%}">{--ADMIN_SPONSOR_ACTION_DELETE--}</a>]</li>
                        <li>[<a href="{%url=modules.php?module=admin&amp;what=lock_sponsor&amp;id=$content[id]%}">{--ADMIN_SPONSOR_ACTION_LOCK--}</a>]</li>
                        <li>[<a href="{%url=modules.php?module=admin&amp;what=list_sponsor_pays&amp;id=$content[id]%}">{--ADMIN_LIST_SPONSOR_ORDERS--}</a>] (<strong>$content[orders]</strong>)</li>
index e411602..5c664bd 100644 (file)
@@ -11,7 +11,7 @@
     <a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>
   </td>
   <td align="center" class="{%template,ColorSwitch%} bottom" width="160">
-    <a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points%}"
+    <a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;do=add_points%}"
      title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">{%pipe,translateComma=$content[points]%}</a> {?POINTS?}
   </td>
 </tr>
diff --git a/templates/de/html/admin/admin_main.tpl b/templates/de/html/admin/admin_main.tpl
new file mode 100644 (file)
index 0000000..79213c5
--- /dev/null
@@ -0,0 +1,18 @@
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+       <tr>
+               <td colspan="2" align="center" class="table_header">
+                       <div align="center">
+                               $content[header]
+                       </div>
+
+                       <div align="center">
+                               $content[welcome]
+                       </div>
+               </td>
+       </tr>
+       <tr>
+               <td class="admin_menu" valign="top">
+                       $content[menu]
+               </td>
+               <td class="admin_content" id="admin_content" valign="top">
index d386e82..6c22966 100644 (file)
@@ -1,13 +1,14 @@
 </td>
 </tr>
 <tr>
-       <td class="admin_menu">&nbsp;</td>
-       <td class="admin_content">&nbsp;</td>
-</tr>
-<tr>
        <td align="center" colspan="2">
                $content[footer]
        </td>
 </tr>
 </table>
 </div>
+<script language="JavaScript">
+<!--
+initMenuFoldStates();
+//-->
+</script>
index ec094d1..11f5d85 100644 (file)
@@ -1,18 +1 @@
-<div align="center">
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-       <tr>
-               <td colspan="2" align="center" class="table_header">
-                       <div align="center">
-                               $content[header]
-                       </div>
-
-                       <div align="center">
-                               $content[welcome]
-                       </div>
-               </td>
-       </tr>
-       <tr>
-               <td class="admin_menu" valign="top">
-                       $content[menu]
-               </td>
-               <td class="admin_content" valign="top">
+<!-- @DEPRECATED //-->
index 3ccb779..52c5bd9 100644 (file)
@@ -3,7 +3,7 @@
                <input type="checkbox" class="form_field" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               <a href="{%url=modules.php?module=admin&amp;what=$content[mode]edit&amp;sub=$content[action]%}">{%pipe,fixEmptyContentToDashes=$content[action]%}</a>
+               <a href="{%url=modules.php?module=admin&amp;what=$content[do]edit&amp;sub=$content[action]%}">{%pipe,fixEmptyContentToDashes=$content[action]%}</a>
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
                {%pipe,fixEmptyContentToDashes=$content[what]%}
index bfd057d..f057a5d 100644 (file)
                        <tr>
                                <td align="right">{--NL_MODE_TEXT--}</td>
                                <td>
-                                       <input type="radio" class="form_field" name="mode" value="text" checked="checked" />
+                                       <input type="radio" class="form_field" name="mail_mode" value="text" checked="checked" />
                                </td>
                        </tr>
                        <tr>
                                <td align="right">{--NL_MODE_HTML--}</td>
                                <td>
-                                       <input type="radio" class="form_field" name="mode" value="html" />
+                                       <input type="radio" class="form_field" name="mail_mode" value="html" />
                                </td>
                        </tr>
                </table>
index 39c657a..99cd3b5 100644 (file)
@@ -37,7 +37,7 @@
        </tr>
        <tr>
                <td colspan="2" class="table_footer">
-                       <input type="hidden" name="mode" value="text" />
+                       <input type="hidden" name="mail_mode" value="text" />
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" class="form_submit" name="ok" value="{--ADMIN_SEND_NL--}" />
                </td>
index 1e9d951..223dfc3 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mode=$content[mode]%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mail_mode=$content[mail_mode]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
@@ -11,8 +11,8 @@
                <td>
                        <select name="cat" size="1" class="form_select">
                                <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>
-                               <option value="0">{--ALL_MEMBERS--} ({%pipe,getTotalReceivers,translateComma=$content[mode]%})</option>
-                               {%pipe,generateCategoryOptionsList=$content[mode]%}
+                               <option value="0">{--ALL_MEMBERS--} ({%pipe,getTotalReceivers,translateComma=$content[mail_mode]%})</option>
+                               {%pipe,generateCategoryOptionsList=$content[mail_mode]%}
                        </select>
                </td>
        </tr>
index 07adc6e..ba14ee5 100644 (file)
@@ -7,7 +7,7 @@
                <ul class="listing">
                        <li class="listing">
                                <div class="para">
-                                       <a href="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mode=normal%}">{--ADMIN_SEND_BONUS_NORMAL--}</a>
+                                       <a href="{%url=modules.php?module=admin&amp;what=send_bonus&amp;do=normal%}">{--ADMIN_SEND_BONUS_NORMAL--}</a>
                                </div>
                                <div class="para">
                                        {--ADMIN_SEND_BONUS_NORMAL_NOTES--}
@@ -15,7 +15,7 @@
                        </li>
                        <li class="listing">
                                <div class="para">
-                                       <a href="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mode=html%}">{--ADMIN_SEND_BONUS_HTML--}</a>
+                                       <a href="{%url=modules.php?module=admin&amp;what=send_bonus&amp;do=html%}">{--ADMIN_SEND_BONUS_HTML--}</a>
                                </div>
                                <div class="para">
                                        {--ADMIN_SEND_BONUS_HTML_NOTES--}
index 5fa339a..30e811d 100644 (file)
@@ -1,6 +1,6 @@
 <div class="para">
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=sponsor_login&amp;mode=activate%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=sponsor_login&amp;do=activate%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="400">
 <tr>
        <td class="table_header bottom" align="center" colspan="2">
index 3a30ba2..95e20dc 100644 (file)
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center">
-               [<a href="{%url=modules.php?module=index&amp;what=sponsor_login&amp;mode=lost_pass%}">{--SPONSOR_PASSWORD_LOST--}</a>]
+               [<a href="{%url=modules.php?module=index&amp;what=sponsor_login&amp;do=lost_pass%}">{--SPONSOR_PASSWORD_LOST--}</a>]
        </td>
 </tr>
 <tr>
        <td align="center">
-               [<a href="{%url=modules.php?module=index&amp;what=sponsor_login&amp;mode=activate%}">{--SPONSOR_ACTIVATION_LINK_LOST--}</a>]
+               [<a href="{%url=modules.php?module=index&amp;what=sponsor_login&amp;do=activate%}">{--SPONSOR_ACTIVATION_LINK_LOST--}</a>]
        </td>
 </tr>
 </table>
index 71224d4..78b5c9c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=sponsor_login&amp;mode=lost_pass%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=sponsor_login&amp;do=lost_pass%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="400">
 <tr>
        <td class="table_header bottom" align="center" colspan="2">
index 8601cba..4ebdfdd 100644 (file)
@@ -46,7 +46,7 @@
        $content[cats_rows]
        <tr>
                <td align="center" class="table_footer" colspan="4"><a
-                       href="{%url=modules.php?module=index&amp;what=stats&amp;mode=$content[lmode]%}">$content[ltitle]</a>
+                       href="{%url=modules.php?module=index&amp;what=stats&amp;do=$content[lmode]%}">$content[ltitle]</a>
                </td>
        </tr>
 </table>
index c9c2689..5b00eca 100644 (file)
@@ -8,7 +8,7 @@
 $content[rows]
 <tr>
        <td align="center" class="table_footer" colspan="2">
-               <a href="{%url=modules.php?module=index&amp;what=stats&amp;mode=$content[lmode]%}">$content[ltitle]</a>
+               <a href="{%url=modules.php?module=index&amp;what=stats&amp;do=$content[lmode]%}">$content[ltitle]</a>
        </td>
 </tr>
 </table>
diff --git a/templates/de/html/js/js_admin_menu_onclick.tpl b/templates/de/html/js/js_admin_menu_onclick.tpl
new file mode 100644 (file)
index 0000000..5605e52
--- /dev/null
@@ -0,0 +1 @@
+ onclick="return changeMenuFoldState('$content[menu_mode]', '$content[main_action]', '$content[action]', '$content[what]')"
index ac95980..9a33d61 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="mailid_table">
        <tr>
                <td width="220" align="center">
-                       <form accept-charset="UTF-8" action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;mode=add&amp;code=$content[code]%}" method="post">
+                       <form accept-charset="UTF-8" action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;do=add&amp;code=$content[code]%}" method="post">
                                {--MEMBER_MAILID_CLICK_BUTTON--}:<br />
                                <input type="hidden" name="gfx_check" value="$content[gfx]" />
                                <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SUBMIT_CODE--}" />
index 2737bfb..c838b19 100644 (file)
@@ -4,7 +4,7 @@
                <td width="220" align="center">
                        <form
                                accept-charset="UTF-8"
-                               action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;mode=add&amp;code=$content[code]%}"
+                               action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;do=add&amp;code=$content[code]%}"
                                method="post">
                                        {--MEMBER_ENTER_CODE--}:
                                        $content[image]<br />
index 6e90f99..eaf77a7 100644 (file)
@@ -14,7 +14,7 @@ function startCounter() {
        timer--;
        document.confirm.counter.value = timer;
        if (timer == 0) {
-               document.location.href = '{%url,js=mailid_top.php?userid=$content[userid]&$content[type]=$content[data]&mode=confirm&code=$content[rand]%}';
+               document.location.href = '{%url,js=mailid_top.php?userid=$content[userid]&$content[type]=$content[data]&do=confirm&code=$content[rand]%}';
                clearInterval(Counter);
        }
 }
index e66d6c5..0d254c5 100644 (file)
@@ -14,7 +14,7 @@
        $content[rows]
        <tr>
                <td colspan="4" class="table_footer" align="center">
-                       <a href="{%url=modules.php?module=login&amp;what=primera&amp;mode=choose%}">{--MEMBER_PRIMERA_MODE_CHOOSE2--}</a>
+                       <a href="{%url=modules.php?module=login&amp;what=primera&amp;do=choose%}">{--MEMBER_PRIMERA_MODE_CHOOSE2--}</a>
                </td>
        </tr>
 </table>
index c138366..d379b92 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=primera&amp;mode=pay%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=primera&amp;do=pay%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
index 8a2f89d..a4e1e6b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=transfer&amp;mode=new%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=transfer&amp;do=new%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="right" class="bottom" height="40"><strong>
index 09541d3..220fddf 100644 (file)
@@ -14,7 +14,7 @@
        $content[rows]
        <tr>
                <td colspan="4" class="table_footer" align="center">
-                       <a href="{%url=modules.php?module=login&amp;what=wernis&amp;mode=choose%}">{--MEMBER_WERNIS_MODE_CHOOSE2--}</a>
+                       <a href="{%url=modules.php?module=login&amp;what=wernis&amp;do=choose%}">{--MEMBER_WERNIS_MODE_CHOOSE2--}</a>
                </td>
        </tr>
 </table>
index c4cf6d0..6c6f4dd 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=wernis&amp;mode=payout%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=wernis&amp;do=payout%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom" height="30">
index d55a2a8..ce96c84 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=wernis&amp;mode=withdraw%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=wernis&amp;do=withdraw%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
index f3e0185..c91a5b5 100644 (file)
@@ -1,3 +1,3 @@
-<table border="0" cellspacing="0" cellpadding="0" class="$content[mode]_menu">
+<table border="0" cellspacing="0" cellpadding="0" class="$content[menu_mode]_menu">
 $content[rows]
 </table>
index b8426f6..f4424ef 100644 (file)
@@ -8,3 +8,4 @@
 <meta http-equiv="language" content="de" />
 
 <script src="{%url=js/jquery.js?dummy=1%}{%ext,version=sql_patches%}" type="text/javascript"></script>
+<script src="{%url=js/menu-common.js?dummy=1%}{%ext,version=sql_patches%}" type="text/javascript"></script>