From a18efdcd57ba91893f0958a457b5c58639b135c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 12 Aug 2011 20:58:25 +0000 Subject: [PATCH] Large code cleanups: - Typo 'referal' fixed (should be 'referral', really!) - Several queries improved with back-ticks and formatting - TODOs.txt updated --- .gitattributes | 5 + DOCS/TODOs.txt | 13 +- DOCS/de/AUTHORS.txt | 2 +- DOCS/de/README.txt | 10 +- DOCS/de/THANK_YOU.txt | 2 +- DOCS/de/network/README.txt | 10 +- DOCS/en/AUTHORS.txt | 2 +- DOCS/en/THANK_YOU.txt | 2 +- birthday_confirm.php | 4 +- click.php | 2 +- doubler.php | 12 +- inc/classes/cachesystem.class.php | 4 +- inc/config-global.php | 2 +- inc/extensions/ext-active.php | 4 +- inc/extensions/ext-autopurge.php | 2 +- inc/extensions/ext-bank.php | 4 +- inc/extensions/ext-beg.php | 20 +- inc/extensions/ext-bitcoins.php | 2 +- inc/extensions/ext-bonus.php | 18 +- inc/extensions/ext-booking.php | 4 +- inc/extensions/ext-coupon.php | 4 +- inc/extensions/ext-doubler.php | 14 +- inc/extensions/ext-earning.php | 4 +- inc/extensions/ext-funcoins.php | 8 +- inc/extensions/ext-geoip.php | 2 +- inc/extensions/ext-grade.php | 8 +- inc/extensions/ext-holiday.php | 6 +- inc/extensions/ext-html_mail.php | 4 +- inc/extensions/ext-imprint.php | 4 +- inc/extensions/ext-mailid.php | 4 +- inc/extensions/ext-mediadata.php | 4 +- inc/extensions/ext-mods.php | 2 +- inc/extensions/ext-mydata.php | 4 +- inc/extensions/ext-network.php | 2 +- inc/extensions/ext-nickname.php | 6 +- inc/extensions/ext-online.php | 4 +- inc/extensions/ext-order.php | 10 +- inc/extensions/ext-payout.php | 6 +- inc/extensions/ext-primera.php | 4 +- inc/extensions/ext-rallye.php | 37 +- inc/extensions/ext-refback.php | 4 +- inc/extensions/ext-refsell.php | 4 +- inc/extensions/ext-register.php | 8 +- inc/extensions/ext-repair.php | 2 +- inc/extensions/ext-sponsor.php | 14 +- inc/extensions/ext-sql_patches.php | 39 +- inc/extensions/ext-support.php | 4 +- inc/extensions/ext-surfbar.php | 6 +- inc/extensions/ext-task.php | 2 +- inc/extensions/ext-teams.php | 2 +- inc/extensions/ext-theme.php | 10 +- inc/extensions/ext-top10.php | 4 +- inc/extensions/ext-transfer.php | 6 +- inc/extensions/ext-user.php | 28 +- inc/extensions/ext-wernis.php | 8 +- inc/extensions/ext-yacy.php | 2 +- inc/filter-functions.php | 7 +- inc/filter/coupon_filter.php | 4 +- inc/filter/online_filter.php | 4 +- inc/filter/rallye_filter.php | 2 +- inc/filters.php | 4 +- inc/fix_filters.php | 8 +- inc/fix_menu.php | 4 +- inc/fix_refsystem.php | 2 +- inc/functions.php | 86 +-- inc/language/bonus_de.php | 8 +- inc/language/de.php | 116 +-- inc/language/doubler_de.php | 20 +- inc/language/funcoins_de.php | 4 +- inc/language/mediadata_de.php | 10 +- inc/language/network_de.php | 2 +- inc/language/nickname_de.php | 2 +- inc/language/order_de.php | 2 +- inc/language/primera_de.php | 2 +- inc/language/rallye_de.php | 64 +- inc/language/refback_de.php | 16 +- inc/language/repair_de.php | 2 +- inc/language/sponsor_de.php | 8 +- inc/language/support_de.php | 4 +- inc/language/task_de.php | 12 +- inc/language/wernis_de.php | 2 +- inc/libs/admins_functions.php | 13 +- inc/libs/autopurge_functions.php | 4 +- inc/libs/beg_functions.php | 4 +- inc/libs/earning_functions.php | 2 +- inc/libs/holiday_functions.php | 3 +- inc/libs/order_functions.php | 4 +- inc/libs/rallye_functions.php | 62 +- inc/libs/refback_functions.php | 6 +- inc/libs/register_functions.php | 65 +- inc/libs/sponsor_functions.php | 4 +- inc/libs/surfbar_functions.php | 27 +- inc/libs/task_functions.php | 10 +- inc/libs/user_functions.php | 22 +- inc/loader/load-admins.php | 10 +- inc/loader/load-config.php | 4 +- inc/loader/load-extension.php | 8 +- inc/loader/load-filter.php | 6 +- inc/loader/load-modules.php | 27 +- inc/loader/load-points_data.php | 2 +- inc/loader/load-refdepths.php | 8 +- inc/loader/load-refsystem.php | 19 +- inc/loader/load-themes.php | 4 +- inc/mails/doubler_mails.php | 20 +- inc/modules/admin/admin-inc.php | 8 +- inc/modules/admin/what-add_rallye.php | 25 +- inc/modules/admin/what-config_cats.php | 2 +- inc/modules/admin/what-config_mods.php | 12 +- inc/modules/admin/what-config_points.php | 14 +- inc/modules/admin/what-config_refid.php | 4 +- inc/modules/admin/what-del_email.php | 4 +- inc/modules/admin/what-del_holiday.php | 3 +- inc/modules/admin/what-edit_user.php | 2 +- inc/modules/admin/what-extensions.php | 2 +- inc/modules/admin/what-list_admins_acls.php | 2 +- inc/modules/admin/what-list_autopurge.php | 2 +- inc/modules/admin/what-list_country.php | 10 +- inc/modules/admin/what-list_doubler.php | 4 +- inc/modules/admin/what-list_payouts.php | 2 +- inc/modules/admin/what-list_rallyes.php | 6 +- inc/modules/admin/what-list_refs.php | 20 +- inc/modules/admin/what-list_sponsor.php | 15 +- inc/modules/admin/what-list_user.php | 8 +- inc/modules/admin/what-lock_user.php | 4 +- inc/modules/admin/what-payments.php | 8 +- inc/modules/admin/what-refbanner.php | 10 +- inc/modules/admin/what-repair_refs.php | 6 +- inc/modules/admin/what-stats_mods.php | 2 +- inc/modules/admin/what-unlock_emails.php | 2 +- inc/modules/admin/what-unlock_sponsor.php | 28 +- inc/modules/guest/what-mediadata.php | 4 +- inc/modules/guest/what-rallyes.php | 10 +- inc/modules/guest/what-sponsor_reg.php | 6 +- inc/modules/guest/what-top10.php | 4 +- inc/modules/member/what-holiday.php | 3 +- inc/modules/member/what-mydata.php | 16 +- inc/modules/member/what-points.php | 10 +- inc/modules/member/what-primera.php | 2 +- inc/modules/member/what-rallyes.php | 14 +- inc/modules/member/what-refback.php | 2 +- inc/modules/member/what-reflinks.php | 6 +- inc/modules/member/what-reflist.php | 10 +- inc/modules/member/what-support.php | 4 +- inc/modules/member/what-transfer.php | 8 +- inc/modules/member/what-wernis.php | 4 +- inc/modules/order.php | 2 +- inc/modules/sponsor/account.php | 2 +- inc/monthly/monthly_beg.php | 7 +- inc/monthly/monthly_bonus.php | 4 +- inc/mysql-manager.php | 4 +- inc/pool/pool-user.php | 43 +- inc/referal-functions.php | 668 +---------------- inc/referral-functions.php | 669 ++++++++++++++++++ inc/session.php | 4 +- inc/template-functions.php | 4 +- inc/wrapper-functions.php | 14 +- install/menu-de.sql | 4 +- install/menu-en.sql | 4 +- mailid_top.php | 14 +- ref.php | 10 +- sponsor_ref.php | 10 +- .../emails/admin/admin_rallye_no_notify.tpl | 2 +- .../de/emails/admin/admin_rallye_notify.tpl | 2 +- .../de/emails/admin/admin_support-reflink.tpl | 2 +- .../de/emails/guest/guest_register_done.tpl | 2 +- .../guest/guest_user_confirmed_referal.tpl | 20 +- .../guest/guest_user_confirmed_referral.tpl | 19 + .../member/member_rallye_expired_bronce.tpl | 2 +- .../member/member_rallye_expired_gold.tpl | 2 +- .../member/member_rallye_expired_other.tpl | 2 +- .../member/member_rallye_expired_silver.tpl | 2 +- .../de/emails/member/member_rallye_notify.tpl | 4 +- templates/de/emails/member/member_refback.tpl | 2 +- .../emails/member/member_support-reflink.tpl | 2 +- templates/de/html/admin/admin_add_network.tpl | 2 +- templates/de/html/admin/admin_add_rallye.tpl | 2 +- .../de/html/admin/admin_add_refbanner.tpl | 10 +- .../de/html/admin/admin_add_reflevel.tpl | 6 +- .../de/html/admin/admin_config_bonus.tpl | 4 +- .../de/html/admin/admin_config_doubler.tpl | 2 +- .../admin/admin_config_point_settings.tpl | 2 +- .../de/html/admin/admin_config_points.tpl | 2 +- .../de/html/admin/admin_config_refid.tpl | 4 +- .../de/html/admin/admin_config_sponsor.tpl | 2 +- .../de/html/admin/admin_config_sub_points.tpl | 2 +- .../html/admin/admin_delete_networks_row.tpl | 2 +- .../de/html/admin/admin_delete_reflevel.tpl | 2 +- .../html/admin/admin_delete_reflevel_row.tpl | 2 +- .../de/html/admin/admin_edit_networks_row.tpl | 2 +- .../de/html/admin/admin_edit_refbanner.tpl | 2 +- .../html/admin/admin_edit_refbanner_row.tpl | 6 +- .../de/html/admin/admin_edit_reflevel.tpl | 4 +- .../de/html/admin/admin_edit_reflevel_row.tpl | 6 +- .../de/html/admin/admin_list_networks.tpl | 2 +- .../de/html/admin/admin_list_rallye_usr.tpl | 4 +- .../de/html/admin/admin_list_refbanner.tpl | 12 +- .../de/html/admin/admin_list_reflevel.tpl | 8 +- templates/de/html/admin/admin_list_refs.tpl | 4 +- templates/de/html/admin/admin_list_refs2.tpl | 4 +- .../de/html/admin/admin_list_refs_level.tpl | 2 +- .../de/html/admin/admin_list_refs_norefs.tpl | 2 +- .../html/admin/admin_list_sponsor_details.tpl | 2 +- .../de/html/admin/admin_list_user_row.tpl | 4 +- .../de/html/admin/admin_user_details.tpl | 8 +- templates/de/html/doubler/doubler_index.tpl | 6 +- templates/de/html/doubler/doubler_reflink.tpl | 2 +- templates/de/html/ext/ext_doubler.tpl | 16 +- templates/de/html/ext/ext_refback.tpl | 8 +- templates/de/html/ext/ext_refsell.tpl | 11 +- templates/de/html/ext/ext_teams.tpl | 2 +- templates/de/html/ext/ext_terms.tpl | 2 +- templates/de/html/ext/ext_yoomedia.tpl | 15 +- templates/de/html/guest/guest_beg.tpl | 2 +- templates/de/html/guest/guest_doubler.tpl | 10 +- templates/de/html/guest/guest_list_rallye.tpl | 4 +- .../de/html/guest/guest_register_refid.tpl | 2 +- .../html/guest/guest_register_refid_hide.tpl | 4 +- templates/de/html/guest/guest_sponsor_reg.tpl | 4 +- templates/de/html/guest/guest_top10.tpl | 4 +- templates/de/html/mediadata.tpl | 6 +- templates/de/html/member/member_doubler.tpl | 10 +- .../de/html/member/member_doubler_list.tpl | 2 +- .../de/html/member/member_list_rallye.tpl | 4 +- .../de/html/member/member_list_referal.tpl | 11 +- .../html/member/member_list_referal_level.tpl | 38 +- .../html/member/member_list_referal_row.tpl | 21 +- .../de/html/member/member_list_referral.tpl | 10 + .../member/member_list_referral_level.tpl | 37 + .../html/member/member_list_referral_row.tpl | 20 + .../de/html/member/member_list_reflinks.tpl | 2 +- .../html/member/member_list_reflinks_row.tpl | 4 +- templates/de/html/member/member_points.tpl | 6 +- .../html/member/member_points_bonus_rows.tpl | 2 +- .../de/html/member/member_points_row.tpl | 2 +- templates/de/html/member/member_reflink.tpl | 2 +- .../html/member/member_reflink_nickname.tpl | 2 +- .../de/html/member/member_support_form.tpl | 2 +- templates/de/html/welcome.tpl | 2 +- 238 files changed, 1798 insertions(+), 1560 deletions(-) create mode 100644 inc/referral-functions.php create mode 100644 templates/de/emails/guest/guest_user_confirmed_referral.tpl create mode 100644 templates/de/html/member/member_list_referral.tpl create mode 100644 templates/de/html/member/member_list_referral_level.tpl create mode 100644 templates/de/html/member/member_list_referral_row.tpl diff --git a/.gitattributes b/.gitattributes index 2b190f4fa6..635adebf99 100644 --- a/.gitattributes +++ b/.gitattributes @@ -764,6 +764,7 @@ inc/purge/purge-mails.php svneol=native#text/plain inc/purge/purge-tasks.php svneol=native#text/plain inc/purge/purge-unconfirmed.php svneol=native#text/plain inc/referal-functions.php svneol=native#text/plain +inc/referral-functions.php svneol=native#text/plain inc/request-functions.php svneol=native#text/plain inc/reset/.htaccess svneol=native#text/plain inc/reset/reset_ svneol=native#text/plain @@ -914,6 +915,7 @@ templates/de/emails/guest/guest_register_done.tpl svneol=native#text/plain templates/de/emails/guest/guest_request_confirm.tpl svneol=native#text/plain templates/de/emails/guest/guest_user_confirmed.tpl svneol=native#text/plain templates/de/emails/guest/guest_user_confirmed_referal.tpl svneol=native#text/plain +templates/de/emails/guest/guest_user_confirmed_referral.tpl svneol=native#text/plain templates/de/emails/header.tpl svneol=native#text/plain templates/de/emails/html_header.tpl svneol=native#text/plain templates/de/emails/lock-user.tpl svneol=native#text/plain @@ -1746,6 +1748,9 @@ templates/de/html/member/member_list_refback_row.tpl svneol=native#text/plain templates/de/html/member/member_list_referal.tpl svneol=native#text/plain templates/de/html/member/member_list_referal_level.tpl svneol=native#text/plain templates/de/html/member/member_list_referal_row.tpl svneol=native#text/plain +templates/de/html/member/member_list_referral.tpl svneol=native#text/plain +templates/de/html/member/member_list_referral_level.tpl svneol=native#text/plain +templates/de/html/member/member_list_referral_row.tpl svneol=native#text/plain templates/de/html/member/member_list_reflinks.tpl svneol=native#text/plain templates/de/html/member/member_list_reflinks_row.tpl svneol=native#text/plain templates/de/html/member/member_list_surfbar.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 1b8e58ba31..aa52e1d15e 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -63,7 +63,7 @@ ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings * ./inc/language/refback_de.php:53: // @TODO Rewrite these constants to one ./inc/language/sponsor_de.php:117:// @TODO Rewrite these four constants to one and use sprintf() -./inc/libs/admins_functions.php:486: // @TODO This can be, somehow, rewritten +./inc/libs/admins_functions.php:495: // @TODO This can be, somehow, rewritten ./inc/libs/bonus_functions.php:194: // @TODO Move this HTML to a template ./inc/libs/doubler_functions.php:44:// @TODO Lame description ./inc/libs/doubler_functions.php:93: // @TODO Can't this be moved into EL? @@ -75,8 +75,8 @@ ./inc/libs/register_functions.php:286: // @TODO Rewrite these all to a single filter ./inc/libs/sponsor_functions.php:159: // @TODO Rewrite this to API function ./inc/libs/sponsor_functions.php:430: // @TODO Rewrite this to API function -./inc/libs/surfbar_functions.php:1624: // @TODO This can be somehow rewritten -./inc/libs/surfbar_functions.php:731:// @TODO Can't we use our new expression language instead of this ugly code? +./inc/libs/surfbar_functions.php:1639: // @TODO This can be somehow rewritten +./inc/libs/surfbar_functions.php:746:// @TODO Can't we use our new expression language instead of this ugly code? ./inc/libs/task_functions.php:247: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:51:// @TODO Move all extension-dependent queries into filters ./inc/libs/theme_functions.php:93: // @TODO Can't this be rewritten to an API function? @@ -149,7 +149,7 @@ ./inc/modules/guest/what-mediadata.php:182:// @TODO Rewrite all these if-blocks to filters ./inc/modules/guest/what-mediadata.php:67: // @TODO Find a better formular than this one ./inc/modules/guest/what-rallyes.php:89: // @TODO Reactivate this: $content['admin'] = '' . $login . ''; -./inc/modules/guest/what-sponsor_reg.php:289: // @TODO Maybe a default referal id? +./inc/modules/guest/what-sponsor_reg.php:289: // @TODO Maybe a default referral id? ./inc/modules/guest/what-stats.php:108: // @TODO This can be somehow rewritten ./inc/modules/guest/what-stats.php:82:// @TODO This can be rewritten in a dynamic include ./inc/modules/member/what-beg.php:54:// @TODO Can't this be moved into EL? @@ -239,6 +239,7 @@ ./inc/modules/member/what-surfbar_book.php:2:// @DEPRECATED ./inc/modules/member/what-surfbar_start.php:2:// @DEPRECATED ./inc/modules/member/what-surfbar_stats.php:2:// @DEPRECATED +./inc/referal-functions.php:2:// @DEPRECATED ./inc/reset/reset_100_bonus.php:2:// @DEPRECATED ./inc/reset/reset_autopurge.php:2:// @DEPRECATED ./inc/reset/reset_beg.php:2:// @DEPRECATED @@ -265,6 +266,7 @@ ./templates/de/emails/del-user.tpl:1:@DEPRECATED ./templates/de/emails/done-admin.tpl:1:@DEPRECATED ./templates/de/emails/done-member.tpl:1:@DEPRECATED +./templates/de/emails/guest/guest_user_confirmed_referal.tpl:1:@DEPRECATED ./templates/de/emails/lock-user.tpl:1:@DEPRECATED ./templates/de/emails/member/member_coupon.tpl:1:@DEPRECATED ./templates/de/emails/member/member_del_surfbar_urls.tpl:1:@DEPRECATED @@ -328,6 +330,9 @@ ./templates/de/html/guest/guest_rallye_row.tpl:1: ./templates/de/html/guest/guest_rallye_show.tpl:1: ./templates/de/html/guest/guest_rallye.tpl:1: +./templates/de/html/member/member_list_referal_level.tpl:1: +./templates/de/html/member/member_list_referal_row.tpl:1: +./templates/de/html/member/member_list_referal.tpl:1: ./templates/de/html/member/member_refback_edit.tpl:1: ./templates/de/html/member/member_refback_list_level.tpl:1: ./templates/de/html/member/member_refback_list_row_deleted.tpl:1: diff --git a/DOCS/de/AUTHORS.txt b/DOCS/de/AUTHORS.txt index 5fffb8048a..fe65fcbc1e 100644 --- a/DOCS/de/AUTHORS.txt +++ b/DOCS/de/AUTHORS.txt @@ -52,7 +52,7 @@ - Lars Moehlenbruch - (Verbesserter HTML-Template Support, Referals eines Mitgliedes auflisten, + (Verbesserter HTML-Template Support, Referrals eines Mitgliedes auflisten, veraltete Version, die nur die erste Ebene anzeigt) - Erol Ilkan diff --git a/DOCS/de/README.txt b/DOCS/de/README.txt index 239f7574ff..947d738eb2 100644 --- a/DOCS/de/README.txt +++ b/DOCS/de/README.txt @@ -273,16 +273,16 @@ Menues zufrieden sind (was auch meistens so ist... ;-) ). Dann richten Sie unter * Willkommensgutschrift und andere Festbetraege editieren: Hier stellen Sie Die Vergueetung bei Anmeldung ("Willkommensgutschrift") und eine einmalige - Referal-Gutschrift (nur erste Ebene!) ein. + Referral-Gutschrift (nur erste Ebene!) ein. -* Referal-Ebenen editieren / loeschen / hinzufuegen: Dies ist wohl das +* Referral-Ebenen editieren / loeschen / hinzufuegen: Dies ist wohl das interessanteste fuer Mitglieder! Es empfiehlt sich, das ganze "in der Waage" zu halten: Nicht zu viel aber auch nicht zu wenig und je "tiefer" die Ebenen, desto niedriger der prozentualer Anteil. Zudem sollten zum Starten 5 Ebenen reichen. :-) -* Auch bei den Referal-Ebenen koennen Sie noch nichts aendern / loeschen! - Loeschen von Referal-Ebenen im Betrieb ist gefaehrlich! Dadurch +* Auch bei den Referral-Ebenen koennen Sie noch nichts aendern / loeschen! + Loeschen von Referral-Ebenen im Betrieb ist gefaehrlich! Dadurch verlieren Ihre Mitglieder definitiv Punkte in den Ebenen! Also vorher manuell gutschreiben!!! @@ -357,7 +357,7 @@ Accounts! Dabei brauchen Sie noch nicht mal Ihren Ref-Link bewerben! Das geschieht vollkommen automatisch! Melden Sie sich als naechstes selber an. Die vom System Ihnen zugeteilte Ref-ID -tragen Sie unter "Einstellungen -> Standart Ref-ID" als Referal-ID ein. +tragen Sie unter "Einstellungen -> Standart Ref-ID" als Referral-ID ein. Sobald Sie dies getan haben, und jemand Ihren Mailtausch ohne Ref-Link aufruft, wird automatisch Ihre Ref-ID im Anmeldeformular eingesetzt. Folglich erhalten Sie diff --git a/DOCS/de/THANK_YOU.txt b/DOCS/de/THANK_YOU.txt index 77449820ad..93e60baf26 100644 --- a/DOCS/de/THANK_YOU.txt +++ b/DOCS/de/THANK_YOU.txt @@ -19,7 +19,7 @@ Personen: Spalten zu setzen (http://www.biel-newmedia.de) - Herr Robert Niedziela: Hat mir diverese Patches (viele!) zugesandt. Danke Dir! (http://www.mcpserver.de; http://www.mc-p.org) -- Herr Lars Moehlenbruch: Einige gute Hinweise und das Auflisten von Referals +- Herr Lars Moehlenbruch: Einige gute Hinweise und das Auflisten von Referrals im Admin-Bereich (http://www.masterportal24.com) - Herr Michael Dittrich: Verbesserung eines Werbetextes auf meinen Webseiten (http://www.oshop.de) diff --git a/DOCS/de/network/README.txt b/DOCS/de/network/README.txt index 4e0ba0241c..d562f74036 100644 --- a/DOCS/de/network/README.txt +++ b/DOCS/de/network/README.txt @@ -32,13 +32,13 @@ extra = Extra-Parameter, der sonst oben nicht passt ------------------------------------------------------------------------------- -Referal-Links: --------------- -Die eingebundenen Referal-Links bleiben bitte erhalten, auch nach der Anmeldung +Referral-Links: +--------------- +Die eingebundenen Referral-Links bleiben bitte erhalten, auch nach der Anmeldung beim jeweiligen Werbenetzwerk brauchen Sie diese nicht aendern, da keiner veroeffentlicht wird. Der einizge Grund, weshalb diese vorhanden sind ist der, dass ich dies als indirekte Bezahlung meiner "Arbeitszeiten" am Script verstehe. -Deshalb moechte ich Sie auch bitten, meine Referal-Links zum Anmelden zu +Deshalb moechte ich Sie auch bitten, meine Referral-Links zum Anmelden zu verwenden. Wenn Sie selber das Werbenetzwerk bewerben wollen, koennen Sie -selbstverstaendlich Ihren Referal-Link verwenden. +selbstverstaendlich Ihren Referral-Link verwenden. diff --git a/DOCS/en/AUTHORS.txt b/DOCS/en/AUTHORS.txt index 17fa6d1cc5..23e92476b0 100644 --- a/DOCS/en/AUTHORS.txt +++ b/DOCS/en/AUTHORS.txt @@ -31,7 +31,7 @@ - Lars Moehlenbruch - (Better HTML template support, list referals of a member) + (Better HTML template support, list referrals of a member) - Erol Ilkan diff --git a/DOCS/en/THANK_YOU.txt b/DOCS/en/THANK_YOU.txt index 5973b3e630..2d7676c3e8 100644 --- a/DOCS/en/THANK_YOU.txt +++ b/DOCS/en/THANK_YOU.txt @@ -14,7 +14,7 @@ Persona: (http://www.biel-newmedia.de) - Mr. Robert Niedziela: Sends several patches (a lot!) to me. Thank you. (http://www.mcpserver.de; http://www.mc-p.org) -- Mr. Lars Moehlenbruch: Some nice hints and referal listing script (admin +- Mr. Lars Moehlenbruch: Some nice hints and referral listing script (admin area) (http://www.masterportal24.com) - Mr. Michael Dittrich: MyAutoInstaller-Community into text (http://www.oshop.de) diff --git a/birthday_confirm.php b/birthday_confirm.php index 13cd43104a..333e5b03b7 100644 --- a/birthday_confirm.php +++ b/birthday_confirm.php @@ -90,8 +90,8 @@ if (SQL_NUMROWS($result) == 1) { // Is the account confirmed? if ($data['status'] == 'CONFIRMED') { // Add points to account - initReferalSystem(); - addPointsThroughReferalSystem('birthday_confirm', $userid, $data['points']); + initReferralSystem(); + addPointsThroughReferralSystem('birthday_confirm', $userid, $data['points']); // Remove entry from table SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_birthday` WHERE `userid`=%s AND `chk_value`='%s' LIMIT 1", diff --git a/click.php b/click.php index 47f9c16cf2..4826310617 100644 --- a/click.php +++ b/click.php @@ -55,7 +55,7 @@ if ((isGetRequestElementSet('user')) && (isGetRequestElementSet('banner'))) { // A line has been updated? if ((!SQL_HASZEROAFFECTED()) && (isGetRequestElementSet('user'))) { - // Redirect to the user's referal link + // Redirect to the user's referral link redirectToUrl('ref.php?refid=' . bigintval(getRequestElement('user'))); } // END - if } // END - if diff --git a/doubler.php b/doubler.php index 2f8b0a2341..80b913e61e 100644 --- a/doubler.php +++ b/doubler.php @@ -102,7 +102,7 @@ if (isFormSent()) { SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`,`refid`,`points`,`remote_ip`,`timemark`,`completed`,`is_ref`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(), 'N','N')", array( getUserData('userid'), - makeZeroToNull(determineReferalId()), + makeZeroToNull(determineReferralId()), bigintval(postRequestElement('points') * 2), detectRemoteAddr() ), __FILE__, __LINE__); @@ -115,17 +115,17 @@ if (isFormSent()) { updateConfiguration('doubler_points', $points, '+'); incrementConfigEntry('doubler_points', $points); - // Add second line for the referal but only when userid != refid - if ((isValidUserId(determineReferalId())) && (determineReferalId() != getUserData('userid'))) { + // Add second line for the referral but only when userid != refid + if ((isValidUserId(determineReferralId())) && (determineReferralId() != getUserData('userid'))) { // Okay add a refid line and apply refid percents SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`,`refid`,`points`,`remote_ip`,`timemark`,`completed`,`is_ref`) VALUES (%s,0,%s,'%s',UNIX_TIMESTAMP(),'N','Y')", array( - makeZeroToNull(determineReferalId()), + makeZeroToNull(determineReferralId()), (postRequestElement('points') * 2 * getConfig('doubler_ref') / 100), detectRemoteAddr() ), __FILE__, __LINE__); - // And that's why we don't want to you more than one referal level of doubler-points. ^^^ + // And that's why we don't want to you more than one referral level of doubler-points. ^^^ } // END - if // Update usage counter @@ -191,7 +191,7 @@ if (isUserDataValid()) { $content['refid'] = getUserData('userid'); } else { // Transfer userid/nickname to constant - $content['refid'] = determineReferalId(); + $content['refid'] = determineReferralId(); } // Text "Enter login" diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index e4db35bfcd..dd99172118 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -189,10 +189,10 @@ class CacheSystem { // Access control lines $GLOBALS['cache_array']['admin_acls'][$k][$data['admin_id']][] = $v; } elseif ($this->name == 'refdepths') { - // Referal levels + // Referral levels $GLOBALS['cache_array']['refdepths'][$k][$data['id']] = $v; } elseif ($this->name == 'refsystem') { - // Referal system + // Referral system $GLOBALS['cache_array']['refsystem'][$k][$data['id']] = $v; } elseif ($this->name == 'revision') { // Revision data diff --git a/inc/config-global.php b/inc/config-global.php index 88b1ea5741..9eba061612 100644 --- a/inc/config-global.php +++ b/inc/config-global.php @@ -60,7 +60,7 @@ error_reporting(E_ALL | E_STRICT); $path = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3)); // Some very important function includes -foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'stats', 'http', 'xml', 'callback', 'referal') as $inc) { +foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'stats', 'http', 'xml', 'callback', 'referral') as $inc) { include($path . 'inc/' . $inc . '-functions.php'); } // END - foreach diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index 2ea6a3afbc..4845b2fcfc 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -63,12 +63,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='N' WHERE `what`='active' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='N' WHERE `what`='active' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='active' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='active' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index de4431a44e..0dc861c131 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -230,7 +230,7 @@ switch (getExtensionMode()) { case '0.3.6': // SQL queries for v0.3.6 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Die Accounts der Standard-Referal-Id, der Bonus-Id, Bettellink-Id und der Verdoppler-Id werden nun nicht mehr gelöscht und tauchen auch unterhalb der Inaktiven-Liste nicht mehr auf."); + setExtensionUpdateNotes("Die Accounts der Standard-Referral-Id, der Bonus-Id, Bettellink-Id und der Verdoppler-Id werden nun nicht mehr gelöscht und tauchen auch unterhalb der Inaktiven-Liste nicht mehr auf."); break; case '0.3.7': // SQL queries for v0.3.7 diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index cdffe783d2..43dc0757cd 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -169,12 +169,12 @@ UNIQUE (`account_id`,`tan`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `action`='bank' LIMIT 8"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `action`='bank' LIMIT 8"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `action`='bank' LIMIT 8"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `action`='bank' LIMIT 8"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index ab3cee4a19..36236bfac3 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -86,16 +86,16 @@ INDEX (`userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='beg' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what` IN ('beg','beg2') LIMIT 2"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='beg' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='beg' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='beg' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what` IN ('beg','beg2')"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='beg' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='beg' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='beg' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what` IN('beg','beg2') LIMIT 2"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='beg' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what` IN('beg','beg2')"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='beg' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='beg' LIMIT 1"); break; @@ -241,7 +241,7 @@ INDEX (`userid`)", break; case '0.2.4': // SQL queries for v0.2.4 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras', `sort`=1 WHERE `what`='beg' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras',`sort`=1 WHERE `what`='beg' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); @@ -291,13 +291,13 @@ INDEX (`userid`)", `referal_url` TINYTEXT NOT NULL, PRIMARY KEY (`id`), INDEX (`userid`)", - 'Recorded Referal URLs'); + 'Recorded referral URLs'); // Add admin menu - addAdminMenuSql('user','list_beg_referal_urls','Bettel-Referals auflisten','Listet alle Bettellink-Aufrufe inklusive Referal-URL auf.','13'); + addAdminMenuSql('user','list_beg_referal_urls','Bettel-Referrals auflisten','Listet alle Bettellink-Aufrufe inklusive Referral-URL auf.','13'); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Loggen der Referal-URLs hinzugefügt."); + setExtensionUpdateNotes("Loggen der Referral-URLs hinzugefügt."); break; case '0.3.0': // SQL queries for v0.3.0 diff --git a/inc/extensions/ext-bitcoins.php b/inc/extensions/ext-bitcoins.php index aa12ff7f11..626488786e 100644 --- a/inc/extensions/ext-bitcoins.php +++ b/inc/extensions/ext-bitcoins.php @@ -64,7 +64,7 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - //addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='foo' LIMIT 1"); + //addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='foo' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index b0d34a1523..cf745843ec 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -96,15 +96,15 @@ INDEX (`cat_id`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='bonus' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `action`='bonus' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='show_bonus' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='bonus' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `action`='bonus' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='show_bonus' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='bonus' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `action`='bonus' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='bonus' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `action`='bonus' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='show_bonus' LIMIT 1"); break; @@ -298,7 +298,7 @@ INDEX `userid` (`userid`)", addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `bonus_stats` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000"); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Bonus-{?POINTS?} für: Mailbestellung, Referal-Werbung (bei Best. der EMail-Adresse) und wenn 100% Klickrate jeder Mailbuchung erreicht wurde.
Template admin_config_bonus_pro.tpl ist überflüssig geworden. Bitte löschen Sie dies!
Eingestellte Bonus-{?POINTS?} für Rank 2 war um eins verschoben."); + setExtensionUpdateNotes("Bonus-{?POINTS?} für: Mailbestellung, Referral-Werbung (bei Best. der EMail-Adresse) und wenn 100% Klickrate jeder Mailbuchung erreicht wurde.
Template admin_config_bonus_pro.tpl ist überflüssig geworden. Bitte löschen Sie dies!
Eingestellte Bonus-{?POINTS?} für Rank 2 war um eins verschoben."); break; case '0.4.5': // SQL queries for v0.4.5 @@ -312,7 +312,7 @@ INDEX `userid` (`userid`)", break; case '0.4.7': // SQL queries for v0.4.7 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_bonus`=0, `turbo_bonus`=0, `bonus_ref`=0, `bonus_order`=0, `bonus_stats`=0"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_bonus`=0,`turbo_bonus`=0,`bonus_ref`=0,`bonus_order`=0,`bonus_stats`=0"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Die Aktiv-Rallye wurde nicht auf 0 {?POINTS?} gesetzt. Dieser Fehler ist nun behoben. Allerdings ist mit diesem Update auch die Aktiv-Rallye zurückgesetzt worden."); @@ -448,7 +448,7 @@ ORDER BY addConfigAddSql('bonus_click_yn', "ENUM('Y','N') NOT NULL DEFAULT 'Y'"); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Es können nun auch die folgenden Vergütungen bei der Auswertung der monatlichen Aktiv-Rallye mit berücksichtigt werden: Mailbestätigung (war vorher schon), Login-, Mailbuchung, Referal und Statistik-Bonus (100% Klickrate erreicht)."); + setExtensionUpdateNotes("Es können nun auch die folgenden Vergütungen bei der Auswertung der monatlichen Aktiv-Rallye mit berücksichtigt werden: Mailbestätigung (war vorher schon), Login-, Mailbuchung, Referral und Statistik-Bonus (100% Klickrate erreicht)."); break; case '0.7.0': // SQL queries for v0.7.0 @@ -519,7 +519,7 @@ ORDER BY break; case '0.8.3': // SQL queries for v0.8.3 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='rals', `sort`=2, `title`='Aktiv-Rallye' WHERE `what`='bonus' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='rals',`sort`=2,`title`='Aktiv-Rallye' WHERE `what`='bonus' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php index 01557fa309..34712f1ab4 100644 --- a/inc/extensions/ext-booking.php +++ b/inc/extensions/ext-booking.php @@ -93,12 +93,12 @@ INDEX (`userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='booking' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='booking' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='booking' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='booking' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-coupon.php b/inc/extensions/ext-coupon.php index 77143b8ac3..84ee50137c 100644 --- a/inc/extensions/ext-coupon.php +++ b/inc/extensions/ext-coupon.php @@ -119,12 +119,12 @@ UNIQUE (`coupon_code`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `action`='coupon' LIMIT 3"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `action`='coupon' LIMIT 3"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `action`='coupon' LIMIT 3"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `action`='coupon' LIMIT 3"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index 46d31abd98..09444fce93 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -75,7 +75,7 @@ INDEX (`userid`)", addConfigAddSql('doubler_left', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 1000'); // Charge for doubling points which goes to the webmaster (shreddered in fact!) addConfigAddSql('doubler_charge', 'FLOAT(7,5) UNSIGNED NOT NULL DEFAULT 0.03000'); - // Referal percents + // Referral percents addConfigAddSql('doubler_ref', 'FLOAT(7,5) UNSIGNED NOT NULL DEFAULT 0.02000'); // Shall I use the jackpot to take points from? (Y/N, default=Y) addConfigAddSql('doubler_jackpot', "ENUM('Y','N') NOT NULL DEFAULT 'Y'"); @@ -124,15 +124,15 @@ INDEX (`userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='doubler' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='doubler' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='doubler' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='doubler' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='doubler' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='doubler' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='doubler' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='doubler' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='doubler' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='doubler' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='doubler' LIMIT 1"); break; @@ -214,7 +214,7 @@ INDEX (`userid`)", break; case '0.1.4': // SQL queries for v0.1.4 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras', `sort`=4 WHERE `what`='doubler' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras',`sort`=4 WHERE `what`='doubler' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); diff --git a/inc/extensions/ext-earning.php b/inc/extensions/ext-earning.php index cd8f3a9f4a..43f9924f36 100644 --- a/inc/extensions/ext-earning.php +++ b/inc/extensions/ext-earning.php @@ -104,12 +104,12 @@ INDEX (`earning_userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='earning' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='earning' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='earning' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='earning' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-funcoins.php b/inc/extensions/ext-funcoins.php index 04f4944a80..bf544b4602 100644 --- a/inc/extensions/ext-funcoins.php +++ b/inc/extensions/ext-funcoins.php @@ -112,14 +112,14 @@ INDEX (`userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='funcoins_portal' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='funcoins' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='funcoins_portal' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='funcoins' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='funcoins_portal' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='funcoins' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='funcoins_portal' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='funcoins' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-geoip.php b/inc/extensions/ext-geoip.php index 320c0c4410..d79cd93946 100644 --- a/inc/extensions/ext-geoip.php +++ b/inc/extensions/ext-geoip.php @@ -63,7 +63,7 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - //addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='foo' LIMIT 1"); + //addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='foo' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension diff --git a/inc/extensions/ext-grade.php b/inc/extensions/ext-grade.php index 3eff1425ed..5a0db2e8cc 100644 --- a/inc/extensions/ext-grade.php +++ b/inc/extensions/ext-grade.php @@ -128,14 +128,14 @@ INDEX (`grade_id`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `locked`='N', `visible`='Y' WHERE `what`='grade' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='N', `visible`='Y' WHERE `what`='grade' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `locked`='N',`visible`='Y' WHERE `what`='grade' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='N',`visible`='Y' WHERE `what`='grade' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `locked`='Y', `visible`='N' WHERE `what`='grade' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='Y', `visible`='N' WHERE `what`='grade' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `locked`='Y',`visible`='N' WHERE `what`='grade' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='Y',`visible`='N' WHERE `what`='grade' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 2491236140..ae6787f9ab 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -87,12 +87,12 @@ INDEX (`userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='holiday' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='holiday' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='holiday' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='holiday' LIMIT 1"); break; case 'update': // Update an extension @@ -199,7 +199,7 @@ INDEX (`userid`)", break; case '0.1.9': // SQL queries for v0.1.9 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='account', `sort`=2, `title`='In Urlaub' WHERE `what`='holiday' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='account',`title`='In Urlaub',`sort`=2 WHERE `what`='holiday' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php index 3829864aea..e162861124 100644 --- a/inc/extensions/ext-html_mail.php +++ b/inc/extensions/ext-html_mail.php @@ -62,12 +62,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='html_mail' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='html_mail' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='html_mail' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='html_mail' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-imprint.php b/inc/extensions/ext-imprint.php index 1ce7ad4af1..dc936919dc 100644 --- a/inc/extensions/ext-imprint.php +++ b/inc/extensions/ext-imprint.php @@ -92,12 +92,12 @@ UNIQUE (`imprint_key`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='N', `visible`='Y' WHERE `what`='imprint' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='N',`visible`='Y' WHERE `what`='imprint' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='Y', `visible`='N' WHERE `what`='imprint' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='Y',`visible`='N' WHERE `what`='imprint' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php index d8348e6ab5..29772069d0 100644 --- a/inc/extensions/ext-mailid.php +++ b/inc/extensions/ext-mailid.php @@ -59,7 +59,7 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='mailid' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='mailid' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension @@ -201,7 +201,7 @@ switch (getExtensionMode()) { case '0.2.8': // SQL queries for v0.2.8 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Bonus- und Standard-Referal-Id ausblendbar aus Aktiv-Rallye und bekommt kein Aktiv-Guthaben."); + setExtensionUpdateNotes("Bonus- und Standard-Referral-Id ausblendbar aus Aktiv-Rallye und bekommt kein Aktiv-Guthaben."); break; case '0.2.9': // SQL queries for v0.2.9 diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index f31d0c08ec..e401d0fce6 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -72,12 +72,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='mediadata' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='mediadata' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='mediadata' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='mediadata' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php index d008a9a2ec..c2b1902a92 100644 --- a/inc/extensions/ext-mods.php +++ b/inc/extensions/ext-mods.php @@ -119,7 +119,7 @@ switch (getExtensionMode()) { addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Java-Script Ausgabe' WHERE `module`='js' AND `title`='' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Externe Seite wird geladen . . .' WHERE `module`='loader' AND `title`='' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Willkommen zum Mitgliedsbereich!' WHERE `module`='login' AND `title`='' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Referal-Link' WHERE `module`='ref' AND `title`='' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Referral-Link' WHERE `module`='ref' AND `title`='' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Standardnamen gesetzt, diese überschreiben nicht Ihre bereits gespeicherten Modulnamen."); diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php index eb0ae0e717..dc9434e2fa 100644 --- a/inc/extensions/ext-mydata.php +++ b/inc/extensions/ext-mydata.php @@ -59,12 +59,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='mydata' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='mydata' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='mydata' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='mydata' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index fe0a72f634..b3dd951dc0 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -5172,7 +5172,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)", // 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_network_api', 'API-Zugangsdaten', 'Stellen Sie Ihre Affiliate- Webseiten-Id und API-Passwort ein. Diese erhalten Sie aus dem Affiliate-Bereich des jeweiligen Werbenetzwerkes. Sollten Sie bei einem Werbenetzwerk noch nicht angemeldet sein, verwenden Sie bitte meinen Referal-Link dazu.',1); + addAdminMenuSql('network', 'config_network_api', 'API-Zugangsdaten', 'Stellen Sie Ihre Affiliate- Webseiten-Id und API-Passwort ein. Diese erhalten Sie aus dem Affiliate-Bereich des jeweiligen Werbenetzwerkes. Sollten Sie bei einem Werbenetzwerk noch nicht angemeldet sein, verwenden Sie bitte meinen Referral-Link dazu.',1); addAdminMenuSql('network', 'config_network_types', 'Werbearten', 'Stellen Sie hier Reload-Zeiten, Mindestauffenthalt und so weiter pro Werbeart und Werbenetzwerk ein. Es werden sonst Ausgangswerte (Mimimumwerte: 0, Maximumwerte: sehr gross, Erotik: aus) angenommen, die Sie meistens nicht wollen.',2); addAdminMenuSql('network', 'query_networks', 'APIs abfragen', 'Fragt alle eingestellten APIs ab. Die Ergebnisse werden dann für einen einstellbaren Zeitraum gecacht und nicht erneut angefordert.',3); addAdminMenuSql('network', 'config_network', 'Einstellungen', 'Stellen Sie generelle Einstellungen ein, die für alle Werbenetzwerke gelten, wie z.B. Cache-Erneuerungsinterval. Generell sind aber die Einstellungen in Ordnung, da z.B. sonst Ihre freien Abfragen beim Werbenetzwerk sich zu schnell abbauen.',4); diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index 9aec530528..1358ecf6f2 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -64,12 +64,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='nickname' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='nickname' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='nickname' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='nickname' LIMIT 1"); break; case 'update': // Update an extension @@ -155,7 +155,7 @@ switch (getExtensionMode()) { break; case '0.1.6': // SQL queries for v0.1.6 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras', `sort`=2 WHERE `what`='nickname' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras',`sort`=2 WHERE `what`='nickname' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php index d79d8f7981..e04c025e6e 100644 --- a/inc/extensions/ext-online.php +++ b/inc/extensions/ext-online.php @@ -82,12 +82,12 @@ INDEX `admin_member` (`is_admin`,`is_member`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `action`='online' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `action`='online' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `action`='online' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `action`='online' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php index c2962026e3..21247edc6e 100644 --- a/inc/extensions/ext-order.php +++ b/inc/extensions/ext-order.php @@ -65,14 +65,14 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `action`='order'"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `hidden`='N', `locked`='N', `admin_only`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `action`='order'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `hidden`='N',`locked`='N',`admin_only`='N',`mem_only`='Y' WHERE `module`='order' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `action`='order'"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `hidden`='Y', `locked`='Y' WHERE `module`='order' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `action`='order'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `hidden`='Y',`locked`='Y' WHERE `module`='order' LIMIT 1"); break; case 'update': // Update an extension @@ -275,7 +275,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us case '0.4.6': // SQL queries for v0.4.6 addMemberMenuSql('order', NULL, 'Mailbuchungen', 3); addMemberMenuSql('order', 'order2', 'Framekiller-Mails', 2); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='order', `sort`=1, `title`='Klick-Mails' WHERE `what`='order' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='order',`title`='Klick-Mails',`sort`=1 WHERE `what`='order' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php index 266bcfd0b4..6fd1cf56d8 100644 --- a/inc/extensions/ext-payout.php +++ b/inc/extensions/ext-payout.php @@ -91,19 +91,19 @@ PRIMARY KEY (`id`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='payout' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='payout' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='payout' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='payout' LIMIT 1"); break; case 'update': // Update an extension switch (getCurrentExtensionVersion()) { case '0.1.2': // SQL queries for v0.1.2 addAdminMenuSql('payouts', NULL, 'Auszahlungsmanagement','Management der Auszahlungsarten.',8); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `action`='payouts', `title`='Einstellungen' WHERE `action`='setup' AND `what`='config_payouts' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `action`='payouts',`title`='Einstellungen' WHERE `action`='setup' AND `what`='config_payouts' LIMIT 1"); break; case '0.1.3': // SQL queries for v0.1.3 diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php index 310bab40c5..fc54a62b9b 100644 --- a/inc/extensions/ext-primera.php +++ b/inc/extensions/ext-primera.php @@ -94,12 +94,12 @@ INDEX (`userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='primera' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='primera' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='primera' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='primera' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index fe00417623..1d7601c6bf 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : ext-rallye.php * * -------------------------------------------------------------------- * - * Short description : Referal rallye * + * Short description : Referral rallye * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Ref-Rallyes starten * + * Kurzbeschreibung : Referral Rallyes starten * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -119,14 +119,14 @@ INDEX (`userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='rallyes' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='rallyes' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='rallyes' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='rallyes' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='rallyes' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='rallyes' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='rallyes' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='rallyes' LIMIT 1"); break; case 'update': // Update an extension @@ -209,12 +209,12 @@ INDEX (`userid`)", case '0.1.8': // SQL queries for v0.1.8 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Weitere Templates vom Admin-Bereich ausgelagert und Referal-Anazahl in der Mail zur Rallye-Ankündigung repariert."); + setExtensionUpdateNotes("Weitere Templates vom Admin-Bereich ausgelagert und Referral-Anazahl in der Mail zur Rallye-Ankündigung repariert."); break; case '0.1.9': // SQL queries for v0.1.9 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Funktion generateUserProfileLink() mit Verlinkung auf Referal-Liste implementiert."); + setExtensionUpdateNotes("Funktion generateUserProfileLink() mit Verlinkung auf Referral-Liste implementiert."); break; case '0.2.0': // SQL queries for v0.2.0 @@ -261,7 +261,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu case '0.2.6': // SQL queries for v0.2.6 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Automatisches Starten von Referal-Rallyes repariert."); + setExtensionUpdateNotes("Automatisches Starten von Referral-Rallyes repariert."); break; case '0.2.7': // SQL queries for v0.2.7 @@ -291,7 +291,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu break; case '0.3.2': // SQL queries for v0.3.2 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='rals', `sort`=1, `title`='Referal-Rallye' WHERE `what`='rallyes' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='rals',`title`='Referral-Rallye',`sort`=1 WHERE `what`='rallyes' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); @@ -325,7 +325,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu addExtensionDependency('sql_patches'); // Update notes - setExtensionUpdateNotes("Gewinn aus der Referal-Rallye wird nun über die Tabelle {OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data verwaltet."); + setExtensionUpdateNotes("Gewinn aus der Referral-Rallye wird nun über die Tabelle {OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data verwaltet."); break; } // END - switch break; @@ -346,8 +346,8 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu // Add more data on higher versions $ADD1 = ''; $ADD2 = ''; $OR = ''; if (isExtensionInstalledAndNewer('rallye', '0.2.0')) { - $ADD1 = ", `min_users`,`min_prices`"; - $ADD2 = ", d.`min_users`, d.`min_prices`"; + $ADD1 = ",`min_users`,`min_prices`"; + $ADD2 = ",d.`min_users`,d.`min_prices`"; $OR = " OR (d.`min_users` <= " . $total . " AND d.`min_users` > 0)"; } // END - if @@ -365,7 +365,7 @@ WHERE LIMIT 1", __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Start rallye - autostartReferalRallyes($result); + autostartReferralRallyes($result); } // END - if // Free memory @@ -373,7 +373,12 @@ LIMIT 1", __FILE__, __LINE__); // Check for expired rallyes $result = SQL_QUERY("SELECT SQL_SMALL_RESULT - d.`id`, d.`title`, d.`start_time`, d.`end_time`, d.`send_notify`" . $ADD2 . " + d.`id`, + d.`title`, + d.`start_time`, + d.`end_time`, + d.`send_notify` + " . $ADD2 . " FROM `{?_MYSQL_PREFIX?}_rallye_data` AS d WHERE @@ -384,7 +389,7 @@ WHERE LIMIT 1", __FILE__, __LINE__); if ((SQL_NUMROWS($result) == 1) && (isExtensionActive('autopurge'))) { // End rallye here... - markReferalRallyesAsExpired($result); + markReferralRallyesAsExpired($result); } // END - if // Free memory diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index aca491b1bb..0e6a98a781 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -63,12 +63,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what` IN('refback','reflist') LIMIT 2"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what` IN('refback','reflist') LIMIT 2"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what` IN('refback','reflist') LIMIT 2"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what` IN('refback','reflist') LIMIT 2"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-refsell.php b/inc/extensions/ext-refsell.php index e1188c9b43..ca90175333 100644 --- a/inc/extensions/ext-refsell.php +++ b/inc/extensions/ext-refsell.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : ext-refsell.php * * -------------------------------------------------------------------- * - * Short description : An extension for selling referals * + * Short description : An extension for selling referrals * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Eine Erweiterung zum Verkauf von Referals * + * Kurzbeschreibung : Eine Erweiterung zum Verkauf von Referrals * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index 2d9360e864..b745f744d6 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -64,12 +64,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='N', `visible`='Y' WHERE `what`='register' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='N',`visible`='Y' WHERE `what`='register' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='Y', `visible`='N' WHERE `what`='register' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `locked`='Y',`visible`='N' WHERE `what`='register' LIMIT 1"); break; case 'update': // Update an extension @@ -111,7 +111,7 @@ PRIMARY KEY (`id`)", addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Standard Referal-Id kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)"); + setExtensionUpdateNotes("Standard Referral-Id kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)"); break; case '0.1.4': // SQL queries for v0.1.4 @@ -181,7 +181,7 @@ PRIMARY KEY (`id`)", case '0.2.7': // SQL queries for v0.2.7 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Referal-Id wird endlich korrekt gesetzt."); + setExtensionUpdateNotes("Referral-Id wird endlich korrekt gesetzt."); break; case '0.2.8': // SQL queries for v0.2.8 diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php index b79a383e3c..309776aca2 100644 --- a/inc/extensions/ext-repair.php +++ b/inc/extensions/ext-repair.php @@ -121,7 +121,7 @@ switch (getExtensionMode()) { break; case '0.1.8': // SQL queries for v0.1.8 - addAdminMenuSql('repair','repair_refs','Referal-Tabelle', 'Setzt die Referal-Tabelle {?_MYSQL_PREFIX?}_user_refs zurück und baut diese neu auf. Dies sollten Sie nur tun, falls Ihre Mitglieder Ihnen Probleme mit Referals melden.',6); + addAdminMenuSql('repair','repair_refs','Referral-Tabelle', 'Setzt die Referral-Tabelle {?_MYSQL_PREFIX?}_user_refs zurück und baut diese neu auf. Dies sollten Sie nur tun, falls Ihre Mitglieder Ihnen Probleme mit Referrals melden.',6); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Sprachdateien sind nun auch "reparierbar" - nicht durch das Script, das findet nur die nicht übersetzten Zeichenketten, sondern durch den Menschen."); diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index f82a2a697a..e04bb00bd5 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -359,7 +359,7 @@ INDEX (`sponsor_id`)", addSponsorMenuSql('main', 'fillup', 'Konto auffüllen', 'N', 7); addSponsorMenuSql('main', 'stats', 'Statistiken', 'N', 8); addSponsorMenuSql('main', 'inquiry', 'Kontaktanfrage', 'N', 9); - addSponsorMenuSql('main', 'refid', 'Referal-Link', 'N', 10); + addSponsorMenuSql('main', 'refid', 'Referral-Link', 'N', 10); addSponsorMenuSql('actions', NULL, 'Sponsorenaktionen', 'N', 2); addSponsorMenuSql('actions', 'mail', 'Sponsor-Mail', 'N', 1); addSponsorMenuSql('actions', 'banner', 'Banner buchen', 'N', 2); @@ -382,7 +382,7 @@ INDEX (`sponsor_id`)", // Update name, if not yet set addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Sponsorbereich' WHERE `module`='sponsor' AND `title`='' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Sponsor-Bestätigung' WHERE `module`='sponsor_confirm' AND `title`='' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Sponsor-Referallink' WHERE `module`='sponsor_ref' AND `title`='' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='Sponsor-Referrallink' WHERE `module`='sponsor_ref' AND `title`='' LIMIT 1"); break; case 'remove': // Do stuff when removing extension @@ -407,17 +407,17 @@ INDEX (`sponsor_id`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `action`='sponsor'"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='sponsor' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `action`='sponsor'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='sponsor' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_menu` SET `active`='Y' WHERE active='N'"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_registry` SET `is_active`='Y' WHERE `is_active`='N'"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module` IN ('sponsor','sponsor_confirm','sponsor_ref') LIMIT 3"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module` IN ('sponsor','sponsor_confirm','sponsor_ref') LIMIT 3"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `action`='sponsor'"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='sponsor' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `action`='sponsor'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='sponsor' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_menu` SET `active`='N' WHERE `active`='Y'"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_sponsor_registry` SET `is_active`='N' WHERE `is_active`='Y'"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module` IN ('sponsor','sponsor_confirm','sponsor_ref') LIMIT 3"); diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index e9cb0920e9..ee1ef7186a 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.8.5'); +setThisExtensionVersion('0.8.6'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5')); +setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -178,7 +178,7 @@ IN ( case '0.1.0': // SQL queries for v0.1.0 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Soll der einmalige Ref-Bonus über das Referal-System (also alle oberen Refs bekommen auch etwas davon ab) oder direkt dem Werber aufgebucht werden?"); + setExtensionUpdateNotes("Soll der einmalige Ref-Bonus über das Referral-System (also alle oberen Refs bekommen auch etwas davon ab) oder direkt dem Werber aufgebucht werden?"); break; case '0.1.1': // SQL queries for v0.1.1 @@ -191,11 +191,11 @@ IN ( break; case '0.1.2': // SQL queries for v0.1.2 - addAdminMenuSql('setup','config_refid','Standard-Ref-Id','Stellen Sie hier die Mitglied-Id ein, die genommen werden soll, wenn der Gast n icht per Referal-Link Ihren {?mt_word?} aufgerufen hat.', 7); + addAdminMenuSql('setup','config_refid','Standard-Ref-Id','Stellen Sie hier die Mitglied-Id ein, die genommen werden soll, wenn der Gast n icht per Referral-Link Ihren {?mt_word?} aufgerufen hat.', 7); addConfigAddSql('def_refid', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 0'); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Standard Referal-Id kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)"); + setExtensionUpdateNotes("Standard Referral-Id kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)"); break; case '0.1.3': // SQL queries for v0.1.3 @@ -327,7 +327,7 @@ IN ( break; case '0.3.0': // SQL queries for v0.3.0 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title`='{OPEN_CONFIG}POINTS{CLOSE_CONFIG}/Referal-Ebenen' WHERE `what`='config_points' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title`='{OPEN_CONFIG}POINTS{CLOSE_CONFIG}/Referral-Ebenen' WHERE `what`='config_points' LIMIT 1"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `title`='Mailvergütungen...' WHERE `what`='payments' LIMIT 1"); // Update notes (these will be set as task text!) @@ -429,14 +429,14 @@ INDEX (`admin_id`)", break; case '0.3.5': // SQL queries for v0.3.5 - // List accounts with no referal + // List accounts with no referral addMemberMenuSql('stats', NULL, 'Statistiken', 4); addMemberMenuSql('stats', 'stats2', 'Framekiller-Mails', 2); addMemberMenuSql('extras', NULL, 'Extras', 5); addMemberMenuSql('rals', NULL, 'Rallyes', 6); addMemberMenuSql('account', NULL, 'Ihr Account', 7); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='stats', `sort`=1, `title`='Klick-Mails' WHERE `what`='stats' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras', `sort`=3 WHERE `what`='reflinks' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='stats',`sort`=1,`title`='Klick-Mails' WHERE `what`='stats' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras',`sort`=3 WHERE `what`='reflinks' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut."); @@ -555,7 +555,7 @@ INDEX (`admin_id`)", addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_refsystem` ADD UNIQUE INDEX `userid_level` (`userid`,`level`)'); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Referal-System unterstützt nun detailierte Referal-Übersicht und vieles mehr."); + setExtensionUpdateNotes("Referral-System unterstützt nun detailierte Referral-Übersicht und vieles mehr."); break; case '0.5.1': // SQL queries for v0.5.1 @@ -622,7 +622,7 @@ INDEX (`admin_id`)", `filter_active` ENUM('N','Y') NOT NULL DEFAULT 'Y', `filter_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`filter_id`), -UNIQUE INDEX `name_function` (`filter_name` , `filter_function`)", +UNIQUE INDEX `name_function` (`filter_name`,`filter_function`)", 'Filter system'); // Admin menu @@ -679,9 +679,9 @@ UNIQUE INDEX `name_function` (`filter_name` , `filter_function`)", break; case '0.6.6': // SQL queries for v0.6.6 - addAdminMenuSql('setup','config_secure','Sicherheitseinstellungen','Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.',9); - addAdminMenuSql('setup','config_points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}','Stellen Sie hier die Willkommensgutschrift, Referal-Gutschrift (einmalige) usw. ein.',10); - addAdminMenuSql('email','email_archiv','E-Mail Archiv','Sehen Sie sich hier bereits gesendete Mails an.',6); + addAdminMenuSql('setup', 'config_secure', 'Sicherheitseinstellungen', 'Stellen Sie ein, wie lange das Passwort eines Mitgliedes mindestens sein muss uvm.', 9); + addAdminMenuSql('setup', 'config_points', '{OPEN_CONFIG}POINTS{CLOSE_CONFIG}', 'Stellen Sie hier die Willkommensgutschrift, Referral-Gutschrift (einmalige) usw. ein.', 10); + addAdminMenuSql('email', 'email_archiv', 'E-Mail Archiv', 'Sehen Sie sich hier bereits gesendete Mails an.', 6); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Die Sicherheitseinstellungen, {?POINTS?}-Einstellungen und Email-Archiv funktionieren nur, wenn diese Erweiterung installiert ist."); @@ -807,7 +807,7 @@ INDEX (`ip`)", `subject` VARCHAR(255) NOT NULL DEFAULT '', `column_name` VARCHAR(255) NOT NULL DEFAULT 'points', `locked_mode` ENUM('LOCKED','UNLOCKED') NOT NULL DEFAULT 'LOCKED', -`payment_method` ENUM('DIRECT','REFERAL') NOT NULL DEFAULT 'REFERAL', +`payment_method` ENUM('DIRECT','REFERRAL') NOT NULL DEFAULT 'REFERRAL', `notify_recipient` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`id`), INDEX (`subject`)", @@ -831,7 +831,6 @@ INDEX (`subject`)", case '0.8.2': // SQL queries for v0.8.2 addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` DROP INDEX `ext_name`"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` CHANGE `ext_name` `subject` VARCHAR(255) NOT NULL DEFAULT ''"); - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` CHANGE `payment_method` `payment_method` ENUM('DIRECT','REFERAL') NOT NULL DEFAULT 'REFERAL'"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` ADD INDEX `subject` (`subject`)"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` ADD `notify_recipient` ENUM('Y','N') NOT NULL DEFAULT 'N'"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`,`column_name`,`locked_mode`,`payment_method`) VALUES ('pool_payback','points','LOCKED','DIRECT')"); @@ -873,6 +872,14 @@ INDEX (`history_last_used` DESC)", // Old-lost configuration entry addConfigDropSql('ext_autopurge'); + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Uralten Konfigurationseintrag entfernt."); + break; + + case '0.8.6': // SQL queries for v0.8.6 + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_points_data` CHANGE `payment_method` `payment_method` ENUM('DIRECT','REFERRAL') NOT NULL DEFAULT 'REFERRAL'"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_points_data` SET `payment_method`='REFERRAL' WHERE `payment_method`='REFERAL'"); + // Update notes (these will be set as task text!) setExtensionUpdateNotes("Uralten Konfigurationseintrag entfernt."); break; diff --git a/inc/extensions/ext-support.php b/inc/extensions/ext-support.php index 0b1c6fd507..0265d8ee16 100644 --- a/inc/extensions/ext-support.php +++ b/inc/extensions/ext-support.php @@ -59,12 +59,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='support' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='support' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='support' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='support' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index 61e4262d9a..60ad16778a 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -227,13 +227,13 @@ UNIQUE INDEX `status_action` (`actions_status`,`actions_action`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `action`='surfbar' LIMIT 5"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='Y' WHERE `module`='surfbar' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `action`='surfbar' LIMIT 5"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='Y' WHERE `module`='surfbar' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `action` = 'surfbar' LIMIT 5"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `action` = 'surfbar' LIMIT 5"); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='Y' WHERE `module`='surfbar' LIMIT 1"); break; diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index 63f7cdb85b..aab3190c14 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -176,7 +176,7 @@ switch (getExtensionMode()) { case '0.2.0': // SQL queries for v0.2.0 // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Alle Administratoren, Referal-Banner und aktivierte Referal-Banner werden nun eingeblendet."); + setExtensionUpdateNotes("Alle Administratoren, Referral-Banner und aktivierte Referral-Banner werden nun eingeblendet."); break; case '0.2.1': // SQL queries for v0.2.1 diff --git a/inc/extensions/ext-teams.php b/inc/extensions/ext-teams.php index 90e5899788..b9ad10675e 100644 --- a/inc/extensions/ext-teams.php +++ b/inc/extensions/ext-teams.php @@ -64,7 +64,7 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - //addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='foo' LIMIT 1"); + //addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='foo' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index 311349b34e..a6ac8f8655 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -71,14 +71,14 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `action`='theme' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `action`='themes' OR `what`='themes' LIMIT 2"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `action`='theme' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `action`='themes' OR `what`='themes' LIMIT 2"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `action`='theme' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `action`='themes' OR `what`='themes' LIMIT 2"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `action`='theme' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `action`='themes' OR `what`='themes' LIMIT 2"); break; case 'update': // Update an extension @@ -143,7 +143,7 @@ INDEX (`theme_active`)", 'Themes'); addMemberMenuSql('themes', NULL, 'Design-Auswahl', 3); addMemberMenuSql('main', 'themes', 'Designs', 6); addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `sort`=8 WHERE `action`='themes' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='account', `sort`=1, `title`='Designs' WHERE `what`='themes' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='account',`sort`=1,`title`='Designs' WHERE `what`='themes' LIMIT 1"); // User data addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `curr_theme` VARCHAR(255) NOT NULL DEFAULT 'default'"); diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php index 48aef7e75d..64102e3628 100644 --- a/inc/extensions/ext-top10.php +++ b/inc/extensions/ext-top10.php @@ -62,12 +62,12 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='top10' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='top10' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='top10' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='top10' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index abcc5f55fa..f2de534ecd 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -109,12 +109,12 @@ INDEX (`to_userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='transfer' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='transfer' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='transfer' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='transfer' LIMIT 1"); break; case 'update': // Update an extension @@ -244,7 +244,7 @@ INDEX (`to_userid`)", break; case '0.2.5': // SQL queries for v0.2.5 - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras', `sort`=5 WHERE `what`='transfer' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='extras',`sort`=5 WHERE `what`='transfer' LIMIT 1"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Eintrag im Mitgliedsmenü verschoben."); diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 9405d91046..7dbe2fba80 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -159,15 +159,15 @@ INDEX (`stats_type`)", 'Member statistics data'); // Admin menu - addAdminMenuSql('user',NULL,'Mitglieder-Management','Mitglieder freischalten, sperren, Accounts editieren, Neuanmeldungen verwalten, {OPEN_CONFIG}POINTS{CLOSE_CONFIG} gutschreiben und abziehen und und und...',3); - addAdminMenuSql('user','del_user','Mitglied löschen','Löschen Sie hier Mitglied, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.',1); - addAdminMenuSql('user','lock_user','Mitglied sperren / entsperren','Sperren Sie Mitglied, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.',3); - addAdminMenuSql('user','list_user','Mitglied auflisten','Listen Sie alle Mitglied oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum Mitglied ansehen.',4); - addAdminMenuSql('user','add_points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG} gutschreiben','Buchen Sie einem Mitglied direkt {OPEN_CONFIG}POINTS{CLOSE_CONFIG} auf. Sie können dazu auch einen Kommentar mitsenden.',5); - addAdminMenuSql('user','edit_user','Account editieren','Daten eines Mitglieder-Accountes ändern.',6); - addAdminMenuSql('user','list_refs','Referals anzeigen','Mit diesem Menüpunkt können Sie die generierten Referals eines Mitgliedes auflisten.',7); - addAdminMenuSql('user','list_links','Unbestätigte Mails','Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.',8); - addAdminMenuSql('user','list_cats','Kategorien anzeigen','Listet die ausgewählten Kategorien eines Mitgliedes auf.',9); + addAdminMenuSql('user', NULL, 'Mitglieder-Management', 'Mitglieder freischalten, sperren, Accounts editieren, Neuanmeldungen verwalten, {OPEN_CONFIG}POINTS{CLOSE_CONFIG} gutschreiben und abziehen und und und...', 3); + addAdminMenuSql('user', 'del_user', 'Mitglied löschen', 'Löschen Sie hier Mitglied, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.', 1); + addAdminMenuSql('user', 'lock_user', 'Mitglied sperren / entsperren', 'Sperren Sie Mitglied, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.', 3); + addAdminMenuSql('user', 'list_user', 'Mitglied auflisten', 'Listen Sie alle Mitglied oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum Mitglied ansehen.', 4); + addAdminMenuSql('user', 'add_points', '{OPEN_CONFIG}POINTS{CLOSE_CONFIG} gutschreiben', 'Buchen Sie einem Mitglied direkt {OPEN_CONFIG}POINTS{CLOSE_CONFIG} auf. Sie können dazu auch einen Kommentar mitsenden.', 5); + addAdminMenuSql('user', 'edit_user', 'Account editieren', 'Daten eines Mitglieder-Accountes ändern.', 6); + addAdminMenuSql('user', 'list_refs', 'Referrals anzeigen', 'Mit diesem Menüpunkt können Sie die generierten Referrals eines Mitgliedes auflisten.', 7); + addAdminMenuSql('user', 'list_links', 'Unbestätigte Mails', 'Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.', 8); + addAdminMenuSql('user', 'list_cats', 'Kategorien anzeigen', 'Listet die ausgewählten Kategorien eines Mitgliedes auf.', 9); break; case 'remove': // Do stuff when removing extension @@ -343,7 +343,7 @@ INDEX (`stats_type`)", addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `rand_confirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0'); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Mitglieder werden per Zufall als Referal-Id ausgewählt, die eine Mindestanzahl an bestätigten Mails haben, wenn die Ref-Id 0 ist."); + setExtensionUpdateNotes("Mitglieder werden per Zufall als Referral-Id ausgewählt, die eine Mindestanzahl an bestätigten Mails haben, wenn die Ref-Id 0 ist."); break; case '0.3.5': // SQL queries for v0.3.5 @@ -372,7 +372,7 @@ INDEX (`userid`)", case '0.3.6': // SQL queries for v0.3.6 addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` DROP INDEX `userid`'); - addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` ADD UNIQUE INDEX `userid_catid` (`userid` , `cat_id`)'); + addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` ADD UNIQUE INDEX `userid_catid` (`userid`,`cat_id`)'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Der Sperrgrund wird nun mit abgespeichert und beim Löschen des Users mit ausgesendet."); @@ -436,7 +436,7 @@ INDEX (`userid`)", addIncludeToPool('extension', 'inc/fix_user_points.php'); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Das Mitgliederguthaben musste repariert werden, da für Referal-Ebene 0, noch NULL geschrieben wurde."); + setExtensionUpdateNotes("Das Mitgliederguthaben musste repariert werden, da für Referral-Ebene 0, noch NULL geschrieben wurde."); break; case '0.4.2': // SQL queries for v0.4.2 @@ -467,9 +467,9 @@ PRIMARY KEY (`id`), UNIQUE INDEX `user_refid` (`userid`,`level`,`refid`), INDEX (`level`), INDEX (`refid`)", - 'User referals'); + 'User referrals'); - // Load ext-refback's special include to regenerate the referal table + // Load ext-refback's special include to regenerate the referral table addIncludeToPool('extension', 'inc/fix_refsystem.php'); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index fb1e925928..c54b2db7a4 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -95,14 +95,14 @@ INDEX (`userid`)", case 'activate': // Do stuff when admin activates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='wernis_portal' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='wernis' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='wernis_portal' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='wernis' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension // SQL commands to run - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='wernis_portal' LIMIT 1"); - addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='wernis' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='wernis_portal' LIMIT 1"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='wernis' LIMIT 1"); break; case 'update': // Update an extension diff --git a/inc/extensions/ext-yacy.php b/inc/extensions/ext-yacy.php index 03e792b691..c9b4168476 100644 --- a/inc/extensions/ext-yacy.php +++ b/inc/extensions/ext-yacy.php @@ -64,7 +64,7 @@ switch (getExtensionMode()) { case 'activate': // Do stuff when admin activates this extension // SQL commands to run - //addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `admin_only`='N', `mem_only`='N' WHERE `module`='foo' LIMIT 1"); + //addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`admin_only`='N',`mem_only`='N' WHERE `module`='foo' LIMIT 1"); break; case 'deactivate': // Do stuff when admin deactivates this extension diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 8d78bb5d63..a894e0e77c 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -59,12 +59,15 @@ function initFilterSystem () { // Init add $add = ''; if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) { - $add = ", `filter_counter`"; + $add = ',`filter_counter`'; } // END - if // Load all filters $result = SQL_QUERY('SELECT - `filter_name`,`filter_function`,`filter_active`' . $add . ' + `filter_name`, + `filter_function`, + `filter_active` + ' . $add . ' FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY diff --git a/inc/filter/coupon_filter.php b/inc/filter/coupon_filter.php index 4a9f0fca29..6d6a5485fe 100644 --- a/inc/filter/coupon_filter.php +++ b/inc/filter/coupon_filter.php @@ -55,8 +55,8 @@ function FILTER_COUPON_CHANGE_POINTS_COLUMN_NAME ($filterData) { function FILTER_POST_CASH_COUPON ($filterData) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!'); // Now we just need to book that points on the user's account - initReferalSystem(); - addPointsThroughReferalSystem('coupon_cashed', $filterData['userid'], $filterData['points']); + initReferralSystem(); + addPointsThroughReferralSystem('coupon_cashed', $filterData['userid'], $filterData['points']); // Subtract points from member account if the admin has selected one if (isValidUserId(getCouponUserid())) { diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php index d647c69e79..c1459c6b09 100644 --- a/inc/filter/online_filter.php +++ b/inc/filter/online_filter.php @@ -94,7 +94,7 @@ LIMIT 1", $action, getWhat(), makeZeroToNull($userid), - makeZeroToNull(determineReferalId()), + makeZeroToNull(determineReferralId()), $isMember, $isAdmin, detectRemoteAddr(), @@ -108,7 +108,7 @@ LIMIT 1", $action, getWhat(), makeZeroToNull($userid), - makeZeroToNull(determineReferalId()), + makeZeroToNull(determineReferralId()), $isMember, $isAdmin, session_id(), diff --git a/inc/filter/rallye_filter.php b/inc/filter/rallye_filter.php index d95a1c906f..6df1f69c1a 100644 --- a/inc/filter/rallye_filter.php +++ b/inc/filter/rallye_filter.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { function FILTER_RALLYE_EXTRA_AUTOPURGE ($filterData) { // Check expired rallyes (hard-coded 3 days limit for displaying expired rallyes!) //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!'); - purgeExpiredReferalRallyes(); + purgeExpiredReferralRallyes(); // Return data //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!'); diff --git a/inc/filters.php b/inc/filters.php index 872936cbda..aa3d7d3d94 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -1117,8 +1117,8 @@ function FILTER_ACTIVATE_EXCHANGE () { // Check total amount of users if (getTotalConfirmedUser() >= getActivateXchange()) { // Activate System - addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1"); - addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2"); + addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`mem_only`='Y' WHERE `module`='order' LIMIT 1"); + addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2"); // Run SQLs runFilterChain('run_sqls'); diff --git a/inc/fix_filters.php b/inc/fix_filters.php index b7dc7a9f40..d3d0b82354 100644 --- a/inc/fix_filters.php +++ b/inc/fix_filters.php @@ -42,11 +42,13 @@ if (!defined('__SECURITY')) { // Get all filters $result = SQL_QUERY('SELECT - `filter_name`,`filter_function` + `filter_name`, + `filter_function` FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY - `filter_name` ASC, `filter_function` ASC', __FILE__, __LINE__); + `filter_name` ASC, + `filter_function` ASC', __FILE__, __LINE__); // Do we have entries? (we should have!) if (!SQL_HASZERONUMS($result)) { @@ -72,7 +74,7 @@ SQL_FREERESULT($result); // Now insert our unqiue key addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` DROP KEY `name_function`'); -addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` ADD UNIQUE INDEX `name_function` (`filter_name` , `filter_function`)'); +addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` ADD UNIQUE INDEX `name_function` (`filter_name`,`filter_function`)'); // [EOF] ?> diff --git a/inc/fix_menu.php b/inc/fix_menu.php index da6e5dcf97..ac685a3372 100644 --- a/inc/fix_menu.php +++ b/inc/fix_menu.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { // Get all menus foreach (array('guest','member','admin') as $menu) { // Query it - $result = SQL_QUERY_ESC("SELECT `action`,`what` FROM `{?_MYSQL_PREFIX?}_%s_menu` ORDER BY `action` ASC, `what` ASC", + $result = SQL_QUERY_ESC("SELECT `action`,`what` FROM `{?_MYSQL_PREFIX?}_%s_menu` ORDER BY `action` ASC,`what` ASC", array($menu), __FILE__, __LINE__); // Init array @@ -99,7 +99,7 @@ foreach (array('guest','member','admin') as $menu) { // Now insert our unqiue key for action-what combination addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` DROP KEY `action_what`", $menu)); - addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` ADD UNIQUE INDEX `action_what` (`action` , `what`)", $menu)); + addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` ADD UNIQUE INDEX `action_what` (`action`,`what`)", $menu)); // Now insert our unqiue key for what addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` DROP KEY `what`", $menu)); diff --git a/inc/fix_refsystem.php b/inc/fix_refsystem.php index 916795cd0f..44547a1918 100644 --- a/inc/fix_refsystem.php +++ b/inc/fix_refsystem.php @@ -78,7 +78,7 @@ if (!SQL_HASZERONUMS($result_direct)) { while ($content = SQL_FETCHARRAY($result_direct)) { // Update refback table //* DEBUG: */ debugOutput('userid=' . $content['userid']); - updateReferalTable($content['userid']); + updateReferralTable($content['userid']); } // END - while } // END - if diff --git a/inc/functions.php b/inc/functions.php index e25da2007a..28c3beea4c 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -658,8 +658,8 @@ function generateRandomCode ($length, $code, $userid, $extraData = '') { $data .= getEncryptSeparator() . getSession('u_hash'); } // END - if - // Add referal id, language, theme and userid - $data .= getEncryptSeparator() . determineReferalId(); + // Add referral id, language, theme and userid + $data .= getEncryptSeparator() . determineReferralId(); $data .= getEncryptSeparator() . getLanguage(); $data .= getEncryptSeparator() . getCurrentTheme(); $data .= getEncryptSeparator() . getMemberId(); @@ -1605,96 +1605,96 @@ function addNewBonusMail ($data, $mode = '', $output = true) { } } -// Determines referal id and sets it -function determineReferalId () { +// Determines referral id and sets it +function determineReferralId () { // Skip this in non-html-mode and outside ref.php if ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) { return false; } // END - if // Check if refid is set - if (isReferalIdValid()) { + if (isReferralIdValid()) { // This is fine... - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferalId() . ')'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferralId() . ')'); } elseif (isPostRequestElementSet('refid')) { - // Get referal id from POST element refid + // Get referral id from POST element refid //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestElement('refid') . ')'); - setReferalId(secureString(postRequestElement('refid'))); + setReferralId(secureString(postRequestElement('refid'))); } elseif (isGetRequestElementSet('refid')) { - // Get referal id from GET parameter refid + // Get referral id from GET parameter refid //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestElement('refid') . ')'); - setReferalId(secureString(getRequestElement('refid'))); + setReferralId(secureString(getRequestElement('refid'))); } elseif (isGetRequestElementSet('ref')) { - // Set refid=ref (the referal link uses such variable) + // Set refid=ref (the referral link uses such variable) //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestElement('refid') . ')'); - setReferalId(secureString(getRequestElement('ref'))); + setReferralId(secureString(getRequestElement('ref'))); } elseif ((isGetRequestElementSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) { // The variable user comes from click.php //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestElement('user') . ')'); - setReferalId(bigintval(getRequestElement('user'))); + setReferralId(bigintval(getRequestElement('user'))); } elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) { // Set session refid as global //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from SESSION data (' . getSession('refid') . ')'); - setReferalId(bigintval(getSession('refid'))); - } elseif (isRandomReferalIdEnabled()) { + setReferralId(bigintval(getSession('refid'))); + } elseif (isRandomReferralIdEnabled()) { // Select a random user which has confirmed enougth mails - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Checking random referal id'); - setReferalId(determineRandomReferalId()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Checking random referral id'); + setReferralId(determineRandomReferralId()); } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid()))) { // Set default refid as refid in URL //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')'); - setReferalId(getDefRefid()); + setReferralId(getDefRefid()); } else { // No default id when sql_patches is not installed or none set //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using NULL as refid'); - setReferalId(NULL); + setReferralId(NULL); } // Set cookie when default refid > 0 - if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferalId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) { + if ((!isSessionVariableSet('refid')) || (!isValidUserId(getReferralId())) || ((!isValidUserId(getSession('refid'))) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getDefRefid())))) { // Default is not found $found = false; // Do we have nickname or userid set? - if ((isExtensionActive('nickname')) && (isNicknameUsed(getReferalId()))) { + if ((isExtensionActive('nickname')) && (isNicknameUsed(getReferralId()))) { // Nickname in URL, so load the id - $found = fetchUserData(getReferalId(), 'nickname'); + $found = fetchUserData(getReferralId(), 'nickname'); - // If we found it, use the userid as referal id + // If we found it, use the userid as referral id if ($found === true) { // Set the userid as 'refid' //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from user account by nickname (' . getUserData('userid') . ')'); - setReferalId(getUserData('userid')); + setReferralId(getUserData('userid')); } // END - if - } elseif (isValidUserId(getReferalId())) { + } elseif (isValidUserId(getReferralId())) { // Direct userid entered - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using direct userid (' . getReferalId() . ')'); - $found = fetchUserData(getReferalId()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using direct userid (' . getReferralId() . ')'); + $found = fetchUserData(getReferralId()); } // Is the record valid? if ((($found === false) || (!isUserDataValid())) && (isExtensionInstalledAndNewer('sql_patches', '0.1.2'))) { - // No, then reset referal id + // No, then reset referral id //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using default refid (' . getDefRefid() . ')'); - setReferalId(getDefRefid()); + setReferralId(getDefRefid()); } // END - if // Set cookie - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #1'); - setSession('refid', getReferalId()); - } elseif ((!isReferalIdValid()) || (!fetchUserData(getReferalId()))) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferralId() . ') #1'); + setSession('refid', getReferralId()); + } elseif ((!isReferralIdValid()) || (!fetchUserData(getReferralId()))) { // Not valid! - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not valid referal id (' . getReferalId() . '), setting NULL in session'); - setReferalId(NULL); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not valid referral id (' . getReferralId() . '), setting NULL in session'); + setReferralId(NULL); setSession('refid', NULL); } else { // Set it from GLOBALS array in session - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferalId() . ') #2'); - setSession('refid', getReferalId()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Saving refid to session (' . getReferralId() . ') #2'); + setSession('refid', getReferralId()); } // Return determined refid - return getReferalId(); + return getReferralId(); } // Enables the reset mode and runs it @@ -2361,18 +2361,18 @@ function determinePointsColumnFromSubjectLocked ($subject, $locked) { return $pointsColumn; } -// Setter for referal id (no bigintval, or nicknames will fail!) -function setReferalId ($refid) { +// Setter for referral id (no bigintval, or nicknames will fail!) +function setReferralId ($refid) { $GLOBALS['refid'] = $refid; } // Checks if 'refid' is valid -function isReferalIdValid () { - return ((isset($GLOBALS['refid'])) && (getReferalId() !== NULL) && (getReferalId() > 0)); +function isReferralIdValid () { + return ((isset($GLOBALS['refid'])) && (getReferralId() !== NULL) && (getReferralId() > 0)); } -// Getter for referal id -function getReferalId () { +// Getter for referral id +function getReferralId () { return $GLOBALS['refid']; } diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php index d49b309f96..af1dcb3dd7 100644 --- a/inc/language/bonus_de.php +++ b/inc/language/bonus_de.php @@ -60,7 +60,7 @@ addMessages(array( 'BONUS_SHOW_WRONG_TYPE' => "Falscher Typ an das Script übergeben! Bitte melden Sie sich beim Webmaster .", 'BONUS_SHOW_NO_DATA' => "Entweder haben Sie für diese Mail keine Aktiv-Vergütung erhalten oder der Link ist nicht mehr gültig.", 'MEMBER_BONUS_NO_RANKS' => "Es hat noch niemand {?POINTS?} zur Mail %s gewonnen! Sie könnten der erste sein! :-)", - 'MEMBER_BONUS_LOGIN_TURBO_NOTE' => "Der Login-, Referal-, Klickrate-, Mailbuchungs- und Bestätigungsbonus wird Ihnen nicht sofort vergütet, sondern erst am Ende jeden Monats in Form einer Aktiv-Rallye. Den Mailbuchungsbonus erhalten Sie erst bei Freischaltung Ihrer Mail auf das Bonus-Konto gutgeschrieben.", + 'MEMBER_BONUS_LOGIN_TURBO_NOTE' => "Der Login-, Referral-, Klickrate-, Mailbuchungs- und Bestätigungsbonus wird Ihnen nicht sofort vergütet, sondern erst am Ende jeden Monats in Form einer Aktiv-Rallye. Den Mailbuchungsbonus erhalten Sie erst bei Freischaltung Ihrer Mail auf das Bonus-Konto gutgeschrieben.", 'MEMBER_BONUS_POINTS_TITLE' => "Sonderbonus-{?POINTS?}", 'MEMBER_BONUS_RANK_YOU_ARE_404' => "Sie haben bis jetzt noch keine Aktiv-Vergütung erhalten.", 'BONUS_RANK' => "Platz", @@ -91,12 +91,12 @@ addMessages(array( 'ADMIN_SEND_BONUS_NORMAL_NOTES' => "Standard Text-Mail an Ihre Mitglieder aussenden.", 'ADMIN_SEND_BONUS_HTML_NOTES' => "HTML-Mail an Ihre Mitglieder versenden. Dazu muss die Erweiterung html_mail jedoch installiert sein.", 'ADMIN_CONFIG_BONUS_ORDER' => "Bonus für eine Mailbuchung", - 'ADMIN_CONFIG_BONUS_REFERAL' => "Bonus für das Werben eines weiteren Mitgliedes", + 'ADMIN_CONFIG_BONUS_REFERRAL' => "Bonus für das Werben eines weiteren Mitgliedes", 'ADMIN_CONFIG_BONUS_STATS' => "Einmalige Bonus bei Erreichen von 100% Klickrate auf eine Mailbuchung (=Statistik-Bonus)", 'ADMIN_CONFIG_BONUS_TURBO_TITLE' => "Bonus-{?POINTS?} für bestätigte Mails", 'ADMIN_CONFIG_BONUS_TURBO_TIMEOUT_TITLE' => "Zeitabstände und Aufbewahrungszeiten", 'ADMIN_CONFIG_BONUS_TURBO_MISC_TITLE' => "Sonstige Einstellungen zur Bonus-Erweiterung", - 'MEMBER_BONUS_REFERAL_TOTAL' => "Referal-Bonus", + 'MEMBER_BONUS_REFERRAL_TOTAL' => "Referral-Bonus", 'MEMBER_BONUS_ORDER_TOTAL' => "Mailbestellungsbonus", 'MEMBER_BONUS_STATS_TOTAL' => "100%-Klickratebonus", 'MEMBER_BONUS_RALLYE_DISABLED' => "Aktiv-Rallye derzeit nicht aktiv.", @@ -132,7 +132,7 @@ addMessages(array( 'ADMIN_CONFIG_BONUS_RALLYE_ORDER_INCLUDE' => "Mailbuchungsbonus in monatlicher Auswertung mit einschliessen?", 'ADMIN_CONFIG_BONUS_RALLYE_STATS_INCLUDE' => "Statistik-Bonus in monatlicher Auswertung mit einschliessen?", 'ADMIN_CONFIG_BONUS_RALLYE_CLICK_INCLUDE' => "Mailbestätigungsbonus in monatlicher Auswertung mit einschliessen?", - 'ADMIN_CONFIG_BONUS_RALLYE_REFERAL_INCLUDE' => "Referal-Bonus in monatlicher Auswertung mit einschliessen?", + 'ADMIN_CONFIG_BONUS_RALLYE_REFERRAL_INCLUDE' => "Referral-Bonus in monatlicher Auswertung mit einschliessen?", // Header 'MEMBER_MAIL_BONUS_DETAILS_TITLE' => "Details zur Bonusmail %s:", diff --git a/inc/language/de.php b/inc/language/de.php index 86d5bbf417..b642bf80df 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -206,18 +206,18 @@ addMessages(array( 'GUEST_EMPTY_PASSWORD_HINT' => "Lassen Sie beide Passwörter leer, so wird Ihnen eines per Zufall generiert.", 'ADMIN_CONFIG_POINTS_SETTINGS_TITLE' => "Ändern der Willkommensgutschrift und anderer {?POINTS?}", 'ADMIN_ENTER_POINTS_REGISTER' => "Willkommensgutschrift", - 'ADMIN_ENTER_POINTS_REFERAL' => "Einmalige Referal-Gutschrift", + 'ADMIN_ENTER_POINTS_REFERRAL' => "Einmalige Referral-Gutschrift", 'CHOOSE_MORE_CATEGORIES' => "Bitte wählen Sie mehr Kategorien aus! Minimum ist: {?least_cats?}", 'ADMIN_CONFIG_REJECT_DOUBLE_EMAIL' => "Doppelt angemeldete Email-Adressen ablehnen?", 'ADMIN_EDIT_POINTS' => "Willkommensgutschrift und andere Festbeträge editieren", - 'ADMIN_EDIT_REFERAL_DEPTHS' => "Referal-Ebenen editieren / löschen / hinzufügen", - 'ADMIN_ADD_NEW_REFERAL_DEPTH_TITLE' => "Neue Referal-Ebene hinzufügen", - 'ADMIN_ADD_DEPTH' => "Referal-Ebene hinzufügen", - 'ADMIN_ENTER_REFERAL_LEVEL' => "Referal-Ebene eingeben", - 'ADMIN_ENTER_REFERAL_PERCENTS' => "Prozentuale Vergütung", - 'ADMIN_EDIT_DELETE_REFERAL_DEPTH_TITLE' => "Referal-Ebenen editieren / löschen", - 'REFERAL_LEVEL' => "Referal-Ebene", - 'REFERAL_PERCENT' => "Prozentuale Vergütung", + 'ADMIN_EDIT_REFERRAL_DEPTHS' => "Referral-Ebenen editieren / löschen / hinzufügen", + 'ADMIN_ADD_NEW_REFERRAL_DEPTH_TITLE' => "Neue Referral-Ebene hinzufügen", + 'ADMIN_ADD_DEPTH' => "Referral-Ebene hinzufügen", + 'ADMIN_ENTER_REFERRAL_LEVEL' => "Referral-Ebene eingeben", + 'ADMIN_ENTER_REFERRAL_PERCENTS' => "Prozentuale Vergütung", + 'ADMIN_EDIT_DELETE_REFERRAL_DEPTH_TITLE' => "Referral-Ebenen editieren / löschen", + 'REFERRAL_LEVEL' => "Referral-Ebene", + 'REFERRAL_PERCENT' => "Prozentuale Vergütung", 'ADMIN_EDIT_LEVEL' => "Ref-Ebene editieren", 'ADMIN_DELETE_LEVEL' => "Ref-Ebene löschen", 'GUEST_SURNAME' => "Vorname", @@ -311,10 +311,10 @@ addMessages(array( 'SELECT_CAT' => "Mails aus Kategorie empfangen?", 'MEMBER_CATEGORIES_SAVED' => "Kategorien gespeichert.", 'MEMBER_CATEGORIES_NOT_SAVED' => "Kategorien wurden nicht geändert.", - 'MEMBER_YOUR_PERSONAL_REFERAL_LINK' => "Ihr persönlicher Ref-Link zum Werben neuer Mitglieder lautet", - 'MEMBER_YOUR_REFCLICKS' => "Klicks auf Ihren Referal-Link", + 'MEMBER_YOUR_PERSONAL_REFERRAL_LINK' => "Ihr persönlicher Ref-Link zum Werben neuer Mitglieder lautet", + 'MEMBER_YOUR_REFCLICKS' => "Klicks auf Ihren Referral-Link", 'CLICKS' => "Klicks", - 'MEMBER_NO_REFLEVEL_LEFT' => "Keine Referal-Ebenen mehr verfügbar! Bitte melden Sie sich bei uns.", + 'MEMBER_NO_REFLEVEL_LEFT' => "Keine Referral-Ebenen mehr verfügbar! Bitte melden Sie sich bei uns.", 'ENGINE' => "{?mt_word?}-Engine", 'ADMIN_ADD_NEW_PAYMENT_TITLE' => "Neue Mailvergütung hinzufügen", 'ADMIN_ENTER_PAYMENT_TIME' => "Wartezeit", @@ -331,14 +331,14 @@ addMessages(array( 'ENTER_URL' => "Banner-URL", 'ENTER_ALTERNATE' => "Alternativen Text", 'ADMIN_SELECT_VISIBLE' => "Ist der Banner aktiv?", - 'ADMIN_ADD_REFERAL_BANNER_SUBMIT' => "Werbeanner hinzufügen", - 'ADMIN_EDIT_DELETE_REFERAL_BANNER_TITLE' => "Werbebanner editieren / löschen", + 'ADMIN_ADD_REFERRAL_BANNER_SUBMIT' => "Werbeanner hinzufügen", + 'ADMIN_EDIT_DELETE_REFERRAL_BANNER_TITLE' => "Werbebanner editieren / löschen", 'VIEWS' => "Views", - 'REFERAL_URL' => "Banner", - 'REFERAL_TITLE' => "Alternativer Text", - 'REFERAL_CLICKS_SHORT' => "Klicks", - 'REFERAL_VIEWS' => "Views", - 'REFERAL_IS_ACTIVE' => "Aktiv?", + 'REFERRAL_URL' => "Banner", + 'REFERRAL_TITLE' => "Alternativer Text", + 'REFERRAL_CLICKS_SHORT' => "Klicks", + 'REFERRAL_VIEWS' => "Views", + 'REFERRAL_IS_ACTIVE' => "Aktiv?", 'POINTS_USED' => "Verbrauchte {?POINTS?}", 'MEMBER_POINTS_LEFT' => "{?POINTS?}-Guthaben zum Mailversand übrig", 'SELECT_MAIL_TYPE' => "Mailart auswählen", @@ -446,7 +446,7 @@ addMessages(array( 'ADMIN_UNCONFIRMED_ACCOUNTS' => "Hier alle Accounts, deren Email-Adresse nicht bestätigt ist", '_USERID' => "Mitglied-Id", 'REMOTE_IP' => "IP-Nummer", - 'REFERAL_USERID' => "Werber-Id", + 'REFERRAL_USERID' => "Werber-Id", 'ACCOUNT_STATUS' => "Account-Status", 'ACCOUNT_STATUS_UNKNOWN' => "Unbekannter Status %s erkannt.", 'ACCOUNT_STATUS_UNCONFIRMED' => "Unbestätigt", @@ -459,13 +459,13 @@ addMessages(array( 'LAST_ONLINE_SHORT' => "Zuletzt Online", 'ADMIN_LAST_MODULE' => "Letzte Aktion", 'RECEIVE_MAILS' => "Kann Mails empfangen", - 'REFERAL_CLICKS' => "Klicks auf Ref-Link", + 'REFERRAL_CLICKS' => "Klicks auf Ref-Link", 'TOTAL_LOGINS' => "Logins gesamt", 'USED_POINTS' => "Ausgegebene {?POINTS?}", 'MAILS_SENT' => "Mails versendet", 'HAS_JOINED' => "Beigetreten", 'TOTAL_POINTS' => "{?POINTS?} gesamt", - 'TOTAL_REFERALS' => "Referals gesamt", + 'TOTAL_REFERRALS' => "Referrals gesamt", 'ADMIN_MEMBER_FUNCTIONS' => "Administrative Funktionen", 'ADMIN_ALL_REFS' => "Alle Refs auflisten", 'BIRTHDAY2' => "Geburtstag", @@ -487,7 +487,7 @@ addMessages(array( 'GUEST_CONFIRM_SUBJECT' => "Bitte Ihre Email-Adresse bestätigen.", 'MEMBER_ORDER_ACCEPTED' => "Ihre Mailbuchung wurde freigeschaltet", 'MEMBER_ORDER_REJECTED' => "Ihre Mailbuchung wurde abgelehnt", - 'THANX_REFERAL_ONE_SUBJECT' => "Vielen Dank für die Referal-Werbung.", + 'THANX_REFERRAL_ONE_SUBJECT' => "Vielen Dank für die Referral-Werbung.", 'ADMIN_SEND_MAIL' => "Bonusmail versenden", 'ADMIN_BONUS_SEND' => "Bonusmail wurde in den Sende-Pool eingefügt.", 'ENTER_POINTS' => "Vergütung", @@ -546,17 +546,17 @@ addMessages(array( 'ADMIN_REMOVE_MAX_RECEIVE' => "Maximal-Werte löschen", 'ADMIN_MAX_RECEIVE_SAVED' => "Maximal-Werte gespeichert...", 'ADMIN_MAX_RECEIVE_DELETED' => "Maximal-Werte gelöscht...", - 'ADMIN_EDIT_REFERAL_DEPTHS_TITLE' => "Referal-Ebenen editieren", - 'ADMIN_DELETE_REFERAL_DEPTHS_TITLE' => "Referal-Ebenen löschen", - 'ADMIN_CHANGE_REFERAL_DEPTHS' => "Referal-Ebenen ändern", - 'ADMIN_REFERAL_DEPTHS_ID' => "Ref-Level id", + 'ADMIN_EDIT_REFERRAL_DEPTHS_TITLE' => "Referral-Ebenen editieren", + 'ADMIN_DELETE_REFERRAL_DEPTHS_TITLE' => "Referral-Ebenen löschen", + 'ADMIN_CHANGE_REFERRAL_DEPTHS' => "Referral-Ebenen ändern", + 'ADMIN_REFERRAL_DEPTHS_ID' => "Ref-Level id", 'ADMIN_CHANGE_REF' => "Ändern", - 'ADMIN_REFERAL_DEPTHS_SAVED' => "Referal-Ebenen gespeichert...", - 'ADMIN_REFERAL_DEPTHS_DELETED' => "Referal-Ebenen gelöscht...", + 'ADMIN_REFERRAL_DEPTHS_SAVED' => "Referral-Ebenen gespeichert...", + 'ADMIN_REFERRAL_DEPTHS_DELETED' => "Referral-Ebenen gelöscht...", 'ADMIN_EDIT_PAYMENT_TITLE' => "Mailvergütungen editieren", 'ADMIN_CHANGE_PAYMENT' => "Mailvergütungen ändern", 'ADMIN_REMOVE_PAYMENT' => "Mailvergütungen löschen", - 'REFERALS' => "Referals", + 'REFERRALS' => "Referrals", 'MEMBER_PART_POINTS' => "Teilsummen", 'KBYTES' => "KBytes", 'DEFAULT_SUBJECT_LINE' => "Klick-Mail von {?MAIN_TITLE?}", @@ -598,7 +598,7 @@ addMessages(array( 'WE_HAVE' => "Wir haben", 'MEMBER_TEST_URL' => "Zur beworbenen Seite", 'ADMIN_ENTER_REDIRECT_URL' => "URL eingeben, wenn abgelehnt werden soll", - 'MEMBER_REFERAL_BANNER_404' => "Es sind noch keine Werbebanner eingerichtet worden. Bitte verwenden Sie solange Ihren Referal-Link.", + 'MEMBER_REFERRAL_BANNER_404' => "Es sind noch keine Werbebanner eingerichtet worden. Bitte verwenden Sie solange Ihren Referral-Link.", 'ADMIN_ID_404' => "ID %s nicht gefunden.", 'ADMIN_ASSIGNED_ADMIN' => "Zugewiesener Admin", 'ADMIN_MEMBER_USERID' => "ID des Mitgliedes", @@ -671,7 +671,7 @@ addMessages(array( 'CLICK_RATE' => "Klickrate", 'GUEST_STATS_MODULES' => "Klicks in allen Modulen (TOP-10)", 'GUEST_STATS_MEMBERS' => "Statistiken über unsere Mitglieder", - 'ADMIN_EDIT_REFERAL_BANNER_TITLE' => "Werbebanner editieren", + 'ADMIN_EDIT_REFERRAL_BANNER_TITLE' => "Werbebanner editieren", 'GUEST_LOGIN_ID_UNKNOWN_STATUS' => "Ihr Account weist einen unbekannten Status %s auf. Bitte melden Sie sich beim Support.", 'GUEST_REQUEST_CONFIRM_LINK_TITLE' => "Bestätigungslink erneut anfordern", 'GUEST_CONFIRM_LINK_NOTE' => "Sie haben Ihren Bestätigungslink verlegt? Kein Problem, hier können Sie ihn erneut anfordern. Geben Sie einfach Ihre angemeldete eMail-Adresse an. Der Link wird Ihnen dann per Mail zugesandt.", @@ -684,7 +684,7 @@ addMessages(array( 'SELECT_NONE' => "Keine/s/r", 'ADMIN_EDIT_EMAIL_TITLE' => "Daten der Klick-Mail Nr. %s bearbeiten", 'ADMIN_DELETE_PAYMENT_TITLE' => "Mailvergütungen löschen", - 'ADMIN_CONFIG_REFERAL_PAYOUT' => "Wie viele Mails müssen die Mitglieder mindestens bestätigen, um den Willkommensbonus, einmaliger Referal-Bonus usw. gutgeschrieben zu bekommen?", + 'ADMIN_CONFIG_REFERRAL_PAYOUT' => "Wie viele Mails müssen die Mitglieder mindestens bestätigen, um den Willkommensbonus, einmaliger Referral-Bonus usw. gutgeschrieben zu bekommen?", 'ADMIN_EXTENSION_UPDATED' => "Erweiterung aktualisiert.", 'ADMIN_UPDATE_EXTENSION_SUBJECT' => "Erweiterung-Update installiert", 'MEMBER_ORDER_PAGE1_INTRO' => "Mailbuchung - Schritt 1 von 4: PLZ eingeben", @@ -697,7 +697,7 @@ addMessages(array( 'LOCKED_POINTS' => "Nicht vergütete {?POINTS?}", 'LAST_UPDATE' => "Letzte Profiländerung", 'LAST_PROFILE_SENT' => "Erinnerung gesendet", - 'ADMIN_USER_REFERAL_PAYOUT' => "Noch zu best. Mails", + 'ADMIN_USER_REFERRAL_PAYOUT' => "Noch zu best. Mails", 'DISPLAY_REFID' => "Ref-Id anzeigen", 'ADMIN_SORT_NAVIGATION' => "Sortieren", 'HIGHER' => "Höher", @@ -712,8 +712,8 @@ addMessages(array( 'GUEST_TOPTEN_STATS' => "Die am häufigsten angeklickten Menüs", 'GUEST_TOP_GUEST_STATS' => "Gastmenü", 'GUEST_TOP_MEMBER_STATS' => "Mitgliedmenü", - 'ADMIN_EDIT_REFERAL_BANNER_URL' => "Banner-URL ändern", - 'ADMIN_EDIT_REFERAL_BANNER_ALTERNATIVE_TEXT' => "Alternativen Text ändern", + 'ADMIN_EDIT_REFERRAL_BANNER_URL' => "Banner-URL ändern", + 'ADMIN_EDIT_REFERRAL_BANNER_ALTERNATIVE_TEXT' => "Alternativen Text ändern", 'ADMIN_EDIT_POINT_SETTINGS' => "EInstellungen an den {?POINTS?}vergütungen", 'ADMIN_CONFIG_POINT_SETTINGS_TITLE' => "Einstellungen an {?POINTS?}vergütungen", 'ADMIN_CONFIG_DIRECT_PAY' => "Sollen die eingestellte Anzahl an mindest zubestätigener Mails bei {?POINTS?}gutschriften berücksichtig werden oder immer gutgeschrieben werden?", @@ -727,7 +727,7 @@ addMessages(array( 'ADMIN_TASK_INFOS' => "Infos", 'NICKNAME' => "Nickname", 'ADMIN_PROBLEM_NO_MENU' => "Konnte keine Menüeinträge finden.", - 'USER_REFERAL_404' => "Dieses Mitglied hat keine Referals gemacht.", + 'USER_REFERRAL_404' => "Dieses Mitglied hat keine Referrals gemacht.", 'USER_NICKNAME' => "Nickname", 'ADMIN_CONFIG_POINTS_DIRECT' => "{?POINTS?} immer gutgeschreiben.", 'ADMIN_CONFIG_POINTS_MAILS' => "Anzahl zu best. Mails berücksichtigen.", @@ -787,10 +787,10 @@ addMessages(array( 'WHAT_IS_OVERVIEW' => "Willkommen", '_ON' => "an", 'MEMBER_CLICK_STATISTICS' => "Mail-Statistik", - 'ADMIN_CONFIG_SELECT_DEFAULT_REFID' => "Standard Referal-Id bei Anmeldung über keinen Ref-Link", - 'ADMIN_CONFIG_SELECT_REFID_TARGRT' => "Ziel-Seite des Referal-Linkes", - 'ADMIN_CONFIG_REFERAL_TARGET_REGISTER' => "Zur Anmeldeseite", - 'ADMIN_CONFIG_REFERAL_TARGET_INDEX' => "Zur Eingangsseite", + 'ADMIN_CONFIG_SELECT_DEFAULT_REFID' => "Standard Referral-Id bei Anmeldung über keinen Ref-Link", + 'ADMIN_CONFIG_SELECT_REFID_TARGRT' => "Ziel-Seite des Referral-Linkes", + 'ADMIN_CONFIG_REFERRAL_TARGET_REGISTER' => "Zur Anmeldeseite", + 'ADMIN_CONFIG_REFERRAL_TARGET_INDEX' => "Zur Eingangsseite", 'ADMIN_INSTALL_THEME' => "Theme importieren", 'ADMIN_NO_THEMES_FOUND' => "Keine Themes gefunden.", 'THEME_UNIX' => "Uni*-Name", @@ -876,13 +876,13 @@ addMessages(array( 'NEVER_HAPPENED' => "Nie", 'NO_CONFIG_FOUND_TITLE' => "Keine Konfigurationsdaten gefunden.", 'SORTING_KEY' => "Sortierung", - 'ADMIN_ADD_REFERAL_BANNER_TITLE' => "Neuen Werbebanner hinzufügen", - 'ADMIN_ENTER_REFERAL_BANNER_URL' => "Banner-URL", - 'ADMIN_ENTER_ALTERNATE_REFERAL_BANNER_TEXT' => "Alternativen Text", - 'ADMIN_SELECT_REFERAL_BANNER_ACTIVE' => "Ist der Werbebanner aktiv?", - 'ADMIN_LIST_REFERALS' => "Referal-Übersicht des Mitgliedes {%%pipe,generateUserProfileLink=%s%%} in allen Ebenen:", - 'ADMIN_LIST_REFERALS_LEVEL' => "Referals in Ebene %s:", - 'ADMIN_LIST_REFERALS_NOTE' => "Änderung: Klicken Sie die Mitglied-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.", + 'ADMIN_ADD_REFERRAL_BANNER_TITLE' => "Neuen Werbebanner hinzufügen", + 'ADMIN_ENTER_REFERRAL_BANNER_URL' => "Banner-URL", + 'ADMIN_ENTER_ALTERNATE_REFERRAL_BANNER_TEXT' => "Alternativen Text", + 'ADMIN_SELECT_REFERRAL_BANNER_ACTIVE' => "Ist der Werbebanner aktiv?", + 'ADMIN_LIST_REFERRALS' => "Referral-Übersicht des Mitgliedes {%%pipe,generateUserProfileLink=%s%%} in allen Ebenen:", + 'ADMIN_LIST_REFERRALS_LEVEL' => "Referrals in Ebene %s:", + 'ADMIN_LIST_REFERRALS_NOTE' => "Änderung: Klicken Sie die Mitglied-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referrals an, werden die Referrals des jeweiligen Mitgliedes aufgelistet.", 'ADMIN_NORMAL_MAIL_ALREADY_DELETED' => "Mitglieder-Mail bereits gelöscht.", 'INITIAL_RELEASE' => "Erstes Release fertiggestellt.", 'DEVELOPER_RELEASE' => "Entwickler-Version zum Testen.", @@ -999,7 +999,7 @@ addMessages(array( 'ADMIN_SUPPORT_WIKI_LINK' => "Direktlink zum Doku-Wiki (neues Fenster)", 'ADMIN_SUPPORT_CIAVC_LINK' => "Direktlink zu CIA.vc (neues Fenster)", 'ADMIN_SUPPORT_STATS_LINK' => "Direktlink zur Commit-Statistik (neues Fenster)", - 'ADMIN_REFERAL_LEVEL_ZERO_NOTICE' => "Die Referal-Ebene 0 ist das Mitglied selber und sollte daher auf 100% stehen. Sie sollte auch nicht geändert oder gelöscht werden! Dann erhalten Ihre Mitglieder keine {?POINTS?} gutgeschrieben.", + 'ADMIN_REFERRAL_LEVEL_ZERO_NOTICE' => "Die Referral-Ebene 0 ist das Mitglied selber und sollte daher auf 100% stehen. Sie sollte auch nicht geändert oder gelöscht werden! Dann erhalten Ihre Mitglieder keine {?POINTS?} gutgeschrieben.", 'ADMIN_ALL_ENTRIES_REMOVED' => "Alle ausgewählten Einträge sind gelöscht.", 'ADMIN_SOME_ENTRIES_NOT_DELETED' => "Es wurden %s von %s ausgewählten Einträge gelöscht.", 'ADMIN_ALL_ENTRIES_EDITED' => "Alle ausgewählten Einträge sind geändert.", @@ -1011,7 +1011,7 @@ addMessages(array( 'MEMBER_ORDER_TEST_STARTED' => "Framekiller-Test startet...", 'MEMBER_ORDER_PLEASE_WAIT_1' => "Ihre Seite wird auf Framekiller getestet. Bitte noch ", 'MEMBER_ORDER_PLEASE_WAIT_2' => " Sekunden warten.", - 'ADMIN_NO_REFERAL_LEVELS' => "In Ihrem {?mt_word?} sind keine Referal-Ebenen eingerichtet! Ihre Mitglieder erhalten keine {?POINTS?} gutgeschrieben. Richten Sie mindestens Referal-Ebene 0 mit 100% Vergütung ein.", + 'ADMIN_NO_REFERRAL_LEVELS' => "In Ihrem {?mt_word?} sind keine Referral-Ebenen eingerichtet! Ihre Mitglieder erhalten keine {?POINTS?} gutgeschrieben. Richten Sie mindestens Referral-Ebene 0 mit 100% Vergütung ein.", 'ADMIN_SESSION_SAVE_PATH_INVALID' => "Pfad für Sitzungsdateien ungütig.", 'ADMIN_CONFIG_SESSION_TITLE' => "Einstellungen zum Sitzungsmanagement", 'ADMIN_CONFIG_SESSION_SAVE_PATH' => "Speicherpfad f. Sitzungsdateien", @@ -1021,11 +1021,11 @@ addMessages(array( 'ADMIN_RESET_PASSWORD' => "Passwort vergessen?", 'EMAIL_DETAILS' => "Email-Details", 'EMAIL_DETAILS_LINK' => "Details anzeigen", - 'ADMIN_CONFIG_REFID_TITLE' => "Einstellungen zum Referal-Link", + 'ADMIN_CONFIG_REFID_TITLE' => "Einstellungen zum Referral-Link", 'ADMIN_CONFIG_RANDOM_ZERO_REFID' => "Soll per Zufall ein Mitglied ausgwählt werden oder soll die oben eingestellte Standard-Refid verwendet werden?", 'ADMIN_CONFIG_RANDOM_REFID_ENABLED' => "Mitglieder per Zufall wählen", - 'ADMIN_CONFIG_RANDOM_REFID_DISABLED' => "Voreingestellte Referal-Id setzen", - 'ADMIN_CONFIG_RANDOM_REFID_TITLE' => "Kriterien wonach ein Mitglied als Zufallsreferal ausgewählt wird:", + 'ADMIN_CONFIG_RANDOM_REFID_DISABLED' => "Voreingestellte Referral-Id setzen", + 'ADMIN_CONFIG_RANDOM_REFID_TITLE' => "Kriterien wonach ein Mitglied als Zufallsreferral ausgewählt wird:", 'ADMIN_CONFIG_RANDOM_MIN_CONFIRMED' => "Wie viele Mails muss ein Mitglied mindestens bestätigt haben, um per Zufall ausgewählt zu werden?", 'ADMIN_CONFIG_REFID_NOTICE' => "Sobald ein Mitglied ausgewählt wurde, werden die Zähler aller Mitglieder auf Null gesetzt. Dies soll Chancengleichheit bringen und dass die Mitglieder mehr Mails abklicken.", 'EMAILS_RECEIVED' => "Emails empfangen", @@ -1052,7 +1052,7 @@ addMessages(array( 'ADMIN_ENTRIES_404' => "Es wurden keine Einträge gefunden.", 'DEBUG_REPORT_BUG_SUBJECT' => "[BUG!] Es wurde ein Bug im Script erkannt:", 'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung {%%pipe,getExtensionName=%s%%} kann nicht deaktiviert werden, da sie immer aktiv bleiben muss.", - 'MEMBER_REFERAL_LINKS_FOOTER' => "Ihr Referal-Link eingebaut in Ihrer Homepage bringt Ihnen passiv mehr Referals. (Aber Ihren Referal-Link bewerben schadet auch nicht... ;-) )", + 'MEMBER_REFERRAL_LINKS_FOOTER' => "Ihr Referral-Link eingebaut in Ihrer Homepage bringt Ihnen passiv mehr Referrals. (Aber Ihren Referral-Link bewerben schadet auch nicht... ;-) )", 'POINTS_ORDER' => "Werbeguthaben", 'MEMBER_TOTAL_POINTS' => "Gesamtguthaben", 'ADMIN_UNSUPPORTED_MAIL_TYPE_DETECTED' => "Nicht unterstützer Mail-Typ %s erkannt. Bitte melden Sie dies im Support-Forum.", @@ -1087,11 +1087,11 @@ addMessages(array( // Member reflist // @TODO Rewrite these three constants - 'MEMBER_REFLIST_LIST_TITLE_1' => "Ihre Referals in Ebene ", + 'MEMBER_REFLIST_LIST_TITLE_1' => "Ihre Referrals in Ebene ", 'MEMBER_REFLIST_LIST_TITLE_2' => " (", 'MEMBER_REFLIST_LIST_TITLE_3' => "%)", 'MEMBER_REFLIST_COUNTER' => "In dieser Ebene haben Sie {%%pipe,translateComma=%s%%} Mitglieder geworben.", - 'MEMBER_REFLIST_TITLE' => "Referal-Übersicht", + 'MEMBER_REFLIST_TITLE' => "Referral-Übersicht", 'MEMBER_REFLIST_POINTS' => "Verdienst des Mitgliedes", 'MEMBER_REFLIST_ACTIVITY' => "Mitglied aktiv?", @@ -1101,8 +1101,8 @@ addMessages(array( 'ADMIN_LIST_STATUS_CONFIRMED_ACCOUNTS' => "Alle bestätigten Mitglieder-Accounts auflisten", 'ADMIN_LIST_STATUS_UNCONFIRMED_ACCOUNTS' => "Alle unbestätigten Mitglieder-Accounts auflisten", 'ADMIN_LIST_MODE_CONFIRMED_ACCOUNTS' => "Alle bestätigten Mitglieder-Accounts auflisten", - 'ADMIN_LIST_MODE_NOREFS_ACCOUNTS' => "Alle Mitglieder-Accounts ohne Referals auflisten", - 'ADMIN_LIST_MODE_RANDOM_REFID_ACCOUNTS' => "Alle Mitglieder-Accounts für Zufallsreferal auflisten", + 'ADMIN_LIST_MODE_NOREFS_ACCOUNTS' => "Alle Mitglieder-Accounts ohne Referrals auflisten", + 'ADMIN_LIST_MODE_RANDOM_REFID_ACCOUNTS' => "Alle Mitglieder-Accounts für Zufallsreferral auflisten", // Admin task lines 'ADMIN_TASK_TYPE_MEMBER_SUPPORT' => "Support-Anfrage eines Mitgliedes", diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php index f0d0f5fce8..9f4561a0fa 100644 --- a/inc/language/doubler_de.php +++ b/inc/language/doubler_de.php @@ -54,7 +54,7 @@ addMessages(array( 'ADMIN_CONFIG_DOUBLER_DISPLAY_NEW' => "Anzahl ersten X neuen Einträge", 'ADMIN_CONFIG_DOUBLER_DISPLAY_PAY' => "Anzahl ersten X vor Auszahlung stehender Verdoppelungen", 'ADMIN_CONFIG_DOUBLER_DISPLAY_OLD' => "Anzahl ersten X bereits ausgezahlter Verdoppelungen", - 'ADMIN_CONFIG_DOUBLER_REFERAL' => "Prozentuale Referal-Vergütung", + 'ADMIN_CONFIG_DOUBLER_REFERRAL' => "Prozentuale Referral-Vergütung", 'ADMIN_CONFIG_DOUBLER_MINIMUM' => "Minimum {?POINTS?} die verdoppelt werden sollen", 'ADMIN_CONFIG_DOUBLER_MAXIMUM' => "Maximum {?POINTS?} die verdoppelt werden sollen", 'ADMIN_CONFIG_DOUBLER_LEFT' => "Auf dem Mitgliedsaccount nach Verdoppelung Minimum-{?POINTS?}-Guthaben", @@ -67,17 +67,17 @@ addMessages(array( 'ADMIN_DOUBLER_LIST_WAITING' => "Wartene Auszahlungen", 'ADMIN_DOUBLER_ALREADY_ALL' => "Gesamt Auszahlungen", 'ADMIN_DOUBLER_ALREADY_DIRECT' => "Direkte Auszahlungen", - 'ADMIN_DOUBLER_ALREADY_REF' => "Referal-Auszahlungen", + 'ADMIN_DOUBLER_ALREADY_REF' => "Referral-Auszahlungen", 'ADMIN_DOUBLER_WAITING_ALL' => "Gesamt wartend", 'ADMIN_DOUBLER_WAITING_DIRECT' => "Direkte w. Auszahlungen", - 'ADMIN_DOUBLER_WAITING_REF' => "W. Referal-Auszahlungen", + 'ADMIN_DOUBLER_WAITING_REF' => "W. Referral-Auszahlungen", 'ADMIN_DOUBLER_PAYMENT_TIMEMARK' => "Eingezahlt", 'ADMIN_DOUBLER_LIST_ALREADY_ALL' => "Alle bereits ausgezahlten {?POINTS?}", 'ADMIN_DOUBLER_LIST_ALREADY_DIRECT' => "Direkt ausgezahlte {?POINTS?}", - 'ADMIN_DOUBLER_LIST_ALREADY_REF' => "Ausgezahlte Referal-{?POINTS?}", + 'ADMIN_DOUBLER_LIST_ALREADY_REF' => "Ausgezahlte Referral-{?POINTS?}", 'ADMIN_DOUBLER_LIST_WAITING_ALL' => "Alle wartenden {?POINTS?}-Auszahlungen", 'ADMIN_DOUBLER_LIST_WAITING_DIRECT' => "Wartende Direkt-Auszahlungen", - 'ADMIN_DOUBLER_LIST_WAITING_REF' => "Wartende Referal-Auszahlungen", + 'ADMIN_DOUBLER_LIST_WAITING_REF' => "Wartende Referral-Auszahlungen", 'DOUBLER_TITLE' => "{?POINTS?}-Verdoppler", 'DOUBLER_ENTER_LOGIN_DATA' => "Geben Sie hier Ihre Zugangsdaten ein", 'DOUBLER_NOTE_FOR_PASSWORD' => "Das Passwort wird nicht gespeichert.", @@ -93,10 +93,10 @@ addMessages(array( 'DOUBLER_EXAMPLE_2' => "Auszahlung:", 'DOUBLER_EXAMPLE_3' => ", sobald Sie an der Reihe sind, ohne(*) ein Risiko einzugehen.", 'DOUBLER_FULL_PAYOUT' => "100% Auszahlung", - 'DOUBLER_REFERAL_1' => "Refverdienst: Es gibt {%config,translateComma=doubler_ref%}% Refverdienst. Wenn Sie {?POINTS?} auf dem Refkonto durch Werbung erwirtschaftet haben, (Wichtig! Maximal Verdoppelung darf nicht überschritten werden) werden diese bei Ihrer nächsten Verdoppelung aufgeschlagen.", - 'DOUBLER_REFERAL_2' => "Beispiel: Sie haben 100 {?POINTS?} Refverdienst und verdoppeln 100 {?POINTS?}, Sie bekommen - sobald Sie an der Reihe sind - 300 {?POINTS?} zurück.", + 'DOUBLER_REFERRAL_1' => "Refverdienst: Es gibt {%config,translateComma=doubler_ref%}% Refverdienst. Wenn Sie {?POINTS?} auf dem Refkonto durch Werbung erwirtschaftet haben, (Wichtig! Maximal Verdoppelung darf nicht überschritten werden) werden diese bei Ihrer nächsten Verdoppelung aufgeschlagen.", + 'DOUBLER_REFERRAL_2' => "Beispiel: Sie haben 100 {?POINTS?} Refverdienst und verdoppeln 100 {?POINTS?}, Sie bekommen - sobald Sie an der Reihe sind - 300 {?POINTS?} zurück.", 'DOUBLER_TIMEOUT' => "Es werden Einträge nicht älter als {%config,createFancyTime=doubler_timeout%} angezeigt.", - 'DOUBLER_REFERAL_LINK' => "Den Reflink erfahren Sie nach jeder Verdoppelung.", + 'DOUBLER_REFERRAL_LINK' => "Den Reflink erfahren Sie nach jeder Verdoppelung.", 'DOUBLER_NOT_YET_REGISTERED' => "Noch nicht angemeldet?", 'DOUBLER_REGISTER_NOW' => "Weiter zur Anmeldung.", 'DOUBLER_YOUR_ADVERTISING_HERE' => "Hier könnte auch Ihre Werbung stehen:", @@ -127,9 +127,9 @@ addMessages(array( 'MEMBER_DOUBLER_NO_ENTRIES_FOUND' => "In dieser Kategorie haben Sie noch keine Einträge.", 'MEMBER_DOUBLER_ALREADY_PAYOUT' => "An Sie bereits ausgezahlte Verdoppelungen", 'MEMBER_DOUBLER_NEXT_PAYOUT' => "Sie erhalten bald folgende Verdoppelungen ausgezahlt", - 'MEMBER_DOUBLER_REFERAL_PAYOUT' => "Ihr Refferal-Verdienst", + 'MEMBER_DOUBLER_REFERRAL_PAYOUT' => "Ihr Refferal-Verdienst", 'MEMBER_DOUBLER_YOUR_LINK' => "Hier ist Ihr Verdoppler-Link", - 'MEMBER_DOUBLER_YOUR_REFERAL_LINK' => "Ihr Referal-Link zum Verdoppeln", + 'MEMBER_DOUBLER_YOUR_REFERRAL_LINK' => "Ihr Referral-Link zum Verdoppeln", 'DOUBLER_POINTS_LEFT' => "Es stehen noch {%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?} zum Verdoppeln zur Verfügung.", 'DOUBLER_USAGE_COUNTER' => "Der Verdoppler wurde bereits {%config,translateComma=doubler_counter%} mal genutzt.", 'MEMBER_DOUBLER_FOOTER' => "Hier sollte noch ein guter Hinweis stehen.", diff --git a/inc/language/funcoins_de.php b/inc/language/funcoins_de.php index 273943b713..27d0684c3e 100644 --- a/inc/language/funcoins_de.php +++ b/inc/language/funcoins_de.php @@ -45,7 +45,7 @@ addMessages(array( 'ADMIN_CONFIG_FUNCOINS_TITLE' => "Konfiguration der FuCo-Ex² API", 'ADMIN_CONFIG_FUNCOINS_API_ID' => "Betreiberkonto (Nummer)", 'ADMIN_CONFIG_FUNCOINS_API_PASSWORD' => "Kennwort Ihres Betreiberkontos", - 'ADMIN_CONFIG_FUNCOINS_REFID' => "Referal-Id (gleich die Nummer Ihres FC-Kontos)", + 'ADMIN_CONFIG_FUNCOINS_REFID' => "Referral-Id (gleich die Nummer Ihres FC-Kontos)", 'ADMIN_CONFIG_FUNCOINS_MIN_PAYOUT' => "Minimale Auszahlungssumme auf ein FunCoins-Konto", 'ADMIN_CONFIG_FUNCOINS_MIN_WITHDRAW' => "Minimale Einzahlungssumme von einem FunCoins-Konto", 'ADMIN_CONFIG_FUNCOINS_PAYOUT_FACTOR' => "Umrechnusfaktor von {?POINTS?} in FunCoins für Auszahlungen", @@ -56,7 +56,7 @@ addMessages(array( 'ADMIN_CONFIG_FUNCOINS_WITHDRAW_FEE_FIX' => "Fixe Betreibergebühr für Einzahlungen", 'ADMIN_CONFIG_FUNCOINS_PAYOUT_ACTIVE' => "Auszahlungen zum FunCoins-Portal aktiviert?", 'ADMIN_CONFIG_FUNCOINS_WITHDRAW_ACTIVE' => "Auszahlungen vom FunCoins-Portal aktiviert?", - 'ADMIN_CONFIG_FUNCOINS_NOTE' => "Falls Sie noch kein FunCoins-Account haben, oder sich über die Internet-Währung nur informieren wollen, verwenden Sie bitte meinen Referal-Link. Ihre Mitglieder sehen im Mitgliedsbereich dann natürlich Ihren Werbelink. Sollten Sie sowohl einen feste als auch eine prozentuale Betreibergebühr eingestellt haben, gilt die prozentuale.", + 'ADMIN_CONFIG_FUNCOINS_NOTE' => "Falls Sie noch kein FunCoins-Account haben, oder sich über die Internet-Währung nur informieren wollen, verwenden Sie bitte meinen Referral-Link. Ihre Mitglieder sehen im Mitgliedsbereich dann natürlich Ihren Werbelink. Sollten Sie sowohl einen feste als auch eine prozentuale Betreibergebühr eingestellt haben, gilt die prozentuale.", )); // [EOF] diff --git a/inc/language/mediadata_de.php b/inc/language/mediadata_de.php index 33b2760c2c..5c08bd3ef9 100644 --- a/inc/language/mediadata_de.php +++ b/inc/language/mediadata_de.php @@ -45,7 +45,7 @@ addMessages(array( 'MEDIA_DATA_GENERAL' => "Allgemeine Mediendaten", 'MEDIA_DATA_POINTS' => "{?POINTS?} im System", 'MEDIA_DATA_MISC' => "Verschiedene Mediendaten", - 'MEDIA_DATA_REFBANNER' => "Daten zu unsere Referal-Bannern", + 'MEDIA_DATA_REFBANNER' => "Daten zu unsere Referral-Bannern", 'MEDIA_DATA_MAIL' => "Mailstatistik", 'MEDIA_DOUBLER_HEADER' => "Statistiken - {?POINTS?}-Verdoppler", @@ -60,10 +60,10 @@ addMessages(array( 'MEDIA_TRANSFER_OUT_COUNT' => "Anzahl ausgehende Transfers", 'MEDIA_TRANSFER_OUT_POINTS' => "Ausgehende {?POINTS?}", - 'TOTAL_REFERAL_BANNER' => "Anzahl Referal-Banner", - 'TOTAL_REFERAL_CLICKS' => "Klicks auf die Banner", - 'TOTAL_REFERAL_VIEWS' => "Einblendungen der Banner", - 'TOTAL_REFCLICKS' => "Referal-Klicks", + 'TOTAL_REFERRAL_BANNER' => "Anzahl Referral-Banner", + 'TOTAL_REFERRAL_CLICKS' => "Klicks auf die Banner", + 'TOTAL_REFERRAL_VIEWS' => "Einblendungen der Banner", + 'TOTAL_REFCLICKS' => "Referral-Klicks", 'MEDIA_BEG_CLICKS' => "Klicks auf Bettellinks", 'MEDIA_HOLIDAY_COUNT' => "Auf Urlaub gestellte Accounts", 'CONTINUE_MEMBER_STATS' => "Weiter zur Mitglieder-Statistik", diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 0889814a6f..a0d6a38dec 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -160,7 +160,7 @@ addMessages(array( 'ADMIN_NETWORK_NONE_SUPPORTED' => "Es sind noch keine Werbenetzwerke eingerichtet.", 'ADMIN_NETWORK_SHORT_NAME' => "Kurzname", 'ADMIN_NETWORK_TITLE' => "Linktitel", - 'ADMIN_NETWORK_REFERAL_LINK' => "Referal-Link", + 'ADMIN_NETWORK_REFERRAL_LINK' => "Referral-Link", 'ADMIN_NETWORK_DATA_SEPARATOR' => "Trennsymbol f. Daten", 'ADMIN_NETWORK_ROW_SEPARATOR' => "Trennzeichen f. Zeilen", 'ADMIN_NETWORK_REQUEST_TYPE' => "HTTP-Abfragetyp", diff --git a/inc/language/nickname_de.php b/inc/language/nickname_de.php index e695fd4ec4..ea6e65994b 100644 --- a/inc/language/nickname_de.php +++ b/inc/language/nickname_de.php @@ -51,7 +51,7 @@ addMessages(array( 'GUEST_ENTER_LOGIN_NICKNAME' => "Nickname o. Login-Id", 'MEMBER_NICKNAME_ALLOWED_CHARS' => "Erlaubte Zeichen:", 'MEMBER_NICKNAME_IS_INVALID' => "Ungütige Zeichen im Nicknamen gefunden oder ist zu kurz.", - 'MEMBER_NICKNAME_YOUR_REFERAL_LINK' => "Ihr Nickname-Reflink", + 'MEMBER_NICKNAME_YOUR_REFERRAL_LINK' => "Ihr Nickname-Reflink", 'MEMBER_NO_NICKNAME_SET' => "Sie haben noch keinen Nickname eingerichtet! Damit können Sie sich alternativ zur Mitglied-Id einloggen.", 'MEMBER_PLEASE_CLICK_NICKNAME_FORM' => "Hier können Sie sich nun einen einrichten...", 'ADMIN_CONFIG_NICKNAME_TITLE' => "Einstellungen am Nicknamen", diff --git a/inc/language/order_de.php b/inc/language/order_de.php index 39b05fa470..80590346f1 100644 --- a/inc/language/order_de.php +++ b/inc/language/order_de.php @@ -74,7 +74,7 @@ addMessages(array( 'ADMIN_ORDER_SELECT_COLUMN_EMAIL' => "EMail-Adresse", 'ADMIN_ORDER_SELECT_COLUMN_BIRTH_YEAR' => "Geburtsjahr", 'ADMIN_ORDER_SELECT_COLUMN_LAST_ONLINE' => "Als letztes Online", - 'ADMIN_ORDER_SELECT_COLUMN_REFERAL_CLICKS' => "Klicks auf Ref-Link", + 'ADMIN_ORDER_SELECT_COLUMN_REFERRAL_CLICKS' => "Klicks auf Ref-Link", 'ADMIN_ORDER_SELECT_COLUMN_TOTAL_LOGINS' => "Gesamtlogins", 'ADMIN_ORDER_SELECT_COLUMN_MAIL_ORDERS' => "Heutige Mailbuchungen", diff --git a/inc/language/primera_de.php b/inc/language/primera_de.php index cc84d76b35..ef8e866f7a 100644 --- a/inc/language/primera_de.php +++ b/inc/language/primera_de.php @@ -49,7 +49,7 @@ addMessages(array( 'ADMIN_CONFIG_PRIMERA_MIN_WITHDRAW' => "Minimumguthaben für Einzahlungen.", 'ADMIN_CONFIG_PRIMERA_API_NAME' => "Primus-Nickname", 'ADMIN_CONFIG_PRIMERA_API_MD5' => "Primera-Passwort (Wird als MD5-Hash gespeichert)", - 'ADMIN_CONFIG_PRIMERA_REFID' => "Primus-Referal-Id (???)", + 'ADMIN_CONFIG_PRIMERA_REFID' => "Primus-Referral-Id (???)", 'ADMIN_CONFIG_PRIMERA_NOTE' => "Hier können Sie sich ein Primus-Portal-Account holen. Geben Sie immer Ihren Usernamen von Primus-Portal ein und überprüfen Sie diesen mehrmals! Er wird zum Überweisen von Primera benötigt.", 'ADMIN_PRIMERA_NO_TRANSFERS' => "Derzeit keine Primera transferiert.", 'ADMIN_PRIMERA_ACCOUNT' => "Account bei Primus-Portal", diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php index dbb4252815..0e9d3338b7 100644 --- a/inc/language/rallye_de.php +++ b/inc/language/rallye_de.php @@ -47,35 +47,35 @@ addMessages(array( 'ADMIN_RALLYE_ADD_NEW_TITLE' => "Neue Ref-Rallye hinzufügen", 'ADD_RALLYE' => "Rallye hinzufügen", 'ADD_RALLYE_PRICE' => "Preis hinzufügen", - 'RALLYE_START_DAY' => "Beginn der Referal-Rallye", - 'RALLYE_END_DAY' => "Ende der Referal-Rallye", + 'RALLYE_START_DAY' => "Beginn der Referral-Rallye", + 'RALLYE_END_DAY' => "Ende der Referral-Rallye", 'RALLYE_AUTO_ADD_USER' => "Neue Mitglieder nehmen automatisch dran teil", 'RALLYE_IS_ACTIVE' => "Rallye ist aktiv", 'RALLYE_SEND_NOTIFY' => "Autom. Benachrichtigung an Mitglieder senden", 'RALLYE_OVERLAP_TIMES' => "Rallyes dürfen nicht zeitgleich laufen.", 'RALLYE_TITLE' => "Rallye-Titel", - 'RALLYE_DESCR' => "Kurze Beschreibung / Freier HTML-Code der Referal-Rallye", + 'RALLYE_DESCR' => "Kurze Beschreibung / Freier HTML-Code der Referral-Rallye", 'RALLYE_TEMPLATE' => "Template (anstelle freien HTML-Codes)", - 'RALLYE_PROBLEM_CREATE' => "Problem beim Erzeugen der Referal-Rallye.", - 'RALLYE_NO_RALLYES_SETUP' => "Bitte fügen Sie zuerst eine neue Referal-Rallye hinzu.", - 'RALLYE_CONFIG_PRICES' => "Preise einrichten für Referal-Rallye %s", + 'RALLYE_PROBLEM_CREATE' => "Problem beim Erzeugen der Referral-Rallye.", + 'RALLYE_NO_RALLYES_SETUP' => "Bitte fügen Sie zuerst eine neue Referral-Rallye hinzu.", + 'RALLYE_CONFIG_PRICES' => "Preise einrichten für Referral-Rallye %s", 'RALLYE_PRICE_LEVEL' => "Platz eingeben (1, 2, 3, usw.)", 'RALLYE_PRICE_POINTS' => "Preis in {?POINTS?}", 'RALLYE_PRICE_INFOS' => "Preisbeschreibung (Sie können auch nur die Beschreibung eingeben!)", 'RALLYE_PRICE_ALREADY_FOUND' => "Sie haben bereits für diesen Platz einen Preis vergeben oder ist identisch mit anderen Preisen.", 'RALLYE_PRICE_LEVEL_SAVED' => "Preis wurde hinzugefügt.", - 'RALLYE_EDIT_DELETE_PRICES' => "Ändern und Löschen von Referal-Rallye-Preisen", + 'RALLYE_EDIT_DELETE_PRICES' => "Ändern und Löschen von Referral-Rallye-Preisen", 'RALLYE_LEVEL' => "Platz", 'RALLYE_PRICE_INFO' => "Infos", 'RALLYE_EDIT_SELECTED_PRICES' => "Preise/Plätze ändern", 'RALLYE_CHANGE_PRICES' => "Ändern", 'RALLYE_ID' => "Rallye-Id", - 'RALLYE_EDIT_DELETE_RALLYES' => "Ändern / Löschen von Referal-Rallyes (Grunddaten)", + 'RALLYE_EDIT_DELETE_RALLYES' => "Ändern / Löschen von Referral-Rallyes (Grunddaten)", 'RALLYE_ADMIN_ID' => "Admin-Login", 'RALLYE_TSTART' => "Anfang", 'RALLYE_TEND' => "Ende", - 'RALLYE_EDIT_DELETE_NOTE' => "Wenn Sie die Grunddaten der ausgewählten Referal-Rallyes ändern / löschen wollen, markieren Sie diese per Kästchen. Wollen Sie die Preise ändern, klicken Sie den Referal-Rallye-Titel an. Aktive Referal-Rallyes können nicht geändert werden, sondern müssen erst deaktiviert werden.", - 'ADMIN_RALLYE_PRICES_NOTE' => "Wenn Sie die Referal-Rallye-Preise hinzufügen, ändern oder löschen wollen, klicken Sie einfach den Referal-Rallye-Titel an.", + 'RALLYE_EDIT_DELETE_NOTE' => "Wenn Sie die Grunddaten der ausgewählten Referral-Rallyes ändern / löschen wollen, markieren Sie diese per Kästchen. Wollen Sie die Preise ändern, klicken Sie den Referral-Rallye-Titel an. Aktive Referral-Rallyes können nicht geändert werden, sondern müssen erst deaktiviert werden.", + 'ADMIN_RALLYE_PRICES_NOTE' => "Wenn Sie die Referral-Rallye-Preise hinzufügen, ändern oder löschen wollen, klicken Sie einfach den Referral-Rallye-Titel an.", 'RALLYE_ENTRIES_DELETED' => "Einträge gelöscht.", 'RALLYE_ENTRIES_CHANGED' => "Einträge geändert.", 'RALLYE_ENTRIES_NOT_DELETED' => "Bitte wählen Sie mindestens einen Eintrag zum Löschen aus.", @@ -87,30 +87,30 @@ addMessages(array( 'RALLYE_NOTIFIED' => "Benachrichtigt", 'RALLYE_ASSIGNED_PRICES' => "Bereits eingerichtete Preise", 'RALLYE_ASSIGNED_USERS' => "Teilnehmende Mitglieder", - 'RALLYE_LIST_OVERVIEW_TITLE' => "Datenblätter der Referal-Rallyes", + 'RALLYE_LIST_OVERVIEW_TITLE' => "Datenblätter der Referral-Rallyes", 'RALLYE_NO_RALLYES_SELECTED' => "Sie haben keine Rallyes zum Editieren ausgewählt.", 'RALLYE_DEACTIVATE_NOW' => "Rallye deaktivieren", 'RALLYE_ACTIVATE_NOW' => "Rallye aktivieren", 'RALLYE_STOP_NOTIFY_NOW' => "Nicht mehr benachrichtigen", 'RALLYE_START_NOTIFY_NOW' => "Mitglieder autom. benachrichtigen", - 'RALLYE_EDIT_ONLY_INACTIVE_NOTE' => "Es können nur deaktivierte Referal-Rallyes bearbeitet bzw. gelöscht werden. Beim Löschen werden alle dazu verknüpften Daten ebenfalls ohne Vorwarnung gelöscht.", - 'RALLYE_DELETE_NOTHING_SELECTED' => "Keine Referal-Rallye(s) zum Löschen ausgewählt.", + 'RALLYE_EDIT_ONLY_INACTIVE_NOTE' => "Es können nur deaktivierte Referral-Rallyes bearbeitet bzw. gelöscht werden. Beim Löschen werden alle dazu verknüpften Daten ebenfalls ohne Vorwarnung gelöscht.", + 'RALLYE_DELETE_NOTHING_SELECTED' => "Keine Referral-Rallye(s) zum Löschen ausgewählt.", 'RALLYE_DELETED' => "Rallye(s) wurde(n) gelöscht.", 'RALLYE_MEMBER_NO_PRICES' => "--> Keine Preise für Modus %s ausgesetzt! <--", 'RALLYE_MEMBER_PRICES_ADDED' => "Die Preise", 'RALLYE_PRICE' => ". Platz", 'RALLYE_MEMBER_NOTIFY' => "REF-RALLYE GESTARTET: %s", 'RALLYE_ADMIN_NOTIFY' => "Neue Ref-Rallye: %s", - 'RALLYE_ADMIN_USERS_404' => "Zur ausgewählten Referal-Rallye sind noch keine Mitglieder hinzugefügt worden.", - 'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referal-Rallye %s", - 'RALLYE_OLD_REFS' => "Refs vor Referal-Rallye", + 'RALLYE_ADMIN_USERS_404' => "Zur ausgewählten Referral-Rallye sind noch keine Mitglieder hinzugefügt worden.", + 'RALLYE_LIST_USERS' => "Teilnehmende Mitglieder an der Referral-Rallye %s", + 'RALLYE_OLD_REFS' => "Refs vor Referral-Rallye", 'RALLYE_NEW_REFS' => "Neue Refs", 'RALLYE_STOP_AUTO_ADD_NOW' => "Auto-Beitreten neuer Mitglieder deaktivieren", 'RALLYE_START_AUTO_ADD_NOW' => "Auto-Beitreten neuer Mitglieder aktivieren", 'RALLYE_REFS' => "Geworbene Mitglieder", '_RALLYE_PRICE' => "Platz", 'RALLYE_EXPIRE_ONE_DAY' => "Rallye endet in weniger als 24 Stunden.", - 'RALLYE_HAS_EXPIRED' => "Diese Referal-Rallye ist beendet.", + 'RALLYE_HAS_EXPIRED' => "Diese Referral-Rallye ist beendet.", 'RALLYE_ADMIN_EXPIRED' => "Rallye beendet", 'RALLYE_ADMIN_EXPIRED_SUBJECT' => "Rallye beendet: %s", 'RALLYE_MEMBER_EXPIRED_SUBJECT' => "REF-RALLYE BEENDET: %s. Platz", @@ -118,33 +118,33 @@ addMessages(array( 'RALLYE_OUR_WINNERS_ARE' => "Unsere Gewinner sind dieses Mal", 'RALLYE_PRICE_IS' => "Hat gewonnen", 'RALLYE_HAPPY_WINNERS' => "Wir gratulieren allen Gewinnern.", - 'RALLYE_ADMIN_PURGED_SUBJECT' => "[HINWEIS:] Referal-Rallye '%s' entfernt", - 'RALLYE_ADMIN_EXPIRED_TEXT' => "Eine Referal-Rallye ist beendet worden. Bitte kontrollieren Sie diese und führen Sie ggf. weitere Schritte durch.", - 'RALLYE_ADMIN_PURGED_TEXT' => "Eine oder mehr Referal-Rallye(s) ist/sind gelöscht worden.", + 'RALLYE_ADMIN_PURGED_SUBJECT' => "[HINWEIS:] Referral-Rallye '%s' entfernt", + 'RALLYE_ADMIN_EXPIRED_TEXT' => "Eine Referral-Rallye ist beendet worden. Bitte kontrollieren Sie diese und führen Sie ggf. weitere Schritte durch.", + 'RALLYE_ADMIN_PURGED_TEXT' => "Eine oder mehr Referral-Rallye(s) ist/sind gelöscht worden.", 'RALLYE_EDIT_RALLYES' => "Rallye-Grunddaten ändern", 'RALLYE_CHANGE_ADMIN' => "Änderungen speichern", 'RALLYE_CHANGED' => "Änderungen gespeichert.", - 'RALLYE_REFERAL_POINTS' => "Verdienst durch Refs", + 'RALLYE_REFERRAL_POINTS' => "Verdienst durch Refs", 'RALLYE_REGISTER_NOW' => "Jetzt kostenlos und unverbindlich anmelden.", - 'RALLYE_GET_REFERAL_LINK' => "Jetzt dran teilnehmen.", + 'RALLYE_GET_REFERRAL_LINK' => "Jetzt dran teilnehmen.", 'ADMIN_TASK_TYPE_RALLYE_EXPIRED' => "Rallye wurde beendet", 'ADMIN_TASK_TYPE_RALLYE_PURGED' => "Rallye wurde gelöscht", 'RALLYE_LIST_USERS_TITLE' => "Alle teilnehmenden Mitglieder auflisten.", - 'RALLYE_REFERAL_POINTS_NOTE' => "Die {?POINTS?} in der Spalte Verdienst durch Refs geben den Verdienst in erster Ebene vor der Referal-Rallye an und wird sich bis Ende der Referal-Rallye nicht verändern.", - 'RALLYE_MIN_USERS' => "Gesamtzahl der Mitglieder, ab der Referal-Rallye automatisch endet.", + 'RALLYE_REFERRAL_POINTS_NOTE' => "Die {?POINTS?} in der Spalte Verdienst durch Refs geben den Verdienst in erster Ebene vor der Referral-Rallye an und wird sich bis Ende der Referral-Rallye nicht verändern.", + 'RALLYE_MIN_USERS' => "Gesamtzahl der Mitglieder, ab der Referral-Rallye automatisch endet.", 'RALLYE_MIN_PRICES' => "Mindestens zu belegende Plätze", 'RALLYE_MIN_USERS_MINI' => "Mitgliederanzahl erreicht", 'RALLYE_MIN_PRICES_MINI' => "Minimum Plätze", - 'RALLYE_END_NO_USER_LIMITATION' => "Die Referal-Rallye endet ohne Mitgliederbegrenzung.", - 'RALLYE_END_NO_PRICE_LIMITATION' => "Die Referal-Rallye endet ohne Platzbelegungsbegrenzung.", - 'RALLYE_END_USERS' => "Die Referal-Rallye endet, wenn wir %s Mitglieder in unserem {?mt_word?} haben.", - 'RALLYE_END_PRICES' => "Die Referal-Rallye endet, wenn mindestens %s Plätze belegt sind.", - 'RALLYE_LIMITATIONS' => "Einschränkungen an der Dauer der Referal-Rallye", + 'RALLYE_END_NO_USER_LIMITATION' => "Die Referral-Rallye endet ohne Mitgliederbegrenzung.", + 'RALLYE_END_NO_PRICE_LIMITATION' => "Die Referral-Rallye endet ohne Platzbelegungsbegrenzung.", + 'RALLYE_END_USERS' => "Die Referral-Rallye endet, wenn wir %s Mitglieder in unserem {?mt_word?} haben.", + 'RALLYE_END_PRICES' => "Die Referral-Rallye endet, wenn mindestens %s Plätze belegt sind.", + 'RALLYE_LIMITATIONS' => "Einschränkungen an der Dauer der Referral-Rallye", 'RALLYE_REMOVE_PRICES' => "Rallye-Preis(e) entfernen", 'RALLYE_NO_TEMPLATES_FOUND' => "Keine Templates gefunden.", - 'ADMIN_LIST_RALLYES_PRICING' => "Auflisten von Referal-Rallyes - Preise einrichten", - 'GUEST_RALLYE_HAS_STARTED_TITLE' => "{?MAIN_TITLE?} - Referal-Rallye gestartet", - 'RALLYE_NONE_ACTIVE_TITLE' => "Keine Referal-Rallyes aktiv", + 'ADMIN_LIST_RALLYES_PRICING' => "Auflisten von Referral-Rallyes - Preise einrichten", + 'GUEST_RALLYE_HAS_STARTED_TITLE' => "{?MAIN_TITLE?} - Referral-Rallye gestartet", + 'RALLYE_NONE_ACTIVE_TITLE' => "Keine Referral-Rallyes aktiv", 'RALLYE_NONE_ACTIVE' => "Derzeit ist noch keine Rallye im Gange. Bitte kommen Sie später noch einmal wieder.", )); diff --git a/inc/language/refback_de.php b/inc/language/refback_de.php index 62545726b6..2dc668170a 100644 --- a/inc/language/refback_de.php +++ b/inc/language/refback_de.php @@ -42,33 +42,33 @@ if (!defined('__SECURITY')) { // Admin language strings addMessages(array( - 'ADMIN_LIST_USER_NOREFS' => "Das Mitglied %s hat in dieser Referal-Ebene keine Refs.", + 'ADMIN_LIST_USER_NO_REFERRALS' => "Das Mitglied %s hat in dieser Referral-Ebene keine Refs.", 'ADMIN_LIST_USER_NODATA' => "Das Mitglied %s wurde bereits gelöscht.", 'ADMIN_CONFIG_REFBACK_TITLE' => "Refback-Einstellungen", - 'ADMIN_CONFIG_REFBACK_ENABLED' => "Refback eingeschaltet? (Wenn nein, ist nur die Referal-Übersicht funktionell.)", + 'ADMIN_CONFIG_REFBACK_ENABLED' => "Refback eingeschaltet? (Wenn nein, ist nur die Referral-Übersicht funktionell.)", 'ADMIN_CONFIG_REFBACK_MIN_PERCENTS' => "Minimum erlaubte Refback-Prozente:
(0% ist immer erlaubt!)", 'ADMIN_CONFIG_REFBACK_MAX_PERCENTS' => "Maximum erlaubte Refback-Prozente:", // Member language strings // @TODO Rewrite these constants to one - 'MEMBER_REFBACK_LIST_TITLE_1' => "Refback-Übersicht für Referal-Ebene ", + 'MEMBER_REFBACK_LIST_TITLE_1' => "Refback-Übersicht für Referral-Ebene ", 'MEMBER_REFBACK_LIST_TITLE_2' => " (", 'MEMBER_REFBACK_LIST_TITLE_3' => "%)", - 'MEMBER_REFBACK_TITLE' => "Refback und Referal-Übersicht", - 'MEMBER_REFBACK_NOTE' => "Hier können Sie in jeder Referal-Ebene jedem von Ihnen geworbenen Mitglied Refback einstellen. Sollte Ihr Referal {?POINTS?} verdienen und diese ihm/ihr nicht direkt gutgeschrieben werden, so erhält Ihr Referal die eingestellten Prozente von Ihrem Referalverdienst aufgebucht. Ihnen wird dafür sein Anteil (=eingestellte Prozente) von Ihrem Referalverdienst abgezogen. Unter {--MEMBER_REFBACK_POINTS--} sind die {?POINTS?}-Gutschriften durch Refback an das jeweilige Mitglied zu verstehen.", - 'MEMBER_REFBACK_EXAMPLE' => "Ein Rechenbeispiel: Ihr Referal X verdient 1.000 {?POINTS?}, es sind 10% in Ref-Ebene 1 eingestellt. Ohne Refback erhalten Sie 100 {?POINTS?} in Referal-Ebene 1 gutgeschrieben. Nun haben Sie einen Refback von 90% dem Referal X gegeben. Die 100 {?POINTS?} werden dann aufgeteilt: Ihrem Referal werden 90 und Ihnen die restlichen 10 von den ursprünglichen 100 {?POINTS?} gutgeschrieben.", + 'MEMBER_REFBACK_TITLE' => "Refback und Referral-Übersicht", + 'MEMBER_REFBACK_NOTE' => "Hier können Sie in jeder Referral-Ebene jedem von Ihnen geworbenen Mitglied Refback einstellen. Sollte Ihr Referral {?POINTS?} verdienen und diese ihm/ihr nicht direkt gutgeschrieben werden, so erhält Ihr Referral die eingestellten Prozente von Ihrem Referralverdienst aufgebucht. Ihnen wird dafür sein Anteil (=eingestellte Prozente) von Ihrem Referralverdienst abgezogen. Unter {--MEMBER_REFBACK_POINTS--} sind die {?POINTS?}-Gutschriften durch Refback an das jeweilige Mitglied zu verstehen.", + 'MEMBER_REFBACK_EXAMPLE' => "Ein Rechenbeispiel: Ihr Referral X verdient 1.000 {?POINTS?}, es sind 10% in Ref-Ebene 1 eingestellt. Ohne Refback erhalten Sie 100 {?POINTS?} in Referral-Ebene 1 gutgeschrieben. Nun haben Sie einen Refback von 90% dem Referral X gegeben. Die 100 {?POINTS?} werden dann aufgeteilt: Ihrem Referral werden 90 und Ihnen die restlichen 10 von den ursprünglichen 100 {?POINTS?} gutgeschrieben.", 'MEMBER_REFBACK_NO_ENTRIES' => "Es gibt technische Probleme mit der Refback-Tabelle. Bitte Support benachrichtigen.", 'MEMBER_REFBACK_EDIT_SUBMIT' => "Refback einstellen", 'MEMBER_REFBACK_REFID' => "Mitglied-Id", 'MEMBER_REFBACK_LEVEL_REFID' => "Werber", - 'MEMBER_REFBACK_STATUS' => "Referal-Status", + 'MEMBER_REFBACK_STATUS' => "Referral-Status", 'MEMBER_REFBACK_PERCENTS' => "Refback-Prozente", 'MEMBER_REFBACK_POINTS' => "Refback Vergütung", 'MEMBER_REFBACK_EDIT' => "Einstellen", 'MEMBER_REFBACK_EDIT_TITLE' => "Refback für ausgewähltes Mitglied einstellen:", 'MEMBER_REFBACK_DELETED_SUBMIT' => "Nicht möglich", 'MEMBER_REFBACK_DELETED_TITLE' => "Einstellen von Refback ist für gelöschte Mitglieder nicht möglich.", - 'MEMBER_REFBACK_DISABLED' => "Refback ist administrativ deaktiviert. Bitte nutze die Referal-Übersicht links im Menü.", + 'MEMBER_REFBACK_DISABLED' => "Refback ist administrativ deaktiviert. Bitte nutze die Referral-Übersicht links im Menü.", 'MEMBER_REFBACK_MIN_MAX_NOTE' => "Hinweis: Sie können derzeit zwischen {%config,translateComma=refback_min_perc%} und {%config,translateComma=refback_max_perc%} Prozent, inklusive, Refback einstellen.", // - Edit form 'MEMBER_ENTER_REFBACK_PERCENTS' => "Refback-Prozente eingeben", diff --git a/inc/language/repair_de.php b/inc/language/repair_de.php index f02b2f1fe8..5a92ba742e 100644 --- a/inc/language/repair_de.php +++ b/inc/language/repair_de.php @@ -47,7 +47,7 @@ addMessages(array( 'ADMIN_REPAIR_NOTHING_FIXED' => "Es wurden keine Einträge repariert.", 'ADMIN_REPAIR_LANGUAGE_TO_MUCH' => "Es sind mehr als 100 nicht existierende Elemente in der Zielsprachdatei gefunden worden.", 'ADMIN_REPAIR_LANGUAGE_TITLE' => "Analyse an den Sprachdateien", - 'ADMIN_REPAIR_REFERAL_SYSTEM_DONE' => "Das Referal-System wurde zurückgesetzt und neu aufgebaut.", + 'ADMIN_REPAIR_REFERRAL_SYSTEM_DONE' => "Das Referral-System wurde zurückgesetzt und neu aufgebaut.", )); // [EOF] diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 6e0f1c5ec3..c15e05ae33 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -45,7 +45,7 @@ addMessages(array( 'SPONSOR_NOT_INITIALIZED' => "Sponsorenbereich noch nicht eingerichtet.", 'ADMIN_CONFIG_SPONSOR_TITLE' => "Allgemeine Einstellungen", 'ADMIN_CONFIG_SPONSOR_MIN_POINTS' => "Minimum buchbare {?POINTS?}", - 'ADMIN_CONFIG_SPONSOR_REFERAL_POINTS' => "Einmalige Referal-Gutschrift bei Vermittlung eines neuen Sponsors", + 'ADMIN_CONFIG_SPONSOR_REFERRAL_POINTS' => "Einmalige Referral-Gutschrift bei Vermittlung eines neuen Sponsors", 'ADMIN_SPONSOR_ENTER_COMPANY_DATA' => "Daten zur anzumeldenen Unternehmen eingeben", 'SPONSOR_ENTER_COMPANY_TITLE' => "Firmenname", 'SPONSOR_ENTER_COMPANY_POSITION' => "Position", @@ -87,7 +87,7 @@ addMessages(array( 'SPONSOR_POINTS_LEFT' => "Restguthaben", 'ADMIN_LIST_SPONSOR_NOTES' => "Klicken Sie auf die id-Nummer, um weitere Details zu sehen und um weitere Aktionen am Sponsorenaccount durchführen zu können! Klicken Sie auf das Restguthaben an {?POINTS?}, um dem jeweiligen Sponsor mehr {?POINTS?} aufzubuchen.", 'ADMIN_SPONSOR_404' => "Sponsorenaccount %s nicht gefunden.", - 'ADMIN_SPONSOR_REFS_404' => "Der Sponsor %s hat keine Referals.", + 'ADMIN_SPONSOR_REFS_404' => "Der Sponsor %s hat keine Referrals.", 'ADMIN_SPONSOR_DETAILS' => "Datenblatt eines Sponsors", 'ADMIN_SPONSOR_COMPANY_DATA' => "Firmendaten des Sponsors", 'ADMIN_SPONSOR_PERSONA_DATA' => "Persönliche Daten des Sponsors", @@ -101,7 +101,7 @@ addMessages(array( 'ADMIN_SPONSOR_ACTIONS' => "Aktionen am Sponsorenaccount", 'SPONSOR_ID' => "Sponsor-Id", 'SPONSOR_STATUS' => "Sponsor-Status", - 'SPONSOR_REFERALS' => "Sponsoren geworben", + 'SPONSOR_REFERRALS' => "Sponsoren geworben", 'ADMIN_SPONSOR_INVALID_MODE' => "Ungütiger Modus %s angegeben.", 'ADMIN_SPONSOR_MODUS_TPL_404' => "Modus-Template %s nicht gefunden.", 'ADMIN_ADD_POINTS_TO_SPONSOR' => "{?POINTS?} gutschreiben", @@ -161,7 +161,7 @@ addMessages(array( 'SPONSOR_PAY_ENTRIES_REMOVED' => "Buchungspakete gelöscht.", 'SPONSOR_PAYMENT_LIST_EMPTY' => "Noch keine Buchungspakete eingerichtet.", 'ADMIN_SPONSOR_UNKNOWN_STATUS' => "Unbekannter Status %s wurde bei der Anmeldung zurückgeliefert.", - 'SPONSOR_REFERAL' => "Sponsoren-Referal", + 'SPONSOR_REFERRAL' => "Sponsoren-Referral", 'SPONSOR_REFID_WAS' => "Sie wurden vom Sponsor geworben", 'SPONSOR_ACCOUNT_IS_PENDING' => "EMail-Adresse bestätigt! Sie haben soeben eine EMail mit weiteren Anweisungen erhalten.", diff --git a/inc/language/support_de.php b/inc/language/support_de.php index e61ec8a7d8..0958454d7a 100644 --- a/inc/language/support_de.php +++ b/inc/language/support_de.php @@ -43,10 +43,10 @@ if (!defined('__SECURITY')) { // Language constans addMessages(array( 'ADMIN_SUPPORT_ORDER_SUBJECT' => "[Support:] Mailbuchung", - 'ADMIN_SUPPORT_REFERAL_LINK_SUBJECT' => "[Support:] Referal-Link", + 'ADMIN_SUPPORT_REFERRAL_LINK_SUBJECT' => "[Support:] Referral-Link", 'ADMIN_SUPPORT_UNCONFIRMED_SUBJECT' => "[Support:] Unbestätigte Mails", 'MEMBER_SUPPORT_ORDER_SUBJECT' => "Ihr Anfrage an den Support: Mailbuchung", - 'MEMBER_SUPPORT_REFERAL_LINK_SUBJECT' => "Ihr Anfrage an den Support: Referal-Link", + 'MEMBER_SUPPORT_REFERRAL_LINK_SUBJECT' => "Ihr Anfrage an den Support: Referral-Link", 'MEMBER_SUPPORT_UNCONFIRMED_SUBJECT' => "Ihr Anfrage an den Support: Unbestätigte Mails", 'ADMIN_TASK_TYPE_MEMBER_SUPPORT' => "Mitglieder-Support", 'ADMIN_UNKNOWN_SUPPORT_MODE' => "Unbekannter Support-Modus %s erkannt.", diff --git a/inc/language/task_de.php b/inc/language/task_de.php index 822ae4ebc4..dc43a2f07c 100644 --- a/inc/language/task_de.php +++ b/inc/language/task_de.php @@ -50,7 +50,7 @@ addMessages(array( 'ADMIN_TASK_CONFIRMED' => "Bestätigt", 'ADMIN_TASK_UNCONFIRMED' => "Unbestätigt", 'ADMIN_TASK_LOCKED' => "Gesperrt", - 'ADMIN_TASK_RANDOM_REFID' => "Zufallsreferal", + 'ADMIN_TASK_RANDOM_REFID' => "Zufallsreferral", 'ADMIN_TASK_NEW_TASKS' => "Ohne Zuweisung", 'ADMIN_TASK_CLOSED_TASKS' => "Geschlossen", 'ADMIN_TASK_YOUR_TASKS' => "Ihre Aufgaben", @@ -107,16 +107,16 @@ addMessages(array( 'ADMIN_TASK_LIST_THEME_ACTIVE_TITLE' => "Sie haben Themes in Ihrem {?mt_word?} aktiviert.", 'ADMIN_TASK_LIST_ADMINS_ALL' => "Administratoren", 'ADMIN_TASK_LIST_ADMINS_ALL_TITLE' => "Es existieren Administratoren-Accounts in Ihrem {?mt_word?}.", - 'ADMIN_TASK_LIST_REFBANNER_ALL' => "Alle Referal-Banner", - 'ADMIN_TASK_LIST_REFBANNER_ALL_TITLE' => "Es exisitieren Referal-Banner in Ihrem {?mt_word?}.", + 'ADMIN_TASK_LIST_REFBANNER_ALL' => "Alle Referral-Banner", + 'ADMIN_TASK_LIST_REFBANNER_ALL_TITLE' => "Es exisitieren Referral-Banner in Ihrem {?mt_word?}.", 'ADMIN_TASK_LIST_REFBANNER_ACTIVE' => "Aktivierte Ref-Banner", - 'ADMIN_TASK_LIST_REFBANNER_ACTIVE_TITLE' => "Ihre Mitglieder können Referal-Banner auswählen.", + 'ADMIN_TASK_LIST_REFBANNER_ACTIVE_TITLE' => "Ihre Mitglieder können Referral-Banner auswählen.", 'ADMIN_TASK_LIST_EXTENSIONS_ALL' => "Alle Erweiterungen", 'ADMIN_TASK_LIST_EXTENSIONS_ALL_TITLE' => "Es exisitieren installierte Erweiterungen in Ihrem {?mt_word?}.", 'ADMIN_TASK_LIST_EXTENSIONS_ACTIVE' => "Aktivierte Erweiterungen", 'ADMIN_TASK_LIST_EXTENSIONS_ACTIVE_TITLE' => "Sie haben Erweiterungen aktiviert.", - 'ADMIN_TASK_LIST_ACCOUNT_NOREF' => "Accounts ohne Werber", - 'ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE' => "Es wurden Accounts ohne Werber-Id (refid=0) gefunden.", + 'ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL' => "Accounts ohne Werber", + 'ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL_TITLE' => "Es wurden Accounts ohne Werber-Id (refid=0) gefunden.", 'ADMIN_TASK_LIST_SURFBAR_URLS_ALL' => "Alle URLs in Surfbar", 'ADMIN_TASK_LIST_SURFBAR_URLS_ALL_TITLE' => "In der Surfbar sind URLs gebucht worden.", 'ADMIN_TASK_LIST_SURFBAR_URLS_PENDING' => "Wartende URLs in Surfbar", diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php index 6fd0f04c85..9c3d228f44 100644 --- a/inc/language/wernis_de.php +++ b/inc/language/wernis_de.php @@ -57,7 +57,7 @@ addMessages(array( 'ADMIN_CONFIG_WERNIS_API_ID' => "WDS66-API-Id (api_id=x)", 'ADMIN_CONFIG_WERNIS_API_MD5' => "WDS66-API-Key (api_md5=xxxxx; 32-stellig)", 'ADMIN_CONFIG_WERNIS_API_URL' => "Basis-URL der API-Skripte", - 'ADMIN_CONFIG_WERNIS_REFID' => "Ihre Referal-Id bei WDS66-Portal (= Ihr Username!)", + 'ADMIN_CONFIG_WERNIS_REFID' => "Ihre Referral-Id bei WDS66-Portal (= Ihr Username!)", 'ADMIN_CONFIG_WERNIS_WPASS' => "Wernis-Passwort (nicht Account-Passwort!)", 'ADMIN_CONFIG_WERNIS_NOTE' => "[Hier] können Sie schon für einmalig kostenlos 25.000 Abfragen ein API-Account beantragen (dazu ist ein kostenloses Wernis-Account dennoch nötig!) Geben Sie immer Ihren Usernamen von WDS66-Hauptaccount ein und überprüfen Sie diesen mehrmals! Er wird zum Überweisen von und nach WDS66-Wernis-Portal benötigt. Die Betreibergebühren und Umrechnungsfaktoren sind für den Betrieb Ihres {?mt_word2?} komplett in Wernis ausgelegt, diese müssen Sie also noch anpassen, wenn Sie z.B. Punkte haben und in Wernis auszahlen lassen wollen. Sollten Sie sowohl einen feste als auch eine prozentuale Betreibergebühr eingestellt haben, gilt die prozentuale.", 'ADMIN_WERNIS_NO_TRANSFERS' => "Derzeit keine Wernis transferiert.", diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 0fad9b6657..2df52a1046 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -201,7 +201,7 @@ function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = t // Save password when set if (!empty($postData['pass1'][$id])) { - $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash)); + $add = sprintf(",`password`='%s'", SQL_ESCAPE($hash)); } // END - if // Get admin's id @@ -445,7 +445,16 @@ function adminsRemoveAdminAccount ($postData) { // List all admin accounts function adminsListAdminAccounts() { // Select all admin accounts - $result = SQL_QUERY('SELECT `id`,`login`,`email`,`default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC', __FUNCTION__, __LINE__); + $result = SQL_QUERY('SELECT + `id`, + `login`, + `email`, + `default_acl` AS `mode`, + `la_mode` +FROM + `{?_MYSQL_PREFIX?}_admins` +ORDER BY + `login` ASC', __FUNCTION__, __LINE__); $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { // Compile some variables diff --git a/inc/libs/autopurge_functions.php b/inc/libs/autopurge_functions.php index d9097a11d0..275cdfcacc 100644 --- a/inc/libs/autopurge_functions.php +++ b/inc/libs/autopurge_functions.php @@ -49,8 +49,8 @@ function addPointsAutoPurge ($userid, $points) { } // END - if // Add points over the ref system directly now - initReferalSystem(); - addPointsThroughReferalSystem('autopurge_add', $userid, $points); + initReferralSystem(); + addPointsThroughReferralSystem('autopurge_add', $userid, $points); // Send out mail to user $message = loadEmailTemplate('member_autopurge_points', array('points' => $points), $userid); diff --git a/inc/libs/beg_functions.php b/inc/libs/beg_functions.php index f1f333ae43..6c97bc34be 100644 --- a/inc/libs/beg_functions.php +++ b/inc/libs/beg_functions.php @@ -55,8 +55,8 @@ function addPointsBeg ($userid, $points) { $added = (!SQL_HASZEROAFFECTED()); } else { // Add points to account - initReferalSystem(); - $added = addPointsThroughReferalSystem('beg', $userid, $points); + initReferralSystem(); + $added = addPointsThroughReferralSystem('beg', $userid, $points); } // Subtract begged points from member account if the admin has selected one diff --git a/inc/libs/earning_functions.php b/inc/libs/earning_functions.php index 0209841f56..2507db9257 100644 --- a/inc/libs/earning_functions.php +++ b/inc/libs/earning_functions.php @@ -153,7 +153,7 @@ function updateMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') { // Does the user cancel the earning? if ($isActive == 'N') { // Then update cancellation timestamp as well - $moreSql = ', `earning_canceled`=NOW()'; + $moreSql = ',`earning_canceled`=NOW()'; } // END - if // Update database record diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php index b231b06046..b38e212039 100644 --- a/inc/libs/holiday_functions.php +++ b/inc/libs/holiday_functions.php @@ -68,7 +68,8 @@ ORDER BY addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `holiday_active`='N', `holiday_activated`=0 + `holiday_active`='N', + `holiday_activated`=0 WHERE `userid`=%s LIMIT 1", diff --git a/inc/libs/order_functions.php b/inc/libs/order_functions.php index 4a2009e0c1..f6da85ea79 100644 --- a/inc/libs/order_functions.php +++ b/inc/libs/order_functions.php @@ -52,9 +52,9 @@ function addOrderSelectionOptions ($default) { $selected = ' selected="selected"'; } // END - if - // 'ref_clicks' needs to be rewritten to 'referal_clicks' + // 'ref_clicks' needs to be rewritten to 'referral_clicks' if ($item == 'ref_clicks') { - $item = 'referal_clicks'; + $item = 'referral_clicks'; } // END - if // Add option line diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index baf0bdef92..feffef0f61 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -40,8 +40,8 @@ if (!defined('__SECURITY')) { die(); } // END - if -// Auto-start referal rallyes -function autostartReferalRallyes ($result) { +// Auto-start referral rallyes +function autostartReferralRallyes ($result) { // Load all rallyes (usally we have only one rallye active per time! list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result); @@ -67,11 +67,11 @@ LIMIT 1", $content['id'] = $id; // id for the rallye details link // Determine min_users and min_prices - $content['min_users'] = determineReferalRallyeMinimumUsers($min_users); - $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices); + $content['min_users'] = determineReferralRallyeMinimumUsers($min_users); + $content['min_prices'] = determineReferralRallyeMinimumPrices($min_prices); // Load prices - $content['prices'] = addReferalRallyePrices($id); + $content['prices'] = addReferralRallyePrices($id); // Query all users $result_user = SQL_QUERY("SELECT @@ -91,7 +91,7 @@ ORDER BY $un = false; // Get refs by userid - $count = getReferalRallyeRefsCount($content['userid']); + $count = getReferralRallyeRefsCount($content['userid']); if (empty($count)) $count = '0'; // Added prevent some unknown troubles... :-? // Check if line is already included... @@ -173,7 +173,7 @@ WHERE } // -function addReferalRallyePrices ($rallye, $mode = 'email') { +function addReferralRallyePrices ($rallye, $mode = 'email') { // Output mode switch($mode) { case 'email': $mode = "\n"; break; @@ -222,7 +222,7 @@ ORDER BY } // -function addReferalRallyeTopUsers ($mode, $rallye, $default=0) { +function addReferralRallyeTopUsers ($mode, $rallye, $default=0) { // Init variables $min_users = 0; $min_prices = 0; @@ -259,7 +259,7 @@ ORDER BY // Load all users while ($content = SQL_FETCHARRAY($result)) { // Get current refs - $count = getReferalRallyeRefsCount($content['userid'], $content['refs']); + $count = getReferralRallyeRefsCount($content['userid'], $content['refs']); // Points of ref's $result_ref = SQL_QUERY_ESC("SELECT @@ -346,12 +346,12 @@ LIMIT 1", } // Run this function only when a new member has confirmed his email address! -function addUserToReferalRallye ($userid, $content = array()) { +function addUserToReferralRallye ($userid, $content = array()) { $add = ''; // Updated extension? if (isExtensionInstalledAndNewer('rallye', '0.2.0')) { - $add .= ', `min_users`,`min_prices`'; + $add .= ',`min_users`,`min_prices`'; } // END - if // Check for an auto-add rallye @@ -390,11 +390,11 @@ LIMIT 1", __FUNCTION__, __LINE__); $content['refs'] = countSumTotalData($userid, 'user_data', 'userid', 'refid', true); // Load prices - $content['prices'] = addReferalRallyePrices($id); + $content['prices'] = addReferralRallyePrices($id); // Determine min_users/prices tring - $content['min_users'] = determineReferalRallyeMinimumUsers($min_users); - $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices); + $content['min_users'] = determineReferralRallyeMinimumUsers($min_users); + $content['min_prices'] = determineReferralRallyeMinimumPrices($min_prices); // Send notification to member $message = loadEmailTemplate('member_rallye_notify', $content, $userid); @@ -435,7 +435,7 @@ LIMIT 1", } // -function markReferalRallyesAsExpired ($result) { +function markReferralRallyesAsExpired ($result) { // Load rallye data list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result); @@ -452,7 +452,7 @@ function markReferalRallyesAsExpired ($result) { $content['now_t'] = generateDateTime(time(), 1); // Load users array (!) with assigned prices - $prices = getArrayFromReferalRallyeUsers($id); + $prices = getArrayFromReferralRallyeUsers($id); // Just count... $total = '0'; @@ -507,8 +507,8 @@ function markReferalRallyesAsExpired ($result) { if ($content['points'] > 0) { // Add points directly to user's account - initReferalSystem(); - addPointsThroughReferalSystem('rallye_winner:' . $winnerLevel, $userid, $content['points']); + initReferralSystem(); + addPointsThroughReferralSystem('rallye_winner:' . $winnerLevel, $userid, $content['points']); } // END - if if ($notify == 'Y') { @@ -541,7 +541,7 @@ function markReferalRallyesAsExpired ($result) { $templ = 'admin_rallye_expired'; } elseif (is_array($users['userid'])) { $templ = 'admin_rallye_expired_no'; - $count = getReferalRallyeUserDataFromArray($users); + $count = getReferralRallyeUserDataFromArray($users); } // Add count @@ -555,7 +555,7 @@ function markReferalRallyesAsExpired ($result) { } // -function getReferalRallyeUserDataFromArray ($userIds) { +function getReferralRallyeUserDataFromArray ($userIds) { // Implode user ids $userid_string = implode(',', $userIds['userid']); @@ -593,7 +593,7 @@ LIMIT %s", } // -function getArrayFromReferalRallyePrices ($rallye) { +function getArrayFromReferralRallyePrices ($rallye) { // Init multi array $prices = array( 'level' => array(), @@ -627,7 +627,7 @@ ORDER BY } // -function getArrayFromReferalRallyeUsers ($rallye) { +function getArrayFromReferralRallyeUsers ($rallye) { // Fix zero points to 0.00000 if (getConfig('ref_payout') == '0') setConfigEntry('ref_payout', '0.00000'); @@ -643,7 +643,7 @@ function getArrayFromReferalRallyeUsers ($rallye) { array(bigintval($rallye)), __FUNCTION__, __LINE__); while ($content = SQL_FETCHARRAY($result_user)) { // Load current ref count - $count = getReferalRallyeRefsCount($content['userid'], $content['refs']); + $count = getReferralRallyeRefsCount($content['userid'], $content['refs']); // Points of ref's $result_ref = SQL_QUERY_ESC("SELECT @@ -686,7 +686,7 @@ LIMIT 1", array_pk_sort($users, array('ref', 'cpoints'), 0, 1, true); // Load prices array (!) - $prices = getArrayFromReferalRallyePrices($rallye); + $prices = getArrayFromReferralRallyePrices($rallye); // Merge users into prices foreach ($prices['level'] as $k => $level) { @@ -703,12 +703,12 @@ LIMIT 1", } // @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() -function addReferalRallyeWinners ($mode, $rallye, $default=0) { +function addReferralRallyeWinners ($mode, $rallye, $default=0) { // First check how many prices are set $prices = countSumTotalData(bigintval($rallye), 'rallye_prices', 'id', 'rallye_id', true); // Load data - $content = getArrayFromReferalRallyeUsers($rallye); + $content = getArrayFromReferralRallyeUsers($rallye); // Generate table $OUT = ''; @@ -765,7 +765,7 @@ function addReferalRallyeWinners ($mode, $rallye, $default=0) { } // -function purgeExpiredReferalRallyes () { +function purgeExpiredReferralRallyes () { // Check for expired rallyes $EXPIRE = 3; // @TODO The hard-coded value... $result_rallye = SQL_QUERY_ESC("SELECT @@ -812,7 +812,7 @@ WHERE } // -function addReferalRallyeTemplateSelection ($name = 'template', $default = '') { +function addReferralRallyeTemplateSelection ($name = 'template', $default = '') { // Init variables $OUT = ''; $ral = array(); @@ -854,7 +854,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') { } // @TODO Please document this function -function getReferalRallyeRefsCount ($currUserid, $oldReferralCount = '0') { +function getReferralRallyeRefsCount ($currUserid, $oldReferralCount = '0') { // Check current refs if (isExtensionInstalledAndNewer('cache', '0.1.2')) { // Get refs from cache @@ -927,7 +927,7 @@ WHERE } // Determines the right language string for min_users -function determineReferalRallyeMinimumUsers ($min_users) { +function determineReferralRallyeMinimumUsers ($min_users) { // Rallye ends without user limitation is the default $return = '{--RALLYE_END_NO_USER_LIMITATION--}'; @@ -941,7 +941,7 @@ function determineReferalRallyeMinimumUsers ($min_users) { } // Determines the right language string for min_prices -function determineReferalRallyeMinimumPrices ($min_prices) { +function determineReferralRallyeMinimumPrices ($min_prices) { // Rallye ends without user limitation is the default $return = '{--RALLYE_END_NO_PRICE_LIMITATION--}'; diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php index f8d2ba7155..dbab02152d 100644 --- a/inc/libs/refback_functions.php +++ b/inc/libs/refback_functions.php @@ -57,7 +57,7 @@ function addRefbackPoints ($userid, $ref, $points, $ref_points) { while ($content = SQL_FETCHARRAY($result_refs)) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'level=' . $content['level'] . ',percents=' . $content['percents'] . ' - LOOP START!'); // Reset ref depths - initReferalSystem(); + initReferralSystem(); // Init array $refids = getArrayFromRefbackLevel($userid, $content['level']); @@ -103,7 +103,7 @@ LIMIT 1', // Add points again, but only directly //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'refbackPoints=' . $refbackPoints . ',userid=' . $userid . ',ref=' . $ref . ',refid=' . makeNullToZero($refid) . ' - REFBACK-UPDATE! (' . SQL_AFFECTEDROWS() . ')'); - addPointsThroughReferalSystem(sprintf("refback:%s", $refid), $userid, $refbackPoints); + addPointsThroughReferralSystem(sprintf("refback:%s", $refid), $userid, $refbackPoints); // Reduce points if refid is found //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . $refid . ',ref=' . $ref . ' - REDUCING?'); @@ -131,7 +131,7 @@ LIMIT 1', * "Getter" for refback percents * * @param $userid "Current" user's userid - * @param $refid $userid has this userid as referal + * @param $refid $userid has this userid as referral * @return $percents Refback percents $userid has given to $refid */ function getRefbackPercents ($userid, $refid) { diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 16d16fd7aa..480e65dbd6 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -288,7 +288,7 @@ function doRegistration () { $GLOBALS['register_sql_data'] = ''; if (isExtensionInstalledAndNewer('theme', '0.0.8')) { // Okay, add design here - $GLOBALS['register_sql_columns'] .= ', `curr_theme`'; + $GLOBALS['register_sql_columns'] .= ',`curr_theme`'; $GLOBALS['register_sql_data'] .= ", '{%%pipe,getCurrentTheme%%}'"; } // END - if @@ -296,13 +296,13 @@ function doRegistration () { // // First comes first: begging rallye if ((isExtensionInstalledAndNewer('beg', '0.2.7')) && (!isBegNewMemberNotifyEnabled())) { - $GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`,`beg_rallye_disable_notify`'; + $GLOBALS['register_sql_columns'] .= ',`beg_rallye_enable_notify`,`beg_rallye_disable_notify`'; $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()'; } // END - if // Second: active rallye if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) { - $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`,`bonus_rallye_disable_notify`'; + $GLOBALS['register_sql_columns'] .= ',`bonus_rallye_enable_notify`,`bonus_rallye_disable_notify`'; $GLOBALS['register_sql_data'] .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()'; } // END - if @@ -316,9 +316,52 @@ function doRegistration () { // Create user's account... SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_data` -(`gender`,`surname`,`family`,`street_nr`,%s, `zip`,`city`,`email`,`birth_day`,`birth_month`,`birth_year`,`password`,`max_mails`,`receive_mails`,`refid`,`status`,`user_hash`,`REMOTE_ADDR`,`joined`,`last_update`,`ref_payout`".$GLOBALS['register_sql_columns'].") - VALUES -('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','{%%pipe,detectRemoteAddr%%}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), {?ref_payout?}".$GLOBALS['register_sql_data'].")", +( + `gender`, + `surname`, + `family`, + `street_nr`, + %s, + `zip`, + `city`, + `email`, + `birth_day`, + `birth_month`, + `birth_year`, + `password`, + `max_mails`, + `receive_mails`, + `refid`, + `status`, + `user_hash`, + `REMOTE_ADDR`, + `joined`, + `last_update`, + `ref_payout` + ".$GLOBALS['register_sql_columns']." +) VALUES ( + '%s' + '%s' + '%s' + '%s' + '%s', + %s, + '%s', + '%s', + %s, + %s, + %s, + '%s', + %s, + %s, + %s, + 'UNCONFIRMED', + '%s', + '{%%pipe,detectRemoteAddr%%}', + UNIX_TIMESTAMP(), + UNIX_TIMESTAMP(), + {?ref_payout?} + ".$GLOBALS['register_sql_data'].")", array( $countryRow, substr(postRequestElement('gender'), 0, 1), @@ -357,12 +400,12 @@ function doRegistration () { SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=0', __FUNCTION__, __LINE__); } // END - if - // Update referal table - updateReferalCounter($userid); + // Update referral table + updateReferralCounter($userid); // Write his welcome-points - initReferalSystem(); - addPointsThroughReferalSystem('register_welcome', $userid, getPointsRegister()); + initReferralSystem(); + addPointsThroughReferralSystem('register_welcome', $userid, getPointsRegister()); // Write catgories if ((is_array(postRequestElement('cat'))) && (count(postRequestElement('cat')))) { @@ -378,7 +421,7 @@ function doRegistration () { } // END - foreach } // END - if - // ... rewrite a zero referal id to the main title + // ... rewrite a zero referral id to the main title if (!isValidUserId(postRequestElement('refid'))) { setPostRequestElement('refid', getMainTitle()); } // END - if diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 7c48106f35..6853d09d82 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -424,7 +424,7 @@ function saveSponsorData ($postData, $content) { $EMAIL = true; // Okay, has changed then add status with UNCONFIRMED and new hash code - $sql .= " `status`='EMAIL', `hash`='%s',"; + $sql .= " `status`='EMAIL',`hash`='%s',"; // Generate hash code // @TODO Rewrite this to API function @@ -436,7 +436,7 @@ function saveSponsorData ($postData, $content) { $sql = substr($sql, 0, -1); // Add last_change - $sql .= ', `last_change`=NOW()'; + $sql .= ',`last_change`=NOW()'; // Add SQL tail data $sql .= " WHERE `id`=%s AND `password`='%s' LIMIT 1"; diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 7b555fc471..1636cbc8fb 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -441,8 +441,23 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) { if (true) { //if (($urlData['url_views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) { // Run the query - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url`='%s', `url_views_allowed`=%s, `url_views_max`=%s WHERE `url_id`=%s AND `status`='%s' LIMIT 1", - array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['url_status']), __FUNCTION__, __LINE__); + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_surfbar_urls` +SET + `url`='%s', + `url_views_allowed`=%s, + `url_views_max`=%s +WHERE + `url_id`=%s AND + `status`='%s' +LIMIT 1", + array( + $urlData['url'], + $urlData['edit']['limit'], + $urlData['edit']['limit'], + $urlData['id'], + $urlData['url_status'] + ), __FUNCTION__, __LINE__); // All fine $status = true; @@ -1092,11 +1107,11 @@ function SURFBAR_PAY_POINTS () { } // END - if /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.SURFBAR_GET_REWARD()); - // Init referal system here - initReferalSystem(); + // Init referral system here + initReferralSystem(); // Book it to the user and ignore return status - addPointsThroughReferalSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD()); + addPointsThroughReferralSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD()); /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - EXIT!'); } @@ -1111,7 +1126,7 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () { // Do we have a limit? if ($allowed > 0) { // Then count views_max down! - $add .= ', `url_views_max`=`url_views_max`-1'; + $add .= ',`url_views_max`=`url_views_max`-1'; } // END - if // Update URL stats diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index f8e6dcf846..432d96683c 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -273,10 +273,10 @@ ORDER BY } if ((isExtensionInstalledAndNewer('sql_patches', '0.3.4')) && (isExtensionActive('user'))) { - // Check for accounts without referal + // Check for accounts without referral addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 OR `refid` IS NULL ORDER BY `userid` ASC"); - $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}'; - $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}'; + $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL--}'; + $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL_TITLE--}'; $WHATs[] = 'list_user&mode=norefs'; } // END - if @@ -402,7 +402,7 @@ ORDER BY } // END - if // - // All referal banner + // All referral banner // addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC'); $WHATs[] = 'refbanner'; @@ -410,7 +410,7 @@ ORDER BY $TITLEs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL_TITLE--}'; // - // All activated referal banner + // All activated referral banner // addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y' ORDER BY `id` ASC"); $WHATs[] = 'refbanner'; diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 688640aa4d..80fcaf50ea 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -223,9 +223,9 @@ LIMIT 1", return $email; } -// Selects a random user id as the new referal id if they have at least X confirmed mails in this run +// Selects a random user id as the new referral id if they have at least X confirmed mails in this run // @TODO Double-check configuration entry here -function determineRandomReferalId () { +function determineRandomReferralId () { // Default is zero refid $refid = NULL; @@ -245,7 +245,7 @@ function determineRandomReferalId () { // Do we have one entry there? if (SQL_NUMROWS($result) == 1) { - // Use that userid as new referal id + // Use that userid as new referral id list($refid) = SQL_FETCHROW($result); } // END - if @@ -334,7 +334,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p // Is the timeout reached? if ($probe >= getConfig('login_timeout')) { // Add login bonus to user's account - $add = ', `login_bonus`=`login_bonus`+{?login_bonus?}'; + $add = ',`login_bonus`=`login_bonus`+{?login_bonus?}'; $GLOBALS['bonus_payed'] = true; // Subtract login bonus from userid's account or jackpot @@ -601,12 +601,12 @@ LIMIT 1", // And send him right away the confirmation mail sendEmail($userid, '{--GUEST_THANX_CONFIRM--}', $message); - // Maybe he got "referaled"? + // Maybe he got "referraled"? if ((isValidUserId($refid)) && ($refid != $userid)) { - // Select the referal userid + // Select the referral userid if (fetchUserData($refid)) { // Update ref counter... - updateReferalCounter($refid); + updateReferralCounter($refid); // If version matches add ref bonus to refid's account if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (isBonusRallyeActive())) { @@ -618,15 +618,15 @@ LIMIT 1", handleBonusPoints(getConfig('bonus_ref'), $refid); } // END - if - // Add one-time referal bonus over referal system or directly - initReferalSystem(); - addPointsThroughReferalSystem('referal_bonus', $refid, getPointsRef(), bigintval($userid)); + // Add one-time referral bonus over referral system or directly + initReferralSystem(); + addPointsThroughReferralSystem('referral_bonus', $refid, getPointsRef(), bigintval($userid)); } // END - if } // END - if if (isExtensionActive('rallye')) { // Add user to rallye (or not?) - addUserToReferalRallye(bigintval($userid)); + addUserToReferralRallye(bigintval($userid)); } // END - if // Account confirmed! diff --git a/inc/loader/load-admins.php b/inc/loader/load-admins.php index 80f822a05e..c7111d689d 100644 --- a/inc/loader/load-admins.php +++ b/inc/loader/load-admins.php @@ -90,7 +90,11 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins // Query the database about this $result = SQL_QUERY('SELECT - `id` AS admin_id, `login`,`password`,`email`' . $add . ' + `id` AS `admin_id`, + `login`, + `password`, + `email` + ' . $add . ' FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY @@ -112,7 +116,7 @@ ORDER BY if (isExtensionInstalledAndNewer('admins', '0.3')) { // Check for cache file if (($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) { - // Load referal system from cache + // Load admin ACLs from cache $GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache(); // Check if valid @@ -153,7 +157,7 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) { $GLOBALS['cache_instance']->init(); // Load all admins and their data - $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC, `action_menu` ASC, `what_menu` ASC', __FILE__, __LINE__); + $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC,`action_menu` ASC,`what_menu` ASC', __FILE__, __LINE__); // Add all rows while ($content = SQL_FETCHARRAY($result)) { diff --git a/inc/loader/load-config.php b/inc/loader/load-config.php index ba7a1eabb5..0641a92eb1 100644 --- a/inc/loader/load-config.php +++ b/inc/loader/load-config.php @@ -62,8 +62,10 @@ if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_in // Create cache file here $GLOBALS['cache_instance']->init(); - // Load all modules and their data + // Query for all config entries $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_config` ORDER BY `config` ASC', __FILE__, __LINE__); + + // .. and load them while ($content = SQL_FETCHARRAY($result)) { // Add row to cache file $GLOBALS['cache_instance']->addRow($content); diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php index 420b5d4bd3..f68a0abfcb 100644 --- a/inc/loader/load-extension.php +++ b/inc/loader/load-extension.php @@ -139,11 +139,13 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache // Add more if sql_patches is recent enougth $add = ''; if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { - $add = ', `ext_has_css` AS `ext_css`'; - } // END - if + $add = ',`ext_has_css` AS `ext_css`'; + } // END - if - // Load all modules and their data + // Query for all extensions $result = SQL_QUERY('SELECT `id` AS `ext_id`,`ext_name`,`ext_active`,`ext_version`' . $add . ' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__); + + // Load all entries while ($content = SQL_FETCHARRAY($result)) { // Load extension loadExtension($content['ext_name'], 'test'); diff --git a/inc/loader/load-filter.php b/inc/loader/load-filter.php index 570f9d9204..61bb5ffe1d 100644 --- a/inc/loader/load-filter.php +++ b/inc/loader/load-filter.php @@ -54,8 +54,10 @@ if (($GLOBALS['cache_instance']->loadCacheFile('filter')) && ($GLOBALS['cache_in // Create cache file here $GLOBALS['cache_instance']->init(); - // Load all modules and their data - $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY `filter_name` ASC, `filter_id` ASC', __FILE__, __LINE__); + // Query for all filters + $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY `filter_name` ASC,`filter_id` ASC', __FILE__, __LINE__); + + // Load all filters while ($content = SQL_FETCHARRAY($result)) { // Add row to cache file $GLOBALS['cache_instance']->addRow($content); diff --git a/inc/loader/load-modules.php b/inc/loader/load-modules.php index 7278445196..84e1dc4fdd 100644 --- a/inc/loader/load-modules.php +++ b/inc/loader/load-modules.php @@ -91,26 +91,41 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i // Create cache file here $GLOBALS['cache_instance']->init(); - // Load all modules and their data + // Do we have up-to-date ext-sql_patches? if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) { - // Load has_menu + // Yes, has_menu shall be there $result = SQL_QUERY('SELECT - `id`,`module`,`title`,`locked`,`hidden`,`admin_only`,`title`,`mem_only`,`has_menu` + `id`, + `module`, + `title`, + `locked`, + `hidden`, + `admin_only`, + `title`, + `mem_only`, + `has_menu` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `module` ASC', __FILE__, __LINE__); } else { - // Don't load has_menu + // Not recent enough ext-sql_patches ... $result = SQL_QUERY('SELECT - `id`,`module`,`title`,`locked`,`hidden`,`admin_only`,`title`,`mem_only` + `id`, + `module`, + `title`, + `locked`, + `hidden`, + `admin_only`, + `title`, + `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `module` ASC', __FILE__, __LINE__); } - // Cache all data + // ... and load all entries while ($content = SQL_FETCHARRAY($result)) { // Add row to cache file $GLOBALS['cache_instance']->addRow($content); diff --git a/inc/loader/load-points_data.php b/inc/loader/load-points_data.php index 659b3fed1c..eea02d507c 100644 --- a/inc/loader/load-points_data.php +++ b/inc/loader/load-points_data.php @@ -75,7 +75,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('points_data')) && ($GLOBALS['cac // Set the array back and remove temporary $GLOBALS['cache_array']['points_data'] = $pointsData; unset($pointsData); -} elseif ((isHtmlOutputMode()) && (isExtensionInstalledAndNewer('sql_patches', '0.8.0'))) { +} elseif ((isHtmlOutputMode()) && (isExtensionInstalledAndNewer('sql_patches', '0.8.6'))) { // Create cache file $GLOBALS['cache_instance']->init(); diff --git a/inc/loader/load-refdepths.php b/inc/loader/load-refdepths.php index f2b5027977..f30616e593 100644 --- a/inc/loader/load-refdepths.php +++ b/inc/loader/load-refdepths.php @@ -43,16 +43,18 @@ if (!defined('__SECURITY')) { return; } -// Next cached table is the referal system (refdepths)... +// Next cached table is the referral system (refdepths)... if (($GLOBALS['cache_instance']->loadCacheFile('refdepths')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { - // Load referal system from cache + // Load referral system from cache $GLOBALS['cache_array']['refdepths'] = $GLOBALS['cache_instance']->getArrayFromCache(); } elseif (isHtmlOutputMode()) { // Create cache file here $GLOBALS['cache_instance']->init(); - // Load all modules and their data + // Query for all referral depths $result = SQL_QUERY('SELECT `id`,`level`,`percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC', __FILE__, __LINE__); + + // ... and load them while ($content = SQL_FETCHARRAY($result)) { // Add row to cache file $GLOBALS['cache_instance']->addRow($content); diff --git a/inc/loader/load-refsystem.php b/inc/loader/load-refsystem.php index 9e96d7de39..5215581fd8 100644 --- a/inc/loader/load-refsystem.php +++ b/inc/loader/load-refsystem.php @@ -43,16 +43,27 @@ if (!defined('__SECURITY')) { return; } -// Next cached table is the referal system (refsystem)... +// Next cached table is the referral system (refsystem)... if (($GLOBALS['cache_instance']->loadCacheFile('refsystem')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { - // Load referal system from cache + // Load referral system from cache $GLOBALS['cache_array']['refsystem'] = $GLOBALS['cache_instance']->getArrayFromCache(); } elseif (isHtmlOutputMode()) { // Create cache file here $GLOBALS['cache_instance']->init(); - // Load all modules and their data - $result = SQL_QUERY('SELECT `id`,`userid`,`level`,`counter` FROM `{?_MYSQL_PREFIX?}_refsystem` ORDER BY `userid` ASC, `level` ASC', __FILE__, __LINE__); + // Query for all referrals + $result = SQL_QUERY('SELECT + `id`, + `userid`, + `level`, + `counter` +FROM + `{?_MYSQL_PREFIX?}_refsystem` +ORDER BY + `userid` ASC, + `level` ASC', __FILE__, __LINE__); + + // Load all entries while ($content = SQL_FETCHARRAY($result)) { // Add row to cache file $GLOBALS['cache_instance']->addRow($content); diff --git a/inc/loader/load-themes.php b/inc/loader/load-themes.php index f2322765ca..a20956953e 100644 --- a/inc/loader/load-themes.php +++ b/inc/loader/load-themes.php @@ -46,9 +46,9 @@ if (!defined('__SECURITY')) { return false; } -// Next cached table is the referal system (themes)... +// Next cached table are the themes if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_instance']->extensionVersionMatches('theme'))) { - // Load referal system from cache + // Load themes $cache = $GLOBALS['cache_instance']->getArrayFromCache(); // Restructure the array diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php index 15d6e28af0..7ec3e1eb8d 100644 --- a/inc/mails/doubler_mails.php +++ b/inc/mails/doubler_mails.php @@ -124,26 +124,28 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y') // Only double when points are enougth! if ($DOUBLER_POINTS >= $content['points']) { // Check for his ref points - $ref = countSumTotalData($content['userid'], 'doubler', 'points', 'refid', false, " AND `completed`='N' AND `is_ref`='Y'"); + $refPoints = countSumTotalData($content['userid'], 'doubler', 'points', 'refid', false, " AND `completed`='N' AND `is_ref`='Y'"); // Zero refid when empty (might be helpful!) - if (empty($ref)) $ref = '0'; + if (empty($refPoints)) { + $refPoints = '0'; + } // END - if - if (($ref > 0) && ($GLOBALS['local_doubler_userid'] == $content['userid']) && (!empty($ref))) { - // Referal points found so add them and set line(s) to completed='Y' - $content['points'] += $ref; + if (($refPoints > 0) && ($GLOBALS['local_doubler_userid'] == $content['userid']) && (!empty($refPoints))) { + // Referral points found so add them and set line(s) to completed='Y' + $content['points'] += $refPoints; SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `refid`=%s AND `completed`='N' AND `is_ref`='Y'", array(bigintval($content['userid'])), __FILE__, __LINE__); } else { - // No referal points found - $ref = '0'; + // No referral points found + $refPoints = '0'; } // Exclude webmaster from doubling... if ($content['userid'] != getConfig('doubler_userid')) { // Add points - initReferalSystem(); - addPointsThroughReferalSystem(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']); + initReferralSystem(); + addPointsThroughReferralSystem(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']); } // END - if // Set entry as "payed" diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 15c2715924..86de3a3778 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -1312,7 +1312,7 @@ function adminAddEntries ($tableName, $columns = array(), $filterFunctions = arr } // END - foreach // Build the SQL query - $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`, `', $sqlColumns) . "`) VALUES ('" . implode("','", $sqlValues) . "')"; + $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`,`', $sqlColumns) . "`) VALUES ('" . implode("','", $sqlValues) . "')"; // Run the SQL query SQL_QUERY($SQL, __FUNCTION__, __LINE__); @@ -1799,7 +1799,7 @@ function adminProcessMenuEditForm ($type, $subMenu) { case 'edit': // Edit menu if (postRequestElement('sel_what', $sel) == '') { // Update with 'what'=null - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1", array( $type, $menu, @@ -1808,7 +1808,7 @@ function adminProcessMenuEditForm ($type, $subMenu) { ), __FILE__, __LINE__); } else { // Update with selected 'what' - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1", array( $type, $menu, @@ -1825,7 +1825,7 @@ function adminProcessMenuEditForm ($type, $subMenu) { break; case 'status': // Change status of menus - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s',`locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1", array($type, postRequestElement('visible', $sel), postRequestElement('locked', $sel), $sel), __FILE__, __LINE__); break; diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php index 7f5d46d188..1b0aad03c9 100644 --- a/inc/modules/admin/what-add_rallye.php +++ b/inc/modules/admin/what-add_rallye.php @@ -54,8 +54,29 @@ if (isFormSent()) { if (SQL_HASZERONUMS($result)) { // 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')", + 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' +)", array( getCurrentAdminId(), postRequestElement('title'), diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php index 924be5cb3e..4a6b52b392 100644 --- a/inc/modules/admin/what-config_cats.php +++ b/inc/modules/admin/what-config_cats.php @@ -81,7 +81,7 @@ if (isFormSent('add')) { if (!empty($cat)) { switch (getRequestElement('do')) { case 'edit': // Change categories - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s', `visible`='%s', `sort`=%s WHERE `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s',`visible`='%s',`sort`=%s WHERE `id`=%s LIMIT 1", array( $cat, postRequestElement('visible', $id), diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php index 6b84f9af2f..c5b66e5602 100644 --- a/inc/modules/admin/what-config_mods.php +++ b/inc/modules/admin/what-config_mods.php @@ -92,7 +92,17 @@ if (isFormSent('edit')) { $id = bigintval($id); // Update module - addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='%s', `locked`='%s', `hidden`='%s', `admin_only`='%s', `mem_only`='%s' WHERE `id`=%s LIMIT 1", + addSql(SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_mod_reg` +SET + `title`='%s', + `locked`='%s', + `hidden`='%s', + `admin_only`='%s', + `mem_only`='%s' +WHERE + `id`=%s +LIMIT 1", array( postRequestElement('title', $id), postRequestElement('locked', $id), diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index d7fff71927..46aefa2608 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -91,10 +91,10 @@ if (isFormSent()) { setPostRequestElement('percents', array($id => convertCommaToDot(postRequestElement('percents', $id)))); // Update entry - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`=%s, `percents`=%s WHERE `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`=%s,`percents`=%s WHERE `id`=%s LIMIT 1", array(bigintval($value), convertCommaToDot(postRequestElement('percents', $id)), $id), __FILE__, __LINE__); } // END - foreach - $message = '{--ADMIN_REFERAL_DEPTHS_SAVED--}'; + $message = '{--ADMIN_REFERRAL_DEPTHS_SAVED--}'; break; case 'delete': @@ -102,7 +102,7 @@ if (isFormSent()) { SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); } // END - foreach - $message = '{--ADMIN_REFERAL_DEPTHS_DELETED--}'; + $message = '{--ADMIN_REFERRAL_DEPTHS_DELETED--}'; break; } // END - switch @@ -166,7 +166,7 @@ WHERE } // END - if } elseif (getRequestElement('sub') == 'settings') { // Setup some settings like direct pay and so on - // Including new add-mode for one-time referal bonus + // Including new add-mode for one-time referral bonus foreach (array('allow_direct_pay') as $entry) { $content[$entry . '_y'] = ''; $content[$entry . '_n'] = ''; @@ -208,10 +208,10 @@ WHERE // Load main template loadTemplate('admin_edit_reflevel', false, $OUT); } else { - // Referal levels + // Referral levels $result = SQL_QUERY("SELECT `id`,`level`,`percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__); if (!SQL_HASZERONUMS($result)) { - // Make referal levels editable and deletable + // Make referral levels editable and deletable $OUT = ''; // List already existing categories for editing @@ -227,7 +227,7 @@ WHERE loadTemplate('admin_list_reflevel', false, $OUT); } - // Form for adding new referal levels + // Form for adding new referral levels loadTemplate('admin_add_reflevel'); } } elseif (getRequestElement('sub') == 'points') { diff --git a/inc/modules/admin/what-config_refid.php b/inc/modules/admin/what-config_refid.php index 128275142c..41bc8009c5 100644 --- a/inc/modules/admin/what-config_refid.php +++ b/inc/modules/admin/what-config_refid.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : what-config_refid.php * * -------------------------------------------------------------------- * - * Short description : Setup default referal id * + * Short description : Setup default referral id * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Standard Referal-Id einstellen * + * Kurzbeschreibung : Standard Referral-Id einstellen * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index 0b514a9294..9b566b697b 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -109,8 +109,8 @@ LIMIT 1", } // END - if // Pay back points - initReferalSystem(); - addPointsThroughReferalSystem('mail_deleted', $content['sender'], $totalPoints); + initReferralSystem(); + addPointsThroughReferralSystem('mail_deleted', $content['sender'], $totalPoints); // Output message if (getConfig('repay_deleted_mails') == 'REPAY') { diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php index 71455b15ef..b416b3d0bd 100644 --- a/inc/modules/admin/what-del_holiday.php +++ b/inc/modules/admin/what-del_holiday.php @@ -98,7 +98,8 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); // Fetch data $result_load = SQL_QUERY_ESC("SELECT - `holiday_start` AS start, `holiday_end` AS `end` + `holiday_start` AS `start`, + `holiday_end` AS `end` FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php index 6cc2e584eb..617549bc50 100644 --- a/inc/modules/admin/what-edit_user.php +++ b/inc/modules/admin/what-edit_user.php @@ -78,7 +78,7 @@ if ((!isGetRequestElementSet('userid')) || (SQL_NUMROWS($result_main) == 1)) { } elseif ((postRequestElement('pass1') == postRequestElement('pass2'))) { // Change the password $updateUser = true; - $add = ", `password`='" . generateHash(postRequestElement('pass1')) . "'"; + $add = ",`password`='" . generateHash(postRequestElement('pass1')) . "'"; } if ($updateUser === true) { diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index 074cb3db04..a8196dd43a 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -102,7 +102,7 @@ if (isGetRequestElementSet('reg_ext')) { // Update extension's record if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { // Update also CSS column when extensions sql_patches is newer or exact v0.0.6 - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_has_css`='%s', `ext_active`='%s' WHERE `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_has_css`='%s',`ext_active`='%s' WHERE `id`=%s LIMIT 1", array(postRequestElement('css', $ext_id), $active, $ext_id), __FILE__, __LINE__); } else { // When extension is older than v0.0.6 there is no column for the CSS information diff --git a/inc/modules/admin/what-list_admins_acls.php b/inc/modules/admin/what-list_admins_acls.php index a6b9048e1e..65c605e1b3 100644 --- a/inc/modules/admin/what-list_admins_acls.php +++ b/inc/modules/admin/what-list_admins_acls.php @@ -199,7 +199,7 @@ VALUES (%s,'%s','%s','%s')", displayMessage($content); } else { // List all ACLs - $result = SQL_QUERY('SELECT `id`,`admin_id`,`action_menu`,`what_menu`,`access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC, `id` ASC', __FILE__, __LINE__); + $result = SQL_QUERY('SELECT `id`,`admin_id`,`action_menu`,`what_menu`,`access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC,`id` ASC', __FILE__, __LINE__); // Entries found? if (!SQL_HASZERONUMS($result)) { diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php index 485ffb45d3..a312663747 100644 --- a/inc/modules/admin/what-list_autopurge.php +++ b/inc/modules/admin/what-list_autopurge.php @@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -// Exclude default referal id if set +// Exclude default referral id if set // @TODO Rewrite those lines to filter $EXCLUDE_LIST = ''; if (isValidUserId(getDefRefid())) $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}'; diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index 946b758895..069d2ea0b1 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -139,7 +139,15 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl if ((isPostRequestElementSet('modify')) && (isPostRequestElementSet('id'))) { // Modify foreach (postRequestElement('id') as $id => $sel) { - addSql("UPDATE `{?_MYSQL_PREFIX?}_countries` SET `code`='" . postRequestElement('code', $id) . "', `descr`='" . postRequestElement('descr', $id) . "', `is_active`='" . postRequestElement('is_active', $id) . "' WHERE `id`=" . bigintval($id) . " LIMIT 1"); + addSql("UPDATE + `{?_MYSQL_PREFIX?}_countries` +SET + `code`='" . postRequestElement('code', $id) . "', + `descr`='" . postRequestElement('descr', $id) . "', + `is_active`='" . postRequestElement('is_active', $id) . "' +WHERE + `id`=" . bigintval($id) . " +LIMIT 1"); } // END - foreach // Create message diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php index b031b6ff0d..76b443d013 100644 --- a/inc/modules/admin/what-list_doubler.php +++ b/inc/modules/admin/what-list_doubler.php @@ -70,7 +70,7 @@ switch (getRequestElement('mode')) { // Init sums $sumAlready = '0'; $sumWaiting = '0'; - // Number of direct already payouts and referal + // Number of direct already payouts and referral $count = countSumTotalData('Y','doubler','id','completed',true, " AND `is_ref`='N'"); if ($count > 0) { @@ -87,7 +87,7 @@ switch (getRequestElement('mode')) { $content['already_ref_link'] = '' . $count . ''; } // END - if - // And the same for waiting pouts (direct and referal) + // And the same for waiting pouts (direct and referral) $count = countSumTotalData('N','doubler','id','completed',true, " AND `is_ref`='N'"); if ($count > 0) { diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index 222abf1140..1ad813d8af 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__); if (isGetRequestElementSet('pid')) { // First let's get the member's id - $result = SQL_QUERY_ESC("SELECT `userid`, `target_account`, `payout_total`, `payout_timestamp`, `password` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `userid`,`target_account`,`payout_total`,`payout_timestamp`,`password` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `id`=%s LIMIT 1", array(getRequestElement('pid')), __FILE__, __LINE__); list($userid, $tuserid, $points, $tstamp, $tpass) = SQL_FETCHROW($result); SQL_FREERESULT($result); diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php index 9310621f7f..c4eafb6ad1 100644 --- a/inc/modules/admin/what-list_rallyes.php +++ b/inc/modules/admin/what-list_rallyes.php @@ -213,7 +213,7 @@ LIMIT 1", $content['e_year'] = addSelectionBox('year' , getYear($content['end_time']) , 'end' , $id); // Remember other values - $content['templ'] = addReferalRallyeTemplateSelection('templ['.$id.']', $content['template']); + $content['templ'] = addReferralRallyeTemplateSelection('templ['.$id.']', $content['template']); $content['id'] = $id; // Output row @@ -241,8 +241,8 @@ ORDER BY $OUT = ''; $content['rallye'] = getRequestElement('rallye'); while ($row = SQL_FETCHARRAY($result)) { - // Check for referal count - $count = getReferalRallyeRefsCount($row['userid'], $row['refs']); + // Check for referral count + $count = getReferralRallyeRefsCount($row['userid'], $row['refs']); // Init variables $bl = ''; diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php index ab5e019ec5..3632c774ff 100644 --- a/inc/modules/admin/what-list_refs.php +++ b/inc/modules/admin/what-list_refs.php @@ -6,7 +6,7 @@ * -------------------------------------------------------------------- * * File : what-list_refs.php * * -------------------------------------------------------------------- * - * Short description : Show all referals made by a member * + * Short description : Show all referrals made by a member * * -------------------------------------------------------------------- * * Kurzbeschreibung : Alle generierten Refs eines Mitgliedes anzeigen * * -------------------------------------------------------------------- * @@ -54,7 +54,7 @@ if (isGetRequestElementSet('userid')) { // Output info message displayMessage(sprintf(getMessage('ADMIN_USER_TOTAL_REFS'), generateUserProfileLink(getRequestElement('userid')), $menge, $menge_lck)); - // Load all referal levels + // Load all referral levels $result_levels = SQL_QUERY("SELECT `level`,`percents` FROM @@ -92,7 +92,7 @@ ORDER BY while ($content = SQL_FETCHARRAY($result_refs)) { // Is the data there? if (fetchUserData($content['refid'])) { - // Check for referals + // Check for referrals $refs_cnt = countSumTotalData(getUserData('userid'), 'user_refs', 'id', 'userid', true); // Prepare data for the template @@ -108,7 +108,7 @@ ORDER BY 'registered' => generateDateTime(getUserData('joined'), 3), ); - // Check if referal count is larger 0 and update link + // Check if referral count is larger 0 and update link if ($refs_cnt > 0) { $content['refs_link'] = generateUserProfileLink(getUserData('userid'), $refs_cnt, 'list_refs'); } // END - if @@ -137,7 +137,7 @@ ORDER BY // Load level template $OUT .= loadTemplate('admin_list_refs_level', true, $levels); } else { - // Check for referals + // Check for referrals $refs_cnt = countSumTotalData($levels['userid'], 'user_data', 'userid', 'refid', true); // Prepare data for the template @@ -152,8 +152,10 @@ ORDER BY 'registered' => generateDateTime($levels['joined'], 3), ); - // Check if referal count is larger 0 and update link - if ($refs_cnt > 0) $content['refs_link'] = generateUserProfileLink($levels['userid'], $refs_cnt, 'list_refs'); + // Check if referral count is larger 0 and update link + if ($refs_cnt > 0) { + $content['refs_link'] = generateUserProfileLink($levels['userid'], $refs_cnt, 'list_refs'); + } // END - if // Load template for level one $OUT .= loadTemplate('admin_list_refs_row', true, $content); @@ -174,10 +176,10 @@ ORDER BY } } elseif (isExtensionActive('refback')) { // No levels found, very bad! - displayMessage('{--ADMIN_NO_REFERAL_LEVELS--}'); + displayMessage('{--ADMIN_NO_REFERRAL_LEVELS--}'); } else { // No refs made so far - displayMessage('{--USER_REFERAL_404--}'); + displayMessage('{--USER_REFERRAL_404--}'); } // Free result diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index 8b8e451bf9..2fd5305818 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -98,13 +98,20 @@ WHERE // Free memory SQL_FREERESULT($result); - // Sponsor found so let's list all his referals + // Sponsor found so let's list all his referrals $result = SQL_QUERY_ESC("SELECT - `id`,`gender`,`surname`,`family`,`email`,`status`, + `id`, + `gender`, + `surname`, + `family`, + `email`, + `status`, UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`, UNIX_TIMESTAMP(`last_online`) AS `last_online`, - `points_amount`,`points_used`, - `remote_addr`,`ref_count` + `points_amount`, + `points_used`, + `remote_addr`, + `ref_count` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index f3cbe2fd44..feabe013ac 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -55,10 +55,10 @@ if (isExtensionInstalledAndNewer('user', '0.3.5')) { // Is the extension 'country' installed? if (isExtensionActive('country')) { // Add country code - $MORE .= ', `country_code`'; + $MORE .= ',`country_code`'; } else { // Add direct value - $MORE .= ', `country`'; + $MORE .= ',`country`'; } // Init unset data @@ -194,7 +194,7 @@ LIMIT 1", } break; - case 'random_refid': // Users available for random referal id + case 'random_refid': // Users available for random referral id if (!empty($whereStatement)) { // Add AND statement $whereStatement .= ' AND `rand_confirmed` >= {?user_min_confirmed?}'; @@ -281,7 +281,7 @@ LIMIT 1", $content['own_points'] = countSumTotalData($content['userid'], 'user_points', 'points') + countSumTotalData($content['userid'], 'user_points', 'order_points'); $content['locked_points'] = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points'); - // If we have at least one referal, make it clickable to referal list + // If we have at least one referral, make it clickable to referral list if ($content['refs'] > 0) { $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]'; } // END - if diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index 62ac99dbf4..79cc7c84e2 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -55,7 +55,7 @@ if (isGetRequestElementSet('userid')) { // Ok, lock the account! if (isExtensionInstalledAndNewer('user', '0.3.5')) { // Lock with reason - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='LOCKED', `lock_reason`='%s', `lock_timestamp`=NOW() WHERE `userid`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='LOCKED',`lock_reason`='%s',`lock_timestamp`=NOW() WHERE `userid`=%s LIMIT 1", array(postRequestElement('reason'), bigintval(getRequestElement('userid'))), __FILE__, __LINE__); } else { // Lock with no lock reason saved @@ -103,7 +103,7 @@ LIMIT 1", // Send away... sendEmail(bigintval(getRequestElement('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message); if (isExtensionActive('rallye')) { - addUserToReferalRallye(getRequestElement('userid')); + addUserToReferralRallye(getRequestElement('userid')); } // END - if } // END - if diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php index 0033e186b3..19e0990d94 100644 --- a/inc/modules/admin/what-payments.php +++ b/inc/modules/admin/what-payments.php @@ -59,7 +59,7 @@ if (isFormSent()) { case 'edit': foreach (postRequestElement('time') as $id => $value) { - addSql("UPDATE `{?_MYSQL_PREFIX?}_payments` SET `time`='" . $value . "', `payment`='".postRequestElement('payment', $id)."', price='".postRequestElement('price', $id)."', mail_title='".postRequestElement('mail_title', $id)."' WHERE `id`='".$id."' LIMIT 1"); + addSql("UPDATE `{?_MYSQL_PREFIX?}_payments` SET `time`='" . $value . "',`payment`='".postRequestElement('payment', $id)."', price='".postRequestElement('price', $id)."', mail_title='".postRequestElement('mail_title', $id)."' WHERE `id`='".$id."' LIMIT 1"); } // END - foreach break; @@ -117,10 +117,10 @@ if (isFormSent()) { // Load main template loadTemplate('admin_edit_payments', false, $OUT); } else { - // Referal levels + // Referral levels $result = SQL_QUERY("SELECT `id`,`time`,`payment`,`mail_title`,`price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__); if (!SQL_HASZERONUMS($result)) { - // Make referal levels editable and deletable + // Make referral levels editable and deletable $OUT = ''; // List already existing categories for editing @@ -136,7 +136,7 @@ if (isFormSent()) { loadTemplate('admin_list_payments', false, $OUT); } // END - if - // Form for adding new referal levels + // Form for adding new referral levels loadTemplate('admin_add_payment'); } diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php index c47bbf1dcb..c204458fd5 100644 --- a/inc/modules/admin/what-refbanner.php +++ b/inc/modules/admin/what-refbanner.php @@ -6,7 +6,7 @@ * -------------------------------------------------------------------- * * File : what-refbanner.php * * -------------------------------------------------------------------- * - * Short description : Manage all referal banner * + * Short description : Manage all referral banner * * -------------------------------------------------------------------- * * Kurzbeschreibung : Alle Banner fuer die Ref-Links verwalten * * -------------------------------------------------------------------- * @@ -80,7 +80,7 @@ VALUES ('%s','%s','%s')", $id = bigintval($id); // Update entry - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `url`='%s', `alternate`='%s', `visible`='%s' WHERE `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `url`='%s',`alternate`='%s',`visible`='%s' WHERE `id`=%s LIMIT 1", array( postRequestElement('url', $id), postRequestElement('alternate', $id), @@ -130,12 +130,12 @@ VALUES ('%s','%s','%s')", } // END - foreach } // END - if - // Referal levels + // Referral levels $result = SQL_QUERY('SELECT `id`,`url`,`alternate`,`visible`,`counter`,`clicks` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `url` ASC', __FILE__, __LINE__); // Entries found? if (!SQL_HASZERONUMS($result)) { - // Make referal banner editable and deletable + // Make referral banner editable and deletable $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { // Load row template and switch color @@ -149,7 +149,7 @@ VALUES ('%s','%s','%s')", loadTemplate('admin_list_refbanner', false, $OUT); } // END - if - // Form for adding new referal levels + // Form for adding new referral levels loadTemplate('admin_add_refbanner'); } diff --git a/inc/modules/admin/what-repair_refs.php b/inc/modules/admin/what-repair_refs.php index 1fa03431b8..31cf69994f 100644 --- a/inc/modules/admin/what-repair_refs.php +++ b/inc/modules/admin/what-repair_refs.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : what-repair_refs.php * * -------------------------------------------------------------------- * - * Short description : "Repairs" the referal system * + * Short description : "Repairs" the referral system * * -------------------------------------------------------------------- * - * Kurzbeschreibung : "Repariert" das Referal-System * + * Kurzbeschreibung : "Repariert" das Referral-System * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -54,7 +54,7 @@ if (isExtensionInstalledAndOlder('user', '0.4.4')) { loadIncludeOnce('inc/fix_refsystem.php'); // Output message -displayMessage('{--ADMIN_REPAIR_REFERAL_SYSTEM_DONE--}'); +displayMessage('{--ADMIN_REPAIR_REFERRAL_SYSTEM_DONE--}'); // [EOF] ?> diff --git a/inc/modules/admin/what-stats_mods.php b/inc/modules/admin/what-stats_mods.php index b0a8b303dd..56e294d474 100644 --- a/inc/modules/admin/what-stats_mods.php +++ b/inc/modules/admin/what-stats_mods.php @@ -64,7 +64,7 @@ if ((getRequestElement('mod') == 'index') || (getRequestElement('mod') == 'login loadTemplate('admin_list_mods_stats2', false, $OUT); } else { // Load module statics - $result = SQL_QUERY("SELECT `module`,`title`,`clicks` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `clicks` DESC, `module` ASC", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT `module`,`title`,`clicks` FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `clicks` DESC,`module` ASC", __FILE__, __LINE__); $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { if (($content['module'] == 'index') || ($content['module'] == 'login')) { diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php index 4751922e79..c91c068a33 100644 --- a/inc/modules/admin/what-unlock_emails.php +++ b/inc/modules/admin/what-unlock_emails.php @@ -149,7 +149,7 @@ LIMIT 1", } // END - if // Redirect URL - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `url`='%s', `data_type`='NEW' WHERE `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `url`='%s',`data_type`='NEW' WHERE `id`=%s LIMIT 1", array(postRequestElement('redirect'), $id),__FILE__, __LINE__); // Prepare data for the row template diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index 15c1fb40b5..b66eb9fd95 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -142,13 +142,14 @@ WHERE LIMIT 1", array($content['id']), __FILE__, __LINE__); - // Update, if applyable, referal count and points + // Update, if applyable, referral count and points if ((isValidUserId($content['refid'])) && ($content['refid'] != $content['id'])) { - // Update referal account + // Update referral account SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET - `points_amount`=`points_amount`+{?sponsor_ref_points?}, `ref_count`=`ref_count`+1 + `points_amount`=`points_amount`+{?sponsor_ref_points?}, + `ref_count`=`ref_count`+1 WHERE `id`=%s LIMIT 1", @@ -156,24 +157,29 @@ LIMIT 1", // Whas that update fine? if (!SQL_HASZEROAFFECTED()) { - // Load referal's data + // Load referral's data $result = SQL_QUERY_ESC("SELECT - `id`,`gender`,`surname`,`family`,`email`, + `id`, + `gender`, + `surname`, + `family`, + `email`, (`points_amount` - `points_used`) AS `points`, - `receive_warnings`,`ref_count` AS refs + `receive_warnings`, + `ref_count` AS `refs` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1", array(bigintval($content['refid'])), __FILE__, __LINE__); - $REFERAL = SQL_FETCHARRAY($result); + $REFERRAL = SQL_FETCHARRAY($result); // Send warnings out? - if ($REFERAL['receive_warnings'] == 'Y') { - // Send notification to referal - $REFERAL_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL); - sendEmail($REFERAL['email'], '{--SPONSOR_REFERAL_NOTIFY_SUBJECT--}', $REFERAL_MSG); + if ($REFERRAL['receive_warnings'] == 'Y') { + // Send notification to referral + $REFERRAL_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERRAL); + sendEmail($REFERRAL['email'], '{--SPONSOR_REFERRAL_NOTIFY_SUBJECT--}', $REFERRAL_MSG); } // END - if // Free memory diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index 151a831b21..fea217d32f 100644 --- a/inc/modules/guest/what-mediadata.php +++ b/inc/modules/guest/what-mediadata.php @@ -134,7 +134,7 @@ if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints(); if (empty($jackpot)) $jackpot = '0'; $content['jackpot'] = $jackpot; -// Total referal link clicks, total logins +// Total referral link clicks, total logins $result = SQL_QUERY('SELECT SUM(d.ref_clicks), SUM(d.total_logins) FROM @@ -153,7 +153,7 @@ $content['total_points'] = $points; $content['total_refclicks'] = $ref; $content['total_logins'] = $logins; -// Referal banner +// Referral banner $total = countSumTotalData('Y', 'refbanner', 'id', 'visible', true); // Total views and clicks diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php index bbaec5f471..55dbf0f355 100644 --- a/inc/modules/guest/what-rallyes.php +++ b/inc/modules/guest/what-rallyes.php @@ -105,18 +105,18 @@ if (SQL_NUMROWS($result) == 1) { $content['end'] = generateDateTime($end , 1); // Determine min_users - $content['min_users'] = determineReferalRallyeMinimumUsers($min_users); + $content['min_users'] = determineReferralRallyeMinimumUsers($min_users); // Determine min prices (now in function) - $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices); + $content['min_prices'] = determineReferralRallyeMinimumPrices($min_prices); if ($expired === true) { - $content['prices'] = addReferalRallyeWinners('guest', $id); + $content['prices'] = addReferralRallyeWinners('guest', $id); $content['top_users'] = '
' . $content['extras'] . '
'; $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}'; } else { - $content['prices'] = addReferalRallyePrices($id, 'html'); - $content['top_users'] = addReferalRallyeTopUsers('guest', $id, getMemberId()); + $content['prices'] = addReferralRallyePrices($id, 'html'); + $content['top_users'] = addReferralRallyeTopUsers('guest', $id, getMemberId()); $content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}'; } diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index 67e3065ea3..14c62e9a47 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -286,12 +286,12 @@ ORDER BY $content['form_errors'] = $OUT; - // @TODO Maybe a default referal id? + // @TODO Maybe a default referral id? $content['refid'] = 0; - // Is the referal id valid? + // Is the referral id valid? if ((isPostRequestElementSet('refid')) && (isValidUserId(postRequestElement('refid')))) { - // Transfer referal id + // Transfer referral id $content['refid'] = bigintval(postRequestElement('refid')); } // END - if } // END - if diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php index 106abb139e..6610fa1ed1 100644 --- a/inc/modules/guest/what-top10.php +++ b/inc/modules/guest/what-top10.php @@ -151,7 +151,7 @@ $rows['points_out'] = $OUT; // Free result SQL_FREERESULT($result); -// TOP referal "hunter" +// TOP referral "hunter" $result = SQL_QUERY("SELECT d.userid, SUM(r.counter) AS refs, @@ -203,7 +203,7 @@ if ($count < getConfig('top10_max')) { } // END - if // Remember the rows in array -$rows['referals_out'] = $OUT; +$rows['referrals_out'] = $OUT; // Free result SQL_FREERESULT($result); diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index 5f00eeecbd..fc92311e16 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -126,7 +126,8 @@ if (isFormSent()) { SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `holiday_active`='N', `holiday_activated`=UNIX_TIMESTAMP() + `holiday_active`='N', + `holiday_activated`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1", diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 0f21b5b461..83392c1cb0 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -210,7 +210,7 @@ LIMIT 1", // Did the user changed the password? if ($hash != $content['password']) { - $AND = ", `password`='" . $hash . "'"; + $AND = ",`password`='" . $hash . "'"; $mode = 'password'; } // END - if @@ -231,11 +231,11 @@ LIMIT 1", SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `gender`='%s', `surname`='%s', `family`='%s', + `gender`='%s',`surname`='%s',`family`='%s', `street_nr`='%s', - `country_code`=%s, `zip`=%s, `city`='%s', + `country_code`=%s,`zip`=%s,`city`='%s', `email`='%s', - `birth_day`=%s, `birth_month`=%s, `birth_year`=%s, + `birth_day`=%s,`birth_month`=%s,`birth_year`=%s, `max_mails`='%s', `last_update`=UNIX_TIMESTAMP()".$AND.", `notified`='N', @@ -263,11 +263,11 @@ LIMIT 1", SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `gender`='%s', `surname`='%s', `family`='%s', + `gender`='%s',`surname`='%s',`family`='%s', `street_nr`='%s', - `country`='%s', `zip`=%s, `city`='%s', + `country`='%s',`zip`=%s,`city`='%s', `email`='%s', - `birth_day`=%s, `birth_month`=%s, `birth_year`=%s, + `birth_day`=%s,`birth_month`=%s,`birth_year`=%s, `max_mails`='%s', `last_update`=UNIX_TIMESTAMP()".$AND.", `notified`='N', @@ -311,7 +311,7 @@ LIMIT 1", break; case 'notify': // Switch off notfication - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N', `last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N',`last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1", array(getMemberId()), __FILE__, __LINE__); $url = 'modules.php?module=login&what=mydata&code=' . getCode('PROFILE_UPDATED'); break; diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index a00992d463..b476f08b1c 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { // Add description as navigation point addYouAreHereLink('member', __FILE__); -// Query for referal levels and percents +// Query for referral levels and percents $result_depths = SQL_QUERY('SELECT `level`,`percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC', __FILE__, __LINE__); // Get total depths @@ -62,7 +62,7 @@ $content['rowspan'] = ($numDepths * 2 + 15); // Initialize array elements $content['part_points'] = '0.00000'; -$content['part_referals'] = '0'; +$content['part_referrals'] = '0'; $content['part_locked'] = '0.00000'; $content['part_order'] = '0.00000'; $content['part_locked_order'] = '0.00000'; @@ -82,13 +82,13 @@ while ($data = SQL_FETCHARRAY($result_depths)) { // Merge it together $content = merge_array($content, $data); - // Default for referal level > 0 + // Default for referral level > 0 $depth = 'p.`ref_depth`=%s'; if (is_null($content['level'])) { $depth = 'p.`ref_depth` IS NULL'; } // END - if - // Load referal points + // Load referral points $result_points = SQL_QUERY_ESC("SELECT p.`points`, p.`order_points`, @@ -121,7 +121,7 @@ LIMIT 1", $content['part_order'] += $content['order_points']; $content['part_locked'] += $content['locked_points']; $content['part_locked_order'] += $content['locked_order_points']; - $content['part_referals'] += $content['counter']; + $content['part_referrals'] += $content['counter']; } // END - if // Free result diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index 4a5d0c1b1e..d4ac40f02e 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -149,7 +149,7 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) { // Default is locked! $locked = true; - // Shall I 'pay' the referal points imidiately? + // Shall I 'pay' the referral points imidiately? if (getConfig('ref_payout') == '0') { // Yes, 'pay' it now $locked = false; diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php index 3bc862d204..4ecc3cca97 100644 --- a/inc/modules/member/what-rallyes.php +++ b/inc/modules/member/what-rallyes.php @@ -81,8 +81,8 @@ if (SQL_NUMROWS($result) == 1) { // Rallye will expire in less one day! $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}'; } else { - // Link to referal links page - $content['extras'] = '{--RALLYE_GET_REFERAL_LINK--}'; + // Link to referral links page + $content['extras'] = '{--RALLYE_GET_REFERRAL_LINK--}'; } // Set admin line (currently set to impressum, later to contact form) @@ -95,20 +95,20 @@ if (SQL_NUMROWS($result) == 1) { } // END - if // Determine min_users/prices - $content['min_users'] = determineReferalRallyeMinimumUsers($content['min_users']); - $content['min_prices'] = determineReferalRallyeMinimumPrices($content['min_prices']); + $content['min_users'] = determineReferralRallyeMinimumUsers($content['min_users']); + $content['min_prices'] = determineReferralRallyeMinimumPrices($content['min_prices']); // Set start and end time $content['start'] = generateDateTime($content['start_time'], 1); $content['end'] = generateDateTime($content['end_time'] , 1); if ($expired === true) { - $content['prices'] = addReferalRallyeWinners('member', $content['id']); + $content['prices'] = addReferralRallyeWinners('member', $content['id']); $content['top_users'] = '
' . $content['extras'] . '
'; $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}'; } else { - $content['prices'] = addReferalRallyePrices($content['id'], 'html'); - $content['top_users'] = addReferalRallyeTopUsers('member', $content['id'], getMemberId()); + $content['prices'] = addReferralRallyePrices($content['id'], 'html'); + $content['top_users'] = addReferralRallyeTopUsers('member', $content['id'], getMemberId()); $content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}'; } diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php index 7baccad168..e4140d4747 100644 --- a/inc/modules/member/what-refback.php +++ b/inc/modules/member/what-refback.php @@ -95,7 +95,7 @@ if ((isFormSent('edit')) && (isPostRequestElementSet('id'))) { } } // END - if -// Load all referal levels +// Load all referral levels $result = SQL_QUERY('SELECT r.`level`, r.`percents` diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php index 0d18864b49..49f6b585e6 100644 --- a/inc/modules/member/what-reflinks.php +++ b/inc/modules/member/what-reflinks.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : what-reflinks.php * * -------------------------------------------------------------------- * - * Short description : Referal links * + * Short description : Referral links * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Referal-Links * + * Kurzbeschreibung : Referral-Links * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -110,7 +110,7 @@ if (!SQL_HASZERONUMS($result)) { $content['refbanner_content'] = loadTemplate('member_list_reflinks', true, $OUT); } else { // No refbanner found - $content['refbanner_content'] = displayMessage('{--MEMBER_REFERAL_BANNER_404--}', true); + $content['refbanner_content'] = displayMessage('{--MEMBER_REFERRAL_BANNER_404--}', true); } // Free result diff --git a/inc/modules/member/what-reflist.php b/inc/modules/member/what-reflist.php index bea0a44b6e..3853872b01 100644 --- a/inc/modules/member/what-reflist.php +++ b/inc/modules/member/what-reflist.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { // Add description as navigation point addYouAreHereLink('member', __FILE__); -// Load all referal levels +// Load all referral levels $result = SQL_QUERY('SELECT `level`,`percents` FROM @@ -66,12 +66,12 @@ if (!SQL_HASZERONUMS($result)) { $counter = '0'; // Check for users ref in this level - foreach (getUserReferalPoints(getMemberId(), $content['level']) as $refRow) { + foreach (getUserReferralPoints(getMemberId(), $content['level']) as $refRow) { // Add/"translate" more content $refRow['click_rate'] = translateComma($refRow['click_rate'], true, 1); // Load row template - $rows .= loadTemplate('member_list_referal_row', true, $refRow); + $rows .= loadTemplate('member_list_referral_row', true, $refRow); // Count this ref and switch color $counter++; @@ -83,11 +83,11 @@ if (!SQL_HASZERONUMS($result)) { $content['rows'] = $rows; // Load level template - $OUT .= loadTemplate('member_list_referal_level', true, $content); + $OUT .= loadTemplate('member_list_referral_level', true, $content); } // END - while // Load main template - loadTemplate('member_list_referal', false, $OUT); + loadTemplate('member_list_referral', false, $OUT); } else { // No entries displayMessage('{--MEMBER_REFBACK_NO_ENTRIES--}'); diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php index b946503bfb..ccf52971de 100644 --- a/inc/modules/member/what-support.php +++ b/inc/modules/member/what-support.php @@ -70,8 +70,8 @@ if ((!isFormSent()) || (!isPostRequestElementSet('qsummary'))) { break; case 'reflink': - $subj_a = '{--ADMIN_SUPPORT_REFERAL_LINK_SUBJECT--}'; - $subj_m = '{--MEMBER_SUPPORT_REFERAL_LINK_SUBJECT--}'; + $subj_a = '{--ADMIN_SUPPORT_REFERRAL_LINK_SUBJECT--}'; + $subj_m = '{--MEMBER_SUPPORT_REFERRAL_LINK_SUBJECT--}'; break; case 'unconfirmed': diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index e72cf02c0b..da1c7888aa 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -161,8 +161,8 @@ switch ($mode) { ), __FILE__, __LINE__); // Add points to account *directly* ... - initReferalSystem(); - addPointsThroughReferalSystem('transfer', bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points'))); + initReferralSystem(); + addPointsThroughReferralSystem('transfer', bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points'))); // ... and add it to current user's used points and ignore return status subtractPoints('transfer', getMemberId(), postRequestElement('points')); @@ -281,14 +281,14 @@ switch ($mode) { $nothingMessage = ''; switch ($mode) { case 'list_in': - $sql = 'SELECT `trans_id`,`from_userid` AS party_userid, `points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}'; + $sql = 'SELECT `trans_id`,`from_userid` AS party_userid,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}'; $nothingMessage = '{--TRANSFER_NO_INCOMING_TRANSFERS--}'; $content['balance'] = '{--TRANSFER_TOTAL_INCOMING--}'; $content['title'] = '{--TRANSFER_LIST_INCOMING--}'; break; case 'list_out': - $sql = 'SELECT `trans_id`,`to_userid` AS party_userid, `points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}'; + $sql = 'SELECT `trans_id`,`to_userid` AS party_userid,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}'; $nothingMessage = '{--TRANSFER_NO_OUTGOING_TRANSFERS--}'; $content['balance'] = '{--TRANSFER_TOTAL_OUTGOING--}'; $content['title'] = '{--TRANSFER_LIST_OUTGOING--}'; diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index f555256941..a0f0a2b48e 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -175,8 +175,8 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) { $success = WERNIS_EXECUTE_WITHDRAW(postRequestElement('wernis_userid'), md5(postRequestElement('wds66_password')), postRequestElement('amount')); if ($success === true) { // Add it to this amount - initReferalSystem(); - addPointsThroughReferalSystem('wernis_withdraw', getMemberId(), bigintval(postRequestElement('amount'))); + initReferralSystem(); + addPointsThroughReferralSystem('wernis_withdraw', getMemberId(), bigintval(postRequestElement('amount'))); // Update the user data as well.. SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `wernis_userid`=%s WHERE `userid`=%s LIMIT 1", diff --git a/inc/modules/order.php b/inc/modules/order.php index 071e4db443..d2a67e94c5 100644 --- a/inc/modules/order.php +++ b/inc/modules/order.php @@ -103,7 +103,7 @@ if (empty($url)) { // Update used points $add = ''; if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) { - $add = ', `mail_orders`=`mail_orders`+1'; + $add = ',`mail_orders`=`mail_orders`+1'; } // END - if // Send an email to the user diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php index 71d578866c..1371cc619e 100644 --- a/inc/modules/sponsor/account.php +++ b/inc/modules/sponsor/account.php @@ -97,7 +97,7 @@ if (SQL_NUMROWS($result) == 1) { // Check if we want to change password or not if ((postRequestElement('pass1') == postRequestElement('pass2')) && (isPostRequestElementSet('pass1')) && (postRequestElement('pass1') != postRequestElement('pass_old'))) { // Change current password - $PASS_AND = ", `password`='%s'"; + $PASS_AND = ",`password`='%s'"; $PASS_DATA = md5(postRequestElement('pass1')); } // END - if diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php index d344aaee4e..9f24556139 100644 --- a/inc/monthly/monthly_beg.php +++ b/inc/monthly/monthly_beg.php @@ -68,7 +68,8 @@ if ((getBegRanks() > 0) && (!isCssOutputMode())) { // SQL string to check for accounts $result_main = SQL_QUERY("SELECT - `userid`,`email`,`gender`,`surname`,`family`,`beg_points` + `userid`, + `beg_points` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE @@ -83,8 +84,8 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__); // Load our winners... while ($content = SQL_FETCHARRAY($result_main)) { // Add points to user's account directly - initReferalSystem(); - addPointsThroughReferalSystem('monthly_beg', $content['userid'], $content['beg_points']); + initReferralSystem(); + addPointsThroughReferralSystem('monthly_beg', $content['userid'], $content['beg_points']); // Load email template and email it away $message = loadEmailTemplate('member_beg', $content, bigintval($content['userid'])); diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php index 1d4f8ad0d0..2d56553e2f 100644 --- a/inc/monthly/monthly_bonus.php +++ b/inc/monthly/monthly_bonus.php @@ -85,8 +85,8 @@ LIMIT {?bonus_ranks?}', __FILE__, __LINE__); // Make sure zero points are not mailed if ($content['points'] > 0) { // Add points to user's account directly - initReferalSystem(); - addPointsThroughReferalSystem('monthly_bonus', $content['userid'], $content['points']); + initReferralSystem(); + addPointsThroughReferralSystem('monthly_bonus', $content['userid'], $content['points']); // Load email template and email it away $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid'])); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 39a489138b..8f9d7bb7a9 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1292,9 +1292,9 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $ } } else { // Data from database - $SPEC = ', `' . $id . '`'; + $SPEC = ',`' . $id . '`'; if (!empty($special)) { - $SPEC = ', `' . $special . '` AS `special`'; + $SPEC = ',`' . $special . '` AS `special`'; } // END - if // Query the database diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php index 53e589c818..9fe3822ada 100644 --- a/inc/pool/pool-user.php +++ b/inc/pool/pool-user.php @@ -55,7 +55,7 @@ $HTML = ''; // Check for freed mail orders to send out if (isExtensionActive('html_mail')) { // With HTML mails - $HTML = ', `html_msg`'; + $HTML = ',`html_msg`'; } // END - if // Main query @@ -116,8 +116,39 @@ if (!SQL_HASZERONUMS($result_main)) { //* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!'); if (SQL_HASZERONUMS($result_stats)) { // No entry was found, so we add him! - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats` (`pool_id` , `userid`,`cat_id`,`payment_id`,`subject`,`url` , `max_rec` , `timestamp_ordered`,`timestamp_sstart`) VALUES ('%s','%s','%s','%s','%s','%s','%s','%s' , UNIX_TIMESTAMP())", - array(bigintval($mailData['id']), bigintval($mailData['sender_userid']), bigintval($mailData['cat_id']), bigintval($mailData['payment_id']), $mailData['subject'], $mailData['url'], $mailData['target_send'], bigintval($mailData['timestamp'])), __FILE__, __LINE__); + SQL_QUERY_ESC("INSERT INTO + `{?_MYSQL_PREFIX?}_user_stats` +( + `pool_id`, + `userid`, + `cat_id`, + `payment_id`, + `subject`, + `url`, + `max_rec`, + `timestamp_ordered`, + `timestamp_sstart` +) VALUES ( + %s, + %s, + %s, + %s, + '%s', + '%s', + %s, + %s, + UNIX_TIMESTAMP() +)", + array( + bigintval($mailData['id']), + bigintval($mailData['sender_userid']), + bigintval($mailData['cat_id']), + bigintval($mailData['payment_id']), + $mailData['subject'], + $mailData['url'], + bigintval($mailData['target_send']), + bigintval($mailData['timestamp']) + ), __FILE__, __LINE__); // Receive it's id for the links table $result_stats = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s AND `userid`=%s AND timestamp_ordered='%s' LIMIT 1", @@ -207,7 +238,7 @@ if (!SQL_HASZERONUMS($result_main)) { } // END - if // Set status to SEND because we completely send it away - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='SEND', `target_send`=0, `receivers`='' WHERE `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='SEND',`target_send`=0,`receivers`='' WHERE `id`=%s LIMIT 1", array(bigintval($mailData['id'])), __FILE__, __LINE__); // Update send-completed-time @@ -255,8 +286,8 @@ if (!SQL_HASZERONUMS($result_main)) { if (isValidUserId($userid)) { // User does not exists, pay points back $points = getPaymentPoints($mailData['payment_id']); - initReferalSystem(); - addPointsThroughReferalSystem('pool_payback', $mailData['sender_userid'], $points); + initReferralSystem(); + addPointsThroughReferralSystem('pool_payback', $mailData['sender_userid'], $points); // Add points together and remove user $pointsBack[$mailData['sender_userid']] += $points; diff --git a/inc/referal-functions.php b/inc/referal-functions.php index b1e82a13e2..f551ef47b7 100644 --- a/inc/referal-functions.php +++ b/inc/referal-functions.php @@ -1,669 +1,3 @@ 0) { - // Calculate new points - $ref_points = $points * $per / 100; - - // Pay refback here if level > 0 and in ref-mode - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . makeNullToZero(getUserData('refid')) . ',points=' . $points . ',paymentMethod=' . $paymentMethod); - if (($userid != $refid) && ($paymentMethod == 'REFERAL') && (isValidUserId(getUserData('refid'))) && (isExtensionActive('refback'))) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . makeNullToZero(getUserData('refid')) . ',ref_points=' . $ref_points . ',depth=' . makeNullToZero($GLOBALS['ref_level']) . ' - BEFORE!'); - $ref_points = addRefbackPoints($userid, getUserData('refid'), $points, $ref_points); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . makeNullToZero(getUserData('refid')) . ',ref_points=' . $ref_points . ',depth=' . makeNullToZero($GLOBALS['ref_level']) . ' - AFTER!'); - } // END - if - - // Update points... - if (is_null($GLOBALS['ref_level'])) { - // Level NULL (self) - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `%s`=`%s`+%s WHERE `userid`=%s AND `ref_depth` IS NULL LIMIT 1", - array( - $pointsColumn, - $pointsColumn, - $ref_points, - bigintval($userid) - ), __FUNCTION__, __LINE__); - } else { - // Level 1+ - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `%s`=`%s`+%s WHERE `userid`=%s AND `ref_depth`=%s LIMIT 1", - array( - $pointsColumn, - $pointsColumn, - $ref_points, - bigintval($userid), - bigintval($GLOBALS['ref_level']) - ), __FUNCTION__, __LINE__); - } - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pointsColumn='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.makeNullToZero($GLOBALS['ref_level']).',mode='.$paymentMethod.' - UPDATE! ('.SQL_AFFECTEDROWS().')'); - - // No entry updated? - if (SQL_HASZEROAFFECTED()) { - // First ref in this level! :-) - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`,`ref_depth`,`%s`) VALUES (%s, %s, %s)", - array( - $pointsColumn, - bigintval($userid), - makeZeroToNull($GLOBALS['ref_level']), - $ref_points - ), __FUNCTION__, __LINE__); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'data='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.makeNullToZero($GLOBALS['ref_level']).',mode='.$paymentMethod.' - INSERTED! ('.SQL_AFFECTEDROWS().')'); - } // END - if - - // Check affected rows - $added = (SQL_AFFECTEDROWS() == 1); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added=' . intval($added) . ' - BEFORE FILTER'); - - // Prepare data for the filter - $filterData = array( - 'subject' => $subject, - 'userid' => $userid, - 'points' => $points, - 'ref_points' => $ref_points, - 'column' => $pointsColumn, - 'notify' => $sendNotify, - 'refid' => $refid, - 'locked' => $locked, - 'mode' => 'add', - 'add_mode' => $paymentMethod, - 'added' => $added - ); - - // Filter it now - $filterData = runFilterChain('post_add_points', $filterData); - - // Extract $added - $added = $filterData['added']; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added=' . intval($added) . ' - AFTER FILTER'); - - // Points updated, maybe I shall send him an email? - if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) { - // Prepare content - $content = array( - 'percents' => $per, - 'level' => bigintval($GLOBALS['ref_level']), - 'points' => $ref_points, - ); - - // Load email template - $message = loadEmailTemplate('guest_user_confirmed_referal', $content, bigintval($userid)); - - // Send email - sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message); - } elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($paymentMethod == 'DIRECT')) { - // Prepare content - $content = array( - 'reason' => '{--REASON_DIRECT_PAYMENT--}', - 'subject' => $subject, - 'points' => $ref_points - ); - - // Load message - $message = loadEmailTemplate('member_add_points', $content, $userid); - - // And sent it away - sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message); - if (!isGetRequestElementSet('mid')) { - // Output message to admin - displayMessage('{--ADMIN_POINTS_ADDED--}'); - } // END - if - } - - // Increase referal level, if payment method is REFERAL - if ($paymentMethod == 'REFERAL') { - // Increase it - $GLOBALS['ref_level']++; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Referal level increased, ref_level=' . makeNullToZero($GLOBALS['ref_level']) . ',points=' . $points . ',refid=' . makeNullToZero(getUserData('refid')) . ',userid=' . $userid . ',paymentMethod=' . $paymentMethod); - } elseif (isDebugModeEnabled()) { - // Not increasing referal level, DIRECT payment method - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Referal level *NOT* increased, ref_level=' . makeNullToZero($GLOBALS['ref_level']) . ',points=' . $points . ',refid=' . makeNullToZero(getUserData('refid')) . ',userid=' . $userid . ',paymentMethod=' . $paymentMethod); - } - - // Maybe there's another ref? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'points=' . $points . ',refid(var|data)=' . makeNullToZero($refid) . '|' . makeNullToZero(getUserData('refid')) . ',userid=' . $userid . ',paymentMethod=' . $paymentMethod); - if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($paymentMethod == 'REFERAL')) { - // Then let's credit him here... - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . makeNullToZero(getUserData('refid')) . ',points=' . $points . ',ref_points=' . $ref_points . ',added[' . gettype($added) . ']=' . intval($added) . ' - ADVANCE!'); - $added = ($added && addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, getFetchedUserData('userid', getUserData('refid'), 'refid'))); - } // END - if - } // END - if - } // END - if - - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',sendNotify=' . intval($sendNotify) . ',refid=' . makeNullToZero($refid) . ',paymentMethod=' . $paymentMethod . ' - EXIT!'); - return $added; -} - -// Updates the referal counter -function updateReferalCounter ($userid) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); - // Init referal id - $ref = NULL; - - // Check for his referal - if (fetchUserData($userid)) { - // Get it - $ref = getUserData('refid'); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref=' . makeZeroToNull($ref) . ' - FETCHED!'); - } // END - if - - // Init entries - if (empty($GLOBALS['cache_array']['ref_level'][$userid])) { - $GLOBALS['cache_array']['ref_level'][$userid] = NULL; - } // END - if - if (empty($GLOBALS['cache_array']['ref_level'][$ref])) { - $GLOBALS['cache_array']['ref_level'][$ref] = NULL; - } // END - if - - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref=' . makeZeroToNull($ref)); - - // When he has a referal... - if (($ref > 0) && ($ref != $userid)) { - // Move to next referal level and count his counter one up - $GLOBALS['cache_array']['ref_level'][$ref] = $GLOBALS['cache_array']['ref_level'][$userid] + 1; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref(' . $ref . ')=' . $GLOBALS['cache_array']['ref_level'][$ref] . ' - ADVANCED!'); - - // Update counter - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`=%s LIMIT 1", - array( - bigintval($ref), - bigintval($GLOBALS['cache_array']['ref_level'][$ref]) - ), __FUNCTION__, __LINE__); - - // When no entry was updated then we have to create it here - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref=' . $ref . ',level=' . $GLOBALS['cache_array']['ref_level'][$ref] . ',updated=' . SQL_AFFECTEDROWS()); - if (SQL_HASZEROAFFECTED()) { - // First count! - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`,`level`,`counter`) VALUES (%s,%s,1)", - array( - bigintval($ref), - makeZeroToNull($GLOBALS['cache_array']['ref_level'][$ref]) - ), __FUNCTION__, __LINE__); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref=' . $ref . ',level=' . $GLOBALS['cache_array']['ref_level'][$ref] . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS()); - } // END - if - - // Advance to next level - updateReferalCounter($ref); - } elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) { - // Remove cache here - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref=' . makeZeroToNull($ref) . ' - CACHE!'); - rebuildCache('refsystem', 'refsystem'); - } - - // Update the referal table - updateReferalTable($userid); - - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref=' . makeZeroToNull($ref) . ',level=' . makeZeroToNull($GLOBALS['cache_array']['ref_level'][$ref]) . ' - EXIT!'); -} - -// Subtract points from database and mediadata cache -function subtractPoints ($subject, $userid, $points) { - // Add points to used points - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `used_points`=`used_points`+%s WHERE `userid`=%s LIMIT 1", - array( - $points, - bigintval($userid) - ), __FUNCTION__, __LINE__); - - // Prepare filter data - $filterData = array( - 'subject' => $subject, - 'userid' => $userid, - 'points' => $points, - 'mode' => 'sub', - 'added' => (!SQL_HASZEROAFFECTED()) - ); - - // Insert booking record - $filterData = runFilterChain('post_sub_points', $filterData); - - // Return result - return $filterData['added']; -} -// "Getter" for array for user refs and points in given level -function getUserReferalPoints ($userid, $level) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ' - ENTERED!'); - // Default is no refs and no nickname - $refs = array(); - - // Get refs from database - $result = SQL_QUERY_ESC("SELECT - ur.`id`, ur.`refid`, ud.`status`, ud.`last_online`, ud.`mails_confirmed`, ud.`emails_received` -FROM - `{?_MYSQL_PREFIX?}_user_refs` AS `ur` -LEFT JOIN - `{?_MYSQL_PREFIX?}_user_points` AS `up` -ON - ur.`refid`=up.`userid` AND - (ur.`level`=0 OR ur.`level` IS NULL) -LEFT JOIN - `{?_MYSQL_PREFIX?}_user_data` AS `ud` -ON - ur.`refid`=ud.`userid` -WHERE - ur.`userid`=%s AND - ur.`level`=%s -ORDER BY - ur.`refid` ASC", - array( - bigintval($userid), - bigintval($level) - ), __FUNCTION__, __LINE__); - - // Are there some entries? - if (!SQL_HASZERONUMS($result)) { - // Fetch all entries - while ($row = SQL_FETCHARRAY($result)) { - // Init click rate with zero - $row['click_rate'] = '0'; - - // Is at least one mail received? - if ($row['emails_received'] > 0) { - // Calculate click rate - $row['click_rate'] = ($row['mails_confirmed'] / $row['emails_received'] * 100); - } // END - if - - // Activity is 'active' by default because if autopurge is not installed - $row['activity'] = '{--MEMBER_ACTIVITY_ACTIVE--}'; - - // Is autopurge installed and the user inactive? - if ((isExtensionActive('autopurge')) && ((time() - getApInactiveSince()) >= $row['last_online'])) { - // Inactive user! - $row['activity'] = '{--MEMBER_ACTIVITY_INACTIVE--}'; - } // END - if - - // Remove some entries - unset($row['mails_confirmed']); - unset($row['emails_received']); - unset($row['last_online']); - - // Add row - $refs[$row['id']] = $row; - } // END - while - } // END - if - - // Free result - SQL_FREERESULT($result); - - // Return result - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ' - EXIT!'); - return $refs; -} - -// Get points data for given subject -function getPointsDataArrayFromSubject ($subject) { - // Extension ext-sql_patches must be up-to-date - if (isExtensionInstalledAndOlder('sql_patches', '0.8.2')) { - // Please update ext-sql_patches - debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.2 to continue. subject=' . $subject); - } // END - if - - // Remove any double-dot from it - $subjectArray = explode(':', $subject); - $subject = $subjectArray[0]; - unset($subjectArray); - - // If we have cache, shortcut it here - if (isset($GLOBALS['cache_array']['points_data'][$subject])) { - // Return it - return $GLOBALS['cache_array']['points_data'][$subject]; - } // END - if - - // Now checkout the entry in database table - $result = SQL_QUERY_ESC("SELECT `id`,`subject`,`column_name`,`locked_mode`,`payment_method`,`notify_recipient` FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `subject`='%s' LIMIT 1", - array($subject), __FUNCTION__, __LINE__); - - // Do we have an entry? - if (SQL_NUMROWS($result) == 1) { - // Then load it - $pointsData = SQL_FETCHARRAY($result); - - // Add all entries to our cache array - foreach ($pointsData as $key=>$value) { - $GLOBALS['cache_array']['points_data'][$subject][$key] = $value; - } // END - foreach - } else { - // Register this automatically - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`,`column_name`,`locked_mode`,`payment_method`,`notify_recipient`) VALUES ('%s','points','LOCKED','REFERAL','N')", - array($subject), __FUNCTION__, __LINE__); - - // Re-request it - return getPointsDataArrayFromSubject($subject); - } - - // Free result - SQL_FREERESULT($result); - - // Return it - return $GLOBALS['cache_array']['points_data'][$subject]; -} - -// Determines the right points column name for given subject and 'locked' -function getPointsColumnNameFromSubjectLocked ($subject, $isLocked) { - // Get the points_data entry - $pointsData = getPointsDataArrayFromSubject($subject); - - // Regular points by default - $columnName = $pointsData['column_name']; - - // Are the points locked? - if (($isLocked === true) && ($pointsData['locked_mode'] == 'LOCKED')) { - // Locked points, so prefix it - $columnName = 'locked_' . $pointsData['column_name']; - } // END - if - - // Return the result - return $columnName; -} - -// Determines the payment method for given extension and 'locked' -function getPaymentMethodFromSubject ($subject) { - // Get the points_data entry - $pointsData = getPointsDataArrayFromSubject($subject); - - // Regular points by default - $paymentMethod = $pointsData['payment_method']; - - // Return the result - return $paymentMethod; -} - -// Checks wether notification of points recipient is enabled -function isPaymentRecipientNotificationEnabled ($subject) { - // Get the points_data entry - $pointsData = getPointsDataArrayFromSubject($subject); - - // Is it enabled? - $isEnabled = ($pointsData['notify_recipient'] == 'Y'); - - // Return the result - return $isEnabled; -} - -// Update "referal table" -function updateReferalTable ($userid) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); - // Load all referals - loadReferalTable($userid); - - // Add missing level > 1 - addMissingReferalLevels($userid); - - // The last step is to flush all userid's entries to the database - flushReferalTableToDatabase($userid); - - // Rebuild cache - rebuildCache('refsystem', 'refsystem'); - - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!'); -} - -// Loads all referals for given userid -function loadReferalTable ($userid) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); - // Init array - $GLOBALS['referal_refid'][$userid] = array(); - - // Get all level entries from the refsystem table - $result = SQL_QUERY_ESC('SELECT `level` FROM `{?_MYSQL_PREFIX?}_refsystem` WHERE `userid`=%s ORDER BY `level` ASC', - array($userid), __FUNCTION__, __LINE__); - - // Do we have entries? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',SQL_NUMROWS()=' . SQL_NUMROWS($result)); - if (SQL_NUMROWS($result) > 0) { - // Then walk through all levels - while (list($level) = SQL_FETCHROW($result)) { - // Init array - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level); - $GLOBALS['referal_refid'][$userid][$level] = array(); - - // Level is = 1? - if ($level == 1) { - // Load all referals of this user - $result_refs = SQL_QUERY_ESC('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=%s ORDER BY `userid` ASC', - array($userid), __FUNCTION__, __LINE__); - - // Do we have entries? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',SQL_NUMROWS()=' . SQL_NUMROWS($result_refs)); - if (SQL_NUMROWS($result_refs) > 0) { - // Then again walk through all - while (list($refid) = SQL_FETCHROW($result_refs)) { - // Add this refid - $GLOBALS['referal_refid'][$userid][$level][] = $refid; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . $refid); - // Load the refid's array as well - loadReferalTable($refid); - } // END - while - } // END - if - - // Free result - SQL_FREERESULT($result_refs); - } // END - if - } // END - while - } // END - if - - // Free result - SQL_FREERESULT($result); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!'); -} - -// Adds missing referal levels to the array -function addMissingReferalLevels ($userid) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); - // If the array is gone, you have called this function without calling loadReferalTable() - if (!isset($GLOBALS['referal_refid'][$userid])) { - // Please fix your code - debug_report_bug(__FUNCTION__, __LINE__, 'Called without calling loadReferalTable() before! userid=' . $userid); - } // END - if - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',count()=' . count($GLOBALS['referal_refid'][$userid])); - - // Now walk through the array, first levels - foreach ($GLOBALS['referal_refid'][$userid] as $level=>$levelArray) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',count()=' . count($levelArray)); - // Next are the users - foreach ($levelArray as $refid) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . $refid); - // Does the refid have an array? - if (isset($GLOBALS['referal_refid'][$refid])) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . makeNullToZero($refid) . ',count()=' . count($GLOBALS['referal_refid'][$refid])); - // Okay, then walk through here, too - foreach ($GLOBALS['referal_refid'][$refid] as $refLevel=>$refArray) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . makeNullToZero($refid) . ',refLevel=' . $refLevel . ',count()=' . count($refArray)); - // Also walk through this one - foreach ($refArray as $refRefid) { - // Calculate new level - $newLevel = $level + $refLevel; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . makeNullToZero($refid) . ',refLevel=' . $refLevel . ',refRefid=' . $refRefid . ',newLevel=' . $newLevel); - // Is the refRefid not in? - if ((!isset($GLOBALS['referal_refid'][$userid][$newLevel])) || (!in_array($refRefid, $GLOBALS['referal_refid'][$userid][$newLevel]))) { - // Then we must add this ref's refid to the userid's next level - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',newLevel=' . $newLevel . ',refRefid=' . $refRefid . ' - ADDED!'); - $GLOBALS['referal_refid'][$userid][$newLevel][] = $refRefid; - } // END - if - } // END - foreach - } // END - foreach - } // END - foreach - } // END - foreach - } // END - foreach - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!'); -} - -// Flush all entries for given userid to database -function flushReferalTableToDatabase ($userid) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); - // If the array is gone, you have called this function without calling loadReferalTable() - if (!isset($GLOBALS['referal_refid'][$userid])) { - // Please fix your code - debug_report_bug(__FUNCTION__, __LINE__, 'Called without calling loadReferalTable() before! userid=' . $userid); - } // END - if - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',count()=' . count($GLOBALS['referal_refid'][$userid])); - - // If no entries are there, skip this whole step - if (count($GLOBALS['referal_refid'][$userid]) == 0) { - // No entries found - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ABORTING...'); - return; - } // END - if - - // Prepare SQL - $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_user_refs` (`userid`,`level`,`refid`) VALUES '; - $executeSql = false; - - // Now walk through the array, first levels - foreach ($GLOBALS['referal_refid'][$userid] as $level=>$levelArray) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',count()=' . count($levelArray)); - // Next are the users - foreach ($levelArray as $refid) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . $refid); - // Query the user_refs table - list($count) = SQL_FETCHROW(SQL_QUERY_ESC('SELECT COUNT(`id`) AS `count` FROM `{?_MYSQL_PREFIX?}_user_refs` WHERE `userid`=%s AND `level`=%s AND `refid`=%s LIMIT 1', - array( - $userid, - $level, - $refid - ), __FUNCTION__, __LINE__)); - - // Do we have no entry? - if ($count == 0) { - // Then add it to the SQL - $SQL .= '(' . $userid . ',' . $level . ',' . $refid . '),'; - - // Some has been added, so execute the query - $executeSql = true; - } // END - if - } // END - foreach - } // END - foreach - - // Remove last comma from SQL - $SQL = substr($SQL, 0, -1); - - // And run it - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',SQL=' . $SQL); - if ($executeSql === true) { - SQL_QUERY($SQL, __FUNCTION__, __LINE__); - } // END - if - - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!'); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/referral-functions.php b/inc/referral-functions.php new file mode 100644 index 0000000000..75945480cb --- /dev/null +++ b/inc/referral-functions.php @@ -0,0 +1,669 @@ + 0) { + // Calculate new points + $ref_points = $points * $per / 100; + + // Pay refback here if level > 0 and in ref-mode + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . makeNullToZero(getUserData('refid')) . ',points=' . $points . ',paymentMethod=' . $paymentMethod); + if (($userid != $refid) && ($paymentMethod == 'REFERRAL') && (isValidUserId(getUserData('refid'))) && (isExtensionActive('refback'))) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . makeNullToZero(getUserData('refid')) . ',ref_points=' . $ref_points . ',depth=' . makeNullToZero($GLOBALS['ref_level']) . ' - BEFORE!'); + $ref_points = addRefbackPoints($userid, getUserData('refid'), $points, $ref_points); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . makeNullToZero(getUserData('refid')) . ',ref_points=' . $ref_points . ',depth=' . makeNullToZero($GLOBALS['ref_level']) . ' - AFTER!'); + } // END - if + + // Update points... + if (is_null($GLOBALS['ref_level'])) { + // Level NULL (self) + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `%s`=`%s`+%s WHERE `userid`=%s AND `ref_depth` IS NULL LIMIT 1", + array( + $pointsColumn, + $pointsColumn, + $ref_points, + bigintval($userid) + ), __FUNCTION__, __LINE__); + } else { + // Level 1+ + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `%s`=`%s`+%s WHERE `userid`=%s AND `ref_depth`=%s LIMIT 1", + array( + $pointsColumn, + $pointsColumn, + $ref_points, + bigintval($userid), + bigintval($GLOBALS['ref_level']) + ), __FUNCTION__, __LINE__); + } + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pointsColumn='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.makeNullToZero($GLOBALS['ref_level']).',mode='.$paymentMethod.' - UPDATE! ('.SQL_AFFECTEDROWS().')'); + + // No entry updated? + if (SQL_HASZEROAFFECTED()) { + // First ref in this level! :-) + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`,`ref_depth`,`%s`) VALUES (%s, %s, %s)", + array( + $pointsColumn, + bigintval($userid), + makeZeroToNull($GLOBALS['ref_level']), + $ref_points + ), __FUNCTION__, __LINE__); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'data='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.makeNullToZero($GLOBALS['ref_level']).',mode='.$paymentMethod.' - INSERTED! ('.SQL_AFFECTEDROWS().')'); + } // END - if + + // Check affected rows + $added = (SQL_AFFECTEDROWS() == 1); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added=' . intval($added) . ' - BEFORE FILTER'); + + // Prepare data for the filter + $filterData = array( + 'subject' => $subject, + 'userid' => $userid, + 'points' => $points, + 'ref_points' => $ref_points, + 'column' => $pointsColumn, + 'notify' => $sendNotify, + 'refid' => $refid, + 'locked' => $locked, + 'mode' => 'add', + 'add_mode' => $paymentMethod, + 'added' => $added + ); + + // Filter it now + $filterData = runFilterChain('post_add_points', $filterData); + + // Extract $added + $added = $filterData['added']; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added=' . intval($added) . ' - AFTER FILTER'); + + // Points updated, maybe I shall send him an email? + if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) { + // Prepare content + $content = array( + 'percents' => $per, + 'level' => bigintval($GLOBALS['ref_level']), + 'points' => $ref_points, + ); + + // Load email template + $message = loadEmailTemplate('guest_user_confirmed_referral', $content, bigintval($userid)); + + // Send email + sendEmail($userid, '{--THANX_REFERRAL_ONE_SUBJECT--}', $message); + } elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($paymentMethod == 'DIRECT')) { + // Prepare content + $content = array( + 'reason' => '{--REASON_DIRECT_PAYMENT--}', + 'subject' => $subject, + 'points' => $ref_points + ); + + // Load message + $message = loadEmailTemplate('member_add_points', $content, $userid); + + // And sent it away + sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message); + if (!isGetRequestElementSet('mid')) { + // Output message to admin + displayMessage('{--ADMIN_POINTS_ADDED--}'); + } // END - if + } + + // Increase referral level, if payment method is REFERRAL + if ($paymentMethod == 'REFERRAL') { + // Increase it + $GLOBALS['ref_level']++; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Referral level increased, ref_level=' . makeNullToZero($GLOBALS['ref_level']) . ',points=' . $points . ',refid=' . makeNullToZero(getUserData('refid')) . ',userid=' . $userid . ',paymentMethod=' . $paymentMethod); + } elseif (isDebugModeEnabled()) { + // Not increasing referral level, DIRECT payment method + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Referral level *NOT* increased, ref_level=' . makeNullToZero($GLOBALS['ref_level']) . ',points=' . $points . ',refid=' . makeNullToZero(getUserData('refid')) . ',userid=' . $userid . ',paymentMethod=' . $paymentMethod); + } + + // Maybe there's another ref? + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'points=' . $points . ',refid(var|data)=' . makeNullToZero($refid) . '|' . makeNullToZero(getUserData('refid')) . ',userid=' . $userid . ',paymentMethod=' . $paymentMethod); + if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($paymentMethod == 'REFERRAL')) { + // Then let's credit him here... + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',refid=' . makeNullToZero(getUserData('refid')) . ',points=' . $points . ',ref_points=' . $ref_points . ',added[' . gettype($added) . ']=' . intval($added) . ' - ADVANCE!'); + $added = ($added && addPointsThroughReferralSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, getFetchedUserData('userid', getUserData('refid'), 'refid'))); + } // END - if + } // END - if + } // END - if + + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',sendNotify=' . intval($sendNotify) . ',refid=' . makeNullToZero($refid) . ',paymentMethod=' . $paymentMethod . ' - EXIT!'); + return $added; +} + +// Updates the referral counter +function updateReferralCounter ($userid) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); + // Init referral id + $ref = NULL; + + // Check for his referral + if (fetchUserData($userid)) { + // Get it + $ref = getUserData('refid'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref=' . makeZeroToNull($ref) . ' - FETCHED!'); + } // END - if + + // Init entries + if (empty($GLOBALS['cache_array']['ref_level'][$userid])) { + $GLOBALS['cache_array']['ref_level'][$userid] = NULL; + } // END - if + if (empty($GLOBALS['cache_array']['ref_level'][$ref])) { + $GLOBALS['cache_array']['ref_level'][$ref] = NULL; + } // END - if + + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref=' . makeZeroToNull($ref)); + + // When he has a referral... + if (($ref > 0) && ($ref != $userid)) { + // Move to next referral level and count his counter one up + $GLOBALS['cache_array']['ref_level'][$ref] = $GLOBALS['cache_array']['ref_level'][$userid] + 1; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref(' . $ref . ')=' . $GLOBALS['cache_array']['ref_level'][$ref] . ' - ADVANCED!'); + + // Update counter + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`=%s LIMIT 1", + array( + bigintval($ref), + bigintval($GLOBALS['cache_array']['ref_level'][$ref]) + ), __FUNCTION__, __LINE__); + + // When no entry was updated then we have to create it here + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref=' . $ref . ',level=' . $GLOBALS['cache_array']['ref_level'][$ref] . ',updated=' . SQL_AFFECTEDROWS()); + if (SQL_HASZEROAFFECTED()) { + // First count! + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`,`level`,`counter`) VALUES (%s,%s,1)", + array( + bigintval($ref), + makeZeroToNull($GLOBALS['cache_array']['ref_level'][$ref]) + ), __FUNCTION__, __LINE__); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref=' . $ref . ',level=' . $GLOBALS['cache_array']['ref_level'][$ref] . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS()); + } // END - if + + // Advance to next level + updateReferralCounter($ref); + } elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) { + // Remove cache here + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref=' . makeZeroToNull($ref) . ' - CACHE!'); + rebuildCache('refsystem', 'refsystem'); + } + + // Update the referral table + updateReferralTable($userid); + + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',ref=' . makeZeroToNull($ref) . ',level=' . makeZeroToNull($GLOBALS['cache_array']['ref_level'][$ref]) . ' - EXIT!'); +} + +// Subtract points from database and mediadata cache +function subtractPoints ($subject, $userid, $points) { + // Add points to used points + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `used_points`=`used_points`+%s WHERE `userid`=%s LIMIT 1", + array( + $points, + bigintval($userid) + ), __FUNCTION__, __LINE__); + + // Prepare filter data + $filterData = array( + 'subject' => $subject, + 'userid' => $userid, + 'points' => $points, + 'mode' => 'sub', + 'added' => (!SQL_HASZEROAFFECTED()) + ); + + // Insert booking record + $filterData = runFilterChain('post_sub_points', $filterData); + + // Return result + return $filterData['added']; +} +// "Getter" for array for user refs and points in given level +function getUserReferralPoints ($userid, $level) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ' - ENTERED!'); + // Default is no refs and no nickname + $refs = array(); + + // Get refs from database + $result = SQL_QUERY_ESC("SELECT + ur.`id`, ur.`refid`, ud.`status`, ud.`last_online`, ud.`mails_confirmed`, ud.`emails_received` +FROM + `{?_MYSQL_PREFIX?}_user_refs` AS `ur` +LEFT JOIN + `{?_MYSQL_PREFIX?}_user_points` AS `up` +ON + ur.`refid`=up.`userid` AND + (ur.`level`=0 OR ur.`level` IS NULL) +LEFT JOIN + `{?_MYSQL_PREFIX?}_user_data` AS `ud` +ON + ur.`refid`=ud.`userid` +WHERE + ur.`userid`=%s AND + ur.`level`=%s +ORDER BY + ur.`refid` ASC", + array( + bigintval($userid), + bigintval($level) + ), __FUNCTION__, __LINE__); + + // Are there some entries? + if (!SQL_HASZERONUMS($result)) { + // Fetch all entries + while ($row = SQL_FETCHARRAY($result)) { + // Init click rate with zero + $row['click_rate'] = '0'; + + // Is at least one mail received? + if ($row['emails_received'] > 0) { + // Calculate click rate + $row['click_rate'] = ($row['mails_confirmed'] / $row['emails_received'] * 100); + } // END - if + + // Activity is 'active' by default because if autopurge is not installed + $row['activity'] = '{--MEMBER_ACTIVITY_ACTIVE--}'; + + // Is autopurge installed and the user inactive? + if ((isExtensionActive('autopurge')) && ((time() - getApInactiveSince()) >= $row['last_online'])) { + // Inactive user! + $row['activity'] = '{--MEMBER_ACTIVITY_INACTIVE--}'; + } // END - if + + // Remove some entries + unset($row['mails_confirmed']); + unset($row['emails_received']); + unset($row['last_online']); + + // Add row + $refs[$row['id']] = $row; + } // END - while + } // END - if + + // Free result + SQL_FREERESULT($result); + + // Return result + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ' - EXIT!'); + return $refs; +} + +// Get points data for given subject +function getPointsDataArrayFromSubject ($subject) { + // Extension ext-sql_patches must be up-to-date + if (isExtensionInstalledAndOlder('sql_patches', '0.8.2')) { + // Please update ext-sql_patches + debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.2 to continue. subject=' . $subject); + } // END - if + + // Remove any double-dot from it + $subjectArray = explode(':', $subject); + $subject = $subjectArray[0]; + unset($subjectArray); + + // If we have cache, shortcut it here + if (isset($GLOBALS['cache_array']['points_data'][$subject])) { + // Return it + return $GLOBALS['cache_array']['points_data'][$subject]; + } // END - if + + // Now checkout the entry in database table + $result = SQL_QUERY_ESC("SELECT `id`,`subject`,`column_name`,`locked_mode`,`payment_method`,`notify_recipient` FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `subject`='%s' LIMIT 1", + array($subject), __FUNCTION__, __LINE__); + + // Do we have an entry? + if (SQL_NUMROWS($result) == 1) { + // Then load it + $pointsData = SQL_FETCHARRAY($result); + + // Add all entries to our cache array + foreach ($pointsData as $key=>$value) { + $GLOBALS['cache_array']['points_data'][$subject][$key] = $value; + } // END - foreach + } else { + // Register this automatically + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`,`column_name`,`locked_mode`,`payment_method`,`notify_recipient`) VALUES ('%s','points','LOCKED','REFERRAL','N')", + array($subject), __FUNCTION__, __LINE__); + + // Re-request it + return getPointsDataArrayFromSubject($subject); + } + + // Free result + SQL_FREERESULT($result); + + // Return it + return $GLOBALS['cache_array']['points_data'][$subject]; +} + +// Determines the right points column name for given subject and 'locked' +function getPointsColumnNameFromSubjectLocked ($subject, $isLocked) { + // Get the points_data entry + $pointsData = getPointsDataArrayFromSubject($subject); + + // Regular points by default + $columnName = $pointsData['column_name']; + + // Are the points locked? + if (($isLocked === true) && ($pointsData['locked_mode'] == 'LOCKED')) { + // Locked points, so prefix it + $columnName = 'locked_' . $pointsData['column_name']; + } // END - if + + // Return the result + return $columnName; +} + +// Determines the payment method for given extension and 'locked' +function getPaymentMethodFromSubject ($subject) { + // Get the points_data entry + $pointsData = getPointsDataArrayFromSubject($subject); + + // Regular points by default + $paymentMethod = $pointsData['payment_method']; + + // Return the result + return $paymentMethod; +} + +// Checks wether notification of points recipient is enabled +function isPaymentRecipientNotificationEnabled ($subject) { + // Get the points_data entry + $pointsData = getPointsDataArrayFromSubject($subject); + + // Is it enabled? + $isEnabled = ($pointsData['notify_recipient'] == 'Y'); + + // Return the result + return $isEnabled; +} + +// Update "referral table" +function updateReferralTable ($userid) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); + // Load all referrals + loadReferralTable($userid); + + // Add missing level > 1 + addMissingReferralLevels($userid); + + // The last step is to flush all userid's entries to the database + flushReferralTableToDatabase($userid); + + // Rebuild cache + rebuildCache('refsystem', 'refsystem'); + + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!'); +} + +// Loads all referrals for given userid +function loadReferralTable ($userid) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); + // Init array + $GLOBALS['referral_refid'][$userid] = array(); + + // Get all level entries from the refsystem table + $result = SQL_QUERY_ESC('SELECT `level` FROM `{?_MYSQL_PREFIX?}_refsystem` WHERE `userid`=%s ORDER BY `level` ASC', + array($userid), __FUNCTION__, __LINE__); + + // Do we have entries? + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',SQL_NUMROWS()=' . SQL_NUMROWS($result)); + if (SQL_NUMROWS($result) > 0) { + // Then walk through all levels + while (list($level) = SQL_FETCHROW($result)) { + // Init array + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level); + $GLOBALS['referral_refid'][$userid][$level] = array(); + + // Level is = 1? + if ($level == 1) { + // Load all referrals of this user + $result_refs = SQL_QUERY_ESC('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=%s ORDER BY `userid` ASC', + array($userid), __FUNCTION__, __LINE__); + + // Do we have entries? + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',SQL_NUMROWS()=' . SQL_NUMROWS($result_refs)); + if (SQL_NUMROWS($result_refs) > 0) { + // Then again walk through all + while (list($refid) = SQL_FETCHROW($result_refs)) { + // Add this refid + $GLOBALS['referral_refid'][$userid][$level][] = $refid; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . $refid); + // Load the refid's array as well + loadReferralTable($refid); + } // END - while + } // END - if + + // Free result + SQL_FREERESULT($result_refs); + } // END - if + } // END - while + } // END - if + + // Free result + SQL_FREERESULT($result); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!'); +} + +// Adds missing referral levels to the array +function addMissingReferralLevels ($userid) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); + // If the array is gone, you have called this function without calling loadReferralTable() + if (!isset($GLOBALS['referral_refid'][$userid])) { + // Please fix your code + debug_report_bug(__FUNCTION__, __LINE__, 'Called without calling loadReferralTable() before! userid=' . $userid); + } // END - if + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',count()=' . count($GLOBALS['referral_refid'][$userid])); + + // Now walk through the array, first levels + foreach ($GLOBALS['referral_refid'][$userid] as $level=>$levelArray) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',count()=' . count($levelArray)); + // Next are the users + foreach ($levelArray as $refid) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . $refid); + // Does the refid have an array? + if (isset($GLOBALS['referral_refid'][$refid])) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . makeNullToZero($refid) . ',count()=' . count($GLOBALS['referral_refid'][$refid])); + // Okay, then walk through here, too + foreach ($GLOBALS['referral_refid'][$refid] as $refLevel=>$refArray) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . makeNullToZero($refid) . ',refLevel=' . $refLevel . ',count()=' . count($refArray)); + // Also walk through this one + foreach ($refArray as $refRefid) { + // Calculate new level + $newLevel = $level + $refLevel; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . makeNullToZero($refid) . ',refLevel=' . $refLevel . ',refRefid=' . $refRefid . ',newLevel=' . $newLevel); + // Is the refRefid not in? + if ((!isset($GLOBALS['referral_refid'][$userid][$newLevel])) || (!in_array($refRefid, $GLOBALS['referral_refid'][$userid][$newLevel]))) { + // Then we must add this ref's refid to the userid's next level + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',newLevel=' . $newLevel . ',refRefid=' . $refRefid . ' - ADDED!'); + $GLOBALS['referral_refid'][$userid][$newLevel][] = $refRefid; + } // END - if + } // END - foreach + } // END - foreach + } // END - foreach + } // END - foreach + } // END - foreach + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!'); +} + +// Flush all entries for given userid to database +function flushReferralTableToDatabase ($userid) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ENTERED!'); + // If the array is gone, you have called this function without calling loadReferralTable() + if (!isset($GLOBALS['referral_refid'][$userid])) { + // Please fix your code + debug_report_bug(__FUNCTION__, __LINE__, 'Called without calling loadReferralTable() before! userid=' . $userid); + } // END - if + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',count()=' . count($GLOBALS['referral_refid'][$userid])); + + // If no entries are there, skip this whole step + if (count($GLOBALS['referral_refid'][$userid]) == 0) { + // No entries found + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - ABORTING...'); + return; + } // END - if + + // Prepare SQL + $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_user_refs` (`userid`,`level`,`refid`) VALUES '; + $executeSql = false; + + // Now walk through the array, first levels + foreach ($GLOBALS['referral_refid'][$userid] as $level=>$levelArray) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',count()=' . count($levelArray)); + // Next are the users + foreach ($levelArray as $refid) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ',refid=' . $refid); + // Query the user_refs table + list($count) = SQL_FETCHROW(SQL_QUERY_ESC('SELECT COUNT(`id`) AS `count` FROM `{?_MYSQL_PREFIX?}_user_refs` WHERE `userid`=%s AND `level`=%s AND `refid`=%s LIMIT 1', + array( + $userid, + $level, + $refid + ), __FUNCTION__, __LINE__)); + + // Do we have no entry? + if ($count == 0) { + // Then add it to the SQL + $SQL .= '(' . $userid . ',' . $level . ',' . $refid . '),'; + + // Some has been added, so execute the query + $executeSql = true; + } // END - if + } // END - foreach + } // END - foreach + + // Remove last comma from SQL + $SQL = substr($SQL, 0, -1); + + // And run it + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',SQL=' . $SQL); + if ($executeSql === true) { + SQL_QUERY($SQL, __FUNCTION__, __LINE__); + } // END - if + + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ' - EXIT!'); +} + +// [EOF] +?> diff --git a/inc/session.php b/inc/session.php index ef1eb77297..d45062c744 100644 --- a/inc/session.php +++ b/inc/session.php @@ -58,8 +58,8 @@ if (session_id() == '') { // Load language file(s) loadLanguageFile(); -// Determine and set referal id -determineReferalId(); +// Determine and set referral id +determineReferralId(); // [EOF] ?> diff --git a/inc/template-functions.php b/inc/template-functions.php index 62fecd0386..e8bbe8171a 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1709,8 +1709,8 @@ function generateMetaDescriptionCode () { $GLOBALS['page_header'] .= ''; } // END - if - // Initialize referal system - initReferalSystem(); + // Initialize referral system + initReferralSystem(); } // Generates an FQFN for template cache from the given template name diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index d7f6db028e..29638a8fc9 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -740,8 +740,8 @@ function isBlockModeEnabled () { } /** - * Wrapper function for addPointsThroughReferalSystem(), you should generally - * avoid this function and use addPointsThroughReferalSystem() directly and add + * Wrapper function for addPointsThroughReferralSystem(), you should generally + * avoid this function and use addPointsThroughReferralSystem() directly and add * your special payment method entry to points_data instead. * * @param $subject A string-encoded subject for this add @@ -751,10 +751,10 @@ function isBlockModeEnabled () { */ function addPointsDirectly ($subject, $userid, $points) { // Reset level here - initReferalSystem(); + initReferralSystem(); // Call more complicated method (due to more parameters) - return addPointsThroughReferalSystem($subject, $userid, $points, false, 0, 'DIRECT'); + return addPointsThroughReferralSystem($subject, $userid, $points, false, 0, 'DIRECT'); } // Wrapper for redirectToUrl but URL comes from a configuration entry @@ -1546,8 +1546,8 @@ function isAdminNotificationEnabled () { return $GLOBALS[__FUNCTION__]; } -// Checks wether random referal id selection is enabled -function isRandomReferalIdEnabled () { +// Checks wether random referral id selection is enabled +function isRandomReferralIdEnabled () { // Do we have cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it @@ -1570,7 +1570,7 @@ function getDefaultLanguage () { return $GLOBALS[__FUNCTION__]; } -// "Getter" for default referal id +// "Getter" for default referral id function getDefRefid () { // Do we have cache? if (!isset($GLOBALS[__FUNCTION__])) { diff --git a/install/menu-de.sql b/install/menu-de.sql index d257a91e33..76c8c9e59e 100644 --- a/install/menu-de.sql +++ b/install/menu-de.sql @@ -7,7 +7,7 @@ INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sor INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup',NULL,'Einstellungen','Interessen ändern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_email','Versand, Empfang','Hier können Sie die maximal empfangbaren Mails usw. einstellen.',8); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7); -INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referal-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12); +INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referral-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','payments','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen','Fügen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen hinzu oder ändern / löschen Sie bestende.',11); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',7); @@ -63,7 +63,7 @@ INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`vis INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Guthaben',4,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien auswählen',3,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referral-Links',6,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbestätigte Emails',5,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken',9, 'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',999,'Y','N'); diff --git a/install/menu-en.sql b/install/menu-en.sql index a08a1739b7..f774c8312f 100644 --- a/install/menu-en.sql +++ b/install/menu-en.sql @@ -7,7 +7,7 @@ INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sor INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup',NULL,'Einstellungen','Interessen ändern, News schreiben, allgmeine Einstellungen (Auto-Versand usw.). Auto-Lock Funktion einrichten, manueller Lock des Versandes einrichten, Teile der Homepage sperren (wegen Wartungsarbeiten)',5); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_email','Versand, Empfang','Hier können Sie die maximal empfangbaren Mails usw. einstellen.',8); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cats','Kategorien einrichten','Ändern oder löschen Sie bereits bestehende Kategorien oder fügen Sie weitere hinzu.',7); -INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referal-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12); +INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','refbanner','Referral-Banner','Fügen Sie neue Banner hinzu, die dann die Mitglieder verlinken können, um neue Mitglieder zu werben. Oder editieren / löschen Sie bestehende. Hier sehen Sie auch die Anzahl der Klicks auf den jeweiligen Banner!',12); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','payments','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen','Fügen Sie neue {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Vergütungen hinzu oder ändern / löschen Sie bestende.',11); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc',NULL,'Verschiedenes','Verschiedene Einstellungen / Info-Seiten, die sonst nirgenswo reinpassten...',6); INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats',NULL,'Statistiken','Sonstige Statistiken, die nirgenswo reinpassen',7); @@ -63,7 +63,7 @@ INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`vis INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','welcome','Willkommen!',1,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','points','{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Guthaben',4,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','categories','Kategorien auswählen',3,'Y','N'); -INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referal-Links',6,'Y','N'); +INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflinks','Referral-Links',6,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','unconfirmed','Unbestätigte Emails',5,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','stats','Statistiken',9,'Y','N'); INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('logout',NULL,'Ausloggen',999,'Y','N'); diff --git a/mailid_top.php b/mailid_top.php index 1fb207a33e..a3a4c0e44b 100644 --- a/mailid_top.php +++ b/mailid_top.php @@ -235,7 +235,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr array($userId), __FILE__, __LINE__); // Update random confirmed as well? - if ((isExtensionInstalledAndNewer('user', '0.3.4')) && (isRandomReferalIdEnabled())) { + if ((isExtensionInstalledAndNewer('user', '0.3.4')) && (isRandomReferralIdEnabled())) { // Update second counter SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=`rand_confirmed` + 1 WHERE `userid`=%s LIMIT 1", array($userId), __FILE__, __LINE__); @@ -250,12 +250,12 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr // Set HTTP status to okay setHttpStatus('200 OK'); - // Add points over referal system is the default + // Add points over referral system is the default $template = 'mailid_points_done'; // Right code entered add points and remove entry if (ifUserPointsLocked($userId)) { - // Don't add points over the referal system + // Don't add points over the referral system $template = 'mailid_points_locked'; } // END - if @@ -264,8 +264,8 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr array($userId), __FILE__, __LINE__); // Add points - initReferalSystem(); - addPointsThroughReferalSystem('mailid_okay', $userId, $payment); + initReferralSystem(); + addPointsThroughReferralSystem('mailid_okay', $userId, $payment); // Shall I add bonus points for "turbo clickers" ? if (isExtensionInstalledAndNewer('bonus', '0.2.2')) { @@ -302,8 +302,8 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr loadTemplate($template, false, $content); } elseif (isValidUserId($sender)) { // Wrong image code! So add points to sender's account - initReferalSystem(); - addPointsThroughReferalSystem('mailid_payback', $sender, $payment); + initReferralSystem(); + addPointsThroughReferralSystem('mailid_payback', $sender, $payment); // Add payment points $content['points'] = $payment; diff --git a/ref.php b/ref.php index 81d8df238c..6683a7603c 100644 --- a/ref.php +++ b/ref.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : ref.php * * -------------------------------------------------------------------- * - * Short description : Redirection for the referal link * + * Short description : Redirection for the referral link * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Weiterleitungsscript fuer die Referal-Links * + * Kurzbeschreibung : Weiterleitungsscript fuer die Referral-Links * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -51,11 +51,11 @@ setContentType('text/html'); // No refid by default $url = 'modules.php?module=index'; -// Check for determined referal id -if ((isExtensionActive('user')) && (isReferalIdValid()) && (isValidUserId(determineReferalId()))) { +// Check for determined referral id +if ((isExtensionActive('user')) && (isReferralIdValid()) && (isValidUserId(determineReferralId()))) { // Update ref counter SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_clicks`=`ref_clicks`+1 WHERE `userid`=%s LIMIT 1", - array(makeZeroToNull(determineReferalId())), __FILE__, __LINE__); + array(makeZeroToNull(determineReferralId())), __FILE__, __LINE__); // Base URL for redirection switch (getConfig('refid_target')) { diff --git a/sponsor_ref.php b/sponsor_ref.php index 1192d5a896..4d7d467beb 100644 --- a/sponsor_ref.php +++ b/sponsor_ref.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : sponsor_ref.php * * -------------------------------------------------------------------- * - * Short description : Redirection for the referal link * + * Short description : Redirection for the referral link * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Weiterleitungsscript fuer die Referal-Links * + * Kurzbeschreibung : Weiterleitungsscript fuer die Referral-Links * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -52,10 +52,10 @@ setContentType('text/html'); // Base URL for redirection $url = 'modules.php?module=index'; -// Do we have a referal id? -if (isReferalIdValid()) { +// Do we have a referral id? +if (isReferralIdValid()) { // We have an refid here. So we simply add it - $url .= '&what=sponsor_reg&refid=' . determineReferalId(); + $url .= '&what=sponsor_reg&refid=' . determineReferralId(); } // END - if // Load the URL diff --git a/templates/de/emails/admin/admin_rallye_no_notify.tpl b/templates/de/emails/admin/admin_rallye_no_notify.tpl index 8079417f99..9b3517cc1f 100644 --- a/templates/de/emails/admin/admin_rallye_no_notify.tpl +++ b/templates/de/emails/admin/admin_rallye_no_notify.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Soeben wurde automatisch eine neue Referal-Rallye gestartet! +Soeben wurde automatisch eine neue Referral-Rallye gestartet! Hier alle Infos zur Rallye: ------------------------------ diff --git a/templates/de/emails/admin/admin_rallye_notify.tpl b/templates/de/emails/admin/admin_rallye_notify.tpl index 77a51272cd..2b951a5d34 100644 --- a/templates/de/emails/admin/admin_rallye_notify.tpl +++ b/templates/de/emails/admin/admin_rallye_notify.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Soeben wurde automatisch eine neue Referal-Rallye gestartet! +Soeben wurde automatisch eine neue Referral-Rallye gestartet! Hier alle Infos zur Rallye: ------------------------------ diff --git a/templates/de/emails/admin/admin_support-reflink.tpl b/templates/de/emails/admin/admin_support-reflink.tpl index bcbbb3522f..485bd3c6a6 100644 --- a/templates/de/emails/admin/admin_support-reflink.tpl +++ b/templates/de/emails/admin/admin_support-reflink.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgefüllt und hat eine Frage zu seinem Referal-Link. +Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgefüllt und hat eine Frage zu seinem Referral-Link. ------------------------------ Seine Mitglied-Id ist: $userid diff --git a/templates/de/emails/guest/guest_register_done.tpl b/templates/de/emails/guest/guest_register_done.tpl index 3bab8d700e..d061e064aa 100644 --- a/templates/de/emails/guest/guest_register_done.tpl +++ b/templates/de/emails/guest/guest_register_done.tpl @@ -19,7 +19,7 @@ Ihr Passwort: $content[password] Geworben von: {%user,refid,bigintval=$userid%} ----------------------------------------------- -Hier ist Ihr persönlicher Referal-Link, mit dem Sie bereits jetzt schon neue Mitglieder werben können: +Hier ist Ihr persönlicher Referral-Link, mit dem Sie bereits jetzt schon neue Mitglieder werben können: {?URL?}/ref.php?refid=$content[userid] diff --git a/templates/de/emails/guest/guest_user_confirmed_referal.tpl b/templates/de/emails/guest/guest_user_confirmed_referal.tpl index 9839b71220..84d1ed3b8c 100644 --- a/templates/de/emails/guest/guest_user_confirmed_referal.tpl +++ b/templates/de/emails/guest/guest_user_confirmed_referal.tpl @@ -1,19 +1 @@ -Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, - -Sie haben heute ein neues Mitglied für {?MAIN_TITLE?} geworben! - -Hier sehen Sie genau, in welcher Ebene Sie ihn geworben haben: ------------------ -Referal-Ebene ({%pipe,translateComma=$content[percents]%}%): $content[level] -{?POINTS?}: {%pipe,translateComma=$content[points]%} -ID des Mitgliedes: {%user,refid,bigintval=$userid%} ------------------ - -Sie werden nun auch weiterhin {?POINTS?} über diese geworbene Person erhalten. - -Vielen Dank für Ihr Mitwerben! Wir wünschen Ihnen noch weiterhin viele neue Referals! - -Mit freundlichen Grüßen, - Ihr {?MAIN_TITLE?} Team - -{?URL?} ({?WEBMASTER?}) +@DEPRECATED diff --git a/templates/de/emails/guest/guest_user_confirmed_referral.tpl b/templates/de/emails/guest/guest_user_confirmed_referral.tpl new file mode 100644 index 0000000000..d8d044eaa5 --- /dev/null +++ b/templates/de/emails/guest/guest_user_confirmed_referral.tpl @@ -0,0 +1,19 @@ +Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, + +Sie haben heute ein neues Mitglied für {?MAIN_TITLE?} geworben! + +Hier sehen Sie genau, in welcher Ebene Sie ihn geworben haben: +----------------- +Referral-Ebene ({%pipe,translateComma=$content[percents]%}%): $content[level] +{?POINTS?}: {%pipe,translateComma=$content[points]%} +ID des Mitgliedes: {%user,refid,bigintval=$userid%} +----------------- + +Sie werden nun auch weiterhin {?POINTS?} über diese geworbene Person erhalten. + +Vielen Dank für Ihr Mitwerben! Wir wünschen Ihnen noch weiterhin viele neue Referrals! + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Team + +{?URL?} ({?WEBMASTER?}) diff --git a/templates/de/emails/member/member_rallye_expired_bronce.tpl b/templates/de/emails/member/member_rallye_expired_bronce.tpl index f6704bcbd9..eb391577cf 100644 --- a/templates/de/emails/member/member_rallye_expired_bronce.tpl +++ b/templates/de/emails/member/member_rallye_expired_bronce.tpl @@ -4,7 +4,7 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa Ihre Mitglied-Id lautet: $userid ------------------------------ -Herzlichen Glückwunsch, Sie sind der Bronze-Gewinner unserer Referal-Rallye! +Herzlichen Glückwunsch, Sie sind der Bronze-Gewinner unserer Referral-Rallye! ------------------------------ Ihr Gewinn: $content[infos] diff --git a/templates/de/emails/member/member_rallye_expired_gold.tpl b/templates/de/emails/member/member_rallye_expired_gold.tpl index a7bac214cc..3845deec6f 100644 --- a/templates/de/emails/member/member_rallye_expired_gold.tpl +++ b/templates/de/emails/member/member_rallye_expired_gold.tpl @@ -4,7 +4,7 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa Ihre Mitglied-Id lautet: $userid ------------------------------ -Herzlichen Glückwunsch, Sie sind der Gold-Gewinner unserer Referal-Rallye! +Herzlichen Glückwunsch, Sie sind der Gold-Gewinner unserer Referral-Rallye! ------------------------------ Ihr Gewinn: $content[infos] diff --git a/templates/de/emails/member/member_rallye_expired_other.tpl b/templates/de/emails/member/member_rallye_expired_other.tpl index 0239fd3673..b5b242ecb7 100644 --- a/templates/de/emails/member/member_rallye_expired_other.tpl +++ b/templates/de/emails/member/member_rallye_expired_other.tpl @@ -4,7 +4,7 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa Ihre Mitglied-Id lautet: $userid ------------------------------ -Herzlichen Glückwunsch, Sie haben soeben den $content[level]. Platz in unserer aktuellen Referal-Rallye gemacht! +Herzlichen Glückwunsch, Sie haben soeben den $content[level]. Platz in unserer aktuellen Referral-Rallye gemacht! ------------------------------ Ihr Gewinn: $content[infos] diff --git a/templates/de/emails/member/member_rallye_expired_silver.tpl b/templates/de/emails/member/member_rallye_expired_silver.tpl index e62bd62f52..edda187b2e 100644 --- a/templates/de/emails/member/member_rallye_expired_silver.tpl +++ b/templates/de/emails/member/member_rallye_expired_silver.tpl @@ -4,7 +4,7 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa Ihre Mitglied-Id lautet: $userid ------------------------------ -Herzlichen Glückwunsch, Sie sind der Silber-Gewinner unserer Referal-Rallye! +Herzlichen Glückwunsch, Sie sind der Silber-Gewinner unserer Referral-Rallye! ------------------------------ Ihr Gewinn: $content[infos] diff --git a/templates/de/emails/member/member_rallye_notify.tpl b/templates/de/emails/member/member_rallye_notify.tpl index 3514fc26f2..9df542941a 100644 --- a/templates/de/emails/member/member_rallye_notify.tpl +++ b/templates/de/emails/member/member_rallye_notify.tpl @@ -4,7 +4,7 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa Ihre Mitglied-Id lautet: $userid ------------------------------ -Soeben haben wir von {?MAIN_TITLE?} eine neue Referal-Rallye gestartet! +Soeben haben wir von {?MAIN_TITLE?} eine neue Referral-Rallye gestartet! Hier alle Infos zur Rallye: ------------------------------ @@ -21,7 +21,7 @@ Ihr Werbelink zum Werben neuer Mitglieder: Weitere Werbebanner, sowie alle weiteren nötigen Daten finden Sie im Mitgliedsbereich unter *Refs-Banner* ! -Ihre aktuellen $content[refs] Referals wurden dabei nicht berücksichtig, da Sie diese Mitglieder vor der Rallye angeworben hatten. +Ihre aktuellen $content[refs] Referrals wurden dabei nicht berücksichtig, da Sie diese Mitglieder vor der Rallye angeworben hatten. Viel Spass beim Werben! diff --git a/templates/de/emails/member/member_refback.tpl b/templates/de/emails/member/member_refback.tpl index 66085c8415..f5b59aa03d 100644 --- a/templates/de/emails/member/member_refback.tpl +++ b/templates/de/emails/member/member_refback.tpl @@ -1,6 +1,6 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -das Mitglied {%pipe,getMemberId%} hat Ihnen soeben {%pipe,translateComma=$content[refback_percents]%}% Refback eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben. +das Mitglied {%pipe,getMemberId%} hat Ihnen soeben {%pipe,translateComma=$content[refback_percents]%}% Refback eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referral-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben. ------------------------------ Ihr Mitglied-Id ist: $userid diff --git a/templates/de/emails/member/member_support-reflink.tpl b/templates/de/emails/member/member_support-reflink.tpl index a90565409a..6d6147fb50 100644 --- a/templates/de/emails/member/member_support-reflink.tpl +++ b/templates/de/emails/member/member_support-reflink.tpl @@ -1,6 +1,6 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -Sie hatten eine Frage zu Ihrem Referal-Link uns gestellt. Folgendes wurde an den Support weitergeleitet: +Sie hatten eine Frage zu Ihrem Referral-Link uns gestellt. Folgendes wurde an den Support weitergeleitet: ------------------------------ Ihr Mitglied-Id ist: $userid diff --git a/templates/de/html/admin/admin_add_network.tpl b/templates/de/html/admin/admin_add_network.tpl index 7690847e9d..19332e2f08 100644 --- a/templates/de/html/admin/admin_add_network.tpl +++ b/templates/de/html/admin/admin_add_network.tpl @@ -19,7 +19,7 @@ - {--ADMIN_NETWORK_REFERAL_LINK--}: + {--ADMIN_NETWORK_REFERRAL_LINK--}: diff --git a/templates/de/html/admin/admin_add_rallye.tpl b/templates/de/html/admin/admin_add_rallye.tpl index d52b093899..e1f159c038 100644 --- a/templates/de/html/admin/admin_add_rallye.tpl +++ b/templates/de/html/admin/admin_add_rallye.tpl @@ -21,7 +21,7 @@ {--RALLYE_TEMPLATE--}: - {%pipe,addReferalRallyeTemplateSelection%} + {%pipe,addReferralRallyeTemplateSelection%} diff --git a/templates/de/html/admin/admin_add_refbanner.tpl b/templates/de/html/admin/admin_add_refbanner.tpl index bb86b0ac15..c10f6ea132 100644 --- a/templates/de/html/admin/admin_add_refbanner.tpl +++ b/templates/de/html/admin/admin_add_refbanner.tpl @@ -3,23 +3,23 @@ - + - + - +
- {--ADMIN_ADD_REFERAL_BANNER_TITLE--} + {--ADMIN_ADD_REFERRAL_BANNER_TITLE--}
{--ADMIN_ENTER_REFERAL_BANNER_URL--}:{--ADMIN_ENTER_REFERRAL_BANNER_URL--}:
{--ADMIN_ENTER_ALTERNATE_REFERAL_BANNER_TEXT--}:{--ADMIN_ENTER_ALTERNATE_REFERRAL_BANNER_TEXT--}:
{--ADMIN_SELECT_REFERAL_BANNER_ACTIVE--}{--ADMIN_SELECT_REFERRAL_BANNER_ACTIVE--}
- +
diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl index d16065ee64..d70776d9bd 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -3,17 +3,17 @@ - + - + diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index c67ed28c0a..b29807d964 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -56,7 +56,7 @@ - + diff --git a/templates/de/html/admin/admin_config_points.tpl b/templates/de/html/admin/admin_config_points.tpl index e0a19c8726..a113f04b70 100644 --- a/templates/de/html/admin/admin_config_points.tpl +++ b/templates/de/html/admin/admin_config_points.tpl @@ -10,7 +10,7 @@
diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index 3ffbe185fd..04d97cd78a 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -18,8 +18,8 @@
diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl index c537e729c5..f9793b114f 100644 --- a/templates/de/html/admin/admin_config_sponsor.tpl +++ b/templates/de/html/admin/admin_config_sponsor.tpl @@ -16,7 +16,7 @@ - + diff --git a/templates/de/html/admin/admin_delete_networks_row.tpl b/templates/de/html/admin/admin_delete_networks_row.tpl index f746ed1ae2..36fa3181f8 100644 --- a/templates/de/html/admin/admin_delete_networks_row.tpl +++ b/templates/de/html/admin/admin_delete_networks_row.tpl @@ -10,7 +10,7 @@ - + diff --git a/templates/de/html/admin/admin_delete_reflevel.tpl b/templates/de/html/admin/admin_delete_reflevel.tpl index f0ccca9938..b125d95b48 100644 --- a/templates/de/html/admin/admin_delete_reflevel.tpl +++ b/templates/de/html/admin/admin_delete_reflevel.tpl @@ -3,7 +3,7 @@
- {--ADMIN_ADD_NEW_REFERAL_DEPTH_TITLE--} + {--ADMIN_ADD_NEW_REFERRAL_DEPTH_TITLE--}
{--ADMIN_ENTER_REFERAL_LEVEL--}:{--ADMIN_ENTER_REFERRAL_LEVEL--}:
{--ADMIN_ENTER_REFERAL_PERCENTS--}:{--ADMIN_ENTER_REFERRAL_PERCENTS--}: %
- {--ADMIN_CONFIG_BONUS_RALLYE_REFERAL_INCLUDE--} + {--ADMIN_CONFIG_BONUS_RALLYE_REFERRAL_INCLUDE--} {%template,ConfigurationYesNoSelectionBox=include_bonus_ref%} @@ -78,7 +78,7 @@
- {--ADMIN_CONFIG_BONUS_REFERAL--}: + {--ADMIN_CONFIG_BONUS_REFERRAL--}: diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index 08df672c50..3b9d577d3a 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -16,7 +16,7 @@
- {--ADMIN_CONFIG_DOUBLER_REFERAL--}: + {--ADMIN_CONFIG_DOUBLER_REFERRAL--}: (%) diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl index ddfb9b2909..922f3ca23e 100644 --- a/templates/de/html/admin/admin_config_point_settings.tpl +++ b/templates/de/html/admin/admin_config_point_settings.tpl @@ -19,7 +19,7 @@
{--ADMIN_CONFIG_REFERAL_PAYOUT--}{--ADMIN_CONFIG_REFERRAL_PAYOUT--} {--ADMIN_CONFIG_SELECT_REFID_TARGRT--}:
- {--ADMIN_CONFIG_SPONSOR_REFERAL_POINTS--}: + {--ADMIN_CONFIG_SPONSOR_REFERRAL_POINTS--}: diff --git a/templates/de/html/admin/admin_config_sub_points.tpl b/templates/de/html/admin/admin_config_sub_points.tpl index 12cc117faf..945c161a1d 100644 --- a/templates/de/html/admin/admin_config_sub_points.tpl +++ b/templates/de/html/admin/admin_config_sub_points.tpl @@ -13,7 +13,7 @@
{--ADMIN_ENTER_POINTS_REFERAL--}:{--ADMIN_ENTER_POINTS_REFERRAL--}:
{--ADMIN_NETWORK_REFERAL_LINK--}:{--ADMIN_NETWORK_REFERRAL_LINK--}: $content[network_reflink]
$content diff --git a/templates/de/html/admin/admin_delete_reflevel_row.tpl b/templates/de/html/admin/admin_delete_reflevel_row.tpl index 30366a7bd8..53ca50af7a 100644 --- a/templates/de/html/admin/admin_delete_reflevel_row.tpl +++ b/templates/de/html/admin/admin_delete_reflevel_row.tpl @@ -1,6 +1,6 @@ diff --git a/templates/de/html/admin/admin_edit_networks_row.tpl b/templates/de/html/admin/admin_edit_networks_row.tpl index 0d669aa613..167ddd6517 100644 --- a/templates/de/html/admin/admin_edit_networks_row.tpl +++ b/templates/de/html/admin/admin_edit_networks_row.tpl @@ -10,7 +10,7 @@ - + diff --git a/templates/de/html/admin/admin_edit_refbanner.tpl b/templates/de/html/admin/admin_edit_refbanner.tpl index 4df09f4cc2..09a032b04f 100644 --- a/templates/de/html/admin/admin_edit_refbanner.tpl +++ b/templates/de/html/admin/admin_edit_refbanner.tpl @@ -3,7 +3,7 @@
- {--ADMIN_DELETE_REFERAL_DEPTHS_TITLE--}: + {--ADMIN_DELETE_REFERRAL_DEPTHS_TITLE--}:
- {--REFERAL_LEVEL--} $content[level]: + {--REFERRAL_LEVEL--} $content[level]:
{--ADMIN_NETWORK_REFERAL_LINK--}:{--ADMIN_NETWORK_REFERRAL_LINK--}:
$content diff --git a/templates/de/html/admin/admin_edit_refbanner_row.tpl b/templates/de/html/admin/admin_edit_refbanner_row.tpl index d822520433..9bb0516c88 100644 --- a/templates/de/html/admin/admin_edit_refbanner_row.tpl +++ b/templates/de/html/admin/admin_edit_refbanner_row.tpl @@ -1,18 +1,18 @@ - + - + - + diff --git a/templates/de/html/admin/admin_edit_reflevel.tpl b/templates/de/html/admin/admin_edit_reflevel.tpl index 3b7dcebd33..089e0c41c6 100644 --- a/templates/de/html/admin/admin_edit_reflevel.tpl +++ b/templates/de/html/admin/admin_edit_reflevel.tpl @@ -3,14 +3,14 @@
- {--ADMIN_EDIT_REFERAL_BANNER_TITLE--} + {--ADMIN_EDIT_REFERRAL_BANNER_TITLE--}
{--ADMIN_EDIT_REFERAL_BANNER_URL--}:{--ADMIN_EDIT_REFERRAL_BANNER_URL--}:
{--ADMIN_EDIT_REFERAL_BANNER_ALTERNATIVE_TEXT--}:{--ADMIN_EDIT_REFERRAL_BANNER_ALTERNATIVE_TEXT--}:
{--ADMIN_SELECT_REFERAL_BANNER_ACTIVE--}:{--ADMIN_SELECT_REFERRAL_BANNER_ACTIVE--}: $content[visible]
$content
- {--ADMIN_EDIT_REFERAL_DEPTHS_TITLE--}: + {--ADMIN_EDIT_REFERRAL_DEPTHS_TITLE--}:
- +
diff --git a/templates/de/html/admin/admin_edit_reflevel_row.tpl b/templates/de/html/admin/admin_edit_reflevel_row.tpl index df3df3c338..0b57261191 100644 --- a/templates/de/html/admin/admin_edit_reflevel_row.tpl +++ b/templates/de/html/admin/admin_edit_reflevel_row.tpl @@ -1,16 +1,16 @@ - {--ADMIN_REFERAL_DEPTHS_ID--} $content[id]: + {--ADMIN_REFERRAL_DEPTHS_ID--} $content[id]: - {--REFERAL_LEVEL--}:  + {--REFERRAL_LEVEL--}:  - {--REFERAL_PERCENT--}:  + {--REFERRAL_PERCENT--}:  % diff --git a/templates/de/html/admin/admin_list_networks.tpl b/templates/de/html/admin/admin_list_networks.tpl index 31281f0b48..4968debcef 100644 --- a/templates/de/html/admin/admin_list_networks.tpl +++ b/templates/de/html/admin/admin_list_networks.tpl @@ -11,7 +11,7 @@ {--ID_SELECT--} {--ADMIN_NETWORK_SHORT_NAME--} - {--ADMIN_NETWORK_REFERAL_LINK--} + {--ADMIN_NETWORK_REFERRAL_LINK--} {--ADMIN_NETWORK_DATA_SEPARATOR2--} {--ADMIN_NETWORK_ROW_SEPARATOR2--} {--ADMIN_NETWORK_REQUEST_TYPE--} diff --git a/templates/de/html/admin/admin_list_rallye_usr.tpl b/templates/de/html/admin/admin_list_rallye_usr.tpl index 78183e012e..0d40e48cd5 100644 --- a/templates/de/html/admin/admin_list_rallye_usr.tpl +++ b/templates/de/html/admin/admin_list_rallye_usr.tpl @@ -9,12 +9,12 @@ {--_USERID--}: {--RALLYE_OLD_REFS--}: {--RALLYE_NEW_REFS--}: - {--RALLYE_REFERAL_POINTS--}: + {--RALLYE_REFERRAL_POINTS--}: $content[rows] - {--RALLYE_REFERAL_POINTS_NOTE--} + {--RALLYE_REFERRAL_POINTS_NOTE--} diff --git a/templates/de/html/admin/admin_list_refbanner.tpl b/templates/de/html/admin/admin_list_refbanner.tpl index 73945196bd..7991ed2073 100644 --- a/templates/de/html/admin/admin_list_refbanner.tpl +++ b/templates/de/html/admin/admin_list_refbanner.tpl @@ -3,16 +3,16 @@ - - - - - + + + + + $content diff --git a/templates/de/html/admin/admin_list_reflevel.tpl b/templates/de/html/admin/admin_list_reflevel.tpl index 0c691db404..624b7e9161 100644 --- a/templates/de/html/admin/admin_list_reflevel.tpl +++ b/templates/de/html/admin/admin_list_reflevel.tpl @@ -3,13 +3,13 @@
- {--ADMIN_EDIT_DELETE_REFERAL_BANNER_TITLE--} + {--ADMIN_EDIT_DELETE_REFERRAL_BANNER_TITLE--}
{--ID_SELECT--}{--REFERAL_URL--}:{--REFERAL_TITLE--}:{--REFERAL_VIEWS--}:{--REFERAL_CLICKS_SHORT--}{--REFERAL_IS_ACTIVE--}:{--REFERRAL_URL--}:{--REFERRAL_TITLE--}:{--REFERRAL_VIEWS--}:{--REFERRAL_CLICKS_SHORT--}{--REFERRAL_IS_ACTIVE--}:
- - + + $content @@ -23,7 +23,7 @@
- {--ADMIN_REFERAL_LEVEL_ZERO_NOTICE--} + {--ADMIN_REFERRAL_LEVEL_ZERO_NOTICE--}
diff --git a/templates/de/html/admin/admin_list_refs.tpl b/templates/de/html/admin/admin_list_refs.tpl index 8cd32d5aa1..80d9b6f880 100644 --- a/templates/de/html/admin/admin_list_refs.tpl +++ b/templates/de/html/admin/admin_list_refs.tpl @@ -2,7 +2,7 @@
- {--ADMIN_EDIT_DELETE_REFERAL_DEPTH_TITLE--} + {--ADMIN_EDIT_DELETE_REFERRAL_DEPTH_TITLE--}
{--ID_SELECT--}{--REFERAL_LEVEL--}:{--REFERAL_PERCENT--}:{--REFERRAL_LEVEL--}:{--REFERRAL_PERCENT--}:
@@ -16,7 +16,7 @@ $content[rows]
- {%message,ADMIN_LIST_REFERALS=$content[userid]%} + {%message,ADMIN_LIST_REFERRALS=$content[userid]%}
-
{--ADMIN_LIST_REFERALS_NOTE--}
+
{--ADMIN_LIST_REFERRALS_NOTE--}
diff --git a/templates/de/html/admin/admin_list_refs2.tpl b/templates/de/html/admin/admin_list_refs2.tpl index 064c22b5b7..aec71c010c 100644 --- a/templates/de/html/admin/admin_list_refs2.tpl +++ b/templates/de/html/admin/admin_list_refs2.tpl @@ -2,13 +2,13 @@ $content[rows]
- {%message,ADMIN_LIST_REFERALS=$content[userid]%} + {%message,ADMIN_LIST_REFERRALS=$content[userid]%}
- {--ADMIN_LIST_REFERALS_NOTE--} + {--ADMIN_LIST_REFERRALS_NOTE--}
diff --git a/templates/de/html/admin/admin_list_refs_level.tpl b/templates/de/html/admin/admin_list_refs_level.tpl index 1ce28a941e..8d8a291a2a 100644 --- a/templates/de/html/admin/admin_list_refs_level.tpl +++ b/templates/de/html/admin/admin_list_refs_level.tpl @@ -3,7 +3,7 @@ diff --git a/templates/de/html/admin/admin_list_refs_norefs.tpl b/templates/de/html/admin/admin_list_refs_norefs.tpl index 82f80081bc..a6f55889b3 100644 --- a/templates/de/html/admin/admin_list_refs_norefs.tpl +++ b/templates/de/html/admin/admin_list_refs_norefs.tpl @@ -1,5 +1,5 @@ diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index 27d3d0ba42..ca8eaff324 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -114,7 +114,7 @@ - + diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index f8f3ea5358..ec071fbe0d 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -15,7 +15,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 670f01e6f4..64b5dbf3f8 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -61,11 +61,11 @@ diff --git a/templates/de/html/guest/guest_list_rallye.tpl b/templates/de/html/guest/guest_list_rallye.tpl index 5366463256..b012436861 100644 --- a/templates/de/html/guest/guest_list_rallye.tpl +++ b/templates/de/html/guest/guest_list_rallye.tpl @@ -10,8 +10,8 @@ $content[rows] diff --git a/templates/de/html/guest/guest_register_refid.tpl b/templates/de/html/guest/guest_register_refid.tpl index 760ada3e76..9a19588a15 100644 --- a/templates/de/html/guest/guest_register_refid.tpl +++ b/templates/de/html/guest/guest_register_refid.tpl @@ -3,6 +3,6 @@ {--REFID_BY--}: diff --git a/templates/de/html/guest/guest_register_refid_hide.tpl b/templates/de/html/guest/guest_register_refid_hide.tpl index aa1eb38d8b..f1ab9d6c5d 100644 --- a/templates/de/html/guest/guest_register_refid_hide.tpl +++ b/templates/de/html/guest/guest_register_refid_hide.tpl @@ -3,7 +3,7 @@ {--REFID_BY--}: diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index e9de926ddf..21394c5724 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -164,7 +164,7 @@ @@ -172,7 +172,7 @@ {--SPONSOR_REFID_WAS--}: diff --git a/templates/de/html/guest/guest_top10.tpl b/templates/de/html/guest/guest_top10.tpl index 44415691d3..b3f0df34b8 100644 --- a/templates/de/html/guest/guest_top10.tpl +++ b/templates/de/html/guest/guest_top10.tpl @@ -83,7 +83,7 @@ {--_USERID--}: - $content[referals_out] + $content[referrals_out] - + - + - + diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl index 567d94609e..c57985655b 100644 --- a/templates/de/html/member/member_doubler.tpl +++ b/templates/de/html/member/member_doubler.tpl @@ -8,7 +8,7 @@
- Tipp: Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die {%config,translateComma=doubler_ref%}% Referal-Vergütung zu erhalten! + Tipp: Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die {%config,translateComma=doubler_ref%}% Referral-Vergütung zu erhalten!
{--MEMBER_DOUBLER_ALREADY_PAYOUT--}:
@@ -17,7 +17,7 @@
{--MEMBER_DOUBLER_NEXT_PAYOUT--}:
{%pipe,getMemberId,generateDoublerTable%} -
{--MEMBER_DOUBLER_REFERAL_PAYOUT--}:
+
{--MEMBER_DOUBLER_REFERRAL_PAYOUT--}:
$content[payout_ref] @@ -35,9 +35,9 @@
  • {--DOUBLER_FULL_PAYOUT--}
  • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
  • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
    • -
  • {--DOUBLER_REFERAL_1--}
    • -
  • {--DOUBLER_REFERAL_2--}
    • -
  • {--DOUBLER_REFERAL_LINK--}
    • +
  • {--DOUBLER_REFERRAL_1--}
    • +
  • {--DOUBLER_REFERRAL_2--}
    • +
  • {--DOUBLER_REFERRAL_LINK--}
  • {--DOUBLER_TIMEOUT--}
  • {--DOUBLER_HAVE_FUN--}
    • diff --git a/templates/de/html/member/member_doubler_list.tpl b/templates/de/html/member/member_doubler_list.tpl index 5aeea245e3..3b2907808a 100644 --- a/templates/de/html/member/member_doubler_list.tpl +++ b/templates/de/html/member/member_doubler_list.tpl @@ -5,7 +5,7 @@ {--_USERID--} diff --git a/templates/de/html/member/member_list_referal.tpl b/templates/de/html/member/member_list_referal.tpl index 3df765c2a7..11f5d85d80 100644 --- a/templates/de/html/member/member_list_referal.tpl +++ b/templates/de/html/member/member_list_referal.tpl @@ -1,10 +1 @@ -
    -
    - {%message,ADMIN_LIST_REFERALS_LEVEL=$content[level]%}
    + {%message,ADMIN_LIST_REFERRALS_LEVEL=$content[level]%}
    $content[info]
    - {%message,ADMIN_LIST_USER_NOREFS=$content[userid]%} + {%message,ADMIN_LIST_USER_NO_REFERRALS=$content[userid]%}
    $content[refid]
    {--SPONSOR_REFERALS--}:{--SPONSOR_REFERRALS--}: [$content[ref_count]]
    {--EMAIL--}: {--REMOTE_IP--}:{--REFERAL_USERID--}:{--REFERRAL_USERID--}: {--ACCOUNT_STATUS--}: {--UNCONFIRMED_LINKS--}:
    {--MAILS_SENT--}: {--CLICK_RATE--}: {--LOCKED_POINTS--}:{--TOTAL_REFERALS--}:{--TOTAL_REFERRALS--}:
    {%pipe,getTotalPoints,translateComma=$content[userid]%}
    - {--REFERAL_USERID--}:
    + {--REFERRAL_USERID--}:
    {%user,refid,generateUserProfileLink=$content[userid]%}     		- {--REFERAL_CLICKS--}:
    + {--REFERRAL_CLICKS--}:
    {%user,ref_clicks,translateComma=$content[userid]%}     		@@ -137,7 +137,7 @@ $content[links] - {--TOTAL_REFERALS--}:
    + {--TOTAL_REFERRALS--}:
    $content[refs]     		@@ -151,7 +151,7 @@
    - {--ADMIN_USER_REFERAL_PAYOUT--}:
    + {--ADMIN_USER_REFERRAL_PAYOUT--}:
    {%user,ref_payout,translateComma=$content[userid]%}     		diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index be4debbcbf..ee19aeca10 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -73,9 +73,9 @@
    {--DOUBLER_FULL_PAYOUT--}


    - {--DOUBLER_REFERAL_1--} - {--DOUBLER_REFERAL_2--} - {--DOUBLER_REFERAL_LINK--}
    + {--DOUBLER_REFERRAL_1--} + {--DOUBLER_REFERRAL_2--} + {--DOUBLER_REFERRAL_LINK--}
    $content[message]
    {--DOUBLER_NOT_YET_REGISTERED--} {--DOUBLER_REGISTER_NOW--}
    diff --git a/templates/de/html/doubler/doubler_reflink.tpl b/templates/de/html/doubler/doubler_reflink.tpl index dabd2703dd..d254685f60 100644 --- a/templates/de/html/doubler/doubler_reflink.tpl +++ b/templates/de/html/doubler/doubler_reflink.tpl @@ -1,4 +1,4 @@
    - {--MEMBER_DOUBLER_YOUR_REFERAL_LINK--}: + {--MEMBER_DOUBLER_YOUR_REFERRAL_LINK--}: {%url=doubler.php?refid=$content
    diff --git a/templates/de/html/ext/ext_doubler.tpl b/templates/de/html/ext/ext_doubler.tpl index d9f0d77bac..b003ebc2bc 100644 --- a/templates/de/html/ext/ext_doubler.tpl +++ b/templates/de/html/ext/ext_doubler.tpl @@ -1,7 +1,9 @@ -Lassen Sie Ihre Mitglieder ihre {OPEN_CONFIG}POINTS{CLOSE_CONFIG} einfach immer -und immer wieder verdoppeln! Und: Sie selber verdienen wegen der einstellbaren -prozentuallen Gebühr auch noch dran! Zudem können Ihre -Mitglieder einen Verdoppler-Link benutzen, der mehr Referals -(Referal-Link ist mit eingebunden!) bringt. Spielen Refs mit dem -Verdoppler, so bekommen die Werber ebenfalls einstellbare Prozente (eine -Ebene) mit ab! +
    + Lassen Sie Ihre Mitglieder ihre {OPEN_CONFIG}POINTS{CLOSE_CONFIG} einfach + immer und immer wieder verdoppeln! Und: Sie selber verdienen wegen der + einstellbaren prozentuallen Gebühr auch noch dran! Zudem können + Ihre Mitglieder einen Verdoppler-Link benutzen, der mehr Referrals + (Referral-Link ist mit eingebunden!) bringt. Spielen Refs mit dem + Verdoppler, so bekommen die Werber ebenfalls einstellbare Prozente (eine + Ebene) mit ab! +
    diff --git a/templates/de/html/ext/ext_refback.tpl b/templates/de/html/ext/ext_refback.tpl index 0d3fc43e97..873be29e16 100644 --- a/templates/de/html/ext/ext_refback.tpl +++ b/templates/de/html/ext/ext_refback.tpl @@ -1,14 +1,14 @@
    - Refback ist ein Prozentsatz, der von dem Referal-Guthaben Ihrer Mitglieder + Refback ist ein Prozentsatz, der von dem Referral-Guthaben Ihrer Mitglieder abgezogen wird und dem geworbenen, der gerade {OPEN_CONFIG}POINTS{CLOSE_CONFIG} erwirtschaftet, gutgeschrieben. Sobald - das Mitglied Refback für seine Referals ändert, erhält der - Referal eine Mail zugesandt, wie diese jetzt eingestellt ist. + das Mitglied Refback für seine Referrals ändert, erhält der + Referral eine Mail zugesandt, wie diese jetzt eingestellt ist.
    Das Mitglied kann sehen, wo es welche - Referal-Vergütungen an seine Referals gegeben hat. Es + Referral-Vergütungen an seine Referrals gegeben hat. Es ist in späteren Versionen eine Übersicht für erhaltene Refback-Gutschriften geplant.
    diff --git a/templates/de/html/ext/ext_refsell.tpl b/templates/de/html/ext/ext_refsell.tpl index efd025e045..5663403486 100644 --- a/templates/de/html/ext/ext_refsell.tpl +++ b/templates/de/html/ext/ext_refsell.tpl @@ -1,4 +1,7 @@ -Bietet Ihnen die Möglichkeit an, in Ihrem -{OPEN_CONFIG}mt_word{CLOSE_CONFIG} Referals zu verkaufen, die noch keinen Werber -haben. Dabei werden Preise basierend auf verschiedenste Daten des Mitgliedes und -aller Mitglieder berechnet, um einen guten und fairen Preis zu erziehlen. +
    + Bietet Ihnen die Möglichkeit an, in Ihrem + {OPEN_CONFIG}mt_word{CLOSE_CONFIG} Referrals zu verkaufen, die noch keinen + Werber haben. Dabei werden Preise basierend auf verschiedenste Daten des + Mitgliedes und aller Mitglieder berechnet, um einen guten und fairen Preis + zu erzielen. +
    diff --git a/templates/de/html/ext/ext_teams.tpl b/templates/de/html/ext/ext_teams.tpl index 1386dabbb2..04cb57f105 100644 --- a/templates/de/html/ext/ext_teams.tpl +++ b/templates/de/html/ext/ext_teams.tpl @@ -1,6 +1,6 @@
    Ihre Mitglieder können Teams bilden um ein gemeinsames Ziel (z.B. den - Gewinn einer Referal-Rallye) zu erreichen. Dabei können Sie den + Gewinn einer Referral-Rallye) zu erreichen. Dabei können Sie den Mitgliedern eine Frist setzen, bis wann die Team-Anmeldungen bzw. -beitritte, -austritte oder -wechsel maximal geschehen dürfen. Teams sind vielfältig einsetzbar, Teams können gegeneinander in diff --git a/templates/de/html/ext/ext_terms.tpl b/templates/de/html/ext/ext_terms.tpl index 44132fdf65..df8e5413fa 100644 --- a/templates/de/html/ext/ext_terms.tpl +++ b/templates/de/html/ext/ext_terms.tpl @@ -16,7 +16,7 @@ zu reagieren. Solange sie dies nicht tun, erhalten sie keine Vergütung bei Mailbestätigungen usw. Das Werben neuer Mitglieder kann optimional auch nicht mehr vergütbar sein (die Anmeldung jedoch klappt, wartende - Referal-Vergütungen werden bei Zustimmung dann automatisch dem Werber + Referral-Vergütungen werden bei Zustimmung dann automatisch dem Werber gutgeschrieben).
    diff --git a/templates/de/html/ext/ext_yoomedia.tpl b/templates/de/html/ext/ext_yoomedia.tpl index b6e9be0f1c..50c6f5fb80 100644 --- a/templates/de/html/ext/ext_yoomedia.tpl +++ b/templates/de/html/ext/ext_yoomedia.tpl @@ -1,6 +1,9 @@ -Erweiterung zur Anbindung an die API (Interface 2.0!) von [Yoo!Media]. Diese Erweiterung -muss aktiviert sein, damit die täglichen freien Abfragen wieder -zurückgesetzt werden. Diese Erweiterung benötigt iconv(), um das ISO -von Yoo!Media nach UTF-8 (quasi-Standard in diesem Mailer) umzuwandeln. +
    + Erweiterung zur Anbindung an die API (Interface 2.0!) von [Yoo!Media]. Diese + Erweiterung muss aktiviert sein, damit die täglichen freien Abfragen + wieder zurückgesetzt werden. Diese Erweiterung benötigt iconv(), + um das ISO von Yoo!Media nach UTF-8 (quasi-Standard in diesem Mailer) + umzuwandeln. +
    diff --git a/templates/de/html/guest/guest_beg.tpl b/templates/de/html/guest/guest_beg.tpl index 89a93c8a5c..cfbf76709e 100644 --- a/templates/de/html/guest/guest_beg.tpl +++ b/templates/de/html/guest/guest_beg.tpl @@ -18,7 +18,7 @@
    - {--BEG_CONTINUE_REGISTER--} + {--BEG_CONTINUE_REGISTER--}
    diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl index 3af3ba8e05..3538ec591f 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -16,9 +16,9 @@
  • {--DOUBLER_FULL_PAYOUT--}
  • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
  • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
    • -
  • {--DOUBLER_REFERAL_1--} -
  • {--DOUBLER_REFERAL_2--}
    • -
  • {--DOUBLER_REFERAL_LINK--}
    • +
  • {--DOUBLER_REFERRAL_1--} +
  • {--DOUBLER_REFERRAL_2--}
    • +
  • {--DOUBLER_REFERRAL_LINK--}
  • {--DOUBLER_TIMEOUT--}
  • {--DOUBLER_HAVE_FUN--}
  • {--DOUBLER_WANNA_TRY--}
    • @@ -32,8 +32,8 @@
    • Es werden nur aktive User gewertet.
      • -
    • {%pipe,determineReferalRallyeMinimumUsers=$content[min_users]%}
      • -
    • {%pipe,determineReferalRallyeMinimumPrices=$content[min_prices]%}
      • +
    • {%pipe,determineReferralRallyeMinimumUsers=$content[min_users]%}
      • +
    • {%pipe,determineReferralRallyeMinimumPrices=$content[min_prices]%}
    • Der Rechtsweg ist ausgeschlossen.
    		 - +
    - {%pipe,determineReferalId%} - + {%pipe,determineReferralId%} +
    - {--SPONSOR_REFERAL--} + {--SPONSOR_REFERRAL--}
    - {%pipe,determineReferalId%} + {%pipe,determineReferralId%}
    - {--TOTAL_REFERALS--}: + {--TOTAL_REFERRALS--}: {--TOTAL_POINTS--}: @@ -92,7 +92,7 @@ {--LAST_ONLINE_SHORT--}:
    Diese Liste zeigt Ihnen, wer die meisten Mitglieder geworben hat.
    diff --git a/templates/de/html/mediadata.tpl b/templates/de/html/mediadata.tpl index 93903e128f..1d4e2633b6 100644 --- a/templates/de/html/mediadata.tpl +++ b/templates/de/html/mediadata.tpl @@ -83,15 +83,15 @@     		{--MEDIA_DATA_REFBANNER--}
    {--TOTAL_REFERAL_BANNER--}:{--TOTAL_REFERRAL_BANNER--}: {%pipe,translateComma=$content[ref_total]%}
    {--TOTAL_REFERAL_VIEWS--}:{--TOTAL_REFERRAL_VIEWS--}: {%pipe,translateComma=$content[ref_views]%}
    {--TOTAL_REFERAL_CLICKS--}:{--TOTAL_REFERRAL_CLICKS--}: {%pipe,translateComma=$content[ref_clicks]%}
    - {--REFERAL_USERID--} + {--REFERRAL_USERID--} {?POINTS?} diff --git a/templates/de/html/member/member_list_rallye.tpl b/templates/de/html/member/member_list_rallye.tpl index 5366463256..b012436861 100644 --- a/templates/de/html/member/member_list_rallye.tpl +++ b/templates/de/html/member/member_list_rallye.tpl @@ -10,8 +10,8 @@ $content[rows]
    • Es werden nur aktive User gewertet.
      • -
    • {%pipe,determineReferalRallyeMinimumUsers=$content[min_users]%}
      • -
    • {%pipe,determineReferalRallyeMinimumPrices=$content[min_prices]%}
      • +
    • {%pipe,determineReferralRallyeMinimumUsers=$content[min_users]%}
      • +
    • {%pipe,determineReferralRallyeMinimumPrices=$content[min_prices]%}
    • Der Rechtsweg ist ausgeschlossen.
    - - - -$content -
    - {--MEMBER_REFLIST_TITLE--} -
    - + diff --git a/templates/de/html/member/member_list_referal_level.tpl b/templates/de/html/member/member_list_referal_level.tpl index 00d94b74e8..11f5d85d80 100644 --- a/templates/de/html/member/member_list_referal_level.tpl +++ b/templates/de/html/member/member_list_referal_level.tpl @@ -1,37 +1 @@ - - - - - - - - - - - - - - -$content[rows] - - - -
    - {--MEMBER_REFLIST_LIST_TITLE_1--}$content[level]{--MEMBER_REFLIST_LIST_TITLE_2--}$content[percents]{--MEMBER_REFLIST_LIST_TITLE_3--} -
    - {--_USERID--} - - {--ACCOUNT_STATUS--} - - {--MEMBER_REFLIST_POINTS--} - - {--UNCONFIRMED_LINKS--} - - {--MEMBER_CLICK_RATE--} - - {--MEMBER_REFLIST_ACTIVITY--} -
    - {%message,MEMBER_REFLIST_COUNTER=$content[counter]%} -
    - - + diff --git a/templates/de/html/member/member_list_referal_row.tpl b/templates/de/html/member/member_list_referal_row.tpl index b825ffcf8d..11f5d85d80 100644 --- a/templates/de/html/member/member_list_referal_row.tpl +++ b/templates/de/html/member/member_list_referal_row.tpl @@ -1,20 +1 @@ - - - $content[refid] ({%user,nickname,fixEmptyContentToDashes=$content[refid]%}) - - - {%user,status,translateUserStatus=$content[refid]%} - - - {%pipe,getTotalPoints,translateComma=$content[refid]%} {?POINTS?} - - - {%pipe,getTotalUnconfirmedMails,translateComma=$content[refid]%} - - - $content[click_rate]% - - - $content[activity] - - + diff --git a/templates/de/html/member/member_list_referral.tpl b/templates/de/html/member/member_list_referral.tpl new file mode 100644 index 0000000000..3df765c2a7 --- /dev/null +++ b/templates/de/html/member/member_list_referral.tpl @@ -0,0 +1,10 @@ +
    + + + + +$content +
    + {--MEMBER_REFLIST_TITLE--} +
    +
    diff --git a/templates/de/html/member/member_list_referral_level.tpl b/templates/de/html/member/member_list_referral_level.tpl new file mode 100644 index 0000000000..00d94b74e8 --- /dev/null +++ b/templates/de/html/member/member_list_referral_level.tpl @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + +$content[rows] + + + +
    + {--MEMBER_REFLIST_LIST_TITLE_1--}$content[level]{--MEMBER_REFLIST_LIST_TITLE_2--}$content[percents]{--MEMBER_REFLIST_LIST_TITLE_3--} +
    + {--_USERID--} + + {--ACCOUNT_STATUS--} + + {--MEMBER_REFLIST_POINTS--} + + {--UNCONFIRMED_LINKS--} + + {--MEMBER_CLICK_RATE--} + + {--MEMBER_REFLIST_ACTIVITY--} +
    + {%message,MEMBER_REFLIST_COUNTER=$content[counter]%} +
    + + diff --git a/templates/de/html/member/member_list_referral_row.tpl b/templates/de/html/member/member_list_referral_row.tpl new file mode 100644 index 0000000000..b825ffcf8d --- /dev/null +++ b/templates/de/html/member/member_list_referral_row.tpl @@ -0,0 +1,20 @@ + + + $content[refid] ({%user,nickname,fixEmptyContentToDashes=$content[refid]%}) + + + {%user,status,translateUserStatus=$content[refid]%} + + + {%pipe,getTotalPoints,translateComma=$content[refid]%} {?POINTS?} + + + {%pipe,getTotalUnconfirmedMails,translateComma=$content[refid]%} + + + $content[click_rate]% + + + $content[activity] + + diff --git a/templates/de/html/member/member_list_reflinks.tpl b/templates/de/html/member/member_list_reflinks.tpl index 69f1e70ae9..da9836f4f3 100644 --- a/templates/de/html/member/member_list_reflinks.tpl +++ b/templates/de/html/member/member_list_reflinks.tpl @@ -3,7 +3,7 @@ $content - {--MEMBER_REFERAL_LINKS_FOOTER--} + {--MEMBER_REFERRAL_LINKS_FOOTER--} diff --git a/templates/de/html/member/member_list_reflinks_row.tpl b/templates/de/html/member/member_list_reflinks_row.tpl index 5387690264..f12530b012 100644 --- a/templates/de/html/member/member_list_reflinks_row.tpl +++ b/templates/de/html/member/member_list_reflinks_row.tpl @@ -4,8 +4,8 @@ $content[alternate]
    {--REFBANNER_TOTALS--}: - {%pipe,translateComma=$content[counter]%} {--REFERAL_VIEWS--} / - {%pipe,translateComma=$content[clicks]%} {--REFERAL_CLICKS--} + {%pipe,translateComma=$content[counter]%} {--REFERRAL_VIEWS--} / + {%pipe,translateComma=$content[clicks]%} {--REFERRAL_CLICKS--}
    diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index bd4b3d045d..d342497ab2 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -1,10 +1,10 @@
    - + - + $content[rows] @@ -34,7 +34,7 @@ diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl index 12035e8699..b544c4acbe 100644 --- a/templates/de/html/member/member_points_bonus_rows.tpl +++ b/templates/de/html/member/member_points_bonus_rows.tpl @@ -21,7 +21,7 @@ - + diff --git a/templates/de/html/member/member_points_row.tpl b/templates/de/html/member/member_points_row.tpl index 096294e8b8..a433e7b5ee 100644 --- a/templates/de/html/member/member_points_row.tpl +++ b/templates/de/html/member/member_points_row.tpl @@ -1,5 +1,5 @@ - + diff --git a/templates/de/html/member/member_reflink.tpl b/templates/de/html/member/member_reflink.tpl index 40c4884c0c..e7009a58bd 100644 --- a/templates/de/html/member/member_reflink.tpl +++ b/templates/de/html/member/member_reflink.tpl @@ -4,7 +4,7 @@
    • - {--MEMBER_YOUR_PERSONAL_REFERAL_LINK--}:
      + {--MEMBER_YOUR_PERSONAL_REFERRAL_LINK--}:
      {?URL?}/ref.php?refid=$content[userid]
      • diff --git a/templates/de/html/member/member_reflink_nickname.tpl b/templates/de/html/member/member_reflink_nickname.tpl index dca24abf6f..38fd5a7846 100644 --- a/templates/de/html/member/member_reflink_nickname.tpl +++ b/templates/de/html/member/member_reflink_nickname.tpl @@ -1,4 +1,4 @@
    • - {--MEMBER_NICKNAME_YOUR_REFERAL_LINK--}:
      + {--MEMBER_NICKNAME_YOUR_REFERRAL_LINK--}:
      {?URL?}/ref.php?refid=$content
      • diff --git a/templates/de/html/member/member_support_form.tpl b/templates/de/html/member/member_support_form.tpl index 1642b724e7..23c1ec6f3e 100644 --- a/templates/de/html/member/member_support_form.tpl +++ b/templates/de/html/member/member_support_form.tpl @@ -19,7 +19,7 @@ Meine id bei Ihrem {?mt_word?} lautet: {%pipe,getMemberId%} - + diff --git a/templates/de/html/welcome.tpl b/templates/de/html/welcome.tpl index 3fa1af5f13..c19da75e5d 100644 --- a/templates/de/html/welcome.tpl +++ b/templates/de/html/welcome.tpl @@ -24,7 +24,7 @@ Als Startguthaben erhalten Sie von uns für Ihre kostenlose Anmeldung derzei Für jeden User, den Sie geworben haben erhalten Sie {%config,translateComma=points_ref%} {?POINTS?} plus prozentualen Verdienst über $content[ref_levels] -Referal-Ebenen hinweg! +Referral-Ebenen hinweg!
      -- 2.39.5
    {--REFERAL_LEVEL--}{--REFERRAL_LEVEL--} {?POINTS?} {--POINTS_ORDER--}{--REFERALS--}{--REFERRALS--}
    - - {%pipe,translateComma=$content[part_referals]%} + {%pipe,translateComma=$content[part_referrals]%}
    -
    {--MEMBER_BONUS_REFERAL_TOTAL--}{--MEMBER_BONUS_REFERRAL_TOTAL--} {%user,bonus_ref,translateComma%} {?POINTS?} - -
    {%pipe,makeNullToZero=$content[level]%}. {--REFERAL_LEVEL--} ({%pipe,translateComma=$content[percents]%}%){%pipe,makeNullToZero=$content[level]%}. {--REFERRAL_LEVEL--} ({%pipe,translateComma=$content[percents]%}%) {%pipe,translateComma=$content[points]%} {?POINTS?} {%pipe,translateComma=$content[order_points]%} {?POINTS?} {%pipe,translateComma=$content[counter]%}