Template renamed

diff --git a/.gitattributes b/.gitattributes
index 3caa6fe523303d35b6ba345f394307cb6006d4d4..d08344b75d29e99e0915532f1395379b23509b78 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1140,6 +1140,7 @@ templates/de/html/admin/admin_form_selection_box.tpl -text svneol=unset#text/pla
 templates/de/html/admin/admin_guest_menu_status.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_header.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme.tpl -text svneol=unset#text/plain
+templates/de/html/admin/admin_import_theme_form.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_import_theme_none.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme_row.tpl -text svneol=unset#text/plain
 templates/de/html/admin/admin_list_admins.tpl -text svneol=unset#text/plain

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 5a0aaaeae25b0f2b154869d7538e7652bc99adbf..3135e5d234d77025913f78ad874dc6419c7a9312 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -42,17 +42,17 @@
 ./inc/extensions-functions.php:434:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:564:            // @TODO Extension is loaded, what next?
 ./inc/functions.php:110:               // @TODO Extension 'msg' does not exist
-./inc/functions.php:1495:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:1583:                      // @TODO Are these convertions still required?
-./inc/functions.php:1601:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:1501:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:1589:                      // @TODO Are these convertions still required?
+./inc/functions.php:1607:// @TODO Rewrite this function to use readFromFile() and writeToFile()
 ./inc/functions.php:179:// @TODO Rewrite this to an extension 'smtp'
-./inc/functions.php:2259:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2265:      // @TODO This is still very static, rewrite it somehow
 ./inc/gen_sql_patches.php:94:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1087:// @TODO Rewrite these two constants
-./inc/language/de.php:1102:// @TODO Rewrite these three constants
+./inc/language/de.php:1089:// @TODO Rewrite these two constants
+./inc/language/de.php:1104:// @TODO Rewrite these three constants
 ./inc/language/de.php:286:     // @TODO Following two are unused?
-./inc/language/de.php:787:// @TODO Are these constants longer used?
+./inc/language/de.php:789:// @TODO Are these constants longer used?
 ./inc/language-functions.php:232:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function.
 ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *
@@ -92,8 +92,8 @@
 ./inc/libs/yoomedia_functions.php:114: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
 ./inc/load_config.php:75:      // @TODO Rewrite them to avoid this else block
 ./inc/loader/load_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php           *
-./inc/module-functions.php:201:                        // @TODO Nothing helped???
-./inc/module-functions.php:236:                        // @TODO Rewrite this to a filter
+./inc/module-functions.php:225:                        // @TODO Nothing helped???
+./inc/module-functions.php:266:                        // @TODO Rewrite this to a filter
 ./inc/modules/admin/admin-inc.php:262:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/admin/admin-inc.php:267:                         // @TODO ACL is 'allow'... hmmm
 ./inc/modules/admin/admin-inc.php:333:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
@@ -186,16 +186,16 @@
 ./inc/reset/reset_beg.php:49:// @TODO This should be converted in a daily beg rallye
 ./inc/reset/reset_birthday.php:89:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/revision-functions.php:169:// @TODO This function does also set and get in 'cache_array'
-./inc/template-functions.php:1047:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1058:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1145:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1178:             // @TODO Add a little more infos here
-./inc/template-functions.php:1466:// @TODO Lame description for this function
-./inc/template-functions.php:1485:                     // @TODO Move this in a filter
+./inc/template-functions.php:1046:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1057:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1144:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1177:             // @TODO Add a little more infos here
+./inc/template-functions.php:1465:// @TODO Lame description for this function
+./inc/template-functions.php:1484:                     // @TODO Move this in a filter
 ./inc/template-functions.php:187:       * @TODO On some pages this is buggy
 ./inc/template-functions.php:263:      // @TODO Remove this sanity-check if all is fine
-./inc/template-functions.php:577:// @TODO $simple/$constants are deprecated
-./inc/template-functions.php:604:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/template-functions.php:576:// @TODO $simple/$constants are deprecated
+./inc/template-functions.php:603:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
 ./inc/wrapper-functions.php:130:// @TODO Implement $compress
 ./inc/wrapper-functions.php:137:// @TODO Implement $decompress
 ./inc/wrapper-functions.php:452:// @TODO Do some more sanity check here
@@ -266,10 +266,13 @@
 ./templates/de/html/admin/admin_mods_edit.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_theme_edit_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_theme_edit.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_theme_import_form.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_theme_import_none.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_theme_import_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_theme_import.tpl:1:<!-- @DEPRECATED //-->
 ### ### template-warnings.log follows: ### ###
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/sponsor/sponsor_settings_form.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/sponsor/sponsor_settings_form.tpl, line: 16 in 
 Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_uberwach.tpl.
@@ -278,24 +281,178 @@ Warning: Not parsing JavaScript templates/de/html/js/js_jquery.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_book.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_stopped.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_edit.tpl.
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/mailid/mailid_timer.tpl, line: 31 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/guest/guest_register.tpl, line: 122 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/guest/guest_register.tpl, line: 123 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_doubler.tpl, line: 52 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/guest/guest_sponsor_payment_row.tpl, line: 3 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_transfer_settings.tpl, line: 8 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_transfer_settings.tpl, line: 9 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_cats_footer.tpl, line: 7 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/member/member_cats_footer.tpl, line: 8 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_cats_footer.tpl, line: 9 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_html_mail_settings.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_html_mail_settings.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_themes_row.tpl, line: 3 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_cat_row.tpl, line: 4 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_cat_row.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_order-html_intro.tpl, line: 9 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_order-html_intro.tpl, line: 13 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_payout_form.tpl, line: 31 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_payout_form.tpl, line: 37 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 16 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 22 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 28 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 34 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 16 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 20 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 24 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 28 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 32 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 17 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 23 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 29 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 44 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 50 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 56 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_email_row.tpl, line: 4 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_point_settings.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_point_settings.tpl, line: 18 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_point_settings.tpl, line: 25 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_point_settings.tpl, line: 28 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_primera.tpl, line: 12 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_wernis.tpl, line: 54 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_wernis.tpl, line: 62 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Attribute align redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_logout_sql_patches_remove.tpl, line: 10 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_rewrite_rows.tpl, line: 5 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_rewrite_rows.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 62 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 65 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 78 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 79 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 87 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 88 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 104 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 105 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 131 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 132 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 140 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 141 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 149 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 150 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_order.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_order.tpl, line: 22 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 23 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 24 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 32 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 33 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 41 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 42 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 62 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 63 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 71 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 72 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 80 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 81 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 89 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 90 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_extensions.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_extensions.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_admins_contct_select.tpl, line: 8 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_admins_contct_select.tpl, line: 11 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_sub_points_all.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_login_form.tpl, line: 17 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_login_form.tpl, line: 29 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_add_points_all.tpl, line: 12 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_nickname.tpl, line: 12 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_nickname.tpl, line: 18 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_nickname.tpl, line: 24 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_refbanner_row.tpl, line: 5 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_refbanner_row.tpl, line: 11 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_transfer.tpl, line: 12 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_transfer.tpl, line: 26 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_transfer.tpl, line: 36 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 68 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 69 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 77 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 78 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 86 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 87 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 121 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 124 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_validator.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_validator.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 23 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 24 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 32 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 33 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 41 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 42 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 50 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 51 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 59 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 60 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 68 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 69 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 186 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 187 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 195 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 196 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 204 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 205 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_admins_row.tpl, line: 4 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_admins_row.tpl, line: 7 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_add_sponsor_paytype.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_add_sponsor_paytype.tpl, line: 19 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_add_sponsor_paytype.tpl, line: 23 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_email_edit_row.tpl, line: 10 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_email_edit_row.tpl, line: 16 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter_nohtml.tpl, line: 22 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter_nohtml.tpl, line: 26 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_stats.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_stats.tpl, line: 22 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_stats.tpl, line: 30 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_stats.tpl, line: 41 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_payments_row.tpl, line: 9 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_payments_row.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_payments_row.tpl, line: 21 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_payments_row.tpl, line: 28 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_cats_row.tpl, line: 9 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_cats_row.tpl, line: 19 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter.tpl, line: 22 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter.tpl, line: 28 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter.tpl, line: 41 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter.tpl, line: 45 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_admin.tpl, line: 14 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_admin.tpl, line: 20 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_user.tpl, line: 12 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_user.tpl, line: 18 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 12 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_main_footer.tpl, line: 13 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 15 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 22 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 23 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 33 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 37 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_holiday.tpl, line: 12 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_holiday.tpl, line: 23 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_holiday.tpl, line: 25 in 

diff --git a/inc/filters.php b/inc/filters.php
index c15b92abab30287b2a99651b7c552de38b3f0d4d..aece47961aae64b77d8563e3f4fe531bb8f7a88a 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -521,7 +521,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
                                $code = call_user_func($commandFunction, $data);
                        } else {
                                // Unsupported command detected
-                               logDebugMessage(__FUNCTION__, __LINE__, 'Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
+                               logDebugMessage(__FUNCTION__, __LINE__, 'Command cmd=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
                        }
                } // END - foreach
        } // END - if

diff --git a/inc/module-functions.php b/inc/module-functions.php
index a4f03277eeb90ff8cd0857d7450d7cf800d939e9..a5659b906fac960cbb662fe2721a208ea89c0ebf 100644 (file)
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -223,9 +223,10 @@ function checkModulePermissions ($module = '') {
                        setModuleStatus($module_chk, 'admin_only');
                } else {
                        // @TODO Nothing helped???
-                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
+                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,hidden=%s,admin=%s,mem=%s",
                                getModuleStatus($module_chk),
                                $GLOBALS['cache_array']['modules']['locked'][$module_chk],
+                               $GLOBALS['cache_array']['modules']['hidden'][$module_chk],
                                $GLOBALS['cache_array']['modules']['admin_only'][$module_chk],
                                $GLOBALS['cache_array']['modules']['mem_only'][$module_chk]
                        ));

diff --git a/templates/de/html/admin/admin_import_theme_form.tpl b/templates/de/html/admin/admin_import_theme_form.tpl
new file mode 100644 (file)
index 0000000..f6b2248
--- /dev/null
+++ b/templates/de/html/admin/admin_import_theme_form.tpl
@@ -0,0 +1,4 @@
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=theme_import%}" method="post">
+       <input type="hidden" name="theme" value="$content" />
+       <input type="submit" class="form_submit" name="ok" value="{--ADMIN_INSTALL_THEME--}" />
+</form>

diff --git a/templates/de/html/admin/admin_theme_import_form.tpl b/templates/de/html/admin/admin_theme_import_form.tpl
index f6b22488ef68dd8d0eb837e6fa8309bf3c843163..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/admin/admin_theme_import_form.tpl
+++ b/templates/de/html/admin/admin_theme_import_form.tpl
@@ -1,4 +1 @@
-<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=theme_import%}" method="post">
-       <input type="hidden" name="theme" value="$content" />
-       <input type="submit" class="form_submit" name="ok" value="{--ADMIN_INSTALL_THEME--}" />
-</form>
+<!-- @DEPRECATED //-->