From: Roland Häder Date: Thu, 18 Aug 2011 02:18:18 +0000 (+0000) Subject: Admin menu has now a JavaScript "effect": X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=ee3a0b42f93de7676fca549c866c1c2e6f3f0576 Admin menu has now a JavaScript "effect": - 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 --- diff --git a/.gitattributes b/.gitattributes index af3fd83f6f..42fa14819e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 26b1617efc..1ff32ba788 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -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. @@ -89,10 +89,10 @@ ./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 @@ -230,7 +230,7 @@ ./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 @@ -316,6 +316,7 @@ ./templates/de/html/admin/admin_list_network_config.tpl:1: ./templates/de/html/admin/admin_list_refs2.tpl:1: ./templates/de/html/admin/admin_list_user_sort_form.tpl:1: +./templates/de/html/admin/admin_main_header.tpl:1: ./templates/de/html/admin/admin_mods_stats2_row.tpl:1: ./templates/de/html/admin/admin_mods_stats2.tpl:1: ./templates/de/html/admin/admin_mods_stats_row.tpl:1: diff --git a/inc/expression-functions.php b/inc/expression-functions.php index 1eee08b4c3..3aa8026953 100644 --- a/inc/expression-functions.php +++ b/inc/expression-functions.php @@ -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); diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 81b2234b82..e07e75766d 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -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 diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php index 34712f1ab4..d77204cdb3 100644 --- a/inc/extensions/ext-booking.php +++ b/inc/extensions/ext-booking.php @@ -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, diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 98c8c0032a..a3d9dc5b56 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -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ür einen einstellbaren Zeitraum gecacht und nicht erneut angefordert.',3); addAdminMenuSql('network', 'config_network', 'Einstellungen', 'Stellen Sie generelle Einstellungen ein, die fü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öschen Sie hier Reload-Sperren. Vorsicht: Die hier gespeicherten Reload-Sperren sind vom jeweiligen Werbenetzwerk übernommen. Eventuell verdienen Sie nichts, wenn Sie z.B. eine Mail innerhalb der Reload-Sperre erneut versenden.',5); - addAdminMenuSql('network', 'list_networks', 'Auflisten/Verwalten', 'Experten-Einstellungen! Hier ändern Sie die Einstellungen an den Grunddaten (Stammdaten) des jeweiligen Werbenetzwerks ab. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 6); - addAdminMenuSql('network', 'list_network_types', 'Werbearten-Handler', 'Experten-Einstellungen! Hier ändern Sie die Einstellungen zu den Werbearten-Handler pro Werbenetzwerken. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 7); - addAdminMenuSql('network', 'list_network_params', 'Abfrageparameter', 'Experten-Einstellungen! Hier stellen Sie die Abfrageparameter (wie sie genannt werden müssen, um das API-Script korrekt aufrufen zu können) ein, pro Werbenetzwerk. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 8); - addAdminMenuSql('network', 'list_network_api_translation', 'Antwort-Array', 'Experten-Einstellungen! Hier stellen Sie die Zuweisungen der aus der analysierten API-Antwort Array-Elementen zu den Datenspalten ein. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 10); - addAdminMenuSql('network', 'list_network_error_codes', 'Fehlercodes', 'Experten-Einstellungen! Hier stellen Sie die Fehlercodes ein, die im Falle eines Fehlers pro API-Script kommen können. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 11); + addAdminMenuSql('network', 'list_networks', 'Auflisten/Verwalten', 'Entwicklereinstellungen! Hier ändern Sie die Einstellungen an den Grunddaten (Stammdaten) des jeweiligen Werbenetzwerks ab. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 6); + addAdminMenuSql('network', 'list_network_types', 'Werbearten-Handler', 'Entwicklereinstellungen! Hier ändern Sie die Einstellungen zu den Werbearten-Handler pro Werbenetzwerken. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 7); + addAdminMenuSql('network', 'list_network_params', 'Abfrageparameter', 'Entwicklereinstellungen! Hier stellen Sie die Abfrageparameter (wie sie genannt werden müssen, um das API-Script korrekt aufrufen zu können) ein, pro Werbenetzwerk. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 8); + addAdminMenuSql('network', 'list_network_api_translation', 'Antwort-Array', 'Entwicklereinstellungen! Hier stellen Sie die Zuweisungen der aus der analysierten API-Antwort Array-Elementen zu den Datenspalten ein. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 10); + addAdminMenuSql('network', 'list_network_error_codes', 'Fehlercodes', 'Entwicklereinstellungen! Hier stellen Sie die Fehlercodes ein, die im Falle eines Fehlers pro API-Script kommen können. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.', 11); // Configuration entries addConfigAddSql('network_cache_refresh', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT ' . (60 * 15)); diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index a8ba9a1d4a..fad4c45d8b 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.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ählt werden, ob das herkömliche JavaScrit-lose Menü oder mit JavaScript aktiv sein soll. Das herkömliche ist erstmal Standarteinstellung, bis das JavaScript-Menü funktioniert."); + break; } // END - switch break; diff --git a/inc/filter/bonus_filter.php b/inc/filter/bonus_filter.php index b0bfa46ec4..09ed63f552 100644 --- a/inc/filter/bonus_filter.php +++ b/inc/filter/bonus_filter.php @@ -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'] .= '
{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}
'; } else { diff --git a/inc/filter/booking_filter.php b/inc/filter/booking_filter.php index 0f957db169..a5af21e25e 100644 --- a/inc/filter/booking_filter.php +++ b/inc/filter/booking_filter.php @@ -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!'); diff --git a/inc/filter/mediadata_filter.php b/inc/filter/mediadata_filter.php index 0df8d99d47..4cebbeeba9 100644 --- a/inc/filter/mediadata_filter.php +++ b/inc/filter/mediadata_filter.php @@ -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!'); diff --git a/inc/filters.php b/inc/filters.php index 36ded8372f..35b17eef96 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -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, diff --git a/inc/functions.php b/inc/functions.php index 1b6b5dc88c..25035b54e0 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -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 diff --git a/inc/language/de.php b/inc/language/de.php index f88b0afdce..20e45d216b 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -891,8 +891,9 @@ addMessages(array( 'MEMBER_NO_MAILS_IN_POOL' => "Sie haben noch keine Mailbuchungen aufgegeben! Es können somit Ihnen auch keine angezeigt werden.", 'ADMIN_CONFIG_ADMIN_MENU_TITLE' => "Einstellungen am Adminmenü", 'ADMIN_CONFIG_SELECT_MENU_TYPE' => "Menütyp auswählen", - 'ADMIN_MENU_NEW' => "Neues Menüsystem mit "logischen Bereichen"", - 'ADMIN_MENU_OLD' => "Herkömliches Menüsystem links im Browser", + 'ADMIN_CONFIG_ADMIN_MENU_NEW' => "Neues Menüsystem mit "logischen Bereichen"", + 'ADMIN_CONFIG_ADMIN_MENU_OLD' => "Herkömliches Menüsystem links im Browser", + 'ADMIN_CONFIG_ADMIN_MENU_JAVASCRIPT_ENABLED' => "Soll das mit JavaScript ("interaktiv") gesteuerte Adminmenü eingeschaltet werden? (Dies ist noch sehr experimentell.)", 'ADMIN_BACK_TO_GUEST_MENU' => "Zum Gastmenü zurü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 auf jedem Fall 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ätigten Mitglieder-Accounts auflisten", 'ADMIN_LIST_STATUS_UNCONFIRMED_ACCOUNTS' => "Alle unbestätigten Mitglieder-Accounts auflisten", - 'ADMIN_LIST_MODE_CONFIRMED_ACCOUNTS' => "Alle bestä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ür Zufallsreferral auflisten", + 'ADMIN_LIST_DO_CONFIRMED_ACCOUNTS' => "Alle bestä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ü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 %s vom Server entfernen.", // Expert settings - 'ADMIN_EXPERT_SETTINGS_STATUS_UPDATE' => "Ihr {?mt_word?} weisst nicht die nötige Erweiterung admins mindestens in der Version 0.7.3 auf, um Experten-Einstellungen zu prüfen. Bitte aktualisieren Sie Ihre {?mt_word?}-Installation.", + 'ADMIN_EXPERT_SETTINGS_STATUS_UPDATE' => "Ihr {?mt_word?} weisst nicht die nötige Erweiterung admins mindestens in der Version 0.7.3 auf, um Entwicklereinstellungen zu prüfen. Bitte aktualisieren Sie Ihre {?mt_word?}-Installation.", 'ADMIN_EXPERT_SETTINGS_STATUS_FAILED' => "Es ist ein allgemeiner Fehler beim Prüfen der Experteneinstellungen aufgetreten für den Sie vermutlich nichts können.", - 'ADMIN_EXPERT_SETTINGS_STATUS_FORBIDDEN' => "Sie haben nicht die Berechtigung, Experten-Einstellungen zu ändern.", - 'ADMIN_EXPERT_SETTINGS_TITLE' => "Änderungen von Experten-Einstellungen", + 'ADMIN_EXPERT_SETTINGS_STATUS_FORBIDDEN' => "Sie haben nicht die Berechtigung, Entwicklereinstellungen zu ändern.", + 'ADMIN_EXPERT_SETTINGS_TITLE' => "Änderungen von Entwicklereinstellungen", 'ADMIN_EXPERT_SETTINGS_NOTE' => "Sie sind im Begriff Einstellungen zu ändern, die sehr sensibel sind und sich auf die Funktionalität Ihres {?mt_word2?} negativ auswirken können. Sie sollten daher hier nichts ändern, solange Sie nicht wissen, was Sie da tun.", 'ADMIN_EXPERT_SETTINGS_MAKE_PERMANENT' => "Ja, ich weiss was ich tue und mö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.", diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php index 9c3d228f44..c85b1a695f 100644 --- a/inc/language/wernis_de.php +++ b/inc/language/wernis_de.php @@ -114,8 +114,8 @@ addMessages(array( 'MEMBER_WERNIS_PAYOUT_MIN_POINTS' => "Mindestens auszuzahlendes Wernis-Guthaben", 'MEMBER_WERNIS_PAYOUT_SUBMIT' => "Auszahlung durchführen", 'MEMBER_WERNIS_PAYOUT_NOTE' => "Ihr Wernis-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Wernis-Betrag nur gerade Beträge eingeben! Überprüfen Sie vor dem Absenden Ihren WDS66-Usernamen.", - 'MEMBER_WERNIS_WDS66_ID' => "Username bei WDS66-Portal: [Vergessen?]", - 'MEMBER_WERNIS_WDS66_PASSWORD' => "Wernis-Passwort (nicht Accountpasswort!): [Vergessen?]", + 'MEMBER_WERNIS_WDS66_ID' => "Username bei WDS66-Portal: [Vergessen?]", + 'MEMBER_WERNIS_WDS66_PASSWORD' => "Wernis-Passwort (nicht Accountpasswort!): [Vergessen?]", 'MEMBER_WERNIS_WDS66_AMOUNT' => "Zu überweisenden Betrag eingeben:", 'MEMBER_WERNIS_MODE_INVALID' => "Ungültiger Modus %s erkannt! Bitte links im Menü fortfahren.", 'MEMBER_WERNIS_EMPTY_USERNAME' => "Sie haben Ihren WDS66-Usernamen nicht eingegeben.", diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 2df52a1046..3ac7769a27 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -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'] = ' '; + $content['access_mode'] = ' '; } // 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 = ''; // 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); diff --git a/inc/libs/booking_functions.php b/inc/libs/booking_functions.php index 17f72513fe..4ef69c9eb0 100644 --- a/inc/libs/booking_functions.php +++ b/inc/libs/booking_functions.php @@ -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__); } diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index 24227858c8..5f705a06b5 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -115,7 +115,7 @@ function outputAdvancedOverview (&$result_main) { // And random refid $value = getTotalRandomRefidUser(); if ($value > 0) { - $content['random_refid'] = '' . $value . ''; + $content['random_refid'] = '' . $value . ''; } // 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&mode=norefs'; + $WHATs[] = 'list_user&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&mode=waiting&select=all'; + $WHATs[] = 'list_doubler&do=waiting&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'); diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 1241a8748b..2a4bc4f03f 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -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 .= '&' . $param . '=' . getRequestElement($param); } // END - if @@ -91,7 +91,7 @@ function addSortLinks ($letter, $sortby) { $add = '&page=' . getRequestElement('page') . '&offset=' . getRequestElement('offset'); // Add status/ mode - foreach (array('mode','status') as $param) { + foreach (array('do','status') as $param) { if (isGetRequestElementSet($param)) { $add .= '&' . $param . '=' . getRequestElement($param); } // END - if @@ -152,7 +152,7 @@ function addPageNavigation ($numPages) { $OUT .= '
· '; if ($readable === true) { @@ -317,8 +317,29 @@ ORDER BY $OUT .= '
'; - // 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 .= ''; + + // 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 .= '
  • '; - - // Do we have entries? - if (ifAdminMenuHasEntries($mainContent['main_action'])) { - // Sub menu has been called - $SUB = true; - $OUT .= ''; } // END - if + // Close li-tag + $OUT .= '
    • '; + // 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 diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index 9b629ea07e..00764f8505 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -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); diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index dacaab98c3..93d133e3a1 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -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 diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index cb9f00d1ee..4bfdc91a1d 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -230,7 +230,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive() 'what' => $content['what'], 'title' => $content['title'], 'navi' => $NAVI, - 'mode' => 'guest' + 'do' => 'guest' ); // Load row template diff --git a/inc/modules/admin/what-list_admins_acls.php b/inc/modules/admin/what-list_admins_acls.php index 65c605e1b3..559223c08f 100644 --- a/inc/modules/admin/what-list_admins_acls.php +++ b/inc/modules/admin/what-list_admins_acls.php @@ -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--}'; diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index 069d2ea0b1..2523a39fe1 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -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, diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php index 76b443d013..4ede5eee50 100644 --- a/inc/modules/admin/what-list_doubler.php +++ b/inc/modules/admin/what-list_doubler.php @@ -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'] = '' . $count . ''; + $content['already_direct_link'] = '' . $count . ''; } // 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'] = '' . $count . ''; + $content['already_ref_link'] = '' . $count . ''; } // 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'] = '' . $count . ''; + $content['waiting_direct_link'] = '' . $count . ''; } // 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'] = '' . $count . ''; + $content['waiting_ref_link'] = '' . $count . ''; } // END - if // Links for all - $content['already_all_link'] = '' . $sumAlready . ''; - $content['waiting_all_link'] = '' . $sumWaiting . ''; + $content['already_all_link'] = '' . $sumAlready . ''; + $content['waiting_all_link'] = '' . $sumWaiting . ''; // 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] ?> diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index feabe013ac..649aec6ab3 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -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 diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index 2788c66bf5..e2b878f263 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -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); diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php index e8754f6ba2..1a6d1dd7e4 100644 --- a/inc/modules/admin/what-refbanner.php +++ b/inc/modules/admin/what-refbanner.php @@ -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", diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php index 765f304021..a66c30fea1 100644 --- a/inc/modules/admin/what-send_bonus.php +++ b/inc/modules/admin/what-send_bonus.php @@ -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'; diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php index bbb7c17a51..d94191ef98 100644 --- a/inc/modules/admin/what-send_newsletter.php +++ b/inc/modules/admin/what-send_newsletter.php @@ -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 diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index 82a49d2b55..165d912205 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -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 diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index 33f1aaed5b..0a0c4c267a 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -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 %s detected.", secureString(getRequestElement('mode')))); + debug_report_bug(__FILE__, __LINE__, sprintf("Unsupported mode %s detected.", secureString(getRequestElement('do')))); break; } diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index d4ac40f02e..d044bbd7e2 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -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); diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index e9bd50bb2e..56a3b14ebe 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -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'] = '' . $totalIn . ''; + $content['in_link'] = '' . $totalIn . ''; } // END - if // Check outgoing transfers @@ -451,7 +451,7 @@ INDEX (`party_userid`) $content['out_link'] = $totalOut; if ($totalOut > 0) { - $content['out_link'] = '' . $totalOut . ''; + $content['out_link'] = '' . $totalOut . ''; } // 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'] = '{%pipe,translateComma=' . $total . '%}'; + $content['all_link'] = '{%pipe,translateComma=' . $total . '%}'; } // 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'] = '{--TRANSFER_NOW_LINK--}'; + $content['new_link'] = '{--TRANSFER_NOW_LINK--}'; break; case 'N': diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index 84a5cea61a..401b1c88e2 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -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'] = '
    {--MEMBER_WERNIS_MODE_PAYOUT--}
    '; + $content['payout_link'] = '
    {--MEMBER_WERNIS_MODE_PAYOUT--}
    '; } // END - if // Is the withdraw mode active? if (isWernisWithdrawActive()) { // Add link - $content['withdraw_link'] = '
    {--MEMBER_WERNIS_MODE_WITHDRAW--}
    '; + $content['withdraw_link'] = '
    {--MEMBER_WERNIS_MODE_WITHDRAW--}
    '; } // 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); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 52d051cd09..e8e897fed4 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -368,8 +368,8 @@ ORDER BY // Prepare data $content = array( - 'rows' => $GLOBALS['rows'], - 'mode' => $mode + 'rows' => $GLOBALS['rows'], + 'menu_mode' => $mode ); // Load main template diff --git a/inc/referral-functions.php b/inc/referral-functions.php index c66289a0e3..7cc8b6468d 100644 --- a/inc/referral-functions.php +++ b/inc/referral-functions.php @@ -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 diff --git a/inc/template-functions.php b/inc/template-functions.php index 78e58e0790..e13e09a291 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -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 = '' . $GLOBALS['tpl_content'][$template] . ''; @@ -573,7 +573,7 @@ function getMenuCssClasses ($data) { // Generate XHTML code for the CAPTCHA function generateCaptchaCode ($code, $type, $type, $userid) { - return 'Code ' . $code . ''; + return '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 //----------------------------------------------------------------------------- diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 7950dee171..24a2f34095 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -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 index 0000000000..76146fdb7f --- /dev/null +++ b/js/menu-common.js @@ -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] + '
    '); + } // END - if + } // END - for +} diff --git a/mailid_top.php b/mailid_top.php index a3a4c0e44b..6df0ca9c20 100644 --- a/mailid_top.php +++ b/mailid_top.php @@ -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 diff --git a/templates/de/html/admin/admin_add_refbanner.tpl b/templates/de/html/admin/admin_add_refbanner.tpl index c10f6ea132..91beb7c01a 100644 --- a/templates/de/html/admin/admin_add_refbanner.tpl +++ b/templates/de/html/admin/admin_add_refbanner.tpl @@ -1,5 +1,5 @@
    -
    + - + - + + + + +
    diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index a6d824b97d..0e0c9b2a22 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -13,13 +13,25 @@ {--ADMIN_MENU_NEW--} + {--ADMIN_CONFIG_ADMIN_MENU_NEW--} +
    {--ADMIN_MENU_OLD--} + {--ADMIN_CONFIG_ADMIN_MENU_OLD--} +
    + {--ADMIN_CONFIG_ADMIN_MENU_JAVASCRIPT_ENABLED--} + + {%template,ConfigurationYesNoSelectionBox=admin_menu_javascript_enabled%} +
    diff --git a/templates/de/html/admin/admin_delete_admins_row.tpl b/templates/de/html/admin/admin_delete_admins_row.tpl index d1ccf91c1d..2ae9fead10 100644 --- a/templates/de/html/admin/admin_delete_admins_row.tpl +++ b/templates/de/html/admin/admin_delete_admins_row.tpl @@ -9,7 +9,7 @@ $content[email] - $content[mode] + $content[access_mode] $content[la_mode] diff --git a/templates/de/html/admin/admin_edit_admins_row.tpl b/templates/de/html/admin/admin_edit_admins_row.tpl index e333f9baa2..eb3fe5ae17 100644 --- a/templates/de/html/admin/admin_edit_admins_row.tpl +++ b/templates/de/html/admin/admin_edit_admins_row.tpl @@ -11,7 +11,7 @@ - $content[mode] + $content[access_mode] {%pipe,generateAdminMenuModeSelectionBox=$content[id]%} diff --git a/templates/de/html/admin/admin_edit_refbanner.tpl b/templates/de/html/admin/admin_edit_refbanner.tpl index 09a032b04f..e0acd57de2 100644 --- a/templates/de/html/admin/admin_edit_refbanner.tpl +++ b/templates/de/html/admin/admin_edit_refbanner.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl index 05958e7f9b..3d8714112f 100644 --- a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl @@ -1,5 +1,5 @@
    - + diff --git a/templates/de/html/admin/admin_send_bonus_form.tpl b/templates/de/html/admin/admin_send_bonus_form.tpl index 1e9d951ce6..223dfc399b 100644 --- a/templates/de/html/admin/admin_send_bonus_form.tpl +++ b/templates/de/html/admin/admin_send_bonus_form.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl index fee1ace7fc..76b73b7500 100644 --- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl @@ -1,5 +1,5 @@
    - + - + - + diff --git a/templates/de/html/admin/admin_main.tpl b/templates/de/html/admin/admin_main.tpl new file mode 100644 index 0000000000..79213c5838 --- /dev/null +++ b/templates/de/html/admin/admin_main.tpl @@ -0,0 +1,18 @@ +
    +
    diff --git a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl index bc1212f594..f91e691937 100644 --- a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/admin/admin_list_admins_row.tpl b/templates/de/html/admin/admin_list_admins_row.tpl index 3654267f2f..601d48ad05 100644 --- a/templates/de/html/admin/admin_list_admins_row.tpl +++ b/templates/de/html/admin/admin_list_admins_row.tpl @@ -9,7 +9,7 @@   $content[email] -   $content[mode] +   $content[access_mode]   $content[la_mode] diff --git a/templates/de/html/admin/admin_list_country_form.tpl b/templates/de/html/admin/admin_list_country_form.tpl index 6afd7fbd04..edea805165 100644 --- a/templates/de/html/admin/admin_list_country_form.tpl +++ b/templates/de/html/admin/admin_list_country_form.tpl @@ -15,7 +15,7 @@
    $content[reset] - +
    diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index ca8eaff324..32ed3a827e 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -82,11 +82,11 @@
    {--SPONSOR_POINTS_AMOUNT--}:[{%pipe,translateComma=$content[points_amount]%}][{%pipe,translateComma=$content[points_amount]%}]
    {--SPONSOR_POINTS_USED--}:[{%pipe,translateComma=$content[points_used]%}][{%pipe,translateComma=$content[points_used]%}]
    @@ -121,7 +121,7 @@
    {--ADMIN_SPONSOR_ACTIONS--}:
    		 - {%pipe,translateComma=$content[points]%} {?POINTS?}
    + + + + + + - - - -
    +
    + $content[header] +
    + +
    + $content[welcome] +
    +
    + $content[menu] + diff --git a/templates/de/html/admin/admin_main_footer.tpl b/templates/de/html/admin/admin_main_footer.tpl index d386e824f8..6c229665cf 100644 --- a/templates/de/html/admin/admin_main_footer.tpl +++ b/templates/de/html/admin/admin_main_footer.tpl @@ -1,9 +1,5 @@
      
    $content[footer] @@ -11,3 +7,8 @@
    + diff --git a/templates/de/html/admin/admin_main_header.tpl b/templates/de/html/admin/admin_main_header.tpl index ec094d119b..11f5d85d80 100644 --- a/templates/de/html/admin/admin_main_header.tpl +++ b/templates/de/html/admin/admin_main_header.tpl @@ -1,18 +1 @@ -
    - - - - - - -
    -
    - $content[header] -
    - -
    - $content[welcome] -
    -
    - $content[menu] - + diff --git a/templates/de/html/admin/admin_menu_overview_row.tpl b/templates/de/html/admin/admin_menu_overview_row.tpl index 3ccb779e45..52c5bd9580 100644 --- a/templates/de/html/admin/admin_menu_overview_row.tpl +++ b/templates/de/html/admin/admin_menu_overview_row.tpl @@ -3,7 +3,7 @@ - {%pipe,fixEmptyContentToDashes=$content[action]%} + {%pipe,fixEmptyContentToDashes=$content[action]%} {%pipe,fixEmptyContentToDashes=$content[what]%} diff --git a/templates/de/html/admin/admin_newsletter.tpl b/templates/de/html/admin/admin_newsletter.tpl index bfd057db07..f057a5dacb 100644 --- a/templates/de/html/admin/admin_newsletter.tpl +++ b/templates/de/html/admin/admin_newsletter.tpl @@ -19,13 +19,13 @@
    {--NL_MODE_TEXT--} - +
    {--NL_MODE_HTML--} - +
    diff --git a/templates/de/html/admin/admin_newsletter_nohtml.tpl b/templates/de/html/admin/admin_newsletter_nohtml.tpl index 39c657afdd..99cd3b53d0 100644 --- a/templates/de/html/admin/admin_newsletter_nohtml.tpl +++ b/templates/de/html/admin/admin_newsletter_nohtml.tpl @@ -37,7 +37,7 @@
    - +
    diff --git a/templates/de/html/admin/admin_send_bonus_select.tpl b/templates/de/html/admin/admin_send_bonus_select.tpl index 07adc6e80e..ba14ee5bb0 100644 --- a/templates/de/html/admin/admin_send_bonus_select.tpl +++ b/templates/de/html/admin/admin_send_bonus_select.tpl @@ -7,7 +7,7 @@
    @@ -11,8 +11,8 @@
    diff --git a/templates/de/html/guest/guest_sponsor_login.tpl b/templates/de/html/guest/guest_sponsor_login.tpl index 3a30ba2607..95e20dc441 100644 --- a/templates/de/html/guest/guest_sponsor_login.tpl +++ b/templates/de/html/guest/guest_sponsor_login.tpl @@ -39,12 +39,12 @@
    - [{--SPONSOR_PASSWORD_LOST--}] + [{--SPONSOR_PASSWORD_LOST--}]
    - [{--SPONSOR_ACTIVATION_LINK_LOST--}] + [{--SPONSOR_ACTIVATION_LINK_LOST--}]
    diff --git a/templates/de/html/guest/guest_sponsor_lost.tpl b/templates/de/html/guest/guest_sponsor_lost.tpl index 71224d4a9a..78b5c9c4a3 100644 --- a/templates/de/html/guest/guest_sponsor_lost.tpl +++ b/templates/de/html/guest/guest_sponsor_lost.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/guest/guest_stats_member.tpl b/templates/de/html/guest/guest_stats_member.tpl index 8601cbaf95..4ebdfdd5b9 100644 --- a/templates/de/html/guest/guest_stats_member.tpl +++ b/templates/de/html/guest/guest_stats_member.tpl @@ -46,7 +46,7 @@ $content[cats_rows]
    $content[ltitle] + href="{%url=modules.php?module=index&what=stats&do=$content[lmode]%}">$content[ltitle]
    diff --git a/templates/de/html/guest/guest_stats_table.tpl b/templates/de/html/guest/guest_stats_table.tpl index c9c2689a9c..5b00eca011 100644 --- a/templates/de/html/guest/guest_stats_table.tpl +++ b/templates/de/html/guest/guest_stats_table.tpl @@ -8,7 +8,7 @@ $content[rows]
    - $content[ltitle] + $content[ltitle]
    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 index 0000000000..5605e5298c --- /dev/null +++ b/templates/de/html/js/js_admin_menu_onclick.tpl @@ -0,0 +1 @@ + onclick="return changeMenuFoldState('$content[menu_mode]', '$content[main_action]', '$content[action]', '$content[what]')" diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl index ac95980fda..9a33d61e56 100644 --- a/templates/de/html/mailid/mailid_confirm_buttom.tpl +++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl @@ -2,7 +2,7 @@
    - + {--MEMBER_MAILID_CLICK_BUTTON--}:
    diff --git a/templates/de/html/mailid/mailid_enter_code.tpl b/templates/de/html/mailid/mailid_enter_code.tpl index 2737bfbf31..c838b191fc 100644 --- a/templates/de/html/mailid/mailid_enter_code.tpl +++ b/templates/de/html/mailid/mailid_enter_code.tpl @@ -4,7 +4,7 @@     		{--MEMBER_ENTER_CODE--}: $content[image]
    diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl index 6e90f9994d..eaf77a7c88 100644 --- a/templates/de/html/mailid/mailid_timer.tpl +++ b/templates/de/html/mailid/mailid_timer.tpl @@ -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); } } diff --git a/templates/de/html/member/member_primera_mode_list.tpl b/templates/de/html/member/member_primera_mode_list.tpl index e66d6c5f88..0d254c574e 100644 --- a/templates/de/html/member/member_primera_mode_list.tpl +++ b/templates/de/html/member/member_primera_mode_list.tpl @@ -14,7 +14,7 @@ $content[rows]
    - {--MEMBER_PRIMERA_MODE_CHOOSE2--} + {--MEMBER_PRIMERA_MODE_CHOOSE2--}
    diff --git a/templates/de/html/member/member_primera_mode_pay.tpl b/templates/de/html/member/member_primera_mode_pay.tpl index c1383665d2..d379b92629 100644 --- a/templates/de/html/member/member_primera_mode_pay.tpl +++ b/templates/de/html/member/member_primera_mode_pay.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl index 8a2f89d787..a4e1e6b133 100644 --- a/templates/de/html/member/member_transfer_new.tpl +++ b/templates/de/html/member/member_transfer_new.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/member/member_wernis_mode_list.tpl b/templates/de/html/member/member_wernis_mode_list.tpl index 09541d300f..220fddf662 100644 --- a/templates/de/html/member/member_wernis_mode_list.tpl +++ b/templates/de/html/member/member_wernis_mode_list.tpl @@ -14,7 +14,7 @@ $content[rows]
    - {--MEMBER_WERNIS_MODE_CHOOSE2--} + {--MEMBER_WERNIS_MODE_CHOOSE2--}
    diff --git a/templates/de/html/member/member_wernis_mode_payout.tpl b/templates/de/html/member/member_wernis_mode_payout.tpl index c4cf6d0de9..6c6f4dd305 100644 --- a/templates/de/html/member/member_wernis_mode_payout.tpl +++ b/templates/de/html/member/member_wernis_mode_payout.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/member/member_wernis_mode_withdraw.tpl b/templates/de/html/member/member_wernis_mode_withdraw.tpl index d55a2a8c0d..ce96c840d6 100644 --- a/templates/de/html/member/member_wernis_mode_withdraw.tpl +++ b/templates/de/html/member/member_wernis_mode_withdraw.tpl @@ -1,5 +1,5 @@
    - +
    diff --git a/templates/de/html/menu/menu_table.tpl b/templates/de/html/menu/menu_table.tpl index f3e0185776..c91a5b5324 100644 --- a/templates/de/html/menu/menu_table.tpl +++ b/templates/de/html/menu/menu_table.tpl @@ -1,3 +1,3 @@ - +
    $content[rows]
    diff --git a/templates/de/html/page_header.tpl b/templates/de/html/page_header.tpl index b8426f6378..f4424ef386 100644 --- a/templates/de/html/page_header.tpl +++ b/templates/de/html/page_header.tpl @@ -8,3 +8,4 @@ +