From 9afd6ec5878544a7982c50ed9c0dd7de37606d5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 5 Nov 2009 15:18:54 +0000 Subject: [PATCH] Huge rewrite of default parameters, ext-network continued: - All default parameters with default value zero are now char zero and not number. This prevented a bug in several queries and bigintval(). :( - Extension ext-network continued but still unfinished - TODOs.txt updated --- .gitattributes | 9 +- DOCS/TODOs.txt | 75 +++---- beg.php | 6 +- debug.php | 2 +- doubler.php | 5 +- inc/autopurge/purge-general.php | 8 +- inc/autopurge/purge-mails.php | 2 +- inc/classes/rdf.class.php | 22 +- inc/config-functions.php | 7 +- inc/db/lib-mysql3.php | 12 +- inc/extensions-functions.php | 22 +- inc/extensions/ext-bonus.php | 2 +- inc/extensions/ext-network.php | 7 +- inc/extensions/ext-rallye.php | 1 + inc/filter-functions.php | 4 +- inc/filters.php | 12 +- inc/functions.php | 103 +++++---- inc/gen_mediadata.php | 10 +- inc/header.php | 2 +- inc/install-inc.php | 4 +- inc/language-functions.php | 2 +- inc/libs/_functions.php | 45 ++++ inc/libs/admins_functions.php | 8 +- inc/libs/bonus_functions.php | 4 +- inc/libs/doubler_functions.php | 8 +- inc/libs/html_mail_functions.php | 2 +- inc/libs/jackpot_functions.php | 2 +- inc/libs/mediadata_functions.php | 2 +- inc/libs/network_functions.php | 200 ++++++++++++++++++ inc/libs/newsletter_functions.php | 2 +- inc/libs/online_functions.php | 2 +- inc/libs/optimize_functions.php | 8 +- inc/libs/primera_functions.php | 2 +- inc/libs/rallye_functions.php | 38 ++-- inc/libs/refback_functions.php | 16 +- inc/libs/removeip_functions.php | 2 +- inc/libs/sponsor_functions.php | 2 +- inc/libs/surfbar_functions.php | 58 ++--- inc/libs/task_functions.php | 4 +- inc/libs/user_functions.php | 4 +- inc/libs/yoomedia_functions.php | 12 +- inc/mails/doubler_mails.php | 10 +- inc/modules/admin/admin-inc.php | 12 +- inc/modules/admin/overview-inc.php | 6 +- inc/modules/admin/what-add_rallye.php | 2 +- inc/modules/admin/what-adminedit.php | 10 +- inc/modules/admin/what-admins_mails.php | 4 +- inc/modules/admin/what-config_admins.php | 4 +- inc/modules/admin/what-config_bonus.php | 2 +- inc/modules/admin/what-config_cats.php | 2 +- inc/modules/admin/what-config_email.php | 2 +- inc/modules/admin/what-config_mods.php | 4 +- inc/modules/admin/what-config_other.php | 2 +- inc/modules/admin/what-config_payouts.php | 2 +- inc/modules/admin/what-config_points.php | 4 +- .../admin/what-config_rallye_prices.php | 2 +- inc/modules/admin/what-config_secure.php | 2 +- inc/modules/admin/what-config_yoomedia.php | 2 +- inc/modules/admin/what-del_email.php | 8 +- inc/modules/admin/what-del_holiday.php | 4 +- inc/modules/admin/what-del_transfer.php | 2 +- inc/modules/admin/what-email_details.php | 4 +- inc/modules/admin/what-extensions.php | 12 +- inc/modules/admin/what-guestedit.php | 12 +- inc/modules/admin/what-list_beg.php | 4 +- inc/modules/admin/what-list_bonus.php | 4 +- inc/modules/admin/what-list_country.php | 2 +- inc/modules/admin/what-list_doubler.php | 4 +- inc/modules/admin/what-list_payouts.php | 6 +- inc/modules/admin/what-list_rallyes.php | 6 +- inc/modules/admin/what-list_sponsor.php | 2 +- inc/modules/admin/what-list_sponsor_pay.php | 6 +- inc/modules/admin/what-list_surfbar_urls.php | 2 +- inc/modules/admin/what-list_task.php | 2 +- inc/modules/admin/what-list_transfer.php | 2 +- inc/modules/admin/what-list_unconfirmed.php | 2 +- inc/modules/admin/what-list_user.php | 8 +- inc/modules/admin/what-list_yoomedia_tm.php | 6 +- inc/modules/admin/what-memedit.php | 12 +- inc/modules/admin/what-optimize.php | 4 +- inc/modules/admin/what-refbanner.php | 4 +- inc/modules/admin/what-repair_amnu.php | 2 +- inc/modules/admin/what-repair_cats.php | 2 +- inc/modules/admin/what-repair_gmnu.php | 2 +- inc/modules/admin/what-repair_mmnu.php | 2 +- inc/modules/admin/what-surfbar_stats.php | 4 +- inc/modules/admin/what-theme_check.php | 4 +- inc/modules/admin/what-theme_edit.php | 2 +- inc/modules/admin/what-unlock_emails.php | 4 +- inc/modules/admin/what-updates.php | 2 +- inc/modules/guest/action-themes.php | 2 +- inc/modules/guest/what-confirm.php | 4 +- inc/modules/guest/what-login.php | 6 +- inc/modules/guest/what-mediadata.php | 42 ++-- inc/modules/guest/what-register.php | 8 +- inc/modules/guest/what-sponsor_reg.php | 2 +- inc/modules/guest/what-stats.php | 2 +- inc/modules/member/action- | 2 +- inc/modules/member/action-account.php | 2 +- inc/modules/member/action-bank.php | 2 +- inc/modules/member/action-extras.php | 2 +- inc/modules/member/action-logout.php | 2 +- inc/modules/member/action-main.php | 2 +- inc/modules/member/action-order.php | 2 +- inc/modules/member/action-rals.php | 2 +- inc/modules/member/action-stats.php | 2 +- inc/modules/member/action-surfbar.php | 2 +- inc/modules/member/action-themes.php | 2 +- inc/modules/member/what-categories.php | 6 +- inc/modules/member/what-holiday.php | 4 +- inc/modules/member/what-mydata.php | 4 +- inc/modules/member/what-nickname.php | 2 +- inc/modules/member/what-order.php | 22 +- inc/modules/member/what-payout.php | 6 +- inc/modules/member/what-points.php | 8 +- inc/modules/member/what-primera.php | 2 +- inc/modules/member/what-refback.php | 4 +- inc/modules/member/what-reflinks.php | 2 +- inc/modules/member/what-reflist.php | 2 +- inc/modules/member/what-transfer.php | 4 +- inc/modules/member/what-unconfirmed.php | 2 +- inc/modules/member/what-wernis.php | 2 +- inc/mysql-connect.php | 2 +- inc/mysql-manager.php | 62 +++--- inc/phpmailer/class.phpmailer.php | 48 ++--- inc/phpmailer/class.pop3.php | 4 +- inc/phpmailer/class.smtp.php | 6 +- inc/phpmailer/test/phpmailer_test.php | 8 +- inc/phpmailer/test/phpunit.php | 8 +- inc/pool/pool-bonus.php | 4 +- inc/pool/pool-user.php | 8 +- inc/reset/reset_birthday.php | 2 +- inc/reset/reset_profile.php | 4 +- inc/sql-functions.php | 2 +- inc/stats-functions.php | 2 +- inc/stylesheet.php | 2 +- inc/wrapper-functions.php | 8 +- index.php | 4 +- install.php | 2 +- lead-confirm.php | 4 +- mailid.php | 12 +- mailid_top.php | 18 +- modules.php | 10 +- show_bonus.php | 2 +- surfbar.php | 4 +- .../de/emails/admins_mail_contct_admin.tpl | 1 - .../de/emails/admins_msg_contct_admin.tpl | 1 - templates/de/html/admin/admin_add_network.tpl | 90 ++++++++ templates/de/html/admin/admin_config_beg.tpl | 2 +- .../de/html/admin/admin_edit_networks_row.tpl | 37 ++++ .../de/html/admin/admin_list_networks.tpl | 34 +++ .../de/html/admin/admin_list_networks_row.tpl | 28 +++ .../de/html/admin/admin_network_added.tpl | 13 ++ theme/default/css/general.css | 38 ++-- theme/default/css/register.css | 10 +- 155 files changed, 1021 insertions(+), 569 deletions(-) create mode 100644 inc/libs/_functions.php create mode 100644 inc/libs/network_functions.php delete mode 100644 templates/de/emails/admins_mail_contct_admin.tpl delete mode 100644 templates/de/emails/admins_msg_contct_admin.tpl create mode 100644 templates/de/html/admin/admin_add_network.tpl create mode 100644 templates/de/html/admin/admin_edit_networks_row.tpl create mode 100644 templates/de/html/admin/admin_list_networks.tpl create mode 100644 templates/de/html/admin/admin_list_networks_row.tpl create mode 100644 templates/de/html/admin/admin_network_added.tpl diff --git a/.gitattributes b/.gitattributes index 3113150ad2..d43918ba66 100644 --- a/.gitattributes +++ b/.gitattributes @@ -255,6 +255,7 @@ inc/language/user_de.php -text inc/language/wernis_de.php -text inc/language/yoomedia_de.php -text inc/libs/.htaccess -text +inc/libs/_functions.php -text inc/libs/active_functions.php -text inc/libs/admins_functions.php -text inc/libs/autopurge_functions.php -text @@ -270,6 +271,7 @@ inc/libs/holiday_functions.php -text inc/libs/html_mail_functions.php -text inc/libs/jackpot_functions.php -text inc/libs/mediadata_functions.php -text +inc/libs/network_functions.php -text inc/libs/newsletter_functions.php -text inc/libs/nickname_functions.php -text inc/libs/online_functions.php -text @@ -750,8 +752,6 @@ templates/de/emails/admin/admin_wernis_request.tpl -text templates/de/emails/admins/.htaccess -text templates/de/emails/admins/admins_mail_contct_admin.tpl -text templates/de/emails/admins/admins_msg_contct_admin.tpl -text -templates/de/emails/admins_mail_contct_admin.tpl -text -templates/de/emails/admins_msg_contct_admin.tpl -text templates/de/emails/back-admin.tpl -text templates/de/emails/back-member.tpl -text templates/de/emails/beg/.htaccess -text @@ -869,6 +869,7 @@ templates/de/html/admin/admin_add_banner.tpl -text templates/de/html/admin/admin_add_cat.tpl -text templates/de/html/admin/admin_add_country.tpl -text templates/de/html/admin/admin_add_max.tpl -text +templates/de/html/admin/admin_add_network.tpl -text templates/de/html/admin/admin_add_payment.tpl -text templates/de/html/admin/admin_add_points.tpl -text templates/de/html/admin/admin_add_points_all.tpl -text @@ -991,6 +992,7 @@ templates/de/html/admin/admin_edit_cats_row.tpl -text templates/de/html/admin/admin_edit_email.tpl -text templates/de/html/admin/admin_edit_email_row.tpl -text templates/de/html/admin/admin_edit_email_select.tpl -text +templates/de/html/admin/admin_edit_networks_row.tpl -text templates/de/html/admin/admin_edit_payments.tpl -text templates/de/html/admin/admin_edit_payments_row.tpl -text templates/de/html/admin/admin_edit_rallyes.tpl -text @@ -1063,6 +1065,8 @@ templates/de/html/admin/admin_list_links_problem.tpl -text templates/de/html/admin/admin_list_links_row.tpl -text templates/de/html/admin/admin_list_mods.tpl -text templates/de/html/admin/admin_list_mods_row.tpl -text +templates/de/html/admin/admin_list_networks.tpl -text +templates/de/html/admin/admin_list_networks_row.tpl -text templates/de/html/admin/admin_list_notify_emails.tpl -text templates/de/html/admin/admin_list_notify_emails_row.tpl -text templates/de/html/admin/admin_list_online.tpl -text @@ -1157,6 +1161,7 @@ templates/de/html/admin/admin_mods_stats.tpl -text templates/de/html/admin/admin_mods_stats2.tpl -text templates/de/html/admin/admin_mods_stats2_row.tpl -text templates/de/html/admin/admin_mods_stats_row.tpl -text +templates/de/html/admin/admin_network_added.tpl -text templates/de/html/admin/admin_newsletter.tpl -text templates/de/html/admin/admin_newsletter_nohtml.tpl -text templates/de/html/admin/admin_next_link.tpl -text diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index fad06a682d..e6c7cde386 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -8,34 +8,35 @@ ./inc/extensions/ext-html_mail.php:137: // @TODO Move these arrays into config ./inc/extensions/ext-network.php:71: // @TODO network_type_name is an internal name and needs documentation ./inc/extensions/ext-newsletter.php:215: // @TODO Move these into configuration -./inc/extensions/ext-rallye.php:329: // @TODO Move this code into rallye_functions.php +./inc/extensions/ext-rallye.php:330: // @TODO Move this code into rallye_functions.php +./inc/extensions/ext-rallye.php:93: // @TODO Fix config_rallye_prices to list_rallye_prices ./inc/extensions/ext-sql_patches.php:741: // @TODO Rewrite this to a filter ./inc/extensions/ext-sql_patches.php:94: /* @TODO SQL_ALTER_TABLE() should work now properly ./inc/extensions/ext-yoomedia.php:122: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:55:// @TODO Only deprecated when 'network' is ready! setExtensionDeprecated('Y'); ./inc/extensions-functions.php:376:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:489: // @TODO Extension is loaded, what next? -./inc/functions.php:1308: // @TODO Remove this if() block if all is working fine -./inc/functions.php:222: // @TODO Remove this sanity-check if all is fine -./inc/functions.php:225: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2328:// @TODO Try to move this to inc/libs/theme_functions.php -./inc/functions.php:2499:// @TODO Please describe this function -./inc/functions.php:2517: searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); -./inc/functions.php:2613: // @TODO Add a little more infos here -./inc/functions.php:2624: // @TODO This cannot be rewritten to app_die(), try to find a solution for this. -./inc/functions.php:2706: // @TODO Rewrite this old lost code to a template -./inc/functions.php:2825: // @TODO Are these convertions still required? -./inc/functions.php:2843:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:225: // @TODO Remove this sanity-check if all is fine +./inc/functions.php:228: // @TODO Try to rewrite all $DATA to $content +./inc/functions.php:2352:// @TODO Try to move this to inc/libs/theme_functions.php +./inc/functions.php:2523:// @TODO Please describe this function +./inc/functions.php:2541: searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); +./inc/functions.php:2637: // @TODO Add a little more infos here +./inc/functions.php:2648: // @TODO This cannot be rewritten to app_die(), try to find a solution for this. +./inc/functions.php:2730: // @TODO Rewrite this old lost code to a template +./inc/functions.php:2819: // @TODO Are these convertions still required? +./inc/functions.php:2837:// @TODO Rewrite this function to use readFromFile() and writeToFile() ./inc/functions.php:546: // @TODO Extension 'msg' does not exist ./inc/functions.php:615:// @TODO Rewrite this to an extension 'smtp' ./inc/install-functions.php:62: // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); -./inc/language/de.php:1140:// @TODO Rewrite these two constants -./inc/language/de.php:1156:// @TODO Rewrite these five constants -./inc/language/de.php:735:// @TODO The template 'admin_extensions_installed' is using this. But the template is no longer used. -./inc/language/de.php:843:// @TODO Are these constants longer used? +./inc/language/de.php:1141:// @TODO Rewrite these two constants +./inc/language/de.php:1157:// @TODO Rewrite these five constants +./inc/language/de.php:736:// @TODO The template 'admin_extensions_installed' is using this. But the template is no longer used. +./inc/language/de.php:844:// @TODO Are these constants longer used? ./inc/language-functions.php:45:// @TODO Rewrite all language constants to this function. ./inc/language/holiday_de.php:49:// @TODO Rewrite these two constants to one -./inc/language/rallye_de.php:110:// @TODO Rewrite following two lines to one +./inc/language/rallye_de.php:113:// @TODO Rewrite following two lines to one +./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings * ./inc/language/refback_de.php:45:// @TODO Rewrite these constants to one ./inc/language/sponsor_de.php:118:// @TODO Rewrite these four constants to one and use sprintf() ./inc/libs/admins_functions.php:418: // @TODO This can be, somehow, rewritten @@ -45,8 +46,8 @@ ./inc/libs/rallye_functions.php:699: $EXPIRE = 3; // @TODO The hard-coded value... ./inc/libs/rallye_functions.php:763: // @TODO Rewrite this to our API function ./inc/libs/refback_functions.php:60: // @TODO Try to rewrite the following unset() -./inc/libs/surfbar_functions.php:1501: // @TODO This can be somehow rewritten -./inc/libs/surfbar_functions.php:954: // @TODO Invalid salt should be refused +./inc/libs/surfbar_functions.php:1497: // @TODO This can be somehow rewritten +./inc/libs/surfbar_functions.php:950: // @TODO Invalid salt should be refused ./inc/libs/task_functions.php:244: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:52:// @TODO Move all extension-dependent queries into filters ./inc/libs/theme_functions.php:218:// @TODO Move this code block into a filter and register it with 'init' @@ -57,12 +58,12 @@ ./inc/libs/yoomedia_functions.php:64: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script ./inc/load_config.php:76: // @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/modules/admin/admin-inc.php:349: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/modules/admin/admin-inc.php:354: // @TODO ACL is 'allow'... hmmm -./inc/modules/admin/admin-inc.php:406: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/modules/admin/admin-inc.php:412: // @TODO ACL is 'allow'... hmmm -./inc/modules/admin/admin-inc.php:514:// @TODO Try to rewrite this to adminAddMenuSelectionBox() -./inc/modules/admin/admin-inc.php:527: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query +./inc/modules/admin/admin-inc.php:351: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/modules/admin/admin-inc.php:356: // @TODO ACL is 'allow'... hmmm +./inc/modules/admin/admin-inc.php:422: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/modules/admin/admin-inc.php:428: // @TODO ACL is 'allow'... hmmm +./inc/modules/admin/admin-inc.php:530:// @TODO Try to rewrite this to adminAddMenuSelectionBox() +./inc/modules/admin/admin-inc.php:543: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query ./inc/modules/admin/overview-inc.php:160: // @TODO Rewrite this to a filter ./inc/modules/admin/overview-inc.php:274: // @TODO Rewrite this to something with include files ./inc/modules/admin/overview-inc.php:312: // @TODO This may also be rewritten to include files @@ -81,8 +82,8 @@ ./inc/modules/admin/what-chk_regs.php:65: // @TODO Rewritings: surname->surname,family->family,ip->REMOTE_ADDR,ref->refid,hash->user_hash in template ./inc/modules/admin/what-config_admins.php:148: // @TODO Rewrite this to filter 'run_sqls' ./inc/modules/admin/what-config_mods.php:137: // @TODO Rewritings: mod->module in template -./inc/modules/admin/what-config_rallye_prices.php:202: // @TODO Rewritings: level->price_level, infos->info in template -./inc/modules/admin/what-config_rallye_prices.php:219: // @TODO Rewrite these two constants +./inc/modules/admin/what-config_rallye_prices.php:211: // @TODO Rewritings: level->price_level, infos->info in template +./inc/modules/admin/what-config_rallye_prices.php:228: // @TODO Rewrite these two constants ./inc/modules/admin/what-config_register.php:67: // @TODO Move this HTML code into a template ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country * ./inc/modules/admin/what-email_archiv.php:91: // @TODO Rewrite to SQL_FETCHARRAY() @@ -100,9 +101,8 @@ ./inc/modules/admin/what-list_links.php:56: // @TODO Try to rewrite this to a filter ./inc/modules/admin/what-list_links.php:88: // @TODO Find a way to rewrite this. See some lines above for different queries ./inc/modules/admin/what-list_links.php:97: // @TODO Rewrite this to includes/filter -./inc/modules/admin/what-list_payouts.php:118: // @TODO Do we need this time-consuming eval() here? -./inc/modules/admin/what-list_rallyes.php:250: // @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template -./inc/modules/admin/what-list_rallyes.php:303: // @TODO Rewritings: admin_id->admin_id in template +./inc/modules/admin/what-list_payouts.php:117: // @TODO Do we need this time-consuming eval() here? +./inc/modules/admin/what-list_rallyes.php:266: // @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template ./inc/modules/admin/what-list_sponsor.php:148: // @TODO Rewritings: surname->surname,family->family,ip->remote_addr in template ./inc/modules/admin/what-list_task.php:148: // @TODO Rewrite these templates to one and add $OUT ./inc/modules/admin/what-list_task.php:182: // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template @@ -160,20 +160,21 @@ ./inc/modules/member/what-unconfirmed.php:144: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() ./inc/modules/order.php:75: // @TODO Unused: 2,4 ./inc/monthly/monthly_bonus.php:68: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1655: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() -./inc/mysql-manager.php:1876: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/mysql-manager.php:2196: // @TODO This can be somehow rewritten +./inc/mysql-manager.php:1667: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() +./inc/mysql-manager.php:1888: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/mysql-manager.php:2208: // @TODO This can be somehow rewritten ./inc/mysql-manager.php:220: // @TODO Nothing helped??? +./inc/mysql-manager.php:2231:// @TODO Fix inconsistency between last_module and getWhat() ./inc/mysql-manager.php:255: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:576: // @TODO Try to rewrite this to one or more functions -./inc/mysql-manager.php:891:// @TODO Lame description for this function +./inc/mysql-manager.php:903:// @TODO Lame description for this function ./inc/mysql-manager.php:93:// @TODO Can we cache this? ./inc/reset/reset_birthday.php:92: // @TODO 4 is hard-coded here, should we move it out in config? ./inc/wrapper-functions.php:127:// @TODO Implement $compress ./inc/wrapper-functions.php:134:// @TODO Implement $decompress ./inc/wrapper-functions.php:402:// @TODO Do some more sanity check here -./mailid.php:131: // @TODO Rewrite this to a filter -./mailid.php:211: // @TODO Rewrite this to a dynamic include or so +./mailid.php:134: // @TODO Rewrite this to a filter +./mailid.php:214: // @TODO Rewrite this to a dynamic include or so ./mailid.php:94: // @TODO Rewrite this to a filter ./mailid_top.php:135: // @TODO Rewrite this to a filter ./mailid_top.php:182: // @TODO Rewrite this to a filter @@ -183,7 +184,7 @@ ./mailid_top.php:99: // @TODO Rewrite this to a filter ./view.php:72: // @TODO No banner found, output some default banner ### ### DEPRECATION FOLLOWS: ### ### -./inc/modules/admin/admin-inc.php:515:// @DEPRECATED +./inc/modules/admin/admin-inc.php:531:// @DEPRECATED ./templates/de/emails/admins_mail_contct_admin.tpl:1:@DEPRECATED ./templates/de/emails/admins_msg_contct_admin.tpl:1:@DEPRECATED ### ### template-warnings.log follows: ### ### diff --git a/beg.php b/beg.php index 59d3572d67..67e9855844 100644 --- a/beg.php +++ b/beg.php @@ -59,7 +59,7 @@ redirectOnUninstalledExtension('beg'); // Check for userid if (isGetRequestElementSet('userid')) { // Init variables - $points = 0; + $points = '0'; // Don't pay is the default... $pay = false; @@ -107,7 +107,7 @@ if (isGetRequestElementSet('userid')) { array(getUserData('userid'), detectRemoteAddr(), session_id()), __FILE__, __LINE__); // Entry not found, points set and not logged in? - if (((SQL_NUMROWS($result) == 0) || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) { + if (((SQL_NUMROWS($result) == '0') || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) { // Admin is testing? if (!isAdmin()) { @@ -185,7 +185,7 @@ if (isGetRequestElementSet('userid')) { } elseif ((getUserData('status') != 'CONFIRMED') && (getUserData('status') != 'failed')) { // Maybe locked/unconfirmed account? $errorCode = generateErrorCodeFromUserStatus(); - } elseif ((getUserData('userid') == 0) || (getUserData('status') == 'failed')) { + } elseif ((getUserData('userid') == '0') || (getUserData('status') == 'failed')) { // Inalid or locked account, so let's find out if (fetchUserData(getRequestElement('userid'), 'nickname')) { // Locked account diff --git a/debug.php b/debug.php index 6768e95cc0..8475924f9f 100644 --- a/debug.php +++ b/debug.php @@ -47,7 +47,7 @@ $GLOBALS['output_mode'] = -1; require('inc/config-global.php'); // Redirect only to registration page when this script is installed -if ((isExtensionActive('debug')) && (getTotalFatalErrors() == 0)) { +if ((isExtensionActive('debug')) && (getTotalFatalErrors() == '0')) { // Is the request parameter set? if (isPostRequestElementSet('request')) { // Handle the request diff --git a/doubler.php b/doubler.php index 4a97351b9b..abcc79b9f3 100644 --- a/doubler.php +++ b/doubler.php @@ -44,7 +44,7 @@ $GLOBALS['startTime'] = microtime(true); // Set module $GLOBALS['module'] = 'doubler'; -$GLOBALS['output_mode'] = 0; +$GLOBALS['output_mode'] = '0'; // Load the required file(s) require('inc/config-global.php'); @@ -55,9 +55,6 @@ setContentType('text/html'); // Is the 'doubler' extension active? redirectOnUninstalledExtension('doubler'); -// Only check this if refid is provided. This will do the rest for us -determineReferalId(); - // Init content array $content = array( 'message' => '', diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php index c9e9bcbea2..a175389d60 100644 --- a/inc/autopurge/purge-general.php +++ b/inc/autopurge/purge-general.php @@ -56,7 +56,7 @@ if ((getConfig('auto_purge_active') == 'Y') && (getConfig('auto_purge') > 0)) { $PURGE = getConfig('auto_purge'); // Init variables - $admin_points = 0; + $admin_points = '0'; // Then check for outdated mail order. We don't delete them just the confirmation links will be deleted. $result = SQL_QUERY_ESC("SELECT @@ -74,7 +74,7 @@ ORDER BY array(bigintval($PURGE)), __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { // Start deleting procedure - $userid = 0; $points = 0; + $userid = '0'; $points = '0'; while ($content = SQL_FETCHARRAY($result)) { // Check if confirmation links are purged or not $result_links = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s LIMIT 1", @@ -87,7 +87,7 @@ ORDER BY if (($userid != $content['userid']) && ($userid > 0) && ($points > 0)) { // Directly add points back to senders account addPointsAutoPurge($userid, $points); - $points = 0; + $points = '0'; } // END - if // Add points @@ -117,7 +117,7 @@ ORDER BY array(bigintval($PURGE)), __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { // Start deleting procedure - $points = 0; + $points = '0'; while ($content = SQL_FETCHARRAY($result)) { // Check if confirmation links are purged or not $result_links = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s", diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php index a388791124..1b4b39c195 100644 --- a/inc/autopurge/purge-mails.php +++ b/inc/autopurge/purge-mails.php @@ -58,7 +58,7 @@ ORDER BY `sender` ASC", __FILE__, __LINE__); // Reset counter... -$DELETED = 0; +$DELETED = '0'; // Do we have "purged" mails? if (SQL_NUMROWS($result_mails) > 0) { diff --git a/inc/classes/rdf.class.php b/inc/classes/rdf.class.php index dc1e85ca45..4ae354b702 100644 --- a/inc/classes/rdf.class.php +++ b/inc/classes/rdf.class.php @@ -53,7 +53,7 @@ class fase4_rdf { * @access private * @var integer */ - var $_word_wrap = 0; + var $_word_wrap = '0'; /** * Wether to recode \n ->
or not in description @@ -246,7 +246,7 @@ class fase4_rdf { * @access private * @var int */ - var $_item_count = 0; + var $_item_count = '0'; /** * No of max s @@ -399,7 +399,7 @@ class fase4_rdf { $this->out .= $this->cache(); $this->out .= ""; $this->_output = ''; - $this->_item_count = 0; + $this->_item_count = '0'; return true; } @@ -621,13 +621,13 @@ class fase4_rdf { } if( !isset( $this->_depth[$this->get_parser_id($parser)] ) ) { - $this->_depth[$this->get_parser_id($parser)] = 0; + $this->_depth[$this->get_parser_id($parser)] = '0'; } $this->_depth[$this->get_parser_id($parser)]++; array_push($this->_tags, $name); if( !isset( $this->_cdepth[$this->get_parser_id($parser)] ) ) { - $this->_cdepth[$this->get_parser_id($parser)] = 0; + $this->_cdepth[$this->get_parser_id($parser)] = '0'; } $this->_cdepth[$this->get_parser_id($parser)]++; array_push($this->_ctags, $name); @@ -712,7 +712,7 @@ class fase4_rdf { // Wrap with
\n $this->_item['description'] = wordwrap($this->_item['description'], $this->_word_wrap, "*
\n"); } - elseif (($this->_word_wrap == 0) && (!$this->_use_nl2br)) + elseif (($this->_word_wrap == '0') && (!$this->_use_nl2br)) { // Strip tags out instead when word-wrap is disabled $this->_item['description'] = strip_tags($this->_item['description'], ', '); @@ -874,7 +874,7 @@ class fase4_rdf { */ function get_parser_id ($parser) { // Default is zero - $id = 0; + $id = '0'; // Is it a resource? if (is_resource($parser)) { @@ -1024,7 +1024,7 @@ class fase4_rdf { $_cache_f = $this->_cache_dir.$this->_cached_file; - if ( (!file_exists($_cache_f)) || (filemtime($_cache_f) < $this->_refresh) || (filesize($_cache_f) == 0)) { + if ( (!file_exists($_cache_f)) || (filemtime($_cache_f) < $this->_refresh) || (filesize($_cache_f) == '0')) { // We have to parse the remote file $this->_use_cached_file = false; // --> we want to provide proper Information for Use in @@ -1078,7 +1078,7 @@ class fase4_rdf { if($arr[0]=='') { $path = '/'; } - for($i = 0;$i<$c;$i++) + for($i = '0';$i<$c;$i++) { if($arr[$i]!='') { $path .= $arr[$i].'/'; @@ -1297,7 +1297,7 @@ class fase4_rdf { } - for ( $i = 0; !feof ($fp) ; $i++) + for ( $i = '0'; !feof ($fp) ; $i++) { $usable_data[$i] = ""; $usable_data[$i] = fgets($fp,4096); @@ -1384,7 +1384,7 @@ class fase4_rdf { } $i++; } - if ((count($dummy) > 0) && (count($reply) == 0) && (!$isContent)) { + if ((count($dummy) > 0) && (count($reply) == '0') && (!$isContent)) { // Transfer content from dummy $reply = $content; } diff --git a/inc/config-functions.php b/inc/config-functions.php index cda835e775..881b7f63d8 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -278,7 +278,7 @@ function updateOldConfigFile () { } // Update config entries -function updateConfiguration ($entries, $values, $updateMode='') { +function updateConfiguration ($entries, $values, $updateMode='', $config = '0') { // Do not update config in CSS mode if ((getOutputMode() == 1) || (getOutputMode() == -1) || (isInstallationPhase())) { return; @@ -344,7 +344,8 @@ function updateConfiguration ($entries, $values, $updateMode='') { // Run database update //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries}"); - SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=0 LIMIT 1", __FUNCTION__, __LINE__); + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=%s LIMIT 1", + array(bigintval($config)), __FUNCTION__, __LINE__); //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):entries={$entries},affectedRows={$affectedRows}
"); // Rebuild cache @@ -352,7 +353,7 @@ function updateConfiguration ($entries, $values, $updateMode='') { } // Filter for loading configuration -function FILTER_LOAD_CONFIGURATION ($no = 0) { +function FILTER_LOAD_CONFIGURATION ($no = '0') { // Check for cache extension, cache-array and if the requested configuration is in cache if ((isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) { // Load config from cache diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index b4e386ce8e..e75d09fc57 100644 --- a/inc/db/lib-mysql3.php +++ b/inc/db/lib-mysql3.php @@ -142,10 +142,10 @@ function SQL_NUMROWS ($result) { $lines = mysql_num_rows($result); // Is the result empty? Then we have an error! - if (empty($lines)) $lines = 0; + if (empty($lines)) $lines = '0'; } elseif (SQL_IS_LINK_UP()) { // No resource given, no lines found! - $lines = 0; + $lines = '0'; } // Return lines @@ -190,7 +190,7 @@ function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) { if ($remove_numerical) { // So let's remove all numerical elements to save memory! $max = count($row); - for ($idx = 0; $idx < ($max / 2); $idx++) { + for ($idx = '0'; $idx < ($max / 2); $idx++) { // Remove entry unset($row[$idx]); } // END - for @@ -205,7 +205,7 @@ function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) { } // SQL result -function SQL_RESULT ($res, $row, $field = 0) { +function SQL_RESULT ($res, $row, $field = '0') { // Is $res valid? if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false; @@ -401,14 +401,14 @@ function SQL_ALTER_TABLE ($sql, $F, $L) { // Do we have no entry on ADD or an entry on DROP? // 123 4 4 3 3 4 4 32 23 4 4 3 3 4 4 321 - if (((SQL_NUMROWS($result) == 0) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) { + if (((SQL_NUMROWS($result) == '0') && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) { // Do the query //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql); $result = SQL_QUERY($sql, $F, $L, false); // Skip further attempt(s) break; - } elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 0) && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) { + } elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == '0') && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) { // Abort here because it is alreay there //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $sql); break; diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 5bcdf37ee2..a9d1ed2910 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -102,7 +102,7 @@ function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run = // Download functions file loadIncludeOnce($funcsInclude); } // END - if - } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getOutputMode() == 0) && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) { + } elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) { // No functions file is not so good... logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no own functions file or we cannot read from it. mode=%s", $ext_name, @@ -173,12 +173,12 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru initExtensionUpdateDependencies(); // Is the task id zero? Then we need to auto-fix it here - if ($task_id == 0) { + if ($task_id == '0') { // Try to find the task $task_id = determineExtensionTaskId(getCurrentExtensionName()); // Still zero and not in dry-run? - if (($task_id == 0) && (!getExtensionDryRun())) { + if (($task_id == '0') && (!getExtensionDryRun())) { // Then request a bug report debug_report_bug(sprintf("%s: task_id is still zero after determineExtensionTaskId(%s)", __FUNCTION__, @@ -278,7 +278,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru } // END - for // Is there no update? - if (countExtensionUpdateDependencies(getCurrentExtensionName()) == 0) { + if (countExtensionUpdateDependencies(getCurrentExtensionName()) == '0') { // Then test is passed! $test = true; } // END - if @@ -767,7 +767,7 @@ function getExtensionName ($ext_id) { // Get extension id from name function getExtensionId ($ext_name) { // Init id number - $ret = 0; + $ret = '0'; // Do we have cache? if (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) { @@ -891,7 +891,7 @@ function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) { // Is the extension there? if (isExtensionInstalled($ext_name)) { // Check if task is not there - if (determineTaskIdBySubject($subject) == 0) { + if (determineTaskIdBySubject($subject) == '0') { // Create extension update-task createNewTask($subject, $notes, 'EXTENSION_UPDATE', 0, $adminId); } // END - if @@ -904,7 +904,7 @@ function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) { // Creates a new task for newly installed extension function createNewExtensionTask ($adminId, $subject, $ext) { // Not installed and do we have created a task for the admin? - if ((determineTaskIdBySubject($subject) == 0) && (!isExtensionInstalled($ext))) { + if ((determineTaskIdBySubject($subject) == '0') && (!isExtensionInstalled($ext))) { // Set default message if ext-foo is missing $message = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext); @@ -935,7 +935,7 @@ function createExtensionDeactivationTask ($ext) { $subject = sprintf("[%s:] %s", $ext, getMessage('TASK_SUBJ_EXTENSION_DEACTIVATED')); // Not installed and do we have created a task for the admin? - if ((determineTaskIdBySubject($subject) == 0) && (getExtensionVersion($ext) != '')) { + if ((determineTaskIdBySubject($subject) == '0') && (getExtensionVersion($ext) != '')) { // Task not created so add it createNewTask($subject, SQL_ESCAPE(loadTemplate('task_ext_deactivated', true, $ext)), 'EXTENSION_DEACTIVATION'); } // END - if @@ -993,7 +993,7 @@ function ifModuleHasMenu ($mod, $forceDb = false) { // Determines the task id for given extension function determineExtensionTaskId ($ext_name) { // Default is not found - $task_id = 0; + $task_id = '0'; // Search for extension task's id $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `task_type`='EXTENSION' AND `subject`='[%s:]' LIMIT 1", @@ -1015,7 +1015,7 @@ function determineExtensionTaskId ($ext_name) { // Determines the task id for given subject function determineTaskIdBySubject ($subject) { // Default is not found - $task_id = 0; + $task_id = '0'; // Search for task id $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1", @@ -1234,7 +1234,7 @@ function removeExtensionUpdateDependency ($ext_name) { // Init iterator for update depencies function initExtensionUpdateIterator () { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()); - $GLOBALS['ext_depend_iterator'][getCurrentExtensionName()] = 0; + $GLOBALS['ext_depend_iterator'][getCurrentExtensionName()] = '0'; } // Getter for depency iterator diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index b30b1ba113..de89b7015a 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -351,7 +351,7 @@ KEY userid (userid) case '0.5.6': // SQL queries for v0.5.6 // Get current month $curr = date('m', time()); - if (strlen($curr) == 1) $curr = 0 . $curr; + if (strlen($curr) == 1) $curr = '0' . $curr; if ($curr == "00") $curr = "12"; // Generate timemark... diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index a2d93e4295..51288513fb 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -212,6 +212,9 @@ PRIMARY KEY (`network_reload_id`) // - Request parameters incomplete addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_codes` (`network_code`) VALUES ('REQUEST_PARAMS_INCOMPLETE')"); + // Sponsor networks + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`) VALUES ('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252')"); + // Admin menu entries addAdminMenuSql('network',NULL,'Werbenetzwerke','Verwalten Sie hier Werbenetzwerke (API-Anbindung), versenden Sie deren Mails, oder übernehmen Sie deren Textlinks und vieles mehr. VORSICHT: Das Einrichten von weiteren Werbenetzwerken ist nicht leicht, dafür aber sehr flexibel! Sollte ein Netzwerk fehlen, so melden Sie dies bitte im Forum!',4); addAdminMenuSql('network','config_networks','API-Daten','Stellen Sie Ihre Affiliate- Webseiten-Id und API-Passwort ein. Diese erhalten Sie zu über 99% aus dem jeweiligen Zugangsbereich des Anbieters. Sollten Sie bei einem Netzwerk noch nicht angemeldet sein, verwenden Sie bitte meinen Referal-Link.',1); @@ -220,10 +223,10 @@ PRIMARY KEY (`network_reload_id`) addAdminMenuSql('network','config_network','Einstellungen','Stellen Sie generelle Einstellungen ein, die für alle Werbenetzwerke gelten, wie z.B. Cache-Erneuerungsinterval. Generell sind aber die Einstellungen in Ordnung, da z.B. sonst Ihre freien Abfragen beim Werbenetzwerk sich zu schnell abbauen.',4); addAdminMenuSql('network','list_network_reloads','Reload-Sperren','Listen oder löschen Sie hier Reload-Sperren. Vorsicht: Die hier gespeicherten Reload-Sperren sind vom jeweiligen Werbenetzwerk übernommen. Eventuell verdienen Sie nichts, wenn Sie z.B. eine Mail innerhalb der Reload-Sperre erneut versenden.',5); addAdminMenuSql('network','list_networks','Auflisten/Verwalten','Experten-Einstellungen! Hier ändern Sie die Einstellungen an den Grunddaten (Stammdaten) des jeweiligen Werbenetzwerks ab. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',6); - addAdminMenuSql('network','list_network_types','Werbearten verwalten','Experten-Einstellungen! Hier ändern Sie die Einstellungen zu den Werbearten pro Werbenetzwerken. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',7); + addAdminMenuSql('network','list_network_types','Werbearten','Experten-Einstellungen! Hier ändern Sie die Einstellungen zu den Werbearten pro Werbenetzwerken. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',7); addAdminMenuSql('network','list_network_params','Abfrageparameter','Experten-Einstellungen! Hier stellen Sie die Abfrageparameter (wie sie genannt werden müssen, um das API-Script korrekt aufrufen zu können) ein, pro Werbenetzwerk. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',8); addAdminMenuSql('network','list_network_code_types','Rückgabewerte','Experten-Einstellungen! Hier stellen Sie die Rückgabewerte ein, die im Falle eines Fehlers pro API-Script kommen können. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',9); - addAdminMenuSql('network','list_network_codes','Fehlercodes einstellen','Experten-Einstellungen! Hier stellen Sie die Namen von Fehlercodes ein, die Scripte zurückliefern können. Dies sind INTERNE Daten und sollten nur vom MXChange-Entwicklerteam angepasst werden. Stellen Sie an diesen Einstellungen bitte nichts um. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',10); + addAdminMenuSql('network','list_network_codes','Fehlercodes','Experten-Einstellungen! Hier stellen Sie die Namen von Fehlercodes ein, die Scripte zurückliefern können. Dies sind INTERNE Daten und sollten nur vom MXChange-Entwicklerteam angepasst werden. Stellen Sie an diesen Einstellungen bitte nichts um. Sie sollten hier generell nichts einstellen und im Forum um Hilfe fragen, wenn Sie selber ein Werbenetzwerk einrichten möchten.',10); // Configuration entries addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `network_cache_refresh` BIGINT(20) UNSIGNED NOT NULL DEFAULT ' . (60 * 15) . ''); diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 427567273f..75c56d7d75 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -90,6 +90,7 @@ PRIMARY KEY (id) // Admin menu addAdminMenuSql('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.',9); addAdminMenuSql('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.',1); + // @TODO Fix config_rallye_prices to list_rallye_prices addAdminMenuSql('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.',2); addAdminMenuSql('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.',3); diff --git a/inc/filter-functions.php b/inc/filter-functions.php index e83211bd9d..26c986403f 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -96,7 +96,7 @@ ORDER BY $filterFunction = $filterArray['filter_function']; // Set counter to default - $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = 0; + $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0'; // Mark this filter as loaded (from database) $GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction] = true; @@ -215,7 +215,7 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for // Simply add it to the array //* DEBUG: */ print __FUNCTION__.': filterName='.$filterName.',filterFunction='.$filterFunction.'
'; $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'A'; - $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = 0; + $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0'; } // END - if } diff --git a/inc/filters.php b/inc/filters.php index 56d82c0f92..dbc68d39da 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -66,8 +66,8 @@ function FILTER_FLUSH_FILTERS () { } // END - if // Nothing is added/remove by default - $inserted = 0; - $removed = 0; + $inserted = '0'; + $removed = '0'; // Prepare SQL queries $insertSQL = "INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES"; @@ -490,7 +490,7 @@ function FILTER_UPDATE_EXTENSION_DATA ($ext_name) { // Load more reset scripts function FILTER_RUN_RESET_INCLUDES () { // Is the reset set or old sql_patches? - if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == 0)) { + if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == '0')) { // Then abort here logDebugMessage(__FUNCTION__, __LINE__, 'Cannot run reset! Please report this bug. Thanks'); } // END - if @@ -628,7 +628,7 @@ function FILTER_TRIGGER_SENDING_POOL () { } // END - if // Init counter - $GLOBALS['pool_cnt'] = 0; + $GLOBALS['pool_cnt'] = '0'; // Init & set the include pool initIncludePool('pool'); @@ -732,7 +732,7 @@ function FILTER_COUNT_MODULE () { // Handles fatal errors function FILTER_HANDLE_FATAL_ERRORS () { // Do we have errors to handle and right output mode? - if ((getTotalFatalErrors() == 0) || (getOutputMode() != 0)) { + if ((getTotalFatalErrors() == '0') || (getOutputMode() != 0)) { // Abort executing here return false; } // END - if @@ -833,7 +833,7 @@ function FILTER_DISPLAY_COPYRIGHT () { function FILTER_DISPLAY_PARSING_TIME () { // Shall we display the parsing time and number of queries? // 1234 5 54 4 5 5 4 4 5 543 3 4432 2 33 2 2 21 - if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == 0) && ($GLOBALS['header_sent'] == 2)) { + if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) { // Then display it here displayParsingTime(); } // END - if diff --git a/inc/functions.php b/inc/functions.php index e1ed3428f2..a285c70519 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -124,7 +124,7 @@ function outputHtml ($htmlCode, $newLine = true) { } // END - if // Init counter - $cnt = 0; + $cnt = '0'; // Compile and run finished rendered HTML code while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) { @@ -208,7 +208,7 @@ function addFatalMessage ($F, $L, $message, $extra='') { // Getter for total fatal message count function getTotalFatalErrors () { // Init coun - $count = 0; + $count = '0'; // Do we have at least the first entry? if (!empty($GLOBALS['fatal_messages'][0])) { @@ -244,7 +244,7 @@ function loadTemplate ($template, $return=false, $content=array()) { // Init some data $ret = ''; - if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0; + if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0'; // Base directory $basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage()); @@ -325,7 +325,7 @@ function loadTemplate ($template, $return=false, $content=array()) { $ret = ''; if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) { // Normal HTML output? - if (getOutputMode() == 0) { + if (getOutputMode() == '0') { // Add surrounding HTML comments to help finding bugs faster $ret = "\n" . $GLOBALS['tpl_content'] . "\n"; @@ -382,7 +382,7 @@ function loadTemplate ($template, $return=false, $content=array()) { } // Loads an email template and compiles it -function loadEmailTemplate ($template, $content = array(), $UID = 0) { +function loadEmailTemplate ($template, $content = array(), $UID = '0') { global $DATA; // Make sure all template names are lowercase! @@ -412,7 +412,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = 0) { // Expiration in a nice output format // NOTE: Use $content[expiration] in your templates instead of $EXPIRATION - if (getConfig('auto_purge') == 0) { + if (getConfig('auto_purge') == '0') { // Will never expire! $EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE'); } else { @@ -668,16 +668,16 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { } // Generate a password in a specified length or use default password length -function generatePassword ($length = 0) { +function generatePassword ($length = '0') { // Auto-fix invalid length of zero - if ($length == 0) $length = getConfig('pass_len'); + if ($length == '0') $length = getConfig('pass_len'); // Initialize array with all allowed chars $ABC = explode(',', 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,0,1,2,3,4,5,6,7,8,9,-,+,_,/,.'); // Start creating password $PASS = ''; - for ($i = 0; $i < $length; $i++) { + for ($i = '0'; $i < $length; $i++) { $PASS .= $ABC[mt_rand(0, count($ABC) -1)]; } // END - for @@ -693,12 +693,12 @@ function generatePassword ($length = 0) { } // Generates a human-readable timestamp from the Uni* stamp -function generateDateTime ($time, $mode = 0) { +function generateDateTime ($time, $mode = '0') { // Filter out numbers $time = bigintval($time); // If the stamp is zero it mostly didn't "happen" - if ($time == 0) { + if ($time == '0') { // Never happend return getMessage('NEVER_HAPPENED'); } // END - if @@ -768,7 +768,7 @@ function translatePoolType ($type) { } // Translates the american decimal dot into a german comma -function translateComma ($dotted, $cut = true, $max = 0) { +function translateComma ($dotted, $cut = true, $max = '0') { // Default is 3 you can change this in admin area "Misc -> Misc Options" if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', 3); @@ -779,12 +779,12 @@ function translateComma ($dotted, $cut = true, $max = 0) { if ($max > 0) $maxComma = $max; // Cut zeros off? - if (($cut === true) && ($max == 0)) { + if (($cut === true) && ($max == '0')) { // Test for commata if in cut-mode $com = explode('.', $dotted); if (count($com) < 2) { // Don't display commatas even if there are none... ;-) - $maxComma = 0; + $maxComma = '0'; } } // END - if @@ -883,7 +883,7 @@ function countSelection ($array) { } // END - if // Init count - $ret = 0; + $ret = '0'; // Count all entries foreach ($array as $key => $selected) { @@ -1115,7 +1115,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true * Sie, dass es doch nicht so schwer ist! :-) * * * ************************************************************************/ -function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums = false) { +function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums = false) { $dummy = $array; while ($primary_key < count($a_sort)) { foreach ($dummy[$a_sort[$primary_key]] as $key => $value) { @@ -1151,7 +1151,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums = } // -function addSelectionBox ($type, $default, $prefix = '', $id = 0, $class = 'register_select') { +function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'register_select') { $OUT = ''; if ($type == 'yn') { @@ -1235,8 +1235,8 @@ function addSelectionBox ($type, $default, $prefix = '', $id = 0, $class = 'regi case 'sec': case 'min': - for ($idx = 0; $idx < 60; $idx+=5) { - if (strlen($idx) == 1) $idx = 0 . $idx; + for ($idx = '0'; $idx < 60; $idx+=5) { + if (strlen($idx) == 1) $idx = '0' . $idx; $OUT .= "\n"; // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query @@ -708,7 +708,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') { $title = $userid; } // END - if - if (($title == 0) && ($what == 'list_refs')) { + if (($title == '0') && ($what == 'list_refs')) { // Return title again return $title; } elseif (isExtensionActive('nickname')) { @@ -759,7 +759,7 @@ function adminGetMenuMode () { // Change activation status function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') { - $cnt = 0; $newStatus = 'Y'; + $cnt = '0'; $newStatus = 'Y'; if ((is_array($IDs)) && (count($IDs) > 0)) { // "Walk" all through and count them foreach ($IDs as $id => $selected) { @@ -1037,7 +1037,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctio // Shall we change here or list for editing? if ($editNow === true) { // Change them all - $affected = 0; + $affected = '0'; foreach ($IDs as $id => $sel) { // Prepare content array (new values) $content = array(); @@ -1174,7 +1174,7 @@ function sendAdminPasswordResetLink ($email) { array($email), __FUNCTION__, __LINE__); // Is there an account? - if (SQL_NUMROWS($result) == 0) { + if (SQL_NUMROWS($result) == '0') { // No account found! return getMessage('ADMIN_NO_LOGIN_WITH_EMAIL'); } // END - if diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 278c2b0e7a..31b89cb81e 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -150,7 +150,7 @@ LIMIT 1", // Task is valid... list($tid, $userid, $type, $subj, $text, $created, $status, $adminId) = SQL_FETCHROW($result_task); - if ($adminId == 0) { + if ($adminId == '0') { // Assgin current admin to unassgigned task SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s LIMIT 1", array(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__); @@ -176,7 +176,7 @@ LIMIT 1", } else { // Invalid userid, so log and zero it logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!'); - $userid = 0; + $userid = '0'; } } // END - if @@ -279,7 +279,7 @@ LIMIT 1", array($ext_name), __FILE__, __LINE__); $lines = SQL_NUMROWS($result_lines); SQL_FREERESULT($result_lines); - if ($lines == 0) { + if ($lines == '0') { // New extension found $OUT .= loadTemplate('admin_ext_reg_form', true, array( 'id' => bigintval($id), diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php index 555b6ca7f7..12afe8b0c8 100644 --- a/inc/modules/admin/what-add_rallye.php +++ b/inc/modules/admin/what-add_rallye.php @@ -53,7 +53,7 @@ if (isFormSent()) { $result = SQL_QUERY_ESC("SELECT id, admin_id FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE (start_time <= %s AND end_time >= %s) OR (start_time >= %s AND start_time <= %s) LIMIT 1", array($START, $START, $START, $END), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 0) { + if (SQL_NUMROWS($result) == '0') { // Ok, start and end time did not overlap SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_data` (admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify) VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')", diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index ed24beee93..cf97dffe96 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -52,7 +52,7 @@ if (isGetRequestElementSet('sub')) { } // END - if // Get count of (maybe) selected menu points -$chk = 0; +$chk = '0'; if (isPostRequestElementSet('sel')) $chk = countPostSelection(); // List all menu points and make them editable @@ -61,7 +61,7 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) { // @TODO Kill all constants in this file $content['sub'] = $SUB; $content['chk'] = $chk; - $cnt = 0; $SW = 2; + $cnt = '0'; $SW = 2; foreach (postRequestElement('sel') as $sel => $confirm) { if ($confirm == 1) { $cnt++; @@ -112,7 +112,7 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) { $content['chk'] = $chk; // Del menu entries with or without confirmation - $SW = 2; $cnt = 0; $OUT = ''; + $SW = 2; $cnt = '0'; $OUT = ''; foreach (postRequestElement('sel') as $sel => $confirm) { if ($confirm == 1) { $cnt++; @@ -240,7 +240,7 @@ WHERE ".$AND." AND id=%s LIMIT 1", $content['sub'] = $SUB; // Init variables - $OUT = ''; $SW = 2; $cnt = 0; + $OUT = ''; $SW = 2; $cnt = '0'; // Process all entries while ($data = SQL_FETCHARRAY($result)) { @@ -249,7 +249,7 @@ WHERE ".$AND." AND id=%s LIMIT 1", // Init navigation variable $data['navi'] = ''; - if (($data['sort'] == 0) || (($data['sort'] == 1) && (!empty($SUB)))) { + if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) { // Is highest position $data['navi'] = "{--LOWER--}"; } elseif ($cnt == $max) { diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php index 9e582cac8e..c949b03161 100644 --- a/inc/modules/admin/what-admins_mails.php +++ b/inc/modules/admin/what-admins_mails.php @@ -55,12 +55,12 @@ if (isPostRequestElementSet('edit')) { // First of all load data from DB $result = SQL_QUERY_ESC("SELECT `admin_id`, `id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `id` ASC", array($template), __FILE__, __LINE__); - $OUT = ''; $adminId2 = 0; + $OUT = ''; $adminId2 = '0'; while ($content = SQL_FETCHARRAY($result)) { // @TODO Can this be rewritten??? $OUT .= " + + + +   + + + {--ADMIN_NETWORK_TITLE--}: + + + + + +   + + + {--ADMIN_NETWORK_REFLINK--}: + + + + + +   + + + {--ADMIN_NETWORK_DATA_SEPERATOR--}: + + + + + +   + + + {--ADMIN_NETWORK_ROW_SEPERATOR--}: + + + + + +   + + + {--ADMIN_NETWORK_REQUEST_TYPE--}: + + + + + +   + + + {--ADMIN_NETWORK_CHARSET--}: + + + + + +   + + + + + + + + + + + +
+ {--ADMIN_NETWORK_ADD_NOTE--} +
diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index e358aff85e..4d60247330 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -148,7 +148,7 @@   - diff --git a/templates/de/html/admin/admin_edit_networks_row.tpl b/templates/de/html/admin/admin_edit_networks_row.tpl new file mode 100644 index 0000000000..508996c329 --- /dev/null +++ b/templates/de/html/admin/admin_edit_networks_row.tpl @@ -0,0 +1,37 @@ + + {--ADMIN_NETWORK_SHORT_NAME--}: + + + + {--ADMIN_NETWORK_TITLE--}: + + + + + + {--ADMIN_NETWORK_REFLINK--}: + + + + {--ADMIN_NETWORK_DATA_SEPERATOR--}: + + + + + + {--ADMIN_NETWORK_ROW_SEPERATOR--}: + + + + {--ADMIN_NETWORK_REQUEST_TYPE--}: + + $content[network_request_type] + + + + {--ADMIN_NETWORK_CHARSET--}: + + + +   + diff --git a/templates/de/html/admin/admin_list_networks.tpl b/templates/de/html/admin/admin_list_networks.tpl new file mode 100644 index 0000000000..9a0b9e7c3d --- /dev/null +++ b/templates/de/html/admin/admin_list_networks.tpl @@ -0,0 +1,34 @@ +
+
+ + + + + + + + + + + + + + + + $content + + + +
  + {--ADMIN_NETWORK_SEPERATOR--} +  
{--ID_SELECT--}{--ADMIN_NETWORK_SHORT_NAME--}{--ADMIN_NETWORK_REFLINK--}{--ADMIN_NETWORK_DATA_SEPERATOR2--}{--ADMIN_NETWORK_ROW_SEPERATOR2--}{--ADMIN_NETWORK_REQUEST_TYPE--}{--ADMIN_NETWORK_CHARSET--}
+ + + +
+
+ +
+ {--ADMIN_NETWORK_LIST_NOTE--} +
+
diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl new file mode 100644 index 0000000000..f75fa9ee0f --- /dev/null +++ b/templates/de/html/admin/admin_list_networks_row.tpl @@ -0,0 +1,28 @@ + + + + + + $content[network_short_name]: + [T|P|CT|C] + + + [$content[network_title]] + + + $content[network_data_seperator] + + + $content[network_row_seperator] + + + $content[network_request_type] + + + $content[network_charset] + + diff --git a/templates/de/html/admin/admin_network_added.tpl b/templates/de/html/admin/admin_network_added.tpl new file mode 100644 index 0000000000..790a4cac94 --- /dev/null +++ b/templates/de/html/admin/admin_network_added.tpl @@ -0,0 +1,13 @@ +
+ +
+
+ {--ADMIN_NETWORK_ADDED_TITLE--} +
+
+ Das Werbenetzwerk $content[network_title] wurde soeben hinzugefügt. + Sie sollten nun als nächstes die Werbearten hinzufügen. +
+
+ +
diff --git a/theme/default/css/general.css b/theme/default/css/general.css index 2767d477cb..c9dc3f8cd7 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -35,7 +35,7 @@ A:link { } A:visited { - color: #AA0044; + color: #ae3139; } A:active { @@ -50,7 +50,7 @@ A:hover { input,textarea { color: #009900; background-color: #EEFFEE; - border: 1px solid #AA0044; + border: 1px solid #00aa44; text-decoration: none; border-style: groove; } @@ -58,7 +58,7 @@ input,textarea { select,option { background-color: #EEFFEE; border: solid 1px #009900; - color: #AA0044; + color: #00aa44; text-decoration: none; border-style: groove; } @@ -71,12 +71,12 @@ ul,ol { .admin_reset, .guest_reset, .member_reset { border-style: groove; border: solid 1px #009900; - color: #AA0044; + color: #00aa44; cursor: pointer; } .admin_submit, .guest_submit, .member_submit { - color: #AA0044; + color: #00aa44; border-color: #009900; cursor: pointer; } @@ -163,7 +163,7 @@ DIV.admin_note { } .admin_done2 { - color: #AA0044; + color: #00aa44; } .admin_green, .admin_no { @@ -235,7 +235,7 @@ DIV.admin_note { } .admin_header_b1 { - border-bottom: 1px solid #AA0044; + border-bottom: 1px solid #00aa44; background-color: #ddeedd; height: 22px; } @@ -296,12 +296,12 @@ DIV.admin_note { color: #009900; height: 25px; width: 200px; - border: 1px solid #AA0044; + border: 1px solid #00aa44; } .guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom { - border: 1px solid #AA0044; + border: 1px solid #00aa44; border-top: 0px; background-color: #eeffbc; height: 22px; @@ -309,7 +309,7 @@ DIV.admin_note { } .member_menu_whats { - border: 1px solid #AA0044; + border: 1px solid #00aa44; border-top: 0px; background-color: #eeffee; height: 20px; @@ -374,7 +374,7 @@ ul.copyright_box { } .dashed { - border: solid 1px #AA0044; + border: solid 1px #00aa44; } .switch_sw1, .switch_mem1 { @@ -463,7 +463,7 @@ ul.copyright_box { .admin_delete, .admin_yes { border-style: groove; border: solid 1px #00AA00; - background-color: #AA0044; + background-color: #aa0044; color: #DDEEDD; cursor: pointer; } @@ -599,19 +599,19 @@ ul.copyright_box { } .top2 { - border-top: 1px solid #AA0044; + border-top: 1px solid #00aa44; } .bottom2 { - border-bottom: 1px solid #AA0044; + border-bottom: 1px solid #00aa44; } .left2 { - border-left: 1px solid #AA0044; + border-left: 1px solid #00aa44; } .right2 { - border-right: 1px solid #AA0044; + border-right: 1px solid #00aa44; } .nobr { @@ -657,7 +657,7 @@ ul.copyright_box { } .theme_box { - border: 1px dotted #AA0044; + border: 1px dotted #00aa44; border-top: 0px; width: 100%; height: 70px; @@ -704,7 +704,7 @@ ul.copyright_box { } ul.show_timings_block { - border: solid 1px #AA0044; + border: solid 1px #00aa44; background-color: #ddeedd; width: 565px; height: 20px; @@ -747,7 +747,7 @@ li.show_timings_column { .member_skyscraper, .guest_skyscraper { width: 122px; height: 602px; - border: 1px solid #AA0044; + border: 1px solid #00aa44; margin: 0px; padding: 0px; padding-top: 1px; diff --git a/theme/default/css/register.css b/theme/default/css/register.css index 6e42a8966b..6d409022a1 100644 --- a/theme/default/css/register.css +++ b/theme/default/css/register.css @@ -5,11 +5,11 @@ .register_reset { border-style: groove; border: solid 1px #009900; - color: #AA0044; + color: #00aa44; } .register_submit { - color: #AA0044; + color: #00aa44; border-color: #009900; } @@ -70,11 +70,11 @@ background-color: #eeffbc; color: #0000AA; font-weight: bold; - border-top: 1px dotted #AA0044; - border-bottom: 1px dotted #AA0044; + border-top: 1px dotted #00aa44; + border-bottom: 1px dotted #00aa44; height: 25px; } .register_term { - background-color: #AA0044; + background-color: #00aa44; } -- 2.30.2