From: Roland Häder Date: Sat, 10 Nov 2012 00:45:58 +0000 (+0000) Subject: Mailer project continued (heavy refactoring): X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=7052cc3bd3ca07281078acbbce6ce595d753def1 Mailer project continued (heavy refactoring): - Added all missing nodes in all XML templates to allow $content being handled by referred HTML templates - This means that you can pass "dynamic" content through the XML sub system to the templates as usual. If you do so, a generic 'rows' array element is being used for the row output - Refactured all form-tags to EL code to allow e.g. adding session id to all forms or (not yet added) TAN numbers to combat any kind of form spamming and accidentally done re-submits - Including closing form tag - In the above process, onsubmit/onreset are now strongly discouraged as you should better use the jQuery AJAX framework - Other rewrites/refacturings I cannot remember - TODOs.txt updated --- diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 7c1e89e72c..e0baf6e4b2 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -14,6 +14,7 @@ ./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 +./inc/extensions/ext-network.php:100: // @TODO network_type_handler is an internal name and needs documentation ./inc/extensions/ext-network.php:18: * @TODO Ad-Magnet: Layer(klick?). Layerviews.Skybannerklick/-view, * ./inc/extensions/ext-network.php:19: * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel * ./inc/extensions/ext-network.php:20: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS??? * @@ -38,14 +39,14 @@ ./inc/extensions/ext-network.php:39: * @TODO Der Werbepartner.cc: Sky banner is JavaScript! * ./inc/extensions/ext-network.php:40: * @TODO Der Werbepartner.cc: Surfbar click not correct * ./inc/extensions/ext-network.php:41: * @TODO Der Werbepartner.cc: Textlink not not correct * -./inc/extensions/ext-network.php:42: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * -./inc/extensions/ext-network.php:99: // @TODO network_type_handler is an internal name and needs documentation +./inc/extensions/ext-network.php:42: * @TODO Xijide: Lead/Sale (together) unsupported (no target URL) * +./inc/extensions/ext-network.php:43: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * ./inc/extensions/ext-newsletter.php:218: // @TODO Move these into configuration ./inc/extensions/ext-nickname.php:52: // @TODO NOT NULL DEFAULT '' is bad practice, use NULL ./inc/extensions/ext-rallye.php:94: // @TODO Fix config_rallye_prices to list_rallye_prices ./inc/extensions/ext-yoomedia.php:121: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); -./inc/extensions-functions.php:2132:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' +./inc/extensions-functions.php:2119:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' ./inc/extensions-functions.php:424: // @TODO This redirect is still needed to register sql_patches! Please try to avoid it ./inc/extensions-functions.php:440:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:580: // @TODO Extension is loaded, what next? @@ -53,12 +54,13 @@ ./inc/filter/cache_filter.php:94: // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal. ./inc/filter/forced_filter.php:73: // @TODO This part is unfinished ./inc/filters.php:1313: // @TODO No banner found, output some default banner -./inc/functions.php:1099: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? -./inc/functions.php:1185: // @TODO Are these convertions still required? -./inc/functions.php:1206:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:1790: // @TODO Find a way to cache this -./inc/functions.php:1895: // @TODO This is still very static, rewrite it somehow -./inc/functions.php:2105: // @TODO Rename column data_type to e.g. mail_status +./inc/functions.php:1102: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? +./inc/functions.php:1188: // @TODO Are these convertions still required? +./inc/functions.php:1209:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:1796: // @TODO Find a way to cache this +./inc/functions.php:1901: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2108: // @TODO Rename column data_type to e.g. mail_status +./inc/functions.php:2458:// @TODO cacheFiles is not yet supported ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter ./inc/header.php:66:// @TODO Find a way to not use direct module comparison ./inc/install-functions.php:91: // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); @@ -79,7 +81,7 @@ ./inc/libs/doubler_functions.php:96: // @TODO Can't this be moved into EL? ./inc/libs/forced_functions.php:457:// @TODO Can't we use our new expression language instead of this ugly code? ./inc/libs/mailid_functions.php:47: // @TODO Rewrite this to a dynamic include or so -./inc/libs/network_functions.php:1120: // @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine +./inc/libs/network_functions.php:1124: // @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine ./inc/libs/order_functions.php:46: // @TODO Move this array into a filter ./inc/libs/rallye_functions.php:771:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() ./inc/libs/rallye_functions.php:838: $EXPIRE = 3; // @TODO The hard-coded value... @@ -89,9 +91,9 @@ ./inc/libs/sponsor_functions.php:436: // @TODO Rewrite this to API function ./inc/libs/surfbar_functions.php:1692: // @TODO This can be somehow rewritten ./inc/libs/surfbar_functions.php:789:// @TODO Can't we use our new expression language instead of this ugly code? -./inc/libs/task_functions.php:253: // @TODO These can be rewritten to filter +./inc/libs/task_functions.php:256: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:51:// @TODO Move all extension-dependent queries into filters -./inc/libs/theme_functions.php:94: // @TODO Can't this be rewritten to an API function? +./inc/libs/theme_functions.php:96: // @TODO Can't this be rewritten to an API function? ./inc/libs/user_functions.php:325: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); ./inc/libs/user_functions.php:354: // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); ./inc/libs/yoomedia_functions.php:108: $response = YOOMEDIA_QUERY_API('out_textmail.php', TRUE); // @TODO Ask Yoo!Media for test script @@ -100,9 +102,12 @@ ./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten to a filter? ./inc/module-functions.php:273: // @TODO Nothing helped??? ./inc/module-functions.php:314: // @TODO Rewrite this to a filter +./inc/modules/admin/admin-inc.php:1043:// @TODO rawUserId/content is not yet supported +./inc/modules/admin/admin-inc.php:1068:// @TODO rawUserId/cacheFiles/content is not yet supported ./inc/modules/admin/admin-inc.php:163: // @TODO This and the next getCurrentAdminId() call might be moved into the templates? ./inc/modules/admin/admin-inc.php:236: // @TODO This can be rewritten into a filter ./inc/modules/admin/admin-inc.php:521:// @TODO Try to rewrite this to adminAddMenuSelectionBox() +./inc/modules/admin/admin-inc.php:868:// @TODO cacheFiles is not yet supported ./inc/modules/admin/overview-inc.php:176: // @TODO Rewrite this to a filter ./inc/modules/admin/overview-inc.php:289: // @TODO Rewrite this to something with include files and/or filter ./inc/modules/admin/overview-inc.php:323: // @TODO This may also be rewritten to include files @@ -178,7 +183,8 @@ ./inc/mysql-manager.php:1464: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:1770: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:1967: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided -./inc/mysql-manager.php:2070: // @TODO Used generic 'userid' here +./inc/mysql-manager.php:2079: // @TODO Used generic 'userid' here +./inc/mysql-manager.php:2300:// @TODO cacheFiles is not yet supported ./inc/mysql-manager.php:398: // @TODO Try to rewrite this to one or more functions ./inc/mysql-manager.php:44:// @TODO Can we cache this? ./inc/purge/purge-inact.php:55: // @TODO Rewrite these if() blocks to a filter @@ -194,9 +200,9 @@ ./inc/template-functions.php:288: // @TODO Remove these sanity checks if all is fine ./inc/template-functions.php:625:// @TODO $simple/$constants are deprecated ./inc/template-functions.php:723: // @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates -./inc/wrapper-functions.php:3037: // @TODO Find a way to not use direct module comparison -./inc/wrapper-functions.php:506:// @TODO Do some more sanity check here -./inc/xml-functions.php:239: // @TODO Handle characters +./inc/wrapper-functions.php:3031: // @TODO Find a way to not use direct module comparison +./inc/wrapper-functions.php:500:// @TODO Do some more sanity check here +./inc/xml-functions.php:240: // @TODO Handle characters ./mailid.php:102: // @TODO Rewrite this to a filter ./mailid.php:145: // @TODO Rewrite this to a filter ./mailid_top.php:112: // @TODO Rewrite this to a filter/function @@ -205,7 +211,7 @@ ./mailid_top.php:199: // @TODO Rewrite this to a filter ./mailid_top.php:206: // @TODO Rewrite this to a filter ./mailid_top.php:241: // @TODO Rewrite these blocks to filter -./templates/de/html/admin/admin_add_country.tpl:23: +./templates/de/html/admin/admin_add_country.tpl:24: ./templates/de/html/admin/admin_config_other.tpl:79: ./templates/de/html/admin/admin_config_rewrite.tpl:4: ./templates/de/html/admin/admin_edit_admin_menu.tpl:4: @@ -269,6 +275,7 @@ ./templates/de/html/admin/admin_config_bonus_pro.tpl:1: ./templates/de/html/admin/admin_config_cache.tpl:1: ./templates/de/html/admin/admin_config_doubler_pro.tpl:1: +./templates/de/html/admin/admin_config_home_settings_pro.tpl:1: ./templates/de/html/admin/admin_config_reg_pro.tpl:1: ./templates/de/html/admin/admin_config_shop.tpl:1: ./templates/de/html/admin/admin_config_transfer_pro.tpl:1: @@ -306,6 +313,7 @@ ./templates/de/html/guest/guest_confirm_table.tpl:1: ./templates/de/html/guest/guest_paidlinks_register_header.tpl:1: ./templates/de/html/guest/guest_paidlinks_register.tpl:1: +./templates/de/html/install/install_header.tpl:1: ./templates/de/html/theme_one.tpl:1: ./templates/de/html/theme_select_box.tpl:1: ./templates/de/html/theme_select_form.tpl:1: diff --git a/DOCS/tpl-validator.php b/DOCS/tpl-validator.php index 6fb9e3c21d..f0b1a06a2c 100644 --- a/DOCS/tpl-validator.php +++ b/DOCS/tpl-validator.php @@ -56,15 +56,15 @@ $doc->loadHTMLFile($_SERVER['argv'][1]); $data = $doc->saveHTML(); $newData = str_replace("
", "
\n", $data); -$newData = str_replace("\n\n", chr(10), $newData); +$newData = str_replace(PHP_EOL . PHP_EOL, PHP_EOL, $newData); -$array = explode(chr(10), $newData); +$array = explode(PHP_EOL, $newData); array_shift($array); array_shift($array); unset($array[count($array) - 1]); unset($array[count($array) - 1]); -$newData = implode(chr(10), $array).chr(10); +$newData = implode(PHP_EOL, $array).PHP_EOL; // Has a template changed? if ($data != $newData) { diff --git a/inc/callback-functions.php b/inc/callback-functions.php index 55616a0368..8f5aada84d 100644 --- a/inc/callback-functions.php +++ b/inc/callback-functions.php @@ -1328,15 +1328,19 @@ function addXmlValueToCallbackAttributes ($element, $attributes, $extraKey = '', //----------------------------------------------------------------------------- // Execute function for doXmlCallbackFunction() -function doXmlCallbackFunctionExecute ($callbackName, $args, $columnIndex) { +function doXmlCallbackFunctionExecute ($callbackName, $args, $columnIndex, $content) { // Is 'id_index' set and form sent? if ((isset($args['id_index'])) && (isFormSent())) { // Prepare 'id_index' $args['id_index'] = postRequestElement($args['id_index']); } // END - if + // Add content + $args['_content'] = $content; + // Just call it - //* DEBUG: */ die(__FUNCTION__.':callbackFunction=' . $callbackName . ',columnIndex=' . $columnIndex . ',args=
'.print_r($args, TRUE).'
'); + //* DEBUG: */ die(__FUNCTION__.':callbackFunction=' . $callbackName . ',
columnIndex=' . $columnIndex . ',
args(' . count($args) . ')=
'.print_r($args, TRUE).'
'); + //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'Called!'); call_user_func_array($callbackName, $args); } diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index 095187b531..2408c751bc 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -138,7 +138,7 @@ class CacheSystem { // Is the pointer a valid resource? if (is_resource($this->pointer)) { // Write the line - fwrite($this->pointer, $line . chr(10)); + fwrite($this->pointer, $line . PHP_EOL); } else { // Something bad happened reportBug(__METHOD__, __LINE__, 'Pointer type is ' . gettype($this->pointer) . ', expected is resource.'); diff --git a/inc/config-functions.php b/inc/config-functions.php index 035f169d78..cfa68f5ca1 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -194,7 +194,7 @@ function updateOldConfigFile () { copyFileVerified(getPath() . 'inc/config-local.php.dist', getCachePath() . 'config-local.php', 0644); // First of all, load the old one! - $oldConfig = explode(chr(10), readFromFile(getPath() . 'inc/config.php')); + $oldConfig = explode(PHP_EOL, readFromFile(getPath() . 'inc/config.php')); // Now, analyze every entry $done = array(); diff --git a/inc/config-global.php b/inc/config-global.php index 7c59f5d1ce..c798121d32 100644 --- a/inc/config-global.php +++ b/inc/config-global.php @@ -50,7 +50,7 @@ if (function_exists('date_default_timezone_set')) { @date_default_timezone_set('Europe/Berlin'); } // END - if -// CFG: ERROR_REPORTING +// CFG: ERROR-REPORTING error_reporting(E_ALL | E_DEPRECATED | E_STRICT); // Is the function there? (removed in PHP 5.4.x) @@ -101,7 +101,7 @@ setConfigEntry('TITLE', 'Mailer-Project'); // CFG: COPY setConfigEntry('COPY', 'Copyright © 2003 - 2009, by Roland Häder,
2009 - 2012 by Mailer Developer Team'); -// CFG: CACHE_PATH +// CFG: CACHE-PATH setConfigEntry('CACHE_PATH', 'inc/cache/'); // CFG: INTERNAL-STATS (This setting is overwritten by ext-other equal and prior version 0.2.7) diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index 8715bc7b4a..4b8c5a299a 100644 --- a/inc/db/lib-mysql3.php +++ b/inc/db/lib-mysql3.php @@ -66,7 +66,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = TRUE) { } // Remove \t, \n and \r from queries they may confuse some MySQL versions - $sqlStringModified = str_replace(array(chr(9), chr(10), chr(13)), array(' ', ' ', ' '), $sqlStringModified); + $sqlStringModified = str_replace(array(chr(9), PHP_EOL, chr(13)), array(' ', ' ', ' '), $sqlStringModified); // Compile config entries out $sqlStringModified = SQL_PREPARE_SQL_STRING($sqlStringModified, $enableCodes); @@ -118,7 +118,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = TRUE) { } // END - if // Append debug line - appendLineToFile(getCachePath() . 'mysql.log', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . ($queryTime * 1000) . 'ms): ' . str_replace(array(chr(13), chr(10)), array('', ' '), $GLOBALS['last_sql'])); + appendLineToFile(getCachePath() . 'mysql.log', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . ($queryTime * 1000) . 'ms): ' . str_replace(array(chr(13), PHP_EOL), array('', ' '), $GLOBALS['last_sql'])); } // END - if // Increment stats entry diff --git a/inc/expression-functions.php b/inc/expression-functions.php index 3693439c41..e70d284bd8 100644 --- a/inc/expression-functions.php +++ b/inc/expression-functions.php @@ -106,7 +106,7 @@ function doExpressionCode ($data) { return $code; } -// Expression call-back function for URLs +// Expression call-back function for URLs (example: {%url=foo.php?bar=bar%}) function doExpressionUrl ($data) { // Is there JS-mode? if ($data['callback'] == 'js') { @@ -426,5 +426,124 @@ function doExpressionSessionPipe ($data) { return $code; } +// Expression call-back for formulars +function doExpressionForm ($data) { + // Default method is GET, target is _self + $data['__form_method'] = 'get'; + $data['__form_target'] = '_self'; + $data['__form_name'] = 'form'; + $data['__form_id'] = 'form'; + $data['__server'] = ''; + + // Check which method/target is set + foreach (array('callback', 'extra_func', 'extra_func2') as $key) { + // Make lower-case + $value = strtolower($data[$key]); + + // Is formMethodPost set? + if ($value == 'formmethodpost') { + // Use it + $data['__form_method'] = 'post'; + } elseif (($value == 'formmethodget') && (!isSpider()) && (!isSessionValid())) { + // Then expand 'value' with session id + if (strpos($data['value'], '?') !== FALSE) { + // '?' is set + $data['value'] .= '&'; + } else { + // Is not set + $data['value'] .= '?'; + } + + // Append session's name and id + $data['value'] .= session_name() . '=' . session_id(); + } elseif (substr($value, 0, 10) == 'formtarget') { + // Form target is found + $data['__form_target'] = substr($value, 10); + } elseif (substr($value, 0, 8) == 'formname') { + // Form name is found + $data['__form_name'] = substr($value, 8); + } elseif (substr($value, 0, 6) == 'formid') { + // Form id found + $data['__form_id'] = substr($value, 6); + } elseif (substr($value, 0, 6) == 'server') { + // {%server,foo%} found + $data['__server'] = '{%server=' . substr($value, 6) . '%}'; + } + } // END - foreach + + // Generate the replacement code which is the opening form tag + $data['__replacer'] = '' . PHP_EOL; + + /* + * Call a filter chain to allow more hidden fields being added at the end + * of the form. + */ + $data = runFilterChain('close_form_fields', $data); + + // Replace the code + $code = replaceExpressionCode($data, $data['__replacer']); + + // Return the (maybe) replaced code + return $code; +} + +// Expression call-back to handle jquery inclusion +function doExpressionJquery ($data) { + // Default is compressed + $jquery = 'jquery.js'; + + // Is debug mode enabled? + if ((isGetRequestElementSet('jquery')) || (isSessionVariableSet('jquery'))) { + // Then use uncompressed + $jquery = 'jquery-uncompressed.js'; + + // Remember it in session + setSession('jquery', '1'); + } // END - if + + // Add {%url%} around it + $replacer = '{%url=js/' . $jquery . '?dummy=1%}'; + + // Replace the code + $code = replaceExpressionCode($data, $replacer); + + // Return the (maybe) replaced code + return $code; +} + // [EOF] ?> diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php index 12a9b437ad..29634ca48b 100644 --- a/inc/extensions/ext-html_mail.php +++ b/inc/extensions/ext-html_mail.php @@ -153,7 +153,7 @@ switch (getExtensionMode()) { // $GLOBALS['url_ends'] = array( ' ', - chr(10), + PHP_EOL, chr(13), ')', ); diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 0866599256..fcbbb39b7d 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -39,6 +39,7 @@ * @TODO Der Werbepartner.cc: Sky banner is JavaScript! * * @TODO Der Werbepartner.cc: Surfbar click not correct * * @TODO Der Werbepartner.cc: Textlink not not correct * + * @TODO Xijide: Lead/Sale (together) unsupported (no target URL) * * @TODO Yoo!Media: What is LayerAd compared to Layer click? * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * @@ -277,6 +278,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", ('popdown_id'), ('lead_id'), ('sale_id'), +('lead_sale_id'), ('banner_url1'), ('banner_url2'), ('banner_url3'), @@ -343,7 +345,8 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", ('ads2earn', 'Ads2Earn', 'http://www.ads2earn.de?ref=1294', '|', '|', 'GET', 'ISO-8859-1', 'N', 150, 'Y'), ('ads2webbi', 'Ads2Webbi', 'http://www.ads2webbi.de?ref=79', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'), ('superpromo24', 'SuperPromo24', 'http://www.superpromo24.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 300, 'Y'), -('euads', 'eu-ADS.de', 'http://www.eu-ads.de?ref=411', '|', '|', 'GET', 'ISO-8859-1', 'N', 200, 'Y')"); +('euads', 'eu-ADS.de', 'http://www.eu-ads.de?ref=411', '|', '|', 'GET', 'ISO-8859-1', 'N', 200, 'Y'), +('xiji', 'Xiji.de', 'http://www.xiji.de/index.php?ref=7715', '|', '|', 'GET', 'ISO-8859-1', 'N', 100, 'Y')"); // Network type handlers - A3H addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handler`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, `network_type_reload_time_unit`) VALUES @@ -904,6 +907,20 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (154, 22, 'forcedtextlink', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL, 'h'), (155, 22, 'traffic', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL, 'h')"); + // Network type handlers - Xiji.de + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handler`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, `network_type_reload_time_unit`, `network_text_encoding`) VALUES +(450, 43, 'textmail', 'http://www.xiji.de/interface/output_paidmails.php', 'http://www.xiji.de/view/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'), +(451, 43, 'banner_view', 'http://www.xiji.de/interface/output_viewbanner.php', 'http://www.xiji.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE'), +(452, 43, 'forcedbanner', 'http://www.xiji.de/interface/output_forcedbanner.php', 'http://www.xiji.de/view/forcedclickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/forcedviewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE'), +(453, 43, 'popup', 'http://www.xiji.de/interface/output_popup.php', 'http://www.xiji.de/view/popup.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'), +(454, 43, 'layer_view', 'http://www.xiji.de/interface/output_layerviews.php', 'http://www.xiji.de/view/layer.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'), +(455, 43, 'forcedtextlink', 'http://www.xiji.de/interface/output_forcedtextlink.php', 'http://www.xiji.de/view/forcedclicktextlink.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'), +(456, 43, 'traffic', 'http://www.xiji.de/interface/output_traffic.php', 'http://www.xiji.de/view/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'), +(457, 43, 'popdown', 'http://www.xiji.de/interface/output_popdown.php', 'http://www.xiji.de/view/popdown.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'), +(458, 43, 'button_view', 'http://www.xiji.de/interface/output_viewbanner.php', 'http://www.xiji.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE'), +(459, 43, 'skybanner_view', 'http://www.xiji.de/interface/output_viewbanner.php', 'http://www.xiji.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE'), +(460, 43, 'halfbanner_view', 'http://www.xiji.de/interface/output_viewbanner.php', 'http://www.xiji.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE')"); + // Network type handlers - Yoo!Media addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handler`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, `network_type_reload_time_unit`) VALUES (156, 23, 'banner_click', 'http://www.yoomedia.de/interface_2.0/out_banner.php', 'http://www.yoomedia.de/code/z-bannerklf.php?id=%CID%&sid=%SID%', 'http://www.yoomedia.de/code/z-banner.php?id=%CID%&sid=%SID%&bid=%BID%', 'h'), @@ -4076,6 +4093,39 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (22, 155, 'reward', 'verg', NULL), (22, 155, 'sid', 'sid', NULL)"); + // Request parameters per type handler - Xiji.de + + // Request parameters per type handler - Xiji.de + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `network_request_param_key`, `network_request_param_value`, `network_request_param_default`) VALUES +(43, 451, 'affiliate_id', 'id', NULL), +(43, 451, 'password', 'pw', NULL), +(43, 451, 'reload', 'reload', NULL), +(43, 451, 'reward', 'verguetung', NULL), +(43, 451, 'remain', 'uebrig', NULL), +(43, 451, 'size', 'typ', '468x60'), +(43, 451, 'sid', 'aid', NULL), +(43, 458, 'affiliate_id', 'id', NULL), +(43, 458, 'password', 'pw', NULL), +(43, 458, 'reload', 'reload', NULL), +(43, 458, 'reward', 'verguetung', NULL), +(43, 458, 'remain', 'uebrig', NULL), +(43, 458, 'size', 'typ', '88x31'), +(43, 458, 'sid', 'aid', NULL), +(43, 459, 'affiliate_id', 'id', NULL), +(43, 459, 'password', 'pw', NULL), +(43, 459, 'reload', 'reload', NULL), +(43, 459, 'reward', 'verguetung', NULL), +(43, 459, 'remain', 'uebrig', NULL), +(43, 459, 'size', 'typ', '120x600'), +(43, 459, 'sid', 'aid', NULL), +(43, 460, 'affiliate_id', 'id', NULL), +(43, 460, 'password', 'pw', NULL), +(43, 460, 'reload', 'reload', NULL), +(43, 460, 'reward', 'verguetung', NULL), +(43, 460, 'remain', 'uebrig', NULL), +(43, 460, 'size', 'typ', '234x60'), +(43, 460, 'sid', 'aid', NULL)"); + // Request parameters per type handler - Yoo!Media addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `network_request_param_key`, `network_request_param_value`, `network_request_param_default`) VALUES (23, 156, 'erotic', 'erotik', NULL), @@ -7281,6 +7331,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", addDropTableSql('network_types'); addDropTableSql('network_request_params'); addDropTableSql('network_vcheck_params'); + addDropTableSql('network_vcheck_errors'); addDropTableSql('network_error_codes'); addDropTableSql('network_array_translation'); addDropTableSql('network_api_config'); @@ -7288,6 +7339,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", addDropTableSql('network_vcheck_config'); addDropTableSql('network_cache'); addDropTableSql('network_reloads'); + addDropTableSql('network_translations'); // Admin menu addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='network'"); diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php index d4efcfaaf4..60d49f39f5 100644 --- a/inc/extensions/ext-newsletter.php +++ b/inc/extensions/ext-newsletter.php @@ -218,7 +218,7 @@ INDEX `topic` (`nl_topic_id`)", // @TODO Move these into configuration $GLOBALS['url_ends'] = array( ' ', - chr(10), + PHP_EOL, chr(13), ')', ); diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 8a11ac1067..c75f48417e 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -206,6 +206,9 @@ ORDER BY // Handle referral banner click/view registerFilter(__FUNCTION__, __LINE__, 'handle_click_php', 'HANDLE_REFERRER_BANNER_CLICK'); registerFilter(__FUNCTION__, __LINE__, 'handle_view_php', 'HANDLE_REFERRER_BANNER_VIEW'); + + // Generic filter to add hidden fields to formulars + registerFilter(__FUNCTION__, __LINE__, 'open_form_fields', 'ADD_INPUT_HIDDEN_SESSION_ID'); } // "Registers" a new filter function diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php index 31c22ee117..26dd41df98 100644 --- a/inc/filter/online_filter.php +++ b/inc/filter/online_filter.php @@ -51,7 +51,7 @@ function FILTER_UPDATE_ONLINE_LIST ($filterData) { } // END - if // Empty session? - if (session_id() == '') { + if (!isSessionValid()) { // This is invalid here! reportBug(__FUNCTION__, __LINE__, 'Invalid session.'); } // END - if diff --git a/inc/filters.php b/inc/filters.php index 83019226a2..4852a2c12d 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -557,7 +557,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($filterData) { $filterData = call_user_func($etiFunction, $data); } else { // Unsupported command detected - logDebugMessage(__FUNCTION__, __LINE__, 'eti=' . $eti . ', callback=' . $callback . ', extra=' . $extraFunction . ' - unsupported'); + logDebugMessage(__FUNCTION__, __LINE__, 'eti=' . $eti . ',etiFunction=' . $etiFunction . ',callback=' . $callback . ',extraFunction=' . $extraFunction . ',extraFunction2=' . $extraFunction2 . ' - UNSUPPORTED'); } } // END - foreach } // END - if @@ -1340,5 +1340,17 @@ function FILTER_REDIRECT_WRONG_SERVER_NAME ($filterData) { return $filterData; } +// Filter for adding hidden session id +function FILTER_ADD_INPUT_HIDDEN_SESSION_ID ($filterData) { + // Is a spider detected? + if ((!isSpider()) && (!isSessionValid())) { + // No, then add the hidden field + $filterData['__replacer'] .= ''; + } // END - if + + // Return filter data + return $filterData; +} + // [EOF] ?> diff --git a/inc/functions.php b/inc/functions.php index c72f7eb7f6..5fae9029ad 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1245,7 +1245,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0 if ($next > -1) { if ($next === $seek) { $next = -1; - $line = $prefix . $inserted . $suffix . chr(10); + $line = $prefix . $inserted . $suffix . PHP_EOL; } else { $next++; } @@ -1289,7 +1289,7 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) { // Is debug mode enabled? if ((isDebugModeEnabled()) || ($force === TRUE)) { // Remove CRLF - $message = str_replace(array(chr(13), chr(10)), array('', ''), $message); + $message = str_replace(array(chr(13), PHP_EOL), array('', ''), $message); // Log this message away appendLineToFile(getPath() . getCachePath() . 'debug.log', generateDateTime(time(), '4') . '|' . getModule(FALSE) . '|' . basename($funcFile) . '|' . $line . '|' . $message); @@ -1344,8 +1344,11 @@ function handleExtraValues ($filterFunction, $value, $extraValue) { // Tries to determine if call-back functions and/or extra values shall be parsed function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search) { - // Debug message - /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries=' . $entries . ',userIdColumn=' . $userIdColumn[0] . ',search=' . $search . ',filterFunctions=' . print_r($filterFunctions, TRUE) . ',extraValues=' . print_r($extraValues, TRUE)); + // Debug mode enabled? + if (isDebugModeEnabled()) { + // Debug message + /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries=' . $entries . ',userIdColumn=' . $userIdColumn[0] . ',search=' . $search . ',filterFunctions=' . print_r($filterFunctions, TRUE) . ',extraValues=' . print_r($extraValues, TRUE)); + } // END - if // Send data through the filter function if found if ($key == $userIdColumn[0]) { @@ -1925,7 +1928,7 @@ function encodeUrl ($url, $outputMode = '0') { } // END - if // Is there a valid session? - if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === FALSE) || (!isset($_COOKIE[session_name()]))) && (isSpider() === FALSE)) { + if ((!isSessionValid()) && (!isSpider())) { // Determine right separator $separator = '&'; if (!isInString('?', $url)) { @@ -1933,11 +1936,8 @@ function encodeUrl ($url, $outputMode = '0') { $separator = '?'; } // END - if - // Is the session id set? - if (session_id() != '') { - // Then add it to URL - $url .= $separator . session_name() . '=' . session_id(); - } // END - if + // Then add it to URL + $url .= $separator . session_name() . '=' . session_id(); } // END - if // Add {?URL?} ? @@ -2181,7 +2181,7 @@ function isHexadecimal ($hex) { } /** - * Replace chr(13) with "[r]" and chr(10) with "[n]" and add a final new-line to make + * Replace chr(13) with "[r]" and PHP_EOL with "[n]" and add a final new-line to make * them visible to the developer. Use this function to debug e.g. buggy HTTP * response handler functions. * @@ -2189,7 +2189,7 @@ function isHexadecimal ($hex) { * @return $str Overworked string */ function replaceReturnNewLine ($str) { - return str_replace(array(chr(13), chr(10)), array('[r]', '[n]'), $str); + return str_replace(array(chr(13), PHP_EOL), array('[r]', '[n]'), $str); } // Converts a given string by splitting it up with given delimiter similar to @@ -2374,7 +2374,7 @@ function memberAddEntries ($tableName, $columns = array(), $filterFunctions = ar } // Edit rows by given id numbers -function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) { +function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) { // $tableName must be an array if ((!is_array($tableName)) || (count($tableName) != 1)) { // No tableName specified @@ -2408,12 +2408,12 @@ function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFuncti } } else { // List for editing - memberListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); + memberListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content); } } // Delete rows by given id numbers -function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) { +function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) { // Do this only for members assert(isMember()); @@ -2450,17 +2450,18 @@ function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunc } } else { // List for deletion confirmation - memberListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); + memberListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUSerId, $content); } } // Build a special template list -function memberListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) { +// @TODO cacheFiles is not yet supported +function memberListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) { // Do this only for logged in member assert(isMember()); // Call inner (general) function - doGenericListBuilder('member', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId); + doGenericListBuilder('member', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content); } // Checks whether given address is IPv4 diff --git a/inc/http-functions.php b/inc/http-functions.php index cf83770388..67a7043598 100644 --- a/inc/http-functions.php +++ b/inc/http-functions.php @@ -551,7 +551,7 @@ function unchunkHttpResponse ($response) { //* DEBUG: */ die('tempResponse['.strlen($tempResponse).']=
'.replaceReturnNewLine(htmlentities($tempResponse)).'
'); // Re-add the headers - $response = merge_array($GLOBALS['http_headers'], stringToArray(chr(10), $tempResponse)); + $response = merge_array($GLOBALS['http_headers'], stringToArray(PHP_EOL, $tempResponse)); } // END - if // Return the unchunked array diff --git a/inc/install-functions.php b/inc/install-functions.php index 0b5152c99c..fe21fae755 100644 --- a/inc/install-functions.php +++ b/inc/install-functions.php @@ -149,7 +149,7 @@ function readSqlDump ($FQFN) { // Remove some unwanted chars $content = str_replace(chr(13), '', $content); - $content = str_replace("\n\n", chr(10), $content); + $content = str_replace(PHP_EOL . PHP_EOL, PHP_EOL, $content); // Return the content return $content; diff --git a/inc/language/network_de.php b/inc/language/network_de.php index be9915b380..be1698f226 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -161,37 +161,41 @@ addMessages(array( 'ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_LIMITED_TO_TYPE' => "Es wurden nur die Array-Element-Übersetzungen des ausgewählten Werbeart-Handlers angezeigt.", // - Advertise types 'ADMIN_NETWORK_TYPE_HANDLER_BANNER' => "Banner Klick/View", - 'ADMIN_NETWORK_TYPE_HANDLER_BANNER_CLICK' => "Banner-Klick", - 'ADMIN_NETWORK_TYPE_HANDLER_BANNER_VIEW' => "Banner-View", + 'ADMIN_NETWORK_TYPE_HANDLER_BANNER_CLICK' => "Banner Klick", + 'ADMIN_NETWORK_TYPE_HANDLER_BANNER_VIEW' => "Banner View", 'ADMIN_NETWORK_TYPE_HANDLER_BUTTON' => "Button Klick/View", - 'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_CLICK' => "Button-Klick", - 'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_VIEW' => "Button-View", - 'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR' => "Surfbar Klick/View", - 'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_CLICK' => "Surfbar-Klick", - 'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_VIEW' => "Surfbar-View", + 'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_CLICK' => "Button Klick", + 'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_VIEW' => "Button View", + 'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR' => "Surfbar Klick/View", // This is a software surfbar outside the browser window (mostly Windows-only) + 'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_CLICK' => "Surfbar Klick", + 'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_VIEW' => "Surfbar View", 'ADMIN_NETWORK_TYPE_HANDLER_FORCEDBANNER' => "Forced-Banner", 'ADMIN_NETWORK_TYPE_HANDLER_FORCEDTEXTLINK' => "Forced-Textlink", 'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK' => "Textlink Klick/View", - 'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_CLICK' => "Textlink-Klick", - 'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_VIEW' => "Textlink-View", + 'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_CLICK' => "Textlink Klick", + 'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_VIEW' => "Textlink View", 'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER' => "Sky Klick/View", - 'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_CLICK' => "Sky-Klick", - 'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_VIEW' => "Sky-View", + 'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_CLICK' => "Sky Klick", + 'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_VIEW' => "Sky View", + 'ADMIN_NETWORK_TYPE_HANDLER_HALFBANNER' => "Half-Banner Klick/View", + 'ADMIN_NETWORK_TYPE_HANDLER_HALFBANNER_CLICK' => "Half-Banner Klick", + 'ADMIN_NETWORK_TYPE_HANDLER_HALFBANNER_VIEW' => "Half-Banner View", 'ADMIN_NETWORK_TYPE_HANDLER_LAYER' => "Layer Klick/View", - 'ADMIN_NETWORK_TYPE_HANDLER_LAYER_CLICK' => "Layer-Klick", - 'ADMIN_NETWORK_TYPE_HANDLER_LAYER_VIEW' => "Layer-View", + 'ADMIN_NETWORK_TYPE_HANDLER_LAYER_CLICK' => "Layer Klick", + 'ADMIN_NETWORK_TYPE_HANDLER_LAYER_VIEW' => "Layer View", 'ADMIN_NETWORK_TYPE_HANDLER_POPUP' => "PopUp", 'ADMIN_NETWORK_TYPE_HANDLER_POPDOWN' => "PopDown", 'ADMIN_NETWORK_TYPE_HANDLER_TEXTMAIL' => "Textmail", 'ADMIN_NETWORK_TYPE_HANDLER_HTMLMAIL' => "HTML-Mail", 'ADMIN_NETWORK_TYPE_HANDLER_LEAD' => "Lead", 'ADMIN_NETWORK_TYPE_HANDLER_SALE' => "Sale", + 'ADMIN_NETWORK_TYPE_HANDLER_LEAD_SALE' => "Lead/Sale", 'ADMIN_NETWORK_TYPE_HANDLER_PAYPERACTIVE' => "PayPerAktiv", 'ADMIN_NETWORK_TYPE_HANDLER_PAGEPEEL' => "Page-Peel", 'ADMIN_NETWORK_TYPE_HANDLER_TRAFFIC' => "Traffic", // These are visitor exchanges like ext-surfbar! 'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE' => "Signatur Klick/View", - 'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE_CLICK' => "Signatur-Klick", - 'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE_VIEW' => "Signatur-View", + 'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE_CLICK' => "Signatur Klick", + 'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE_VIEW' => "Signatur View", // - Sponsor networks 'ADMIN_LIST_NEWORK_DATA_TITLE' => "Auflistung der Grunddaten aller Werbenetzwerke", 'ADMIN_NETWORK_NONE_SUPPORTED' => "Es sind noch keine Werbenetzwerke eingerichtet.", @@ -328,6 +332,7 @@ addMessages(array( 'ADMIN_NETWORK_TRANSLATE_POPDOWN_ID_NAME' => "PopDown-Id", 'ADMIN_NETWORK_TRANSLATE_LEAD_ID_NAME' => "Lead-Id", 'ADMIN_NETWORK_TRANSLATE_SALE_ID_NAME' => "Sale-Id", + 'ADMIN_NETWORK_TRANSLATE_LEAD_SALE_ID_NAME' => "Lead/Sale-Id", 'ADMIN_NETWORK_TRANSLATE_TRAFFIC_ID_NAME' => "Traffic-Id", 'ADMIN_NETWORK_TRANSLATE_CAMPAIGN_ID_NAME' => "Kampagnen-Id", 'ADMIN_NETWORK_TRANSLATE_MINIMUM_STAY_NAME' => "Mindestauffenthalt", diff --git a/inc/language/nickname_de.php b/inc/language/nickname_de.php index 5f725ef053..256c8241de 100644 --- a/inc/language/nickname_de.php +++ b/inc/language/nickname_de.php @@ -49,7 +49,7 @@ addMessages(array( 'ADMIN_CONFIG_NICKNAME_CHARACTERS' => "Zeichenfolge für Sprachdatei", // Admin - nickname history - 'ADMIN_LIST_NICKNAME_HISTORY_404' => "Das ausgewählte Mitglied {%%pipe,generateUserProfileLink=%s%%} hat noch keinen Nicknamen angelegt. Daher konnten auch keine Historie-Einträge gefunden werden.", + 'ADMIN_LIST_NICKNAME_HISTORY_404' => "Das ausgewählte Mitglied {%get,generateUserProfileLink=userid%} hat noch keinen Nicknamen angelegt. Daher konnten auch keine Historie-Einträge gefunden werden.", 'ADMIN_LIST_NICKNAME_HISTORY_TITLE' => "Alle verwendeten Nicknames des Mitgliedes {%get,generateUserProfileLink=userid%}", // Member diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php index 45ee3bea84..ce5a8b9682 100644 --- a/inc/language/surfbar_de.php +++ b/inc/language/surfbar_de.php @@ -277,8 +277,10 @@ addMessages(array( 'GUEST_SURFBAR_LOGIN_HEADER' => "Login zur Surfbar:", // Points accounts - subject - 'POINTS_SUBJECT_SURFBAR' => "Vergütung im Besuchertausch", - 'POINTS_SUBJECT_MONTHLY_SURFBAR' => "Monatl. Reset (Besuchertausch)", + 'POINTS_SUBJECT_SURFBAR' => "Vergütung im Besuchert.", + 'POINTS_SUBJECT_SURFBAR_REF' => "Anteilige Vergütung im Besuchert.", + 'POINTS_SUBJECT_MONTHLY_SURFBAR' => "Monatl. Reset (Besuchert.)", + 'POINTS_SUBJECT_MONTHLY_SURFBAR_REF' => "Anteilige monatl. Reset (Besuchert.)", // Module title 'MODULE_SURFBAR_TITLE' => "Besuchertausch", diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 31cfefdd20..beac76adc4 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -574,7 +574,7 @@ function sendAdminsEmails ($subject, $template, $content, $userid) { // Is the template a bug report? if ($template == 'admin_report_bug') { // Then set 'Reply-To:' again - $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10); + $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL; } // END - if // Load email addresses and send away diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php index 11ea6194cb..40f9e68cbe 100644 --- a/inc/libs/holiday_functions.php +++ b/inc/libs/holiday_functions.php @@ -90,7 +90,7 @@ LIMIT 1", sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message); // Remember userid for admin - $admin .= $content['userid'].chr(10); + $admin .= $content['userid'] . PHP_EOL; } // END - if // Send mail to admins diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php index 62c13a1a9b..be00219d6c 100644 --- a/inc/libs/html_mail_functions.php +++ b/inc/libs/html_mail_functions.php @@ -148,7 +148,7 @@ function insertUrlsIntoHtml ($text) { } // END - foreach // Replace new-lines agains
-s and finally compile possible own HTML tags out... - return preCompileCode(str_replace(chr(10), "
\n", $text)); + return preCompileCode(str_replace(PHP_EOL, "
" . PHP_EOL, $text)); } // [EOF] diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index 2a52309768..735b1a5335 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -743,6 +743,9 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) { 'skybanner', 'skybanner_click', 'skybanner_view', + 'halfbanner', + 'halfbanner_click', + 'halfbanner_view', 'layer', 'layer_click', 'layer_view', @@ -752,6 +755,7 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) { 'htmlmail', 'lead', 'sale', + 'lead_sale', 'payperactive', 'pagepeel', 'traffic', @@ -1132,11 +1136,7 @@ function doAdminNetworkProcessAddNetwork () { // Already there loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}'); return FALSE; - } elseif (!isNetworkActiveByShortName(postRequestElement('network_short_name'))) { - // Network is not active - loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_NOT_ACTIVE=' . postRequestElement('network_short_name') . '%}'); - return FALSE; - } + } // END - if // Remove the 'ok' part unsetPostRequestElement('ok'); @@ -1179,8 +1179,13 @@ function doAdminNetworkProcessHandleNetworks () { // If we have no rows, we don't need to display the edit form if (!empty($OUT)) { + // Init array with generic element + $content = array( + 'rows' => $OUT + ); + // Output main template - loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $OUT); + loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $content); // Don't display the list/add new form $GLOBALS['network_display'] = FALSE; @@ -1224,11 +1229,17 @@ function doAdminNetworkProcessHandleNetworkTypes () { // If we have no rows, we don't need to display the edit form if (!empty($OUT)) { + // Prepare array with generic elements + $content = array( + 'rows' => $OUT, + 'network_id' => bigintval(getRequestElement('network_id')) + ); + // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_types', FALSE, $OUT); + loadTemplate('admin_edit_network_types', FALSE, $content); } elseif (isFormSent('delete')) { - loadTemplate('admin_delete_network_types', FALSE, $OUT); + loadTemplate('admin_delete_network_types', FALSE, $content); } else { // Problem! reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); @@ -1282,11 +1293,17 @@ function doAdminNetworkProcessHandleRequestParams () { // If we have no rows, we don't need to display the edit form if (!empty($OUT)) { + // Prepare array with generic elements + $content = array( + 'rows' => $OUT, + 'network_id' => bigintval(getRequestElement('network_id')) + ); + // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_request_params', FALSE, $OUT); + loadTemplate('admin_edit_network_request_params', FALSE, $content); } elseif (isFormSent('delete')) { - loadTemplate('admin_delete_network_request_params', FALSE, $OUT); + loadTemplate('admin_delete_network_request_params', FALSE, $content); } else { // Problem! reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); @@ -1802,11 +1819,17 @@ function doAdminNetworkProcessHandleArrayTranslations () { // If we have no rows, we don't need to display the edit form if (!empty($OUT)) { + // Prepare array with generic elements + $content = array( + 'rows' => $OUT, + 'network_id' => bigintval(getRequestElement('network_id')) + ); + // Output main template if (isFormSent('edit')) { - loadTemplate('admin_edit_network_array_translation', FALSE, $OUT); + loadTemplate('admin_edit_network_array_translation', FALSE, $content); } elseif (isFormSent('delete')) { - loadTemplate('admin_delete_network_array_translation', FALSE, $OUT); + loadTemplate('admin_delete_network_array_translation', FALSE, $content); } else { // Problem! reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 11bb77c790..25687437bb 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -174,7 +174,7 @@ WHERE function addReferralRallyePrices ($rallye, $mode = 'email') { // Output mode switch($mode) { - case 'email': $mode = chr(10); break; + case 'email': $mode = PHP_EOL; break; case 'html' : $mode = '
'; break; } // END - switch @@ -195,7 +195,7 @@ ORDER BY if (!SQL_HASZERONUMS($result_prices)) { // Load prices $prices = ''; - if ($mode == chr(10)) { + if ($mode == PHP_EOL) { $prices = '{--RALLYE_MEMBER_PRICES_ADDED--}:' . $mode . '------------------------------' . $mode; } // END - if @@ -217,7 +217,7 @@ ORDER BY } // Add last line for email mode - if ($mode == chr(10)) { + if ($mode == PHP_EOL) { $prices .= '------------------------------'; } // END - if diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index f0f8082655..b1243ce216 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -247,21 +247,20 @@ function outputAdvancedOverview (&$result_main) { // Both extensions must be there if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) { // Start finding them... - $EXCLUDE_LIST = ' '; + $userExclusionSql = ' '; + + // Exclude test accounts + $userExclusionSql = runFilterChain('user_exclusion_sql', ' '); // Check for more extensions // @TODO These can be rewritten to filter - if (isValidUserId(getDefRefid())) $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}'; - if (isExtensionActive('beg')) $EXCLUDE_LIST .= ' AND d.`userid` != {?beg_userid?}'; - if (isExtensionActive('bonus')) $EXCLUDE_LIST .= ' AND d.`userid` != {?bonus_userid?}'; - if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND d.`userid` != {?doubler_userid?}'; + if (isValidUserId(getDefRefid())) $userExclusionSql .= ' AND d.`userid` != {?def_refid?}'; + if (isExtensionActive('beg')) $userExclusionSql .= ' AND d.`userid` != {?beg_userid?}'; + if (isExtensionActive('bonus')) $userExclusionSql .= ' AND d.`userid` != {?bonus_userid?}'; + if (isExtensionActive('doubler')) $userExclusionSql .= ' AND d.`userid` != {?doubler_userid?}'; if (isExtensionInstalledAndNewer('holiday', '0.1.3')) { // Recent ext-holiday found - $EXCLUDE_LIST .= " AND d.`holiday_active`='N'"; - } // END - if - if (isExtensionInstalledAndNewer('user', '0.5.0')) { - // Exclude test accounts - $EXCLUDE_LIST = runFilterChain('user_exclusion_sql', $EXCLUDE_LIST); + $userExclusionSql .= " AND d.`holiday_active`='N'"; } // END - if // Check for all accounts @@ -270,14 +269,13 @@ function outputAdvancedOverview (&$result_main) { d.`email`, d.`last_online` FROM - `{?_MYSQL_PREFIX?}_user_data` AS d + `{?_MYSQL_PREFIX?}_user_data` AS `d` WHERE - d.`status`='CONFIRMED' - " . runFilterChain('user_exclusion_sql', ' ') . " AND + d.`status`='CONFIRMED' AND (UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND (UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND (UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?} -".$EXCLUDE_LIST." +" . $userExclusionSql . " ORDER BY d.`userid` ASC"); $WHATs[] = 'list_autopurge'; diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index 1a8e05bba2..3fce3a9638 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -47,9 +47,8 @@ function generateThemeSelectionBox () { $mod = getModule(); // Construction URL - $formAction = '{%url=modules.php?module='. $mod; + $formAction = 'modules.php?module='. $mod; if (!empty($what)) $formAction .= '&what=' . $what; - $formAction .= '%}'; // Initialize array $themesArray = array( @@ -61,7 +60,10 @@ function generateThemeSelectionBox () { $add = " WHERE `theme_active`='Y'"; // Is there admin? - if (isAdmin()) $add = ''; + if (isAdmin()) { + // Then display all themes + $add = ''; + } // END - if // Select all themes we want $result = SQL_QUERY('SELECT @@ -74,16 +76,16 @@ ORDER BY `theme_name` ASC', __FUNCTION__, __LINE__); // Load all themes - while ($content = SQL_FETCHARRAY($result)) { + while ($row = SQL_FETCHARRAY($result)) { // Construct relative include file name - $inc = sprintf("theme/%s/theme.php", secureString($content['theme_path'])); + $inc = sprintf("theme/%s/theme.php", secureString($row['theme_path'])); // Load it's theme.php file if found if (isIncludeReadable($inc)) { // And save all data in array loadInclude($inc); - array_push($themesArray['theme_unix'], $content['theme_path']); - array_push($themesArray['theme_name'], $GLOBALS['theme_data']['name']); + array_push($themesArray['theme_unix'], $row['theme_path']); + array_push($themesArray['theme_name'], $row['theme_name']); } // END - if } // END - while @@ -105,8 +107,11 @@ ORDER BY 'selection' => $OUT ); + // Load template + $out = loadTemplate('theme_select_form', TRUE, $content); + // Return generated selection - return loadTemplate('theme_select_form', TRUE, $content); + return $out; } // Get version from name diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php index 213b7fab04..d55ba8ddc3 100644 --- a/inc/libs/yoomedia_functions.php +++ b/inc/libs/yoomedia_functions.php @@ -165,7 +165,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) { } // END - if // The result is now still raw, so we must split it up and trim spaces away - $responseLine = trim(implode(chr(10), $dummy)); + $responseLine = trim(implode(PHP_EOL, $dummy)); // Last line should never be a pipe! if (substr($responseLine, -1, 1) == '|') { @@ -414,11 +414,11 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) { $code = $codeArray[0]; // Remove all new-line characters - $codeArray = explode(chr(10), $code); + $codeArray = explode(PHP_EOL, $code); $code = $codeArray[0]; // Remove carrige-return - $code = trim(str_replace(chr(10), '', $code)); + $code = trim(str_replace(PHP_EOL, '', $code)); // Is it still empty? if (empty($code)) { diff --git a/inc/modules/admin.php b/inc/modules/admin.php index 75e43f401d..a9f9405431 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -64,7 +64,7 @@ if (!isAdminRegistered()) { $hashedPass = md5(postRequestElement('admin_pass1')); // Kill maybe existing session variables - destroyAdminSession(FALSE); + destroyAdminSession(); // Do registration $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster()); @@ -251,13 +251,13 @@ if (!isAdminRegistered()) { case '404': // Administrator login not found setPostRequestElement('login', $ret); $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestElement('admin_login') . '%}'; - destroyAdminSession(); + destroyAdminSession(TRUE); break; case 'password': // Wrong password setPostRequestElement('login', $ret); $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; - destroyAdminSession(); + destroyAdminSession(TRUE); break; default: // Others will be logged @@ -320,7 +320,7 @@ if (!isAdminRegistered()) { } // END - if } elseif (isGetRequestElementSet('logout')) { // Only try to remove cookies - if (destroyAdminSession()) { + if (destroyAdminSession(TRUE)) { // Load logout template if (isGetRequestElementSet('register')) { // Secure input @@ -374,19 +374,19 @@ if (!isAdminRegistered()) { case '404': // Administrator login not found setPostRequestElement('login', $ret); displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}'); - destroyAdminSession(); + destroyAdminSession(TRUE); break; case 'password': // Wrong password setPostRequestElement('login', $ret); displayMessage('{--WRONG_PASS--}'); - destroyAdminSession(); + destroyAdminSession(TRUE); break; case 'session': // Invalid admin session setPostRequestElement('login', $ret); displayMessage('{--INVALID_ADMIN_SESSION--}'); - destroyAdminSession(); + destroyAdminSession(TRUE); break; default: // Others will be logged diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 9476cb0863..a9ba796101 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -865,9 +865,10 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') { } // Build a special template list -function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) { +// @TODO cacheFiles is not yet supported +function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) { // Call inner (general) function - doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId); + doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content); } // Change status of "build" list @@ -967,7 +968,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction } // Delete rows by given id numbers -function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) { +function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) { // $tableName must be an array if ((!is_array($tableName)) || (count($tableName) != 1)) { // No tableName specified @@ -998,12 +999,12 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct } } else { // List for deletion confirmation - adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); + adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content); } } // Edit rows by given id numbers -function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) { +function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) { // $tableName must be an array if ((!is_array($tableName)) || (count($tableName) != 1)) { // No tableName specified @@ -1034,11 +1035,12 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio } } else { // List for editing - adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); + adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content); } } // Un-/lock rows by given id numbers +// @TODO rawUserId/content is not yet supported function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) { // $tableName must be an array if ((!is_array($tableName)) || (count($tableName) != 1)) { @@ -1063,6 +1065,7 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio } // Undelete rows by given id numbers +// @TODO rawUserId/cacheFiles/content is not yet supported function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) { // $tableName must be an array if ((!is_array($tableName)) || (count($tableName) != 1)) { diff --git a/inc/modules/admin/subid-stats.php b/inc/modules/admin/subid-stats.php index 3891d32aa6..ba4c0e27b3 100644 --- a/inc/modules/admin/subid-stats.php +++ b/inc/modules/admin/subid-stats.php @@ -43,7 +43,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // List all entries -doGenericXmlTemplateCallback('admin_list_user_subid_stats'); +doGenericXmlTemplateCallback('admin_list_user_subid_stats', array( + 'id' => bigintval(getRequestElement('id')), + 'userid' => bigintval(getRequestElement('userid')) +)); // [EOF] ?> diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php index 60570ece33..ed1611572c 100644 --- a/inc/modules/admin/what-list_autopurge.php +++ b/inc/modules/admin/what-list_autopurge.php @@ -45,16 +45,23 @@ addYouAreHereLink('admin', __FILE__); // Exclude default referral id if set // @TODO Rewrite those lines to filter -$EXCLUDE_LIST = ''; -if (isValidUserId(getDefRefid())) $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}'; -if (isExtensionActive('beg')) $EXCLUDE_LIST .= ' AND d.userid != {?beg_userid?}'; -if (isExtensionActive('bonus')) $EXCLUDE_LIST .= ' AND d.userid != {?bonus_userid?}'; -if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND d.userid != {?doubler_userid?}'; -if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.`holiday_active`='N'"; +$userExclusionSql = runFilterChain('user_exclusion_sql', ' '); +if (isValidUserId(getDefRefid())) $userExclusionSql .= ' AND d.userid != {?def_refid?}'; +if (isExtensionActive('beg')) $userExclusionSql .= ' AND d.userid != {?beg_userid?}'; +if (isExtensionActive('bonus')) $userExclusionSql .= ' AND d.userid != {?bonus_userid?}'; +if (isExtensionActive('doubler')) $userExclusionSql .= ' AND d.userid != {?doubler_userid?}'; +if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $userExclusionSql .= " AND d.`holiday_active`='N'"; // Check for all accounts $result = SQL_QUERY("SELECT - d.`userid`, d.`gender`, d.`surname`, d.`family`, d.`email`, d.`joined`, d.`last_online`, d.`ap_notified` + d.`userid`, + d.`gender`, + d.`surname`, + d.`family`, + d.`email`, + d.`joined`, + d.`last_online`, + d.`ap_notified` FROM `{?_MYSQL_PREFIX?}_user_data` AS d WHERE @@ -62,7 +69,7 @@ WHERE (UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND (UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND (UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?} - ".$EXCLUDE_LIST." + " . $userExclusionSql . " ORDER BY d.`userid` ASC", __FILE__, __LINE__); diff --git a/inc/modules/admin/what-list_network_array_translation.php b/inc/modules/admin/what-list_network_array_translation.php index 506804755f..fe4c5c33b0 100644 --- a/inc/modules/admin/what-list_network_array_translation.php +++ b/inc/modules/admin/what-list_network_array_translation.php @@ -123,8 +123,14 @@ ORDER BY $OUT .= loadTemplate('admin_list_network_array_translation_row', TRUE, $row); } // END - while + // Prepare array with generic elements + $content = array( + 'rows' => $OUT, + 'network_id' => bigintval(getRequestElement('network_id')) + ); + // Load main template - loadTemplate('admin_list_network_array_translation', FALSE, $OUT); + loadTemplate('admin_list_network_array_translation', FALSE, $content); } else { // No entries found displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_404=' . $networkData['network_title'] . '%}'); diff --git a/inc/modules/admin/what-list_network_request_params.php b/inc/modules/admin/what-list_network_request_params.php index 1831d44610..aa369cd69c 100644 --- a/inc/modules/admin/what-list_network_request_params.php +++ b/inc/modules/admin/what-list_network_request_params.php @@ -98,11 +98,11 @@ INNER JOIN ON p.`network_type_id`=t.`network_type_id` WHERE - p.`network_id`=%s".$ADD." + p.`network_id`=%s" . $ADD . " ORDER BY t.`network_type_handler` ASC, p.`network_request_param_id` ASC", - array(getRequestElement('network_id')), __FILE__, __LINE__); + array(bigintval(getRequestElement('network_id'))), __FILE__, __LINE__); // Are there entries? if (!SQL_HASZERONUMS($result)) { @@ -119,8 +119,14 @@ ORDER BY $OUT .= loadTemplate('admin_list_network_request_params_row', TRUE, $row); } // END - while + // Prepare content array + $content = array( + 'rows' => $OUT, + 'network_id' => bigintval(getRequestElement('network_id')) + ); + // Load main template - loadTemplate('admin_list_network_request_params', FALSE, $OUT); + loadTemplate('admin_list_network_request_params', FALSE, $content); } else { // No entries found displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_404=' . $networkData['network_title'] . '%}'); diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php index 91adcd523b..13ea31cdfb 100644 --- a/inc/modules/admin/what-list_network_types.php +++ b/inc/modules/admin/what-list_network_types.php @@ -84,7 +84,7 @@ WHERE `network_id`=%s ORDER BY `network_type_handler` ASC', - array(getRequestElement('network_id')), __FILE__, __LINE__); + array(bigintval(getRequestElement('network_id'))), __FILE__, __LINE__); // Are there entries? if (!SQL_HASZERONUMS($result)) { @@ -98,8 +98,14 @@ ORDER BY $OUT .= loadTemplate('admin_list_network_types_row', TRUE, $row); } // END - while + // Generate array + $content = array( + 'rows' => $OUT, + 'network_id' => bigintval(getRequestElement('network_id')) + ); + // Load main template - loadTemplate('admin_list_network_types', FALSE, $OUT); + loadTemplate('admin_list_network_types', FALSE, $content); } else { // No entries found displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_404=' . $networkData['network_title'] . '%}'); diff --git a/inc/modules/admin/what-list_network_vcheck_params.php b/inc/modules/admin/what-list_network_vcheck_params.php index 82bf013f46..0bc39996e5 100644 --- a/inc/modules/admin/what-list_network_vcheck_params.php +++ b/inc/modules/admin/what-list_network_vcheck_params.php @@ -81,7 +81,7 @@ WHERE `network_id`=%s ORDER BY `network_vcheck_param_id` ASC", - array(getRequestElement('network_id')), __FILE__, __LINE__); + array(bigintval(getRequestElement('network_id'))), __FILE__, __LINE__); // Are there entries? if (!SQL_HASZERONUMS($result)) { @@ -95,8 +95,14 @@ ORDER BY $OUT .= loadTemplate('admin_list_network_vcheck_params_row', TRUE, $row); } // END - while + // Prepare generic array + $content = array( + 'rows' => $OUT, + 'network_id' => bigintval(getRequestElement('network_id')) + ); + // Load main template - loadTemplate('admin_list_network_vcheck_params', FALSE, $OUT); + loadTemplate('admin_list_network_vcheck_params', FALSE, $content); } else { // No entries found displayMessage('{%message,ADMIN_NETWORK_VCHECK_PARAMETER_404=' . $networkData['network_title'] . '%}'); diff --git a/inc/modules/admin/what-list_nickname.php b/inc/modules/admin/what-list_nickname.php index c954fa4481..c67f0d50ad 100644 --- a/inc/modules/admin/what-list_nickname.php +++ b/inc/modules/admin/what-list_nickname.php @@ -48,7 +48,9 @@ if (isGetRequestElementSet('userid')) { // Delete entries? if (isFormSent('do_delete')) { // Remove entries from database - doGenericXmlTemplateCallback('admin_delete_do_nickname_history'); + doGenericXmlTemplateCallback('admin_delete_do_nickname_history', array( + 'userid' => bigintval(getRequestElement('userid')) + )); } // END - if // List all entries per user diff --git a/inc/modules/admin/what-list_user_subid.php b/inc/modules/admin/what-list_user_subid.php index d655ed3d7c..6da574df14 100644 --- a/inc/modules/admin/what-list_user_subid.php +++ b/inc/modules/admin/what-list_user_subid.php @@ -58,25 +58,35 @@ if ((countRequestPost() > 0) && (!ifPostContainsSelections('id')) && (!ifPostCon // Edit or delete button hit? if (isFormSent('edit')) { // Show entries for editing - doGenericXmlTemplateCallback('admin_edit_show_user_subid'); + doGenericXmlTemplateCallback('admin_edit_show_user_subid', array( + 'userid' => bigintval(getRequestElement('userid')) + )); // Do not show the list of URLs after this template $show = FALSE; } elseif (isFormSent('do_edit')) { // Change data of entries - doGenericXmlTemplateCallback('admin_edit_do_user_subid'); + doGenericXmlTemplateCallback('admin_edit_do_user_subid', array( + 'userid' => bigintval(getRequestElement('userid')) + )); } elseif (isFormSent('delete')) { // Show entries for deletion - doGenericXmlTemplateCallback('admin_delete_show_user_subid'); + doGenericXmlTemplateCallback('admin_delete_show_user_subid', array( + 'userid' => bigintval(getRequestElement('userid')) + )); // Do not show the list of URLs after this template $show = FALSE; } elseif (isFormSent('do_delete')) { // Remove entries from database - doGenericXmlTemplateCallback('admin_delete_do_user_subid'); + doGenericXmlTemplateCallback('admin_delete_do_user_subid', array( + 'userid' => bigintval(getRequestElement('userid')) + )); } elseif (isFormSent('do_delete_stats')) { // Remove entries from database - doGenericXmlTemplateCallback('admin_delete_do_user_subid_stats'); + doGenericXmlTemplateCallback('admin_delete_do_user_subid_stats', array( + 'userid' => bigintval(getRequestElement('userid')) + )); } elseif ((isGetRequestElementSet('do')) && (isGetRequestElementSet('id'))) { // Construct module name $incFile = sprintf("inc/modules/admin/subid-%s.php", SQL_ESCAPE(getRequestElement('do'))); diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index 9af3c5b268..b0b960fab2 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -60,9 +60,9 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($ // Which is the latest version on server? $ONLINE = array( - 'version' => trim(str_replace(chr(10), '', $response[0])), - 'changed' => trim(str_replace(chr(10), '', $response[1])), - 'revision' => trim(str_replace(chr(10), '', $response[2])), + 'version' => trim(str_replace(PHP_EOL, '', $response[0])), + 'changed' => trim(str_replace(PHP_EOL, '', $response[1])), + 'revision' => trim(str_replace(PHP_EOL, '', $response[2])), 'code' => '200 OK' ); } else { diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 16eb57d7a2..0078fc0a25 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -100,7 +100,7 @@ LIMIT 1", } // END - if // Remove new-line and carriage-return characters - $TEST = str_replace(array(chr(10), chr(13)), array('', ''), postRequestElement('text')); + $TEST = str_replace(array(PHP_EOL, chr(13)), array('', ''), postRequestElement('text')); // Text length within allowed length? if (strlen($TEST) > getConfig('max_tlength')) { diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 5dfaf1366e..fad3d46bc2 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1066,7 +1066,7 @@ function sendAdminEmails ($subject, $message, $isBugReport = FALSE) { // Is it a bug report? if ($isBugReport === TRUE) { // Then add a reply-to line back to the author (me) - $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10); + $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL; } // END - if // Load all admin email addresses @@ -1850,7 +1850,7 @@ LIMIT 1", } // List all given rows (callback function from XML) -function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array()) { +function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array(), $content = array()) { // Verify that tableName and columns are not empty if ((!is_array($tableName)) || (count($tableName) != 1)) { // No tableName specified @@ -1938,11 +1938,11 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, } // END - if // Now handle all over to the inner function which will execute the listing - doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters); + doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content); } // Do the listing of entries -function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array()) { +function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array(), $content = array()) { // Run the SQL query $result = SQL_QUERY($sql, __FUNCTION__, __LINE__); @@ -1950,11 +1950,11 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $ if (!SQL_HASZERONUMS($result)) { // List all URLs $OUT = ''; - while ($content = SQL_FETCHARRAY($result)) { + while ($row = SQL_FETCHARRAY($result)) { // "Translate" content foreach ($callbackColumns as $columnName => $callbackName) { // Fill the callback arguments - $args = array($content[$columnName]); + $args = array($row[$columnName]); // Is there more to add? if (isset($extraParameters[$columnName])) { @@ -1965,15 +1965,24 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $ // Call the callback-function //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=
'.print_r($args, TRUE).'
'); // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided - $content[$columnName] = call_user_func_array($callbackName, $args); + $row[$columnName] = call_user_func_array($callbackName, $args); } // END - foreach // Load row template - $OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $content); + $OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $row); } // END - while + // Is at least one entry set in content? + if ((is_array($content)) && (count($content) > 0)) { + // Then add generic 'rows' element + $content['rows'] = $OUT; + } else { + // Direct output is content + $content = $OUT; + } + // Load main template - loadTemplate(trim($tableTemplate[0]), FALSE, $OUT); + loadTemplate(trim($tableTemplate[0]), FALSE, $content); } else { // No URLs in surfbar displayMessage('{--' .$noEntryMessageId[0] . '--}'); @@ -2288,7 +2297,8 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF } // Build a special template list -function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) { +// @TODO cacheFiles is not yet supported +function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) { // $tableName and $idColumn must bove be arrays! if ((!is_array($tableName)) || (count($tableName) != 1)) { // $tableName is no array @@ -2316,10 +2326,10 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter // Is there one entry? if (SQL_NUMROWS($result) == 1) { // Load all data - $content = SQL_FETCHARRAY($result); + $row = SQL_FETCHARRAY($result); // Filter all data - foreach ($content as $key => $value) { + foreach ($row as $key => $value) { // Search index $idx = searchXmlArray($key, $columns, 'column'); @@ -2335,8 +2345,8 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter if ($key == $userIdColumn[0]) { // Add it again as raw id //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]); - $content[$userIdColumn[0]] = convertZeroToNull($value); - $content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]]; + $row[$userIdColumn[0]] = convertZeroToNull($value); + $row[$userIdColumn[0] . '_raw'] = $row[$userIdColumn[0]]; } // END - if // If the key matches the idColumn variable, we need to temporary remember it @@ -2351,7 +2361,8 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter } // END - if // Try to handle call-back functions and/or extra values - $content[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $content[$key], $userIdColumn, $idx); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',row[' . $key . ']=' . $row[$key]); + $row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, $key); } // END - foreach // Then list it @@ -2359,7 +2370,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter $prefix, $listType, $tableName[0] - ), TRUE, $content + ), TRUE, $row ); } // END - if @@ -2367,12 +2378,21 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter SQL_FREERESULT($result); } // END - foreach + // Is there an entry in $content? + if ((is_array($content)) && (count($content) > 0)) { + // Use generic 'rows' + $content['rows'] = $OUT; + } else { + // Use direct output + $content = $OUT; + } + // Load master template loadTemplate(sprintf("%s_%s_%s", $prefix, $listType, $tableName[0] - ), FALSE, $OUT + ), FALSE, $content ); } diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php index cd66947b06..da6b87a34e 100644 --- a/inc/purge/purge-inact.php +++ b/inc/purge/purge-inact.php @@ -111,7 +111,7 @@ ORDER BY } // END - while // Remove last comma - $content['userids'] = implode(chr(10), $userids); + $content['userids'] = implode(PHP_EOL, $userids); // Send mail notification to admin sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $content); @@ -156,7 +156,7 @@ ORDER BY } // END - while // Display all userids - $useridsContent = implode(chr(10), $userids); + $useridsContent = implode(PHP_EOL, $userids); // Send mail notification to admin if (getConfig('ap_in_notify') == 'Y') { diff --git a/inc/purge/purge-unconfirmed.php b/inc/purge/purge-unconfirmed.php index 106302b654..741db75b61 100644 --- a/inc/purge/purge-unconfirmed.php +++ b/inc/purge/purge-unconfirmed.php @@ -81,7 +81,7 @@ ORDER BY } // END - while // Remove last comma - $userids = str_replace(', ', chr(10), substr($userids, 0, -2)); + $userids = str_replace(', ', PHP_EOL, substr($userids, 0, -2)); // Send mail notification to admin if (getConfig('ap_un_notify') == 'Y') { diff --git a/inc/revision-functions.php b/inc/revision-functions.php index e61d978875..a889ec1b90 100644 --- a/inc/revision-functions.php +++ b/inc/revision-functions.php @@ -98,7 +98,7 @@ function getRepositoryData ($type = 'Revision') { $new = TRUE; } else { // Revision file found - $ins_vers = explode(chr(10), readFromFile($FQFN)); + $ins_vers = explode(PHP_EOL, readFromFile($FQFN)); // Get array for mapping information $mapper = array_flip($GLOBALS['repository_search_for']); @@ -124,7 +124,7 @@ function getRepositoryData ($type = 'Revision') { // Has it been updated? if ($new === TRUE) { // Write it - writeToFile($FQFN, implode(chr(10), getArrayFromRepositoryData())); + writeToFile($FQFN, implode(PHP_EOL, getArrayFromRepositoryData())); // ... and call recursive $ret = getRepositoryData($type); diff --git a/inc/session-functions.php b/inc/session-functions.php index 7601911fc8..cea985df62 100644 --- a/inc/session-functions.php +++ b/inc/session-functions.php @@ -122,14 +122,14 @@ function destroyMemberSession ($destroy = FALSE) { // Remove all user data from session if ($destroy === TRUE) { // Destroy whole session - return session_destroy(); + return destroySession(); } else { return ((setSession('userid', '')) && (setSession('u_hash', ''))); } } // Destroys the admin session -function destroyAdminSession ($destroy = TRUE) { +function destroyAdminSession ($destroy = FALSE) { // Kill maybe existing session variables including array elements setAdminId(0); setAdminMd5(''); @@ -140,12 +140,33 @@ function destroyAdminSession ($destroy = TRUE) { // Destroy session if requested and return status if ($destroy === TRUE) { - return session_destroy(); + return destroySession(); } // END - if // All fine if we shall not really destroy the session return TRUE; } +// Destroys session and resets some "caches" +function destroySession () { + // Unset "cache" + unset($GLOBALS['isSessionValid']); + + // Destroy session + return session_destroy(); +} + +// Checks whether the session is valid +function isSessionValid () { + // Is there cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Then determine it + $GLOBALS[__FUNCTION__] = ((isset($GLOBALS['valid_session'])) && ($GLOBALS['valid_session'] === TRUE) && (isset($_COOKIE[session_name()]))); + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + // [EOF] ?> diff --git a/inc/session.php b/inc/session.php index e8b9e23317..1849e2f9a8 100644 --- a/inc/session.php +++ b/inc/session.php @@ -50,9 +50,10 @@ if (isExtensionInstalledAndNewer('sql_patches', '0.5.3')) { } // END - if // Is a session id there? -if (session_id() == '') { +if (!isSessionValid()) { // Start the session - $GLOBALS['valid_session'] = session_start(); + $GLOBALS['valid_session'] = session_start(); + $GLOBALS['isSessionValid'] = TRUE; } // END - if // Load language file(s) diff --git a/inc/template-functions.php b/inc/template-functions.php index 208c2f2126..dcf627628f 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -112,7 +112,7 @@ function outputHtml ($htmlCode, $newLine = TRUE) { // That's why you don't need any \n at the end of your HTML code... :-) if ($newLine === TRUE) { - outputRawCode(chr(10)); + outputRawCode(PHP_EOL); } // END - if } else { // Render mode for old or lame servers... @@ -120,7 +120,7 @@ function outputHtml ($htmlCode, $newLine = TRUE) { // That's why you don't need any \n at the end of your HTML code... :-) if ($newLine === TRUE) { - $GLOBALS['__output'] .= chr(10); + $GLOBALS['__output'] .= PHP_EOL; } // END - if } break; @@ -135,7 +135,7 @@ function outputHtml ($htmlCode, $newLine = TRUE) { // The same as above... ^ outputRawCode($htmlCode); if ($newLine === TRUE) { - outputRawCode(chr(10)); + outputRawCode(PHP_EOL); } // END - if break; @@ -1501,7 +1501,7 @@ function linenumberCode ($code) { if (!is_array($code)) { // We need an array, so try it with the new-line character - $codeE = explode(chr(10), $code); + $codeE = explode(PHP_EOL, $code); } // END - if $count_lines = count($codeE); @@ -1702,16 +1702,16 @@ function sendModeMails ($mod, $modes) { switch ($mode) { case 'normal': break; // Do not add any special lines case 'email': // Email was changed! - $content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestElement('old_email') . chr(10); + $content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestElement('old_email') . PHP_EOL; break; case 'password': // Password was changed - $content['message'] = '{--MEMBER_CHANGED_PASS--}' . chr(10); + $content['message'] = '{--MEMBER_CHANGED_PASS--}' . PHP_EOL; break; default: logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode)); - $content['message'] = '{--MEMBER_UNKNOWN_MODE--}' . ': ' . $mode . "\n\n"; + $content['message'] = '{--MEMBER_UNKNOWN_MODE--}' . ': ' . $mode . PHP_EOL . PHP_EOL; break; } // END - switch } // END - foreach @@ -2295,7 +2295,7 @@ function anonymizeSensitiveData ($data) { */ function compactContent ($uncompactedContent) { // First, remove all tab/new-line/revert characters - $compactedContent = str_replace(chr(9), '', str_replace(chr(10), '', str_replace(chr(13), '', $uncompactedContent))); + $compactedContent = str_replace(chr(9), '', str_replace(PHP_EOL, '', str_replace(chr(13), '', $uncompactedContent))); // Then regex all comments like away preg_match_all('//', $compactedContent, $matches); diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index c8b651cf21..ba56fb2c8e 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -2789,7 +2789,7 @@ function ifUserPointsLocked ($userid) { // This function does always add a new-line character to every line. function appendLineToFile ($file, $line) { $fp = fopen($file, 'a') or reportBug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($file) . '!'); - fwrite($fp, $line . chr(10)); + fwrite($fp, $line . PHP_EOL); fclose($fp); } diff --git a/inc/xml-functions.php b/inc/xml-functions.php index 217f8e73a0..2a11ccc4b7 100644 --- a/inc/xml-functions.php +++ b/inc/xml-functions.php @@ -100,6 +100,7 @@ function doGenericXmlTemplateCallback ($template, $content = array(), $compileCo ); $GLOBALS['__XML_ARGUMENTS'] = array(); $GLOBALS['__COLUMN_INDEX'] = array(); + $GLOBALS['__XML_CONTENT'] = $content; // Handle it over to the parser parseXmlData($templateContent); @@ -108,7 +109,7 @@ function doGenericXmlTemplateCallback ($template, $content = array(), $compileCo addXmlSpecialElements($template); // Call the call-back function - doCallXmlCallbackFunction(); + doCallXmlCallbackFunction($content); } else { // Template not found displayMessage('{%message,XML_TEMPLATE_404=' . $template . '%}'); @@ -188,11 +189,11 @@ function doCallXmlCallbackFunction () { // Is it there? if (!function_exists($callbackName)) { // No, then please add it - reportBug(__FUNCTION__, __LINE__, 'callback=' . $callback . ',function=' . $function . 'arguments()=' . count($GLOBALS['__XML_ARGUMENTS'][$callback]) . ' - execute call-back does not exist.'); + reportBug(__FUNCTION__, __LINE__, 'callback=' . $callback . ',function=' . $function . ',arguments()=' . count($GLOBALS['__XML_ARGUMENTS'][$callback]) . ',content()=' . count($GLOBALS['__XML_CONTENT']) . ' - execute call-back does not exist.'); } // END - if // Call it - call_user_func_array($callbackName, array($function, $GLOBALS['__XML_ARGUMENTS'][$callback], $GLOBALS['__COLUMN_INDEX'][$callback])); + call_user_func_array($callbackName, array($function, $GLOBALS['__XML_ARGUMENTS'][$callback], $GLOBALS['__COLUMN_INDEX'][$callback], $GLOBALS['__XML_CONTENT'])); } // END - foreach } else { // Not found diff --git a/templates/de/html/admin/admin_add_admin_menu.tpl b/templates/de/html/admin/admin_add_admin_menu.tpl index 66b412d936..ae2a3152dd 100644 --- a/templates/de/html/admin/admin_add_admin_menu.tpl +++ b/templates/de/html/admin/admin_add_admin_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=admin_add%} @@ -38,5 +38,5 @@
{--ADMIN_ENTER_TITLE--}:
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_admins.tpl b/templates/de/html/admin/admin_add_admins.tpl index 49c39818f5..f91dacbcf2 100644 --- a/templates/de/html/admin/admin_add_admins.tpl +++ b/templates/de/html/admin/admin_add_admins.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=admins_add%}
@@ -37,5 +37,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_admins_acl.tpl b/templates/de/html/admin/admin_add_admins_acl.tpl index 2200018423..af8528b18b 100644 --- a/templates/de/html/admin/admin_add_admins_acl.tpl +++ b/templates/de/html/admin/admin_add_admins_acl.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_admins_acls%}
@@ -35,5 +35,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index d291f5bc8d..602eae776a 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=add_bank_package%}
@@ -108,7 +108,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl index 5d22c877df..411b0189ea 100644 --- a/templates/de/html/admin/admin_add_cat.tpl +++ b/templates/de/html/admin/admin_add_cat.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_cats%}
@@ -45,5 +45,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_config_network_type.tpl b/templates/de/html/admin/admin_add_config_network_type.tpl index b1c93a73fc..cc4d110cc3 100644 --- a/templates/de/html/admin/admin_add_config_network_type.tpl +++ b/templates/de/html/admin/admin_add_config_network_type.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodGet=modules.php%}
{%message,ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_TITLE=$content[network_type_handler]%} @@ -17,5 +17,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_config_network_type_form.tpl b/templates/de/html/admin/admin_add_config_network_type_form.tpl index ae4d4a349e..5d424426ff 100644 --- a/templates/de/html/admin/admin_add_config_network_type_form.tpl +++ b/templates/de/html/admin/admin_add_config_network_type_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_network_types&network_id=$content[network_id]&network_type_id=$content[network_type_id]&do=add_handler_types_config%}
@@ -44,7 +44,7 @@
- +{%form_close%}
diff --git a/templates/de/html/admin/admin_add_country.tpl b/templates/de/html/admin/admin_add_country.tpl index 809e2879c3..bd80fe1ad8 100644 --- a/templates/de/html/admin/admin_add_country.tpl +++ b/templates/de/html/admin/admin_add_country.tpl @@ -1,4 +1,5 @@ -
+
+{%form,formMethodPost=modules.php?module=admin&what=list_country%}
@@ -34,4 +35,5 @@
- +{%form_close%} +
diff --git a/templates/de/html/admin/admin_add_forced_ad.tpl b/templates/de/html/admin/admin_add_forced_ad.tpl index ad5dd02e40..046527c08b 100644 --- a/templates/de/html/admin/admin_add_forced_ad.tpl +++ b/templates/de/html/admin/admin_add_forced_ad.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_ads%}
@@ -89,5 +89,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_forced_campaign.tpl b/templates/de/html/admin/admin_add_forced_campaign.tpl index 36df4b8234..669a665ae0 100644 --- a/templates/de/html/admin/admin_add_forced_campaign.tpl +++ b/templates/de/html/admin/admin_add_forced_campaign.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_campaigns%}
@@ -68,7 +68,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_forced_costs.tpl b/templates/de/html/admin/admin_add_forced_costs.tpl index 36420bddbc..d21798dbd7 100644 --- a/templates/de/html/admin/admin_add_forced_costs.tpl +++ b/templates/de/html/admin/admin_add_forced_costs.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_costs%}
@@ -41,7 +41,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_grade_data.tpl b/templates/de/html/admin/admin_add_grade_data.tpl index 5453ed0061..378257a50c 100644 --- a/templates/de/html/admin/admin_add_grade_data.tpl +++ b/templates/de/html/admin/admin_add_grade_data.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_grade_data%}
@@ -44,7 +44,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_guest_menu.tpl b/templates/de/html/admin/admin_add_guest_menu.tpl index b60cbbd710..0c2424aca9 100644 --- a/templates/de/html/admin/admin_add_guest_menu.tpl +++ b/templates/de/html/admin/admin_add_guest_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=guest_add%} @@ -50,5 +50,5 @@
{--ADMIN_ENTER_TITLE--}:
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl index 9984cadfc0..8915f38bab 100644 --- a/templates/de/html/admin/admin_add_max.tpl +++ b/templates/de/html/admin/admin_add_max.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_email_max_rec%}
@@ -28,5 +28,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_member_menu.tpl b/templates/de/html/admin/admin_add_member_menu.tpl index ba7bc21868..34328fb4f5 100644 --- a/templates/de/html/admin/admin_add_member_menu.tpl +++ b/templates/de/html/admin/admin_add_member_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=mem_add%} @@ -50,5 +50,5 @@
{--ADMIN_ENTER_TITLE--}:
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_network.tpl b/templates/de/html/admin/admin_add_network.tpl index 5eef712c65..761401fbf6 100644 --- a/templates/de/html/admin/admin_add_network.tpl +++ b/templates/de/html/admin/admin_add_network.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_data&do=add_network%}
@@ -69,7 +69,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_network_array_translation.tpl b/templates/de/html/admin/admin_add_network_array_translation.tpl index 9bc4887ce2..67bd737b54 100644 --- a/templates/de/html/admin/admin_add_network_array_translation.tpl +++ b/templates/de/html/admin/admin_add_network_array_translation.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_array_translation&do=add_network_array_translation&network_id=$content[network_id]%}
@@ -32,7 +32,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_network_request_param.tpl b/templates/de/html/admin/admin_add_network_request_param.tpl index 4f70df3ab1..0217d37cf9 100644 --- a/templates/de/html/admin/admin_add_network_request_param.tpl +++ b/templates/de/html/admin/admin_add_network_request_param.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_request_params&do=add_request_param&network_id=$content[network_id]%}
@@ -44,7 +44,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_network_type.tpl b/templates/de/html/admin/admin_add_network_type.tpl index e4bda05bdd..57af05e89e 100644 --- a/templates/de/html/admin/admin_add_network_type.tpl +++ b/templates/de/html/admin/admin_add_network_type.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_types&do=add_network_type&network_id=$content[network_id]%}
@@ -56,7 +56,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_network_vcheck_param.tpl b/templates/de/html/admin/admin_add_network_vcheck_param.tpl index 6f0d4891d7..09a6da5a82 100644 --- a/templates/de/html/admin/admin_add_network_vcheck_param.tpl +++ b/templates/de/html/admin/admin_add_network_vcheck_param.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_vcheck_params&do=add_vcheck_param&network_id=$content[network_id]%}
@@ -36,7 +36,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl index 8513225939..46287db1df 100644 --- a/templates/de/html/admin/admin_add_payment.tpl +++ b/templates/de/html/admin/admin_add_payment.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=payments&do=add%}
@@ -39,5 +39,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_payout.tpl b/templates/de/html/admin/admin_add_payout.tpl index 2af9902da5..5f40c3a1b6 100644 --- a/templates/de/html/admin/admin_add_payout.tpl +++ b/templates/de/html/admin/admin_add_payout.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_payouts%}
@@ -88,7 +88,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_point_accounts.tpl b/templates/de/html/admin/admin_add_point_accounts.tpl index 7cba13006d..43fc738d01 100644 --- a/templates/de/html/admin/admin_add_point_accounts.tpl +++ b/templates/de/html/admin/admin_add_point_accounts.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_point_accounts%}
@@ -59,7 +59,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_points.tpl b/templates/de/html/admin/admin_add_points.tpl index 105ee5c0e9..09348da870 100644 --- a/templates/de/html/admin/admin_add_points.tpl +++ b/templates/de/html/admin/admin_add_points.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=add_points&userid=$content[userid]%}
@@ -26,5 +26,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl index d696608188..66d5c55caf 100644 --- a/templates/de/html/admin/admin_add_points_all.tpl +++ b/templates/de/html/admin/admin_add_points_all.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=add_points&userid=all%}
@@ -25,5 +25,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_rallye.tpl b/templates/de/html/admin/admin_add_rallye.tpl index 58bde3d153..c1964eb3e3 100644 --- a/templates/de/html/admin/admin_add_rallye.tpl +++ b/templates/de/html/admin/admin_add_rallye.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=add_rallye%}
@@ -81,5 +81,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_rallye_prices.tpl b/templates/de/html/admin/admin_add_rallye_prices.tpl index 79b60b25d6..0dbb3d2573 100644 --- a/templates/de/html/admin/admin_add_rallye_prices.tpl +++ b/templates/de/html/admin/admin_add_rallye_prices.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content%}
@@ -31,5 +31,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_refbanner.tpl b/templates/de/html/admin/admin_add_refbanner.tpl index 72b919eb3a..d6d1f8aed9 100644 --- a/templates/de/html/admin/admin_add_refbanner.tpl +++ b/templates/de/html/admin/admin_add_refbanner.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=refbanner&do=add%}
@@ -34,5 +34,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl index d70776d9bd..4d3fcceb6a 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=ref&do=add%}
@@ -25,5 +25,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl index bd3de06018..5455b6bd07 100644 --- a/templates/de/html/admin/admin_add_sponsor.tpl +++ b/templates/de/html/admin/admin_add_sponsor.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=add_sponsor%}
@@ -195,5 +195,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_sponsor_already.tpl b/templates/de/html/admin/admin_add_sponsor_already.tpl index b9300c562e..d20078fd48 100644 --- a/templates/de/html/admin/admin_add_sponsor_already.tpl +++ b/templates/de/html/admin/admin_add_sponsor_already.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=add_sponsor%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_sponsor_paytype.tpl b/templates/de/html/admin/admin_add_sponsor_paytype.tpl index 0f9fa2bdb6..aa6d9679a7 100644 --- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl +++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_sponsor_pay%}
@@ -29,7 +29,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_surfbar_url.tpl b/templates/de/html/admin/admin_add_surfbar_url.tpl index 600a0f8865..7517ffd775 100644 --- a/templates/de/html/admin/admin_add_surfbar_url.tpl +++ b/templates/de/html/admin/admin_add_surfbar_url.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=add_surfbar_url%}
{--ADMIN_ADD_SURFBAR_URL_TITLE--} @@ -31,5 +31,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_add_tester_user.tpl b/templates/de/html/admin/admin_add_tester_user.tpl index 42ce66820e..3064d04f6b 100644 --- a/templates/de/html/admin/admin_add_tester_user.tpl +++ b/templates/de/html/admin/admin_add_tester_user.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=add_tester_user%}
{--ADMIN_ADD_TESTER_USER_TITLE--} @@ -93,7 +93,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_admins_contct_form.tpl b/templates/de/html/admin/admin_admins_contct_form.tpl index bbd2a54216..77bb782b11 100644 --- a/templates/de/html/admin/admin_admins_contct_form.tpl +++ b/templates/de/html/admin/admin_admins_contct_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=admins_contct&id=$content[id]%}
{%message,ADMIN_CONTACT_ADMINS_TITLE=$content[id]%} @@ -13,5 +13,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_admins_mails_edit.tpl b/templates/de/html/admin/admin_admins_mails_edit.tpl index 0cfa2c00af..c7637575c2 100644 --- a/templates/de/html/admin/admin_admins_mails_edit.tpl +++ b/templates/de/html/admin/admin_admins_mails_edit.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=admins_mails%}
@@ -22,5 +22,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl index 2f8c211709..1bd75e7724 100644 --- a/templates/de/html/admin/admin_admins_mails_list.tpl +++ b/templates/de/html/admin/admin_admins_mails_list.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=admins_mails%}
@@ -25,5 +25,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_ b/templates/de/html/admin/admin_config_ index 6ec0fb3474..c876f1cd11 100644 --- a/templates/de/html/admin/admin_config_ +++ b/templates/de/html/admin/admin_config_ @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_foo%}
{--ADMIN_CONFIG_FOO_TITLE--} @@ -21,7 +21,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_active.tpl b/templates/de/html/admin/admin_config_active.tpl index 646b1fd155..74944e862d 100644 --- a/templates/de/html/admin/admin_config_active.tpl +++ b/templates/de/html/admin/admin_config_active.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_active%}
@@ -19,5 +19,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index 4f90a09eb4..572d1a43a1 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_admin%}
{--ADMIN_CONFIG_ADMIN_MENU_TITLE--} @@ -39,7 +39,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index 62a25c509c..93f6243b86 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_autopurge%}
{--ADMIN_CONFIG_AUTOPURGE_TITLE--} @@ -109,5 +109,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index 0e8a428b6d..e5945a8fe0 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_beg%}
@@ -154,5 +154,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index 3f0cacbe79..8e8d0ad904 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_birthday%}
@@ -29,7 +29,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index 7bae83b7e6..92e950e034 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_bonus%}
@@ -219,5 +219,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_coupon.tpl b/templates/de/html/admin/admin_config_coupon.tpl index 6f5ca04471..fefab08ebf 100644 --- a/templates/de/html/admin/admin_config_coupon.tpl +++ b/templates/de/html/admin/admin_config_coupon.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_coupon%}
@@ -38,5 +38,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index 3b9d577d3a..d7c8181659 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_doubler%}
@@ -157,5 +157,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index 8f41726960..87dd723793 100644 --- a/templates/de/html/admin/admin_config_extensions.tpl +++ b/templates/de/html/admin/admin_config_extensions.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_extensions%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 1d3e8936b4..6d964566d3 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_holiday%}
@@ -33,5 +33,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_home.tpl b/templates/de/html/admin/admin_config_home.tpl index 52eefd2de4..bfdd03711b 100644 --- a/templates/de/html/admin/admin_config_home.tpl +++ b/templates/de/html/admin/admin_config_home.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_home&sub=settings%}
@@ -44,5 +44,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_home_settings_pro.tpl b/templates/de/html/admin/admin_config_home_settings_pro.tpl index 435556c7eb..11f5d85d80 100644 --- a/templates/de/html/admin/admin_config_home_settings_pro.tpl +++ b/templates/de/html/admin/admin_config_home_settings_pro.tpl @@ -1,44 +1 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- {--ADMIN_EDIT_HOME_SETTINGS--}
 
- {--ADMIN_CONFIG_INDEX_DELAY--}: 
 
{--ADMIN_CONFIG_INDEX_COOKIE--} {!__INDEX_COOKIE_SELECTION!}
 
- - -
-
\ No newline at end of file + diff --git a/templates/de/html/admin/admin_config_mediadata.tpl b/templates/de/html/admin/admin_config_mediadata.tpl index 480175ec9a..0942f36612 100644 --- a/templates/de/html/admin/admin_config_mediadata.tpl +++ b/templates/de/html/admin/admin_config_mediadata.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_mediadata%}
@@ -23,7 +23,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl index c7bca54030..3d418df13a 100644 --- a/templates/de/html/admin/admin_config_menu.tpl +++ b/templates/de/html/admin/admin_config_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_menu%}
@@ -29,5 +29,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_network_api.tpl b/templates/de/html/admin/admin_config_network_api.tpl index 53ba902b0a..7b1580e7d0 100644 --- a/templates/de/html/admin/admin_config_network_api.tpl +++ b/templates/de/html/admin/admin_config_network_api.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_network_api&do=network_api_config&network_id=$content[network_id]%}
@@ -49,7 +49,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_network_types.tpl b/templates/de/html/admin/admin_config_network_types.tpl index 74b7710b97..20fe83cc9b 100644 --- a/templates/de/html/admin/admin_config_network_types.tpl +++ b/templates/de/html/admin/admin_config_network_types.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_network_types&do=network_types_config&network_id=$content[network_id]%}
@@ -20,5 +20,5 @@ $content[rows]
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_newsletter.tpl b/templates/de/html/admin/admin_config_newsletter.tpl index f5d82e9717..e17e77d680 100644 --- a/templates/de/html/admin/admin_config_newsletter.tpl +++ b/templates/de/html/admin/admin_config_newsletter.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_newsletter%}
@@ -13,5 +13,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index 1c3d904489..2ef4a0d569 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_nickname%}
@@ -31,5 +31,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 84e5c90e33..edaffe9eec 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_order%}
{--ADMIN_CONFIG_ORDER_TITLE--} @@ -112,7 +112,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index 0d16a3adc5..9f42bc28bc 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_other%}
@@ -294,5 +294,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_payouts.tpl b/templates/de/html/admin/admin_config_payouts.tpl index 5b840ebc4e..7a5512a831 100644 --- a/templates/de/html/admin/admin_config_payouts.tpl +++ b/templates/de/html/admin/admin_config_payouts.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_payouts%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl index 922f3ca23e..c7a802dca2 100644 --- a/templates/de/html/admin/admin_config_point_settings.tpl +++ b/templates/de/html/admin/admin_config_point_settings.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=settings%}
@@ -31,5 +31,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl index a379411026..8473d0408d 100644 --- a/templates/de/html/admin/admin_config_proxy.tpl +++ b/templates/de/html/admin/admin_config_proxy.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_proxy%}
@@ -45,5 +45,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl index 93e1cc4921..d8bc757dfd 100644 --- a/templates/de/html/admin/admin_config_refback.tpl +++ b/templates/de/html/admin/admin_config_refback.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_refback%}
@@ -37,5 +37,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index 49c3b384a2..6891539b4c 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_refid%}
{--ADMIN_CONFIG_REFID_TITLE--} @@ -52,7 +52,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_register.tpl b/templates/de/html/admin/admin_config_register.tpl index 6e41d14f61..8a4b12f083 100644 --- a/templates/de/html/admin/admin_config_register.tpl +++ b/templates/de/html/admin/admin_config_register.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_register%}
@@ -19,5 +19,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl index fbb6aa710c..fe02483212 100644 --- a/templates/de/html/admin/admin_config_register2.tpl +++ b/templates/de/html/admin/admin_config_register2.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_register2%}
@@ -39,5 +39,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index 0916ddb8c7..330a001c99 100644 --- a/templates/de/html/admin/admin_config_removeip.tpl +++ b/templates/de/html/admin/admin_config_removeip.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_removeip%}
@@ -89,5 +89,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_rewrite.tpl b/templates/de/html/admin/admin_config_rewrite.tpl index b9e81e14ed..28cb2d8c24 100644 --- a/templates/de/html/admin/admin_config_rewrite.tpl +++ b/templates/de/html/admin/admin_config_rewrite.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_rewrite%} @@ -21,7 +21,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_secure.tpl b/templates/de/html/admin/admin_config_secure.tpl index d8b76db894..dc80e13abc 100644 --- a/templates/de/html/admin/admin_config_secure.tpl +++ b/templates/de/html/admin/admin_config_secure.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_secure%}
@@ -32,7 +32,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_session.tpl b/templates/de/html/admin/admin_config_session.tpl index 439e92ef3d..a64ff5b10c 100644 --- a/templates/de/html/admin/admin_config_session.tpl +++ b/templates/de/html/admin/admin_config_session.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_session%}
@@ -30,5 +30,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl index f9793b114f..75fe947849 100644 --- a/templates/de/html/admin/admin_config_sponsor.tpl +++ b/templates/de/html/admin/admin_config_sponsor.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_sponsor%}
@@ -29,5 +29,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl index 6cedde5fb9..3655c36ff3 100644 --- a/templates/de/html/admin/admin_config_stats.tpl +++ b/templates/de/html/admin/admin_config_stats.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_stats%}
@@ -48,5 +48,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_sub_points.tpl b/templates/de/html/admin/admin_config_sub_points.tpl index 945c161a1d..f8dcc4d0d5 100644 --- a/templates/de/html/admin/admin_config_sub_points.tpl +++ b/templates/de/html/admin/admin_config_sub_points.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=points%}
@@ -25,5 +25,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 37036e70a6..bf4d3fffe3 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_surfbar%}
@@ -213,7 +213,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_timezone.tpl b/templates/de/html/admin/admin_config_timezone.tpl index c33fdad2bb..bb6d863d02 100644 --- a/templates/de/html/admin/admin_config_timezone.tpl +++ b/templates/de/html/admin/admin_config_timezone.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_timezone%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_title.tpl b/templates/de/html/admin/admin_config_title.tpl index 5bddc467f5..a75ec618e9 100644 --- a/templates/de/html/admin/admin_config_title.tpl +++ b/templates/de/html/admin/admin_config_title.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_title%}
{--ADMIN_CONFIG_TITLE_SETTINGS--} @@ -47,7 +47,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_top10.tpl b/templates/de/html/admin/admin_config_top10.tpl index 0d02b242e2..53527b568a 100644 --- a/templates/de/html/admin/admin_config_top10.tpl +++ b/templates/de/html/admin/admin_config_top10.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_top10%}
@@ -19,5 +19,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index 6dc3b0c931..cd02d0764d 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_transfer%}
@@ -49,5 +49,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl index 6e5fa7bdb8..feced38c73 100644 --- a/templates/de/html/admin/admin_config_user.tpl +++ b/templates/de/html/admin/admin_config_user.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_user%}
{--ADMIN_CONFIG_USER_TITLE--} @@ -85,5 +85,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_validator.tpl b/templates/de/html/admin/admin_config_validator.tpl index 84aca3ac14..e14934da69 100644 --- a/templates/de/html/admin/admin_config_validator.tpl +++ b/templates/de/html/admin/admin_config_validator.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_validator%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index 8159e010b2..5d249920d4 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_wernis%}
@@ -137,7 +137,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl index a6befebaaf..b94f8d378b 100644 --- a/templates/de/html/admin/admin_config_yoomedia.tpl +++ b/templates/de/html/admin/admin_config_yoomedia.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_yoomedia%}
@@ -81,7 +81,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_contct_user_form.tpl b/templates/de/html/admin/admin_contct_user_form.tpl index cefd999df3..8752a453fa 100644 --- a/templates/de/html/admin/admin_contct_user_form.tpl +++ b/templates/de/html/admin/admin_contct_user_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=user_contct&userid=$content[userid]%}
@@ -19,5 +19,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_del_bank_packages.tpl b/templates/de/html/admin/admin_del_bank_packages.tpl index a952225002..c1b3ab5324 100644 --- a/templates/de/html/admin/admin_del_bank_packages.tpl +++ b/templates/de/html/admin/admin_del_bank_packages.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_bank_package%}
@@ -19,7 +19,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_admin_menu.tpl b/templates/de/html/admin/admin_delete_admin_menu.tpl index 2d42e33c10..3998f9f30d 100644 --- a/templates/de/html/admin/admin_delete_admin_menu.tpl +++ b/templates/de/html/admin/admin_delete_admin_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=adminedit&sub=$content[sub]%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_admins.tpl b/templates/de/html/admin/admin_delete_admins.tpl index ff2920f8be..3162be774e 100644 --- a/templates/de/html/admin/admin_delete_admins.tpl +++ b/templates/de/html/admin/admin_delete_admins.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=admins_edit%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_admins_acls.tpl b/templates/de/html/admin/admin_delete_admins_acls.tpl index 78b6730c52..b0a8a5a1d6 100644 --- a/templates/de/html/admin/admin_delete_admins_acls.tpl +++ b/templates/de/html/admin/admin_delete_admins_acls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_admins_acls%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_cats.tpl b/templates/de/html/admin/admin_delete_cats.tpl index 447f901027..517ed0e536 100644 --- a/templates/de/html/admin/admin_delete_cats.tpl +++ b/templates/de/html/admin/admin_delete_cats.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_cats&do=del%}
@@ -13,5 +13,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_email_max_rec.tpl b/templates/de/html/admin/admin_delete_email_max_rec.tpl index 824b32d607..5d93e2d246 100644 --- a/templates/de/html/admin/admin_delete_email_max_rec.tpl +++ b/templates/de/html/admin/admin_delete_email_max_rec.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_email_max_rec&do=delete%}
@@ -13,5 +13,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_extensions.tpl b/templates/de/html/admin/admin_delete_extensions.tpl index 87483eac40..3516081211 100644 --- a/templates/de/html/admin/admin_delete_extensions.tpl +++ b/templates/de/html/admin/admin_delete_extensions.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=extensions%}
@@ -18,5 +18,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_forced_ads.tpl b/templates/de/html/admin/admin_delete_forced_ads.tpl index 669c7b41c1..676e0dbfc2 100644 --- a/templates/de/html/admin/admin_delete_forced_ads.tpl +++ b/templates/de/html/admin/admin_delete_forced_ads.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_ads&do=delete_forced_ads%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_forced_costs.tpl b/templates/de/html/admin/admin_delete_forced_costs.tpl index 8039d7e912..f3b4d7daa2 100644 --- a/templates/de/html/admin/admin_delete_forced_costs.tpl +++ b/templates/de/html/admin/admin_delete_forced_costs.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_costs&do=delete_forced_costs%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_guest_menu.tpl b/templates/de/html/admin/admin_delete_guest_menu.tpl index ff36442709..ff4ca3a7e3 100644 --- a/templates/de/html/admin/admin_delete_guest_menu.tpl +++ b/templates/de/html/admin/admin_delete_guest_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=guestedit&sub=$content[sub]%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_member_menu.tpl b/templates/de/html/admin/admin_delete_member_menu.tpl index 31a1910a9f..5133b09491 100644 --- a/templates/de/html/admin/admin_delete_member_menu.tpl +++ b/templates/de/html/admin/admin_delete_member_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=memedit&sub=$content[sub]%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_network_array_translation.tpl b/templates/de/html/admin/admin_delete_network_array_translation.tpl index cee78fda6c..891e1dfea5 100644 --- a/templates/de/html/admin/admin_delete_network_array_translation.tpl +++ b/templates/de/html/admin/admin_delete_network_array_translation.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_array_translation&do=remove_network_array_translation&network_id=$content[network_id]%} - $content + $content[rows]
@@ -11,14 +11,14 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_network_request_params.tpl b/templates/de/html/admin/admin_delete_network_request_params.tpl index a61240a7cb..2829502bfe 100644 --- a/templates/de/html/admin/admin_delete_network_request_params.tpl +++ b/templates/de/html/admin/admin_delete_network_request_params.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_request_params&do=remove_network_request_params&network_id=$content[network_id]%} - $content + $content[rows]
@@ -11,14 +11,14 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_network_types.tpl b/templates/de/html/admin/admin_delete_network_types.tpl index a90556315b..b49730d6fb 100644 --- a/templates/de/html/admin/admin_delete_network_types.tpl +++ b/templates/de/html/admin/admin_delete_network_types.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_types&do=remove_network_types&network_id=$content[network_id]%} - $content + $content[rows]
@@ -11,14 +11,14 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_networks.tpl b/templates/de/html/admin/admin_delete_networks.tpl index 1ab7cb5dfb..90d7c3f648 100644 --- a/templates/de/html/admin/admin_delete_networks.tpl +++ b/templates/de/html/admin/admin_delete_networks.tpl @@ -1,19 +1,19 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_data&do=remove_networks%} - $content + $content[rows]
{--ADMIN_DELETE_NETWORK_DATA_TITLE--}
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_payments.tpl b/templates/de/html/admin/admin_delete_payments.tpl index 3e1251546d..49d87e1df8 100644 --- a/templates/de/html/admin/admin_delete_payments.tpl +++ b/templates/de/html/admin/admin_delete_payments.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=payments&do=del%}
@@ -13,5 +13,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_payouts.tpl b/templates/de/html/admin/admin_delete_payouts.tpl index 4b965442af..36539af4f6 100644 --- a/templates/de/html/admin/admin_delete_payouts.tpl +++ b/templates/de/html/admin/admin_delete_payouts.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_payouts%}
@@ -18,5 +18,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_rallye_prices.tpl b/templates/de/html/admin/admin_delete_rallye_prices.tpl index 58f2b35eb0..500951103e 100644 --- a/templates/de/html/admin/admin_delete_rallye_prices.tpl +++ b/templates/de/html/admin/admin_delete_rallye_prices.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content[rallye_id]%}
@@ -27,5 +27,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_rallyes.tpl b/templates/de/html/admin/admin_delete_rallyes.tpl index 151e742a1a..188a20af07 100644 --- a/templates/de/html/admin/admin_delete_rallyes.tpl +++ b/templates/de/html/admin/admin_delete_rallyes.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_rallyes%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_reflevel.tpl b/templates/de/html/admin/admin_delete_reflevel.tpl index e463bb02a8..237f3e7fc6 100644 --- a/templates/de/html/admin/admin_delete_reflevel.tpl +++ b/templates/de/html/admin/admin_delete_reflevel.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=ref&do=del%}
@@ -13,5 +13,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_sponsor.tpl b/templates/de/html/admin/admin_delete_sponsor.tpl index f68af8a220..13b6fee274 100644 --- a/templates/de/html/admin/admin_delete_sponsor.tpl +++ b/templates/de/html/admin/admin_delete_sponsor.tpl @@ -1,5 +1,6 @@ -
-
+
+{%form,formMethodPost=modules.php?module=admin&what=del_sponsor&id=$content[userid]%} +
{%message,ADMIN_HEADER_DELETE_SPONSOR=$content[userid]%}
@@ -23,4 +24,5 @@
- +{%form_close%} +
diff --git a/templates/de/html/admin/admin_delete_surfbar_urls.tpl b/templates/de/html/admin/admin_delete_surfbar_urls.tpl index b14d5bacde..192b265ba7 100644 --- a/templates/de/html/admin/admin_delete_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_delete_surfbar_urls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_surfbar_urls%}
@@ -18,5 +18,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_user.tpl b/templates/de/html/admin/admin_delete_user.tpl index 2c8a09a84e..534f3d3c1a 100644 --- a/templates/de/html/admin/admin_delete_user.tpl +++ b/templates/de/html/admin/admin_delete_user.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=del_user&userid=$content[userid]%}
@@ -24,5 +24,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_user_subids.tpl b/templates/de/html/admin/admin_delete_user_subids.tpl index a1b757b060..85426228cb 100644 --- a/templates/de/html/admin/admin_delete_user_subids.tpl +++ b/templates/de/html/admin/admin_delete_user_subids.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_user_subid&userid=$content[userid]&do=delete_user_subids%} -$content +$content[rows]
@@ -11,7 +11,7 @@ {--SUBID_VALUE--} {--SUBID_ADDED--}
@@ -20,5 +20,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_admin_menu.tpl b/templates/de/html/admin/admin_edit_admin_menu.tpl index 27e04bb204..da1fce31cc 100644 --- a/templates/de/html/admin/admin_edit_admin_menu.tpl +++ b/templates/de/html/admin/admin_edit_admin_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=adminedit&sub=$content[sub]%} @@ -18,5 +18,5 @@ $content[rows]
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_admin_menu_form.tpl b/templates/de/html/admin/admin_edit_admin_menu_form.tpl index a1e1907348..2be329b7d6 100644 --- a/templates/de/html/admin/admin_edit_admin_menu_form.tpl +++ b/templates/de/html/admin/admin_edit_admin_menu_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=adminedit&sub=$content[sub]%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_admins.tpl b/templates/de/html/admin/admin_edit_admins.tpl index 3475a0fe1b..6e6a943e6b 100644 --- a/templates/de/html/admin/admin_edit_admins.tpl +++ b/templates/de/html/admin/admin_edit_admins.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=admins_edit%}
@@ -22,7 +22,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_admins_acls.tpl b/templates/de/html/admin/admin_edit_admins_acls.tpl index c3f55f54f7..497e0f4423 100644 --- a/templates/de/html/admin/admin_edit_admins_acls.tpl +++ b/templates/de/html/admin/admin_edit_admins_acls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_admins_acls%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_bank_packages.tpl b/templates/de/html/admin/admin_edit_bank_packages.tpl index d7c7628f38..3762518418 100644 --- a/templates/de/html/admin/admin_edit_bank_packages.tpl +++ b/templates/de/html/admin/admin_edit_bank_packages.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_bank_package%}
@@ -14,7 +14,7 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_bonus_email.tpl b/templates/de/html/admin/admin_edit_bonus_email.tpl index 4f6f0e3d95..1f29c87aa3 100644 --- a/templates/de/html/admin/admin_edit_bonus_email.tpl +++ b/templates/de/html/admin/admin_edit_bonus_email.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=edit_emails%}
@@ -38,5 +38,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl index 59d5dac731..0f1696b7b1 100644 --- a/templates/de/html/admin/admin_edit_cats.tpl +++ b/templates/de/html/admin/admin_edit_cats.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_cats&do=edit%}
@@ -14,5 +14,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_config_network_type_form.tpl b/templates/de/html/admin/admin_edit_config_network_type_form.tpl index 450452c9fd..35edd3f624 100644 --- a/templates/de/html/admin/admin_edit_config_network_type_form.tpl +++ b/templates/de/html/admin/admin_edit_config_network_type_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_network_types&network_id=$content[network_id]&network_type_id=$content[network_type_id]&do=edit_handler_types_config%}
@@ -45,7 +45,7 @@
- +{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl index bac4013681..f32359e1a0 100644 --- a/templates/de/html/admin/admin_edit_email.tpl +++ b/templates/de/html/admin/admin_edit_email.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=edit_emails%}
@@ -38,5 +38,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_email_max_rec.tpl b/templates/de/html/admin/admin_edit_email_max_rec.tpl index 9591bb1d51..ed26d4d5c6 100644 --- a/templates/de/html/admin/admin_edit_email_max_rec.tpl +++ b/templates/de/html/admin/admin_edit_email_max_rec.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_email_max_rec&do=edit%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_email_select.tpl b/templates/de/html/admin/admin_edit_email_select.tpl index 6f6a43bb48..a1297f331b 100644 --- a/templates/de/html/admin/admin_edit_email_select.tpl +++ b/templates/de/html/admin/admin_edit_email_select.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=edit_emails%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_extensions.tpl b/templates/de/html/admin/admin_edit_extensions.tpl index a9ac2b95aa..c4441f5980 100644 --- a/templates/de/html/admin/admin_edit_extensions.tpl +++ b/templates/de/html/admin/admin_edit_extensions.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=extensions%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_forced_ads.tpl b/templates/de/html/admin/admin_edit_forced_ads.tpl index ecfedb40f4..fb7c0f0e2b 100644 --- a/templates/de/html/admin/admin_edit_forced_ads.tpl +++ b/templates/de/html/admin/admin_edit_forced_ads.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_ads&do=edit_forced_ads%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_forced_campaigns.tpl b/templates/de/html/admin/admin_edit_forced_campaigns.tpl index d2a37f0616..2f981b7896 100644 --- a/templates/de/html/admin/admin_edit_forced_campaigns.tpl +++ b/templates/de/html/admin/admin_edit_forced_campaigns.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_campaigns&do=edit_forced_campaigns%}
@@ -14,7 +14,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_forced_costs.tpl b/templates/de/html/admin/admin_edit_forced_costs.tpl index 0000f0d632..185f956d32 100644 --- a/templates/de/html/admin/admin_edit_forced_costs.tpl +++ b/templates/de/html/admin/admin_edit_forced_costs.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_costs&do=edit_forced_costs%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_guest_menu.tpl b/templates/de/html/admin/admin_edit_guest_menu.tpl index 9afacc1e92..facbca5d23 100644 --- a/templates/de/html/admin/admin_edit_guest_menu.tpl +++ b/templates/de/html/admin/admin_edit_guest_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=guestedit&sub=$content[sub]%} @@ -18,5 +18,5 @@ $content[rows]
{--ID_SELECT--}
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_guest_menu_form.tpl b/templates/de/html/admin/admin_edit_guest_menu_form.tpl index 0ada43ee60..73baab1634 100644 --- a/templates/de/html/admin/admin_edit_guest_menu_form.tpl +++ b/templates/de/html/admin/admin_edit_guest_menu_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=guestedit&sub=$content[sub]%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_member_menu.tpl b/templates/de/html/admin/admin_edit_member_menu.tpl index d927b1cc8c..891a4c01a9 100644 --- a/templates/de/html/admin/admin_edit_member_menu.tpl +++ b/templates/de/html/admin/admin_edit_member_menu.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=memedit&sub=$content[sub]%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_mods.tpl b/templates/de/html/admin/admin_edit_mods.tpl index b5b5380c69..0c015221ac 100644 --- a/templates/de/html/admin/admin_edit_mods.tpl +++ b/templates/de/html/admin/admin_edit_mods.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_mods%}
@@ -22,5 +22,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_network_array_translation.tpl b/templates/de/html/admin/admin_edit_network_array_translation.tpl index 2638b6f28b..c93301c3bf 100644 --- a/templates/de/html/admin/admin_edit_network_array_translation.tpl +++ b/templates/de/html/admin/admin_edit_network_array_translation.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_array_translation&do=change_array_translation&network_id=$content[network_id]%} - $content + $content[rows]
@@ -11,7 +11,7 @@
@@ -19,7 +19,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_network_request_params.tpl b/templates/de/html/admin/admin_edit_network_request_params.tpl index 9642947dd7..12d9cc900a 100644 --- a/templates/de/html/admin/admin_edit_network_request_params.tpl +++ b/templates/de/html/admin/admin_edit_network_request_params.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_request_params&do=change_request_params&network_id=$content[network_id]%} - $content + $content[rows]
@@ -11,7 +11,7 @@
@@ -19,7 +19,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_network_types.tpl b/templates/de/html/admin/admin_edit_network_types.tpl index 465c88df19..77ae06f91c 100644 --- a/templates/de/html/admin/admin_edit_network_types.tpl +++ b/templates/de/html/admin/admin_edit_network_types.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_types&do=change_handler_types&network_id=$content[network_id]%} - $content + $content[rows]
@@ -11,7 +11,7 @@
@@ -19,7 +19,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_networks.tpl b/templates/de/html/admin/admin_edit_networks.tpl index 097ddb0550..944143ab0a 100644 --- a/templates/de/html/admin/admin_edit_networks.tpl +++ b/templates/de/html/admin/admin_edit_networks.tpl @@ -3,14 +3,14 @@ {--ADMIN_LIST_NETWORK_REFERRAL_LINK_NOTICE--}
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_data&do=change_networks%} - $content + $content[rows]
{--ADMIN_EDIT_NETWORK_DATA_TITLE--}
@@ -18,7 +18,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_payments.tpl b/templates/de/html/admin/admin_edit_payments.tpl index 0d767fa247..c35b230698 100644 --- a/templates/de/html/admin/admin_edit_payments.tpl +++ b/templates/de/html/admin/admin_edit_payments.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=payments&do=edit%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_payouts.tpl b/templates/de/html/admin/admin_edit_payouts.tpl index 692f8c4ac9..7e51ccb915 100644 --- a/templates/de/html/admin/admin_edit_payouts.tpl +++ b/templates/de/html/admin/admin_edit_payouts.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_payouts%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_points_data.tpl b/templates/de/html/admin/admin_edit_points_data.tpl index 5c106837c4..a725ec3c32 100644 --- a/templates/de/html/admin/admin_edit_points_data.tpl +++ b/templates/de/html/admin/admin_edit_points_data.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_point_accounts&do=edit_points_data%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_rallye_prices.tpl b/templates/de/html/admin/admin_edit_rallye_prices.tpl index 1a608bb6dc..9e7abcdf45 100644 --- a/templates/de/html/admin/admin_edit_rallye_prices.tpl +++ b/templates/de/html/admin/admin_edit_rallye_prices.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content[rallye_id]%}
@@ -28,5 +28,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_rallyes.tpl b/templates/de/html/admin/admin_edit_rallyes.tpl index 06cbb1fdb7..e75368da99 100644 --- a/templates/de/html/admin/admin_edit_rallyes.tpl +++ b/templates/de/html/admin/admin_edit_rallyes.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_rallyes%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_refbanner.tpl b/templates/de/html/admin/admin_edit_refbanner.tpl index e0acd57de2..8de197bfe6 100644 --- a/templates/de/html/admin/admin_edit_refbanner.tpl +++ b/templates/de/html/admin/admin_edit_refbanner.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=refbanner&do=edit%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_reflevel.tpl b/templates/de/html/admin/admin_edit_reflevel.tpl index 089e0c41c6..21384def7b 100644 --- a/templates/de/html/admin/admin_edit_reflevel.tpl +++ b/templates/de/html/admin/admin_edit_reflevel.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=ref&do=edit%}
@@ -14,5 +14,5 @@
-
+{%form_close%}
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 3d8714112f..af7caa0c08 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 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=edit_sponsor&do=add_points&id=$content[id]%}
@@ -22,5 +22,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl index b5b66d4d3d..db9a033bd0 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 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=edit_sponsor&id=$content[id]&do=edit%}
@@ -169,5 +169,5 @@
-
+{%form_close%}
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 f91e691937..8249e177b6 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 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=edit_sponsor&do=sub_points&id=$content[id]%}
@@ -22,5 +22,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_surfbar_actions.tpl b/templates/de/html/admin/admin_edit_surfbar_actions.tpl index 4954f4ed11..12f415b99d 100644 --- a/templates/de/html/admin/admin_edit_surfbar_actions.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_actions.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_surfbar_actions%}
@@ -14,7 +14,7 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_surfbar_urls.tpl b/templates/de/html/admin/admin_edit_surfbar_urls.tpl index 7280cc8343..20b60155c3 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_surfbar_urls%}
@@ -14,5 +14,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_theme.tpl b/templates/de/html/admin/admin_edit_theme.tpl index d637385785..fb78af0936 100644 --- a/templates/de/html/admin/admin_edit_theme.tpl +++ b/templates/de/html/admin/admin_edit_theme.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=theme_edit%}
@@ -23,7 +23,7 @@
-
+{%form_close%}
{--ADMIN_EDIT_THEME_NOTICE--} diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl index eb0faf4ae5..f4be578df9 100644 --- a/templates/de/html/admin/admin_edit_user.tpl +++ b/templates/de/html/admin/admin_edit_user.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=edit_user&userid=$content[userid]%}
@@ -78,5 +78,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_user_subids.tpl b/templates/de/html/admin/admin_edit_user_subids.tpl index 46cc969490..43c4e57f96 100644 --- a/templates/de/html/admin/admin_edit_user_subids.tpl +++ b/templates/de/html/admin/admin_edit_user_subids.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_user_subid&userid=$content[userid]&do=edit_user_subids%} -$content +$content[rows]
@@ -11,7 +11,7 @@ {--SUBID_VALUE--} {--SUBID_ADDED--}
@@ -20,5 +20,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_expert_settings_form.tpl b/templates/de/html/admin/admin_expert_settings_form.tpl index 923b446c80..b82ad00371 100644 --- a/templates/de/html/admin/admin_expert_settings_form.tpl +++ b/templates/de/html/admin/admin_expert_settings_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost,serverQuery_String=modules.php?dummy=1%}
{--ADMIN_EXPERT_SETTINGS_TITLE--}: @@ -16,5 +16,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_extension_reg_form.tpl b/templates/de/html/admin/admin_extension_reg_form.tpl index 194b64eeb6..14b00f67ee 100644 --- a/templates/de/html/admin/admin_extension_reg_form.tpl +++ b/templates/de/html/admin/admin_extension_reg_form.tpl @@ -1,4 +1,4 @@ -
+{%form,formMethodPost=modules.php?module=admin&what=extensions&register_ext=$content[ext_name]%} -
+{%form_close%} diff --git a/templates/de/html/admin/admin_form_selection_box.tpl b/templates/de/html/admin/admin_form_selection_box.tpl index 96c525a1b8..b9fb948ac9 100644 --- a/templates/de/html/admin/admin_form_selection_box.tpl +++ b/templates/de/html/admin/admin_form_selection_box.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodGet=modules.php%}
@@ -17,5 +17,5 @@
- +{%form_close%}
diff --git a/templates/de/html/admin/admin_guest_menu_status.tpl b/templates/de/html/admin/admin_guest_menu_status.tpl index 5d091e2bf4..2f5a2e1f4a 100644 --- a/templates/de/html/admin/admin_guest_menu_status.tpl +++ b/templates/de/html/admin/admin_guest_menu_status.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=guestedit&sub=$content[sub]%}
@@ -21,5 +21,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_import_theme_form.tpl b/templates/de/html/admin/admin_import_theme_form.tpl index 91936319f0..f77491c0d3 100644 --- a/templates/de/html/admin/admin_import_theme_form.tpl +++ b/templates/de/html/admin/admin_import_theme_form.tpl @@ -1,4 +1,4 @@ -
+{%form,formMethodPost=modules.php?module=admin&what=theme_import%} -
+{%form_close%} diff --git a/templates/de/html/admin/admin_list_admins.tpl b/templates/de/html/admin/admin_list_admins.tpl index 45f14c9266..4c59a95481 100644 --- a/templates/de/html/admin/admin_list_admins.tpl +++ b/templates/de/html/admin/admin_list_admins.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=admins_edit%}
@@ -22,5 +22,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_admins_acls.tpl b/templates/de/html/admin/admin_list_admins_acls.tpl index 893e55a63c..4c7007ff99 100644 --- a/templates/de/html/admin/admin_list_admins_acls.tpl +++ b/templates/de/html/admin/admin_list_admins_acls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_admins_acls%}
@@ -22,5 +22,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_bank_package.tpl b/templates/de/html/admin/admin_list_bank_package.tpl index 29aef88056..e32822e7b7 100644 --- a/templates/de/html/admin/admin_list_bank_package.tpl +++ b/templates/de/html/admin/admin_list_bank_package.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_bank_package%}
@@ -25,5 +25,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_beg_form.tpl b/templates/de/html/admin/admin_list_beg_form.tpl index 0540ebfb09..aa893f3e91 100644 --- a/templates/de/html/admin/admin_list_beg_form.tpl +++ b/templates/de/html/admin/admin_list_beg_form.tpl @@ -1,6 +1,6 @@ -
+{%form,formMethodPost=modules.php?module=admin&what=list_beg%} -
+{%form_close%}
({--ADMIN_BEG_WITHDRAW_NOTICE--}) diff --git a/templates/de/html/admin/admin_list_bonus_form.tpl b/templates/de/html/admin/admin_list_bonus_form.tpl index 66f40771b8..031e74d250 100644 --- a/templates/de/html/admin/admin_list_bonus_form.tpl +++ b/templates/de/html/admin/admin_list_bonus_form.tpl @@ -1,6 +1,6 @@ -
+{%form,formMethodPost=modules.php?module=admin&what=list_bonus%} -
+{%form_close%}
({--ADMIN_BONUS_WITHDRAW_NOTICE--}) diff --git a/templates/de/html/admin/admin_list_booking.tpl b/templates/de/html/admin/admin_list_booking.tpl index 838f346702..ff38ce325f 100644 --- a/templates/de/html/admin/admin_list_booking.tpl +++ b/templates/de/html/admin/admin_list_booking.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_booking&userid=$content[userid]%} -$content +$content[rows]
@@ -29,7 +29,7 @@ {--BOOKING_COMMENTS--}
diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl index 24b68aab15..674a0be70e 100644 --- a/templates/de/html/admin/admin_list_cats.tpl +++ b/templates/de/html/admin/admin_list_cats.tpl @@ -1,5 +1,5 @@
- +{%form,formMethodPost=modules.php?module=admin&what=config_cats%}
@@ -21,5 +21,5 @@
- +{%form_close%}
diff --git a/templates/de/html/admin/admin_list_country.tpl b/templates/de/html/admin/admin_list_country.tpl index ff02f1d2b5..49ebc49f34 100644 --- a/templates/de/html/admin/admin_list_country.tpl +++ b/templates/de/html/admin/admin_list_country.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_country%}
@@ -22,7 +22,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_country_form.tpl b/templates/de/html/admin/admin_list_country_form.tpl index edea805165..ec460aa1a0 100644 --- a/templates/de/html/admin/admin_list_country_form.tpl +++ b/templates/de/html/admin/admin_list_country_form.tpl @@ -1,4 +1,4 @@ -
+{%form,formMethodPost=modules.php?module=admin&what=list_country%}
@@ -19,4 +19,4 @@
-
+{%form_close%} diff --git a/templates/de/html/admin/admin_list_email_max_rec.tpl b/templates/de/html/admin/admin_list_email_max_rec.tpl index eebd37c463..4d3e02cdc2 100644 --- a/templates/de/html/admin/admin_list_email_max_rec.tpl +++ b/templates/de/html/admin/admin_list_email_max_rec.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_email_max_rec%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_extensions.tpl b/templates/de/html/admin/admin_list_extensions.tpl index d1b5a5bbb6..d7c4a98f21 100644 --- a/templates/de/html/admin/admin_list_extensions.tpl +++ b/templates/de/html/admin/admin_list_extensions.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=extensions%}
@@ -23,5 +23,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_forced_ads.tpl b/templates/de/html/admin/admin_list_forced_ads.tpl index 3ef143f0b8..14fe499fbd 100644 --- a/templates/de/html/admin/admin_list_forced_ads.tpl +++ b/templates/de/html/admin/admin_list_forced_ads.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_ads%}
@@ -23,5 +23,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_forced_campaigns.tpl b/templates/de/html/admin/admin_list_forced_campaigns.tpl index dc97e8e17b..b329f3ec19 100644 --- a/templates/de/html/admin/admin_list_forced_campaigns.tpl +++ b/templates/de/html/admin/admin_list_forced_campaigns.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_campaigns%}
@@ -30,7 +30,7 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_forced_costs.tpl b/templates/de/html/admin/admin_list_forced_costs.tpl index 5f34c50198..ef0bca650e 100644 --- a/templates/de/html/admin/admin_list_forced_costs.tpl +++ b/templates/de/html/admin/admin_list_forced_costs.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_forced_costs%}
@@ -21,5 +21,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_holiday.tpl b/templates/de/html/admin/admin_list_holiday.tpl index 90d5f79958..d43a527ff7 100644 --- a/templates/de/html/admin/admin_list_holiday.tpl +++ b/templates/de/html/admin/admin_list_holiday.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=del_holiday%} @@ -18,5 +18,5 @@ value="{--ADMIN_HOLIDAY_STOP_CHECKED--}" />
{--ID_SELECT--}
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_imprint.tpl b/templates/de/html/admin/admin_list_imprint.tpl index ea3fc2007f..d02bc2b148 100644 --- a/templates/de/html/admin/admin_list_imprint.tpl +++ b/templates/de/html/admin/admin_list_imprint.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_imprint%}
@@ -20,5 +20,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_mods.tpl b/templates/de/html/admin/admin_list_mods.tpl index 799a934941..f615632472 100644 --- a/templates/de/html/admin/admin_list_mods.tpl +++ b/templates/de/html/admin/admin_list_mods.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_mods%}
@@ -23,7 +23,7 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_network_array_translation.tpl b/templates/de/html/admin/admin_list_network_array_translation.tpl index 051faef6ff..26cd4246a8 100644 --- a/templates/de/html/admin/admin_list_network_array_translation.tpl +++ b/templates/de/html/admin/admin_list_network_array_translation.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_array_translation&do=handle_array_translations&network_id=$content[network_id]%} - $content + $content[rows]
@@ -17,7 +17,7 @@ {--ADMIN_NETWORK_ARRAY_INDEX_TRANSLATION--} {--ADMIN_NETWORK_ARRAY_INDEX_SORTING--}
@@ -26,10 +26,10 @@
-
+{%form_close%}
- {--ADMIN_EXPORT_NETWORK_ARRAY_TRANSLATION_LINK--} + {--ADMIN_EXPORT_NETWORK_ARRAY_TRANSLATION_LINK--}
diff --git a/templates/de/html/admin/admin_list_network_data.tpl b/templates/de/html/admin/admin_list_network_data.tpl index 6a0d15c0e0..e7ae683a07 100644 --- a/templates/de/html/admin/admin_list_network_data.tpl +++ b/templates/de/html/admin/admin_list_network_data.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_data&do=handle_networks%}
@@ -32,7 +32,7 @@ $content
-
+{%form_close%}
{--ADMIN_EXPORT_ALL_NETWORK_DATA_LINK--} diff --git a/templates/de/html/admin/admin_list_network_request_params.tpl b/templates/de/html/admin/admin_list_network_request_params.tpl index f568b334a9..50fcc5a10e 100644 --- a/templates/de/html/admin/admin_list_network_request_params.tpl +++ b/templates/de/html/admin/admin_list_network_request_params.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_request_params&do=handle_request_params&network_id=$content[network_id]%} - $content + $content[rows]
@@ -18,7 +18,7 @@ {--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--} {--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}
@@ -27,10 +27,10 @@
-
+{%form_close%}
- {--ADMIN_EXPORT_NETWORK_REQUEST_PARAMS_LINK--} + {--ADMIN_EXPORT_NETWORK_REQUEST_PARAMS_LINK--}
diff --git a/templates/de/html/admin/admin_list_network_types.tpl b/templates/de/html/admin/admin_list_network_types.tpl index 136d9863b6..68687cc0f8 100644 --- a/templates/de/html/admin/admin_list_network_types.tpl +++ b/templates/de/html/admin/admin_list_network_types.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_types&do=handle_network_types&network_id=$content[network_id]%} - $content + $content[rows]
@@ -20,7 +20,7 @@ {--TIME_UNIT--} {--ADMIN_NETWORK_TYPE_HANDLER_TEXT_ENCODING--}
@@ -29,10 +29,10 @@
-
+{%form_close%}
- {--ADMIN_EXPORT_NETWORK_HANDLER_TYPES_LINK--} + {--ADMIN_EXPORT_NETWORK_HANDLER_TYPES_LINK--}
diff --git a/templates/de/html/admin/admin_list_network_vcheck_params.tpl b/templates/de/html/admin/admin_list_network_vcheck_params.tpl index 21ca47b3e1..d81d211bfb 100644 --- a/templates/de/html/admin/admin_list_network_vcheck_params.tpl +++ b/templates/de/html/admin/admin_list_network_vcheck_params.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_network_vcheck_params&do=handle_vcheck_params&network_id=$content[network_id]%} - $content + $content[rows]
@@ -17,7 +17,7 @@ {--ADMIN_NETWORK_VCHECK_PARAMETER_VALUE--} {--ADMIN_NETWORK_VCHECK_PARAMETER_DEFAULT--}
@@ -26,10 +26,10 @@
-
+{%form_close%}
- {--ADMIN_EXPORT_NETWORK_VCHECK_PARAMS_LINK--} + {--ADMIN_EXPORT_NETWORK_VCHECK_PARAMS_LINK--}
diff --git a/templates/de/html/admin/admin_list_nickname_history.tpl b/templates/de/html/admin/admin_list_nickname_history.tpl index 552bed5c47..0240f22e6d 100644 --- a/templates/de/html/admin/admin_list_nickname_history.tpl +++ b/templates/de/html/admin/admin_list_nickname_history.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_nickname&userid=$content[userid]%} -$content +$content[rows]
@@ -13,7 +13,7 @@ {--ENTRY_ADDED--} {--ADMIN_HISTORY_ENTRY_LAST_USED--}
@@ -22,7 +22,7 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl index e8e12ba440..23afb8f965 100644 --- a/templates/de/html/admin/admin_list_payments.tpl +++ b/templates/de/html/admin/admin_list_payments.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=payments%}
@@ -22,5 +22,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_payouts.tpl b/templates/de/html/admin/admin_list_payouts.tpl index a50ed1416d..794a6bba95 100644 --- a/templates/de/html/admin/admin_list_payouts.tpl +++ b/templates/de/html/admin/admin_list_payouts.tpl @@ -1,5 +1,6 @@ -
- +
+{%form,formMethodPost=modules.php?module=admin&what=list_payouts%} +
{--ADMIN_LIST_PAYOUTS--}: @@ -20,4 +21,5 @@
-
+{%form_close%} +
diff --git a/templates/de/html/admin/admin_list_points_accounts.tpl b/templates/de/html/admin/admin_list_points_accounts.tpl index 05b7c892f6..3095ea22b2 100644 --- a/templates/de/html/admin/admin_list_points_accounts.tpl +++ b/templates/de/html/admin/admin_list_points_accounts.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_point_accounts%}
@@ -24,5 +24,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_rallye_prices_simple.tpl b/templates/de/html/admin/admin_list_rallye_prices_simple.tpl index 61e6231c3e..8701caf40d 100644 --- a/templates/de/html/admin/admin_list_rallye_prices_simple.tpl +++ b/templates/de/html/admin/admin_list_rallye_prices_simple.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content[rallye_id]%}
@@ -29,5 +29,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_rallyes.tpl b/templates/de/html/admin/admin_list_rallyes.tpl index d72b52b0cf..7873f7668c 100644 --- a/templates/de/html/admin/admin_list_rallyes.tpl +++ b/templates/de/html/admin/admin_list_rallyes.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_rallyes%}
@@ -19,7 +19,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_refbanner.tpl b/templates/de/html/admin/admin_list_refbanner.tpl index 7991ed2073..781d46d53f 100644 --- a/templates/de/html/admin/admin_list_refbanner.tpl +++ b/templates/de/html/admin/admin_list_refbanner.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=refbanner%}
@@ -23,5 +23,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_reflevel.tpl b/templates/de/html/admin/admin_list_reflevel.tpl index 5c7f5fef7d..7f9f5da6aa 100644 --- a/templates/de/html/admin/admin_list_reflevel.tpl +++ b/templates/de/html/admin/admin_list_reflevel.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=ref%}
@@ -20,7 +20,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_server_name_log.tpl b/templates/de/html/admin/admin_list_server_name_log.tpl index 23c784a039..03cb6e1a25 100644 --- a/templates/de/html/admin/admin_list_server_name_log.tpl +++ b/templates/de/html/admin/admin_list_server_name_log.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_server_name%}
@@ -22,7 +22,7 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_sponsor.tpl b/templates/de/html/admin/admin_list_sponsor.tpl index 59c0f631e7..6a1fb9d8f1 100644 --- a/templates/de/html/admin/admin_list_sponsor.tpl +++ b/templates/de/html/admin/admin_list_sponsor.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_sponsor%}
@@ -13,5 +13,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_sponsor_pay.tpl b/templates/de/html/admin/admin_list_sponsor_pay.tpl index c1658963ff..6d06c00b2d 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_sponsor_pay%}
@@ -22,5 +22,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl index bfd7d84b19..5bac03e90f 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_sponsor_pay%}
@@ -21,5 +21,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl index 8c9c71a41d..853d1e6a4a 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_sponsor_pay%}
@@ -21,5 +21,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_surfbar_actions.tpl b/templates/de/html/admin/admin_list_surfbar_actions.tpl index b7eeb9fb21..98985d31ee 100644 --- a/templates/de/html/admin/admin_list_surfbar_actions.tpl +++ b/templates/de/html/admin/admin_list_surfbar_actions.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_surfbar_actions%}
@@ -28,7 +28,7 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_surfbar_urls.tpl b/templates/de/html/admin/admin_list_surfbar_urls.tpl index 3a9ee6ea7f..77b2f54b0c 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_surfbar_urls%}
@@ -29,5 +29,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_task.tpl b/templates/de/html/admin/admin_list_task.tpl index d180e3baa0..15ec420d5d 100644 --- a/templates/de/html/admin/admin_list_task.tpl +++ b/templates/de/html/admin/admin_list_task.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_task&type=$content[type]%}
@@ -26,5 +26,5 @@ $content[rows]
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_task_delete.tpl b/templates/de/html/admin/admin_list_task_delete.tpl index 4ffec561ca..eca5de334e 100644 --- a/templates/de/html/admin/admin_list_task_delete.tpl +++ b/templates/de/html/admin/admin_list_task_delete.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_task&type=$content[type]%}
@@ -26,7 +26,7 @@ $content[rows]
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_transfer.tpl b/templates/de/html/admin/admin_list_transfer.tpl index dc5b684d07..5c0eebf45d 100644 --- a/templates/de/html/admin/admin_list_transfer.tpl +++ b/templates/de/html/admin/admin_list_transfer.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=del_transfer%}
@@ -41,5 +41,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_user_subid.tpl b/templates/de/html/admin/admin_list_user_subid.tpl index 47d89b3b55..557ad3709a 100644 --- a/templates/de/html/admin/admin_list_user_subid.tpl +++ b/templates/de/html/admin/admin_list_user_subid.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_user_subid&userid=$content[userid]%} -$content +$content[rows]
@@ -12,7 +12,7 @@ {--SUBID_VALUE--} {--SUBID_ADDED--}
@@ -22,5 +22,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_user_subid_stats.tpl b/templates/de/html/admin/admin_list_user_subid_stats.tpl index ebd2571174..3ef4db18ba 100644 --- a/templates/de/html/admin/admin_list_user_subid_stats.tpl +++ b/templates/de/html/admin/admin_list_user_subid_stats.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_user_subid&do=stats&userid=$content[userid]&id=$content[id]%} - $content + $content[rows]
@@ -14,7 +14,7 @@ {--USER_AGENT--} {--ENTRY_ADDED--}
@@ -23,7 +23,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl index 844b99f157..04f57c5c5d 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl @@ -10,11 +10,11 @@
$content[already] -
+ {%form,formMethodPost=modules.php?module=admin&what=list_yoomedia_tm%} -
+ {%form_close%}
diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl index 15efee514b..09e7f91dab 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl @@ -6,7 +6,7 @@ {%pipe,translateComma=$content[remain]%} $content[pay] € -
+ {%form,formMethodPost=modules.php?module=admin&what=list_yoomedia_tm%} @@ -18,6 +18,6 @@ -
+ {%form_close%} diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl index 4d5f055277..6947279596 100644 --- a/templates/de/html/admin/admin_lock_sponsor.tpl +++ b/templates/de/html/admin/admin_lock_sponsor.tpl @@ -1,5 +1,6 @@ -
-
+
+{%form,formMethodPost=modules.php?module=admin&what=lock_sponsor&id=$content[id]%} +
$content[header_message]
@@ -23,4 +24,5 @@
- +{%form_close%} +
diff --git a/templates/de/html/admin/admin_lock_surfbar_urls.tpl b/templates/de/html/admin/admin_lock_surfbar_urls.tpl index 1eedfe6c25..55d5bad87c 100644 --- a/templates/de/html/admin/admin_lock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_lock_surfbar_urls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_surfbar_urls%}
@@ -21,5 +21,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl index cb357a8e25..d3b5df3160 100644 --- a/templates/de/html/admin/admin_lock_user.tpl +++ b/templates/de/html/admin/admin_lock_user.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=lock_user&userid=$content[userid]%}
@@ -26,5 +26,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl index 68b515f593..c0a4c27a24 100644 --- a/templates/de/html/admin/admin_login_form.tpl +++ b/templates/de/html/admin/admin_login_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?$content[all_parameter]%}
@@ -57,5 +57,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_logout_form.tpl b/templates/de/html/admin/admin_logout_form.tpl index 28079ad015..c43caaed8a 100644 --- a/templates/de/html/admin/admin_logout_form.tpl +++ b/templates/de/html/admin/admin_logout_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&action=logout%}
@@ -23,5 +23,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_maintenance_form.tpl b/templates/de/html/admin/admin_maintenance_form.tpl index 49c04cb3af..3fd950e83d 100644 --- a/templates/de/html/admin/admin_maintenance_form.tpl +++ b/templates/de/html/admin/admin_maintenance_form.tpl @@ -1,5 +1,6 @@ -
-
+
+{%form,formMethodPost=modules.php?module=admin&what=maintenance%} +
{--ADMIN_MAINTENANCE_MODE_INTRO--} @@ -14,4 +15,5 @@
- +{%form_close%} +
diff --git a/templates/de/html/admin/admin_member_menu_overview.tpl b/templates/de/html/admin/admin_member_menu_overview.tpl index 4969cc0768..ad352f9571 100644 --- a/templates/de/html/admin/admin_member_menu_overview.tpl +++ b/templates/de/html/admin/admin_member_menu_overview.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=memedit&sub=$content[sub]%} @@ -18,5 +18,5 @@ $content[rows]
{--ID_SELECT--}
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_member_menu_status.tpl b/templates/de/html/admin/admin_member_menu_status.tpl index 722ef9ad4b..dec253da05 100644 --- a/templates/de/html/admin/admin_member_menu_status.tpl +++ b/templates/de/html/admin/admin_member_menu_status.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=memedit&sub=$content[sub]%}
@@ -18,5 +18,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_newsletter.tpl b/templates/de/html/admin/admin_newsletter.tpl index 528cac31fc..943b2f92ad 100644 --- a/templates/de/html/admin/admin_newsletter.tpl +++ b/templates/de/html/admin/admin_newsletter.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=send_newsletter%}
@@ -61,7 +61,7 @@
-
+{%form_close%}
{--ADMIN_NEWSLETTER_NOTICE--} diff --git a/templates/de/html/admin/admin_newsletter_nohtml.tpl b/templates/de/html/admin/admin_newsletter_nohtml.tpl index e32864501c..7d5cdab0fa 100644 --- a/templates/de/html/admin/admin_newsletter_nohtml.tpl +++ b/templates/de/html/admin/admin_newsletter_nohtml.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=send_newsletter%}
@@ -43,7 +43,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_overview_table.tpl b/templates/de/html/admin/admin_overview_table.tpl index d0791c2cbe..2f3eb97980 100644 --- a/templates/de/html/admin/admin_overview_table.tpl +++ b/templates/de/html/admin/admin_overview_table.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin%}
@@ -26,5 +26,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_payout_accept_form.tpl b/templates/de/html/admin/admin_payout_accept_form.tpl index 3554a90264..10612118f3 100644 --- a/templates/de/html/admin/admin_payout_accept_form.tpl +++ b/templates/de/html/admin/admin_payout_accept_form.tpl @@ -1,5 +1,6 @@ -
-
+
+{%form,formMethodPost=modules.php?module=admin&what=list_payouts&do=accept&pid=$content[pid]&task=$content[task]%} +
{--ADMIN_PAYOUT_ACCEPT_PAYOUT_INTRO--} @@ -21,4 +22,5 @@
- +{%form_close%} +
diff --git a/templates/de/html/admin/admin_payout_overview_form.tpl b/templates/de/html/admin/admin_payout_overview_form.tpl index 6567c8edaf..cad004280d 100644 --- a/templates/de/html/admin/admin_payout_overview_form.tpl +++ b/templates/de/html/admin/admin_payout_overview_form.tpl @@ -1,7 +1,7 @@ -
+{%form,formMethodPost=modules.php?module=admin&what=list_payouts&do=accept&pid=$content[pid]&task=$content[tid]%} -
+{%form_close%}
-
+{%form,formMethodPost=modules.php?module=admin&what=list_payouts&do=reject&pid=$content[pid]&task=$content[tid]%} -
+{%form_close%} diff --git a/templates/de/html/admin/admin_payout_reject_form.tpl b/templates/de/html/admin/admin_payout_reject_form.tpl index 3fbc8df716..85a5d59e70 100644 --- a/templates/de/html/admin/admin_payout_reject_form.tpl +++ b/templates/de/html/admin/admin_payout_reject_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_payouts&do=reject&pid=$content[pid]&task=$content[task]%}
@@ -23,5 +23,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_reg_form.tpl b/templates/de/html/admin/admin_reg_form.tpl index d7c3e03ad1..b961107b05 100644 --- a/templates/de/html/admin/admin_reg_form.tpl +++ b/templates/de/html/admin/admin_reg_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin%}
@@ -35,5 +35,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_reset_password.tpl b/templates/de/html/admin/admin_reset_password.tpl index 7633e67c21..cbb29a98f0 100644 --- a/templates/de/html/admin/admin_reset_password.tpl +++ b/templates/de/html/admin/admin_reset_password.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&reset_pass=1%}
@@ -21,7 +21,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_reset_password_form.tpl b/templates/de/html/admin/admin_reset_password_form.tpl index 519d230475..626eb4e870 100644 --- a/templates/de/html/admin/admin_reset_password_form.tpl +++ b/templates/de/html/admin/admin_reset_password_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&reset_pass=1%}
@@ -40,7 +40,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_reset_password_send_link.tpl b/templates/de/html/admin/admin_reset_password_send_link.tpl index 7da1219255..454b00c4c4 100644 --- a/templates/de/html/admin/admin_reset_password_send_link.tpl +++ b/templates/de/html/admin/admin_reset_password_send_link.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&reset_pass=1%}
@@ -21,7 +21,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_send_bonus_form.tpl b/templates/de/html/admin/admin_send_bonus_form.tpl index 223dfc399b..2f26a74dc3 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 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=send_bonus&mail_mode=$content[mail_mode]%}
@@ -60,5 +60,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_send_coupon.tpl b/templates/de/html/admin/admin_send_coupon.tpl index 289bef2a98..065cfe6a64 100644 --- a/templates/de/html/admin/admin_send_coupon.tpl +++ b/templates/de/html/admin/admin_send_coupon.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=send_coupon%}
@@ -32,5 +32,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl index d05d2e927c..1f8f14b4d3 100644 --- a/templates/de/html/admin/admin_send_yoomedia.tpl +++ b/templates/de/html/admin/admin_send_yoomedia.tpl @@ -1,5 +1,6 @@ -
- +
+{%form,formMethodPost=modules.php?module=admin&what=list_yoomedia_tm%}" method="post"> +
{--ADMIN_YOOMEDIA_SEND_MAIL_TITLE--} @@ -67,4 +68,5 @@
-
+{%form_close%} +
diff --git a/templates/de/html/admin/admin_show_config_network_type.tpl b/templates/de/html/admin/admin_show_config_network_type.tpl index 334a824134..76900e8d1c 100644 --- a/templates/de/html/admin/admin_show_config_network_type.tpl +++ b/templates/de/html/admin/admin_show_config_network_type.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodGet=modules.php%}
{%message,ADMIN_SHOW_CONFIG_NETWORK_HANDLER_TYPE_TITLE=$content[network_type_handler]%} @@ -38,5 +38,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_sub_points.tpl b/templates/de/html/admin/admin_sub_points.tpl index 9363bff264..374bb4c50d 100644 --- a/templates/de/html/admin/admin_sub_points.tpl +++ b/templates/de/html/admin/admin_sub_points.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=sub_points&userid=$content[userid]%}
@@ -33,5 +33,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_sub_points_all.tpl b/templates/de/html/admin/admin_sub_points_all.tpl index 309a1ba8bf..c4c973b439 100644 --- a/templates/de/html/admin/admin_sub_points_all.tpl +++ b/templates/de/html/admin/admin_sub_points_all.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=sub_points&userid=all%}
@@ -29,5 +29,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl index 173ac2ca3c..4ce5c1d10f 100644 --- a/templates/de/html/admin/admin_undelete_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_undelete_surfbar_urls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=list_surfbar_urls%}
@@ -20,5 +20,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_unlock_emails.tpl b/templates/de/html/admin/admin_unlock_emails.tpl index 9c3a84d520..f23ff2cab2 100644 --- a/templates/de/html/admin/admin_unlock_emails.tpl +++ b/templates/de/html/admin/admin_unlock_emails.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=unlock_emails%}
@@ -31,5 +31,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_unlock_emails_redir.tpl b/templates/de/html/admin/admin_unlock_emails_redir.tpl index 89274564d6..bbbf49d34c 100644 --- a/templates/de/html/admin/admin_unlock_emails_redir.tpl +++ b/templates/de/html/admin/admin_unlock_emails_redir.tpl @@ -1,4 +1,5 @@ -
+
+{%form,formMethodPost=modules.php?module=admin&what=unlock_emails%}
@@ -13,4 +14,5 @@
- +{%form_close%} +
diff --git a/templates/de/html/admin/admin_unlock_sponsor.tpl b/templates/de/html/admin/admin_unlock_sponsor.tpl index 02b2269a5f..f38d83fea8 100644 --- a/templates/de/html/admin/admin_unlock_sponsor.tpl +++ b/templates/de/html/admin/admin_unlock_sponsor.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=unlock_sponsor%}
@@ -20,7 +20,7 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl index 442f4de3d0..ac963d53d8 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&what=unlock_surfbar_urls%}
@@ -22,5 +22,5 @@ $content
-
+{%form_close%}
diff --git a/templates/de/html/admin/admin_validate_reset_hash_form.tpl b/templates/de/html/admin/admin_validate_reset_hash_form.tpl index a41c9e1482..c83007d15f 100644 --- a/templates/de/html/admin/admin_validate_reset_hash_form.tpl +++ b/templates/de/html/admin/admin_validate_reset_hash_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=admin&reset_pass=1&hash=$content%}
@@ -23,7 +23,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index 276b7e8cb2..3faca827ca 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -10,7 +10,7 @@ $content[enter_login]
{--DOUBLER_NOTICE_FOR_PASSWORD--}

-
+ {%form,formMethodPost=doubler.php?refid=$content[refid]%}
@@ -53,7 +53,7 @@
-
+ {%form_close%}
{--DOUBLER_ALREADY_PAYED--}
{--DOUBLER_POINTS_LEFT--}
diff --git a/templates/de/html/guest/guest_confirm_link.tpl b/templates/de/html/guest/guest_confirm_link.tpl index 61103a266f..4f1407d618 100644 --- a/templates/de/html/guest/guest_confirm_link.tpl +++ b/templates/de/html/guest/guest_confirm_link.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=index&what=confirm%}
@@ -24,5 +24,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl index 7f7b91a8a0..a70e7dd085 100644 --- a/templates/de/html/guest/guest_login.tpl +++ b/templates/de/html/guest/guest_login.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=index&what=login%} -
+{%form_close%}
-
+{%form,formMethodPost=modules.php?module=index&what=login%} -
+{%form_close%}
diff --git a/templates/de/html/guest/guest_nickname_login.tpl b/templates/de/html/guest/guest_nickname_login.tpl index d5de22098c..9809131aaf 100644 --- a/templates/de/html/guest/guest_nickname_login.tpl +++ b/templates/de/html/guest/guest_nickname_login.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=index&what=login%} -
+{%form_close%}
-
+{%form,formMethodPost=modules.php?module=index&what=login%} -
+{%form_close%}
diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index fd09971bbf..501249615c 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost,formNameRegister=modules.php?module=index&what=register%}
@@ -159,5 +159,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/guest/guest_sponsor_activate.tpl b/templates/de/html/guest/guest_sponsor_activate.tpl index 30e811df5b..b2bc442c19 100644 --- a/templates/de/html/guest/guest_sponsor_activate.tpl +++ b/templates/de/html/guest/guest_sponsor_activate.tpl @@ -1,6 +1,6 @@
-
+{%form,formMethodPost=modules.php?module=index&what=sponsor_login&do=activate%}
@@ -22,7 +22,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/guest/guest_sponsor_login.tpl b/templates/de/html/guest/guest_sponsor_login.tpl index 40f97de163..a13229152d 100644 --- a/templates/de/html/guest/guest_sponsor_login.tpl +++ b/templates/de/html/guest/guest_sponsor_login.tpl @@ -1,6 +1,6 @@
-
+{%form,formMethodPost=modules.php?module=index&what=sponsor_login%}
@@ -30,7 +30,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/guest/guest_sponsor_lost.tpl b/templates/de/html/guest/guest_sponsor_lost.tpl index 78b5c9c4a3..244f44a5c8 100644 --- a/templates/de/html/guest/guest_sponsor_lost.tpl +++ b/templates/de/html/guest/guest_sponsor_lost.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=index&what=sponsor_login&do=lost_pass%}
@@ -29,7 +29,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index b4c5a9bc58..97908bc1fe 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -13,7 +13,7 @@
-
+{%form,formMethodPost=modules.php?module=index&what=sponsor_reg%}
@@ -239,5 +239,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/install/install_fatal_errors.tpl b/templates/de/html/install/install_fatal_errors.tpl index 67589c66a6..0148839317 100644 --- a/templates/de/html/install/install_fatal_errors.tpl +++ b/templates/de/html/install/install_fatal_errors.tpl @@ -1,4 +1,4 @@ -
+{%form,formMethodPost=install.php?install_page=2%}
@@ -23,4 +23,4 @@
-
+{%form_close%} diff --git a/templates/de/html/install/install_finished.tpl b/templates/de/html/install/install_finished.tpl index c209634e5d..583b50394b 100644 --- a/templates/de/html/install/install_finished.tpl +++ b/templates/de/html/install/install_finished.tpl @@ -7,8 +7,8 @@ {--INSTALLER_FIN_SECU--}
-
+{%form,formMethodPost,formTarget_self=modules.php%} -
+{%form_close%}
diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index fd79c54e95..22c966f4a5 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost,formTarget_self=install.php?install_page=2%}
@@ -37,5 +37,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index 92e29759f2..9b1d8b5f0e 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost,formTarget_self=install.php?install_page=3%}
@@ -67,5 +67,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl index 844ee53b85..fdedb16328 100644 --- a/templates/de/html/install/install_page3.tpl +++ b/templates/de/html/install/install_page3.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost,formTarget_self=install.php?install_page=5%}
@@ -53,5 +53,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/install/install_page5.tpl b/templates/de/html/install/install_page5.tpl index e89367bb64..6934267b52 100644 --- a/templates/de/html/install/install_page5.tpl +++ b/templates/de/html/install/install_page5.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost,formTarget_self=install.php?install_page=finalize%}
@@ -62,5 +62,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/install/install_selector.tpl b/templates/de/html/install/install_selector.tpl index e662c2a094..8d7685c382 100644 --- a/templates/de/html/install/install_selector.tpl +++ b/templates/de/html/install/install_selector.tpl @@ -52,19 +52,19 @@
-
+ {%form,formMethodGet=install.php%} -
+ {%form_close%}
3 Sekunde(n)
-
+ {%form,formMethodGet=install.php%} -
+ {%form_close%}
diff --git a/templates/de/html/install/install_welcome.tpl b/templates/de/html/install/install_welcome.tpl index 6ecee3c338..21a1612f3b 100644 --- a/templates/de/html/install/install_welcome.tpl +++ b/templates/de/html/install/install_welcome.tpl @@ -39,9 +39,9 @@
-
+ {%form,formMethodGet,formTarget_self=install.php%} -
+ {%form_close%}
diff --git a/templates/de/html/js/js_surfbar_member_book.tpl b/templates/de/html/js/js_surfbar_member_book.tpl index fa74e28ed3..8ec8ffcc91 100644 --- a/templates/de/html/js/js_surfbar_member_book.tpl +++ b/templates/de/html/js/js_surfbar_member_book.tpl @@ -96,3 +96,4 @@ function resetForm () { } focusLimitedNo(); +document.getElementById('url').focus(); diff --git a/templates/de/html/js/js_surfbar_stopped.tpl b/templates/de/html/js/js_surfbar_stopped.tpl index 74f71b7edf..b4e3edc1c5 100644 --- a/templates/de/html/js/js_surfbar_stopped.tpl +++ b/templates/de/html/js/js_surfbar_stopped.tpl @@ -36,7 +36,7 @@ function restart () { } function showButton () { - buttonDiv.innerHTML = '
'; + buttonDiv.innerHTML = '{%form,formTarget_blank,formMethodGet=surfbar.php%}{%form_close%}'; } function counter () { diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl index 9a33d61e56..cdd2791d32 100644 --- a/templates/de/html/mailid/mailid_confirm_buttom.tpl +++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl @@ -2,11 +2,11 @@
-
+ {%form,formMethodPost=mailid_top.php?userid=$content[userid]&$content[type]=$content[data]&do=add&code=$content[code]%} {--MEMBER_MAILID_CLICK_BUTTON--}:
-
+ {%form_close%} 		diff --git a/templates/de/html/member/member_mydata_button.tpl b/templates/de/html/member/member_mydata_button.tpl index 19b25d20bd..38605f883d 100644 --- a/templates/de/html/member/member_mydata_button.tpl +++ b/templates/de/html/member/member_mydata_button.tpl @@ -1,3 +1,3 @@ -
+{%form,formMethodPost=modules.php?module=login&what=mydata%} -
+{%form_close%} diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl index fc99eccbe0..f45fea061c 100644 --- a/templates/de/html/member/member_mydata_edit.tpl +++ b/templates/de/html/member/member_mydata_edit.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=mydata%}
@@ -83,5 +83,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/member/member_newsletter.tpl b/templates/de/html/member/member_newsletter.tpl index 10cdb676f4..8adb8f7a9d 100644 --- a/templates/de/html/member/member_newsletter.tpl +++ b/templates/de/html/member/member_newsletter.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=newsletter%}
{--NL_MEMBER_TITLE--}: @@ -26,5 +26,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl index 8315a73105..04668c3abe 100644 --- a/templates/de/html/member/member_nickname_form.tpl +++ b/templates/de/html/member/member_nickname_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=nickname%}
@@ -32,5 +32,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/member/member_order_back.tpl b/templates/de/html/member/member_order_back.tpl index e2125ec596..6b413bd5ac 100644 --- a/templates/de/html/member/member_order_back.tpl +++ b/templates/de/html/member/member_order_back.tpl @@ -1,8 +1,8 @@
-
+{%form,formMethodGet,formTarget_parent=modules.php%} -
+{%form_close%}
diff --git a/templates/de/html/member/member_order_page1.tpl b/templates/de/html/member/member_order_page1.tpl index 3b09f801ed..5eaa9018ce 100644 --- a/templates/de/html/member/member_order_page1.tpl +++ b/templates/de/html/member/member_order_page1.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=order%}
{--MEMBER_ORDER_PAGE1_TITLE--} @@ -14,5 +14,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl index d8954f64aa..12b007a41f 100644 --- a/templates/de/html/member/member_order_page2.tpl +++ b/templates/de/html/member/member_order_page2.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=order%}
{--MEMBER_ORDER_PAGE2_TITLE--} @@ -75,5 +75,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/member/member_order_send.tpl b/templates/de/html/member/member_order_send.tpl index ed5fc8ff31..ef8b03fa46 100644 --- a/templates/de/html/member/member_order_send.tpl +++ b/templates/de/html/member/member_order_send.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost,formTarget_parent=modules.php?module=order&order=$content%}
{--MEMBER_ORDER_PLEASE_WAIT_1--}10{--MEMBER_ORDER_PLEASE_WAIT_2--}
@@ -7,5 +7,12 @@
- + +{%form_close%} diff --git a/templates/de/html/member/member_order_thanks.tpl b/templates/de/html/member/member_order_thanks.tpl index 95fb7ae853..8df4fc5061 100644 --- a/templates/de/html/member/member_order_thanks.tpl +++ b/templates/de/html/member/member_order_thanks.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=order%}
{--MEMBER_THANX_ORDER_TITLE--}
@@ -11,5 +11,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/member/member_payout_form.tpl b/templates/de/html/member/member_payout_form.tpl index cbfdb38f9c..a31541f3e5 100644 --- a/templates/de/html/member/member_payout_form.tpl +++ b/templates/de/html/member/member_payout_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=payout&payout=$content[payout]%}
@@ -45,7 +45,7 @@
-
+{%form_close%}
diff --git a/templates/de/html/member/member_payout_form_banner.tpl b/templates/de/html/member/member_payout_form_banner.tpl index e5808f2a7f..ab398738e4 100644 --- a/templates/de/html/member/member_payout_form_banner.tpl +++ b/templates/de/html/member/member_payout_form_banner.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=payout&payout=$content[payout]%}
@@ -45,7 +45,7 @@
-
+{%form_close%}
(*): {--PAYOUT_BANNER_NOTICE--}
diff --git a/templates/de/html/member/member_profile_outdated.tpl b/templates/de/html/member/member_profile_outdated.tpl index aa205e36b7..9ee70e07a6 100644 --- a/templates/de/html/member/member_profile_outdated.tpl +++ b/templates/de/html/member/member_profile_outdated.tpl @@ -26,14 +26,14 @@
-
+ {%form,formMethodPost=modules.php?module=login&what=mydata%} -
+ {%form_close%} 		-
+ {%form,formMethodPost=modules.php?module=login&what=mydata%} -
+ {%form_close%}
diff --git a/templates/de/html/member/member_support_form.tpl b/templates/de/html/member/member_support_form.tpl index 23c1ec6f3e..d6c0aa4ddd 100644 --- a/templates/de/html/member/member_support_form.tpl +++ b/templates/de/html/member/member_support_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=support%}
@@ -43,5 +43,5 @@ Meine id bei Ihrem {?mt_word?} lautet: {%pipe,getMemberId%}
-
+{%form_close%}
diff --git a/templates/de/html/member/member_surfbar_delete_action_form.tpl b/templates/de/html/member/member_surfbar_delete_action_form.tpl index 14f2dabe5f..8008a43c5f 100644 --- a/templates/de/html/member/member_surfbar_delete_action_form.tpl +++ b/templates/de/html/member/member_surfbar_delete_action_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formIdDelete,formMethodPost=modules.php?module=login&what=list_surfbar%}
URL in Surfbar löschen: @@ -28,7 +28,7 @@
-
+{%form_close%}
Hinweis: Irtümlich gelöschte URLs können nur diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl index 1188ce9c39..6528368efa 100644 --- a/templates/de/html/member/member_surfbar_edit_action_form.tpl +++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formIdEdit,formMethodPost=modules.php?module=login&what=list_surfbar%}
URL in Surfbar editieren: @@ -20,7 +20,7 @@
- + @@ -28,7 +28,19 @@
- -
+ + + +{%form_close%}
diff --git a/templates/de/html/member/member_themes.tpl b/templates/de/html/member/member_themes.tpl index 0701af1ffb..c25ecb5f2d 100644 --- a/templates/de/html/member/member_themes.tpl +++ b/templates/de/html/member/member_themes.tpl @@ -1,8 +1,8 @@
{--MEMBER_THEME_LIST_USAGE--} -
- + {%form,formMethodPost=modules.php?module=login&what=themes%} +
@@ -17,8 +17,8 @@ -
{--THEME_UNIX--} {--THEME_NAME--}
-
+ + {%form_close%}
diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl index 62abcc96a9..139ccd8fb5 100644 --- a/templates/de/html/member/member_transfer_new.tpl +++ b/templates/de/html/member/member_transfer_new.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=login&what=transfer&do=new%}
@@ -56,5 +56,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/member/member_transfer_settings.tpl b/templates/de/html/member/member_transfer_settings.tpl index 95662a006c..fe39371b9b 100644 --- a/templates/de/html/member/member_transfer_settings.tpl +++ b/templates/de/html/member/member_transfer_settings.tpl @@ -1,4 +1,4 @@ -
+{%form,formMethodPost=modules.php?module=login&what=transfer%}
@@ -16,4 +16,4 @@
-
+{%form_close%} diff --git a/templates/de/html/member/member_wernis_mode_payout.tpl b/templates/de/html/member/member_wernis_mode_payout.tpl index fc97d2cdc9..2ea7dd954f 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 @@
-
+{%form,formMethodPost=modules.php?module=login&what=wernis&do=payout%}
@@ -33,7 +33,7 @@
-
+{%form_close%}
{--MEMBER_WERNIS_PAYOUT_NOTICE--} diff --git a/templates/de/html/member/member_wernis_mode_withdraw.tpl b/templates/de/html/member/member_wernis_mode_withdraw.tpl index 98d3cd45dd..ffba548d33 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 @@
-
+{%form,formMethodPost=modules.php?module=login&what=wernis&do=withdraw%}
@@ -33,7 +33,7 @@
-
+{%form_close%}
{--MEMBER_WERNIS_WITHDRAW_NOTICE--} diff --git a/templates/de/html/page_header.tpl b/templates/de/html/page_header.tpl index de66eba94f..bb99026d63 100644 --- a/templates/de/html/page_header.tpl +++ b/templates/de/html/page_header.tpl @@ -7,6 +7,6 @@ - + diff --git a/templates/de/html/select/select_admins_box.tpl b/templates/de/html/select/select_admins_box.tpl index bb5e35b17d..4016e43c3d 100644 --- a/templates/de/html/select/select_admins_box.tpl +++ b/templates/de/html/select/select_admins_box.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodGet=modules.php%}
@@ -17,5 +17,5 @@
- +{%form_close%}
diff --git a/templates/de/html/select/select_network_box.tpl b/templates/de/html/select/select_network_box.tpl index 7ac4659829..d38523b2ab 100644 --- a/templates/de/html/select/select_network_box.tpl +++ b/templates/de/html/select/select_network_box.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodGet=modules.php%}
@@ -15,5 +15,5 @@
- +{%form_close%}
diff --git a/templates/de/html/select/select_network_type_box.tpl b/templates/de/html/select/select_network_type_box.tpl index 1584919223..48fa59ff47 100644 --- a/templates/de/html/select/select_network_type_box.tpl +++ b/templates/de/html/select/select_network_type_box.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodGet=modules.php%} @@ -24,5 +24,5 @@
- +{%form_close%}
diff --git a/templates/de/html/select/select_network_type_title_box.tpl b/templates/de/html/select/select_network_type_title_box.tpl index 4b3607fe7c..4601b49f5c 100644 --- a/templates/de/html/select/select_network_type_title_box.tpl +++ b/templates/de/html/select/select_network_type_title_box.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodGet=modules.php%}
@@ -17,5 +17,5 @@
- +{%form_close%}
diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl index a0096784de..2dfe5a41fd 100644 --- a/templates/de/html/sponsor/sponsor_account_form.tpl +++ b/templates/de/html/sponsor/sponsor_account_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=sponsor&what=account%}
@@ -168,5 +168,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/sponsor/sponsor_fillup_form.tpl b/templates/de/html/sponsor/sponsor_fillup_form.tpl index 4cf3e8011e..54a4089cfc 100644 --- a/templates/de/html/sponsor/sponsor_fillup_form.tpl +++ b/templates/de/html/sponsor/sponsor_fillup_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=sponsor&what=fillup%}
@@ -37,5 +37,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl index 942a132d2f..65d0448fcd 100644 --- a/templates/de/html/sponsor/sponsor_settings_form.tpl +++ b/templates/de/html/sponsor/sponsor_settings_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=modules.php?module=sponsor&what=settings%}
@@ -48,5 +48,5 @@
-
+{%form_close%}
diff --git a/templates/de/html/surfbar/surfbar_login_form.tpl b/templates/de/html/surfbar/surfbar_login_form.tpl index 84b3d429cf..f41e48144a 100644 --- a/templates/de/html/surfbar/surfbar_login_form.tpl +++ b/templates/de/html/surfbar/surfbar_login_form.tpl @@ -1,5 +1,5 @@
-
+{%form,formMethodPost=surfbar.php%} -
+{%form_close%}
diff --git a/templates/de/html/theme/theme_select_form.tpl b/templates/de/html/theme/theme_select_form.tpl index 9ea296866c..1aade2b6fb 100644 --- a/templates/de/html/theme/theme_select_form.tpl +++ b/templates/de/html/theme/theme_select_form.tpl @@ -1,7 +1,7 @@ -
- $content[selection]
-
+{%form_close%} diff --git a/templates/xml/admin/admin_delete_show_forced_ads.xml b/templates/xml/admin/admin_delete_show_forced_ads.xml index 10e14323d2..568fa708fe 100644 --- a/templates/xml/admin/admin_delete_show_forced_ads.xml +++ b/templates/xml/admin/admin_delete_show_forced_ads.xml @@ -107,4 +107,8 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + diff --git a/templates/xml/admin/admin_delete_show_forced_costs.xml b/templates/xml/admin/admin_delete_show_forced_costs.xml index 697202262e..459c4590d4 100644 --- a/templates/xml/admin/admin_delete_show_forced_costs.xml +++ b/templates/xml/admin/admin_delete_show_forced_costs.xml @@ -86,4 +86,8 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + diff --git a/templates/xml/admin/admin_delete_show_surfbar_urls.xml b/templates/xml/admin/admin_delete_show_surfbar_urls.xml index 343f69db20..6920634055 100644 --- a/templates/xml/admin/admin_delete_show_surfbar_urls.xml +++ b/templates/xml/admin/admin_delete_show_surfbar_urls.xml @@ -100,4 +100,8 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + diff --git a/templates/xml/admin/admin_delete_show_user_subid.xml b/templates/xml/admin/admin_delete_show_user_subid.xml index a1002eacba..f5862fed30 100644 --- a/templates/xml/admin/admin_delete_show_user_subid.xml +++ b/templates/xml/admin/admin_delete_show_user_subid.xml @@ -35,7 +35,6 @@ MA 02110-1301 USA //--> @@ -45,7 +44,7 @@ MA 02110-1301 USA //--> - + - + - - - - - - - - + + diff --git a/templates/xml/admin/admin_edit_show_forced_ads.xml b/templates/xml/admin/admin_edit_show_forced_ads.xml index fb2348733f..ccc0fa91c1 100644 --- a/templates/xml/admin/admin_edit_show_forced_ads.xml +++ b/templates/xml/admin/admin_edit_show_forced_ads.xml @@ -135,4 +135,8 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + diff --git a/templates/xml/admin/admin_edit_show_forced_campaigns.xml b/templates/xml/admin/admin_edit_show_forced_campaigns.xml index bf6050ed36..8919714ad2 100644 --- a/templates/xml/admin/admin_edit_show_forced_campaigns.xml +++ b/templates/xml/admin/admin_edit_show_forced_campaigns.xml @@ -150,4 +150,8 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + diff --git a/templates/xml/admin/admin_edit_show_forced_costs.xml b/templates/xml/admin/admin_edit_show_forced_costs.xml index e30c47560b..a885c3ef3b 100644 --- a/templates/xml/admin/admin_edit_show_forced_costs.xml +++ b/templates/xml/admin/admin_edit_show_forced_costs.xml @@ -81,4 +81,18 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + + + + + diff --git a/templates/xml/admin/admin_edit_show_point_accounts.xml b/templates/xml/admin/admin_edit_show_point_accounts.xml index 6e08bea5b8..fc41ba7faa 100644 --- a/templates/xml/admin/admin_edit_show_point_accounts.xml +++ b/templates/xml/admin/admin_edit_show_point_accounts.xml @@ -92,4 +92,8 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + diff --git a/templates/xml/admin/admin_edit_show_surfbar_actions.xml b/templates/xml/admin/admin_edit_show_surfbar_actions.xml index c5c61a7245..a3777bbe2d 100644 --- a/templates/xml/admin/admin_edit_show_surfbar_actions.xml +++ b/templates/xml/admin/admin_edit_show_surfbar_actions.xml @@ -89,4 +89,8 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + diff --git a/templates/xml/admin/admin_edit_show_surfbar_urls.xml b/templates/xml/admin/admin_edit_show_surfbar_urls.xml index 99700ecb50..466d00bf80 100644 --- a/templates/xml/admin/admin_edit_show_surfbar_urls.xml +++ b/templates/xml/admin/admin_edit_show_surfbar_urls.xml @@ -163,4 +163,8 @@ MA 02110-1301 USA This' type can again only be 'string' (remember why?). //--> + + diff --git a/templates/xml/admin/admin_edit_show_user_subid.xml b/templates/xml/admin/admin_edit_show_user_subid.xml index b2386d9a2f..faecde36b9 100644 --- a/templates/xml/admin/admin_edit_show_user_subid.xml +++ b/templates/xml/admin/admin_edit_show_user_subid.xml @@ -43,7 +43,7 @@ MA 02110-1301 USA numerical column names? //--> - + - + - - - - - - - + + diff --git a/templates/xml/admin/admin_list_booking.xml b/templates/xml/admin/admin_list_booking.xml index f4fb7b70b0..f4b00bea79 100644 --- a/templates/xml/admin/admin_list_booking.xml +++ b/templates/xml/admin/admin_list_booking.xml @@ -121,4 +121,8 @@ MA 02110-1301 USA + + diff --git a/templates/xml/admin/admin_list_user_subid.xml b/templates/xml/admin/admin_list_user_subid.xml index 7f9a24fef5..25f69552cc 100644 --- a/templates/xml/admin/admin_list_user_subid.xml +++ b/templates/xml/admin/admin_list_user_subid.xml @@ -117,4 +117,8 @@ MA 02110-1301 USA + + diff --git a/templates/xml/member/member_delete_show_user_subid.xml b/templates/xml/member/member_delete_show_user_subid.xml index d38e9953ac..506630b915 100644 --- a/templates/xml/member/member_delete_show_user_subid.xml +++ b/templates/xml/member/member_delete_show_user_subid.xml @@ -44,7 +44,7 @@ MA 02110-1301 USA //--> - + - + - + diff --git a/theme/business/css/general.css b/theme/business/css/general.css index ef6be1c750..62c550a01c 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -39,6 +39,19 @@ A:hover { background-color: transparent; } +form { + margin: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; + padding-left: 0px; + padding-right: 0px; + padding-top: 0px; + padding-bottom: 0px; +} + input, textarea, select, option { color: #000000; border: 1px solid #000000; diff --git a/theme/default/css/general.css b/theme/default/css/general.css index eefbb6a7d5..301efebc3f 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -40,6 +40,19 @@ A:hover { background-color: transparent; } +form { + margin: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; + padding-left: 0px; + padding-right: 0px; + padding-top: 0px; + padding-bottom: 0px; +} + input, textarea { color: #009900; background-color: #eeffee; diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index d5b4ad858d..8c4b02dd96 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -39,6 +39,19 @@ A:hover { background-color: transparent; } +form { + margin: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; + padding-left: 0px; + padding-right: 0px; + padding-top: 0px; + padding-bottom: 0px; +} + input, textarea, select, option { color: #880000; background-color: #eeeebb; diff --git a/theme/org/css/general.css b/theme/org/css/general.css index d3bf0e0d31..9c72b416b7 100644 --- a/theme/org/css/general.css +++ b/theme/org/css/general.css @@ -40,6 +40,19 @@ A:hover { background-color: transparent; } +form { + margin: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; + padding-left: 0px; + padding-right: 0px; + padding-top: 0px; + padding-bottom: 0px; +} + input, textarea, select, option { color: #2e51a9; background-color: #eeffee; diff --git a/theme/schleuder/css/general.css b/theme/schleuder/css/general.css index d5d27ecb1a..65e973e4fc 100644 --- a/theme/schleuder/css/general.css +++ b/theme/schleuder/css/general.css @@ -42,6 +42,19 @@ A:hover { background-color : transparent; } +form { + margin: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; + padding-left: 0px; + padding-right: 0px; + padding-top: 0px; + padding-bottom: 0px; +} + input, textarea, select, option { color : #ffffff; background-color : #0571cc; diff --git a/theme/ship-simu/css/general.css b/theme/ship-simu/css/general.css index c41b1729dc..88980acd9b 100644 --- a/theme/ship-simu/css/general.css +++ b/theme/ship-simu/css/general.css @@ -41,6 +41,19 @@ A:hover { background-color : transparent; } +form { + margin: 0px; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; + padding-left: 0px; + padding-right: 0px; + padding-top: 0px; + padding-bottom: 0px; +} + input, textarea, select, option { color : #000000; background-color : #FFFFFF;