From 846ac0998b0735e3c538de5b3c22e4e199cb2cb2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 11 Aug 2011 16:48:36 +0000 Subject: [PATCH] - Template renamed for better naming - Notice in ext-payout for optional parameters (API call) updated - TODOs.txt updated --- .gitattributes | 1 + DOCS/TODOs.txt | 18 +-- inc/language/payout_de.php | 6 +- inc/modules/admin/what-config_payouts.php | 2 +- templates/de/html/admin/admin_add_payout.tpl | 127 ++++++++++++++++++ .../de/html/admin/admin_payout_add_new.tpl | 97 +------------ 6 files changed, 140 insertions(+), 111 deletions(-) create mode 100644 templates/de/html/admin/admin_add_payout.tpl diff --git a/.gitattributes b/.gitattributes index 22227754c1..df6f01f0e2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1043,6 +1043,7 @@ templates/de/html/admin/admin_add_network_api_translation.tpl svneol=native#text templates/de/html/admin/admin_add_network_params.tpl svneol=native#text/plain templates/de/html/admin/admin_add_network_type.tpl svneol=native#text/plain templates/de/html/admin/admin_add_payment.tpl svneol=native#text/plain +templates/de/html/admin/admin_add_payout.tpl svneol=native#text/plain templates/de/html/admin/admin_add_points.tpl svneol=native#text/plain templates/de/html/admin/admin_add_points_all.tpl svneol=native#text/plain templates/de/html/admin/admin_add_rallye.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 6bd635e7b7..4b4ee1c592 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -4,7 +4,7 @@ ./beg.php:175: // @TODO Opps, what is missing here??? ./inc/cache/config-local.php:124:// @TODO Rewrite the following three constants, somehow... ./inc/classes/cachesystem.class.php:510: // @TODO Add support for more types which break in last else-block -./inc/config-functions.php:136: // @TODO Make this all better... :-/ +./inc/config-functions.php:138: // @TODO Make this all better... :-/ ./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye ./inc/daily/daily_birthday.php:96: // @TODO 4 is hard-coded here, should we move it out in config? ./inc/expression-functions.php:164:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again @@ -39,10 +39,9 @@ ./inc/extensions/ext-rallye.php:94: // @TODO Fix config_rallye_prices to list_rallye_prices ./inc/extensions/ext-yoomedia.php:121: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); -./inc/extensions-functions.php:155: // @TODO Do we still need this? setExtensionUpdateNotes(''); -./inc/extensions-functions.php:1943:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' -./inc/extensions-functions.php:425:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) -./inc/extensions-functions.php:562: // @TODO Extension is loaded, what next? +./inc/extensions-functions.php:1940:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' +./inc/extensions-functions.php:422:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) +./inc/extensions-functions.php:559: // @TODO Extension is loaded, what next? ./inc/filter/bonus_filter.php:56: // @TODO This query isn't right, it will only update if the user was for a longer time away! ./inc/filter/cache_filter.php:92: // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal. ./inc/filter/forced_filter.php:73: // @TODO This part is unfinished @@ -55,8 +54,8 @@ ./inc/functions.php:2236: // @TODO Rename column data_type to e.g. mail_status ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter ./inc/install-functions.php:57: // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); -./inc/language/de.php:1072: // @TODO Rewrite these two constants -./inc/language/de.php:1088: // @TODO Rewrite these three constants +./inc/language/de.php:1073: // @TODO Rewrite these two constants +./inc/language/de.php:1089: // @TODO Rewrite these three constants ./inc/language/de.php:758:// @TODO Are these constants longer used? ./inc/language-functions.php:255: // @TODO These are all valid languages, again hard-coded ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function. @@ -84,13 +83,13 @@ ./inc/libs/user_functions.php:227:// @TODO Double-check configuration entry here ./inc/libs/user_functions.php:318: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); ./inc/libs/user_functions.php:347: // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); -./inc/libs/yoomedia_functions.php:114: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script +./inc/libs/yoomedia_functions.php:108: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script ./inc/load_config.php:75: // @TODO Rewrite them to avoid this else block ./inc/loader/load-extension.php:13: * @TODO Rewrite this whole file * ./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten to a filter? ./inc/module-functions.php:267: // @TODO Nothing helped??? ./inc/module-functions.php:308: // @TODO Rewrite this to a filter -./inc/modules/admin/admin-inc.php:1420: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided +./inc/modules/admin/admin-inc.php:1421: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided ./inc/modules/admin/admin-inc.php:171: // @TODO This and the next getCurrentAdminId() call might be moved into the templates? ./inc/modules/admin/admin-inc.php:242: // @TODO This can be rewritten into a filter ./inc/modules/admin/admin-inc.php:274: // @TODO Rewrite this to $content = SQL_FETCHARRAY() @@ -312,6 +311,7 @@ ./templates/de/html/admin/admin_mods_stats2.tpl:1: ./templates/de/html/admin/admin_mods_stats_row.tpl:1: ./templates/de/html/admin/admin_mods_stats.tpl:1: +./templates/de/html/admin/admin_payout_add_new.tpl:1: ./templates/de/html/admin/admin_reset_pass_done.tpl:1: ./templates/de/html/admin/admin_send_reset_link.tpl:1: ./templates/de/html/beg/beg_banner.tpl:1: diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php index c3174a7b9c..7c7333d7e1 100644 --- a/inc/language/payout_de.php +++ b/inc/language/payout_de.php @@ -64,13 +64,9 @@ addMessages(array( 'ADMIN_PAYOUT_YOUR_ACCOUNT' => "Ihre Account-Id", 'ADMIN_PAYOUT_YOUR_PASSWORD' => "Passwort", 'ADMIN_PAYOUT_YOUR_URL' => "URL zum ext. Script", - 'ADMIN_PAYOUT_YOUR_URL_NOTE' => "
- Wobei $fuserid/$fpass und $f/$fpass die Logindaten sind und $points die zu übberweisenden {?POINTS?} sind:
- http://url/engine.php?action=trans&from_userid=$fuserid&from_pass=$fpass&to_userid=$tuserid&to_pass=$tpass&points=$points
-
", 'ADMIN_PAYOUT_YOUR_RET_DONE' => "Return-Code: Erfolgreich", 'ADMIN_PAYOUT_YOUR_RET_FAILED' => "Return-Code: Fehlgeschlagen", - 'ADMIN_PAYOUT_OPTIONAL_SETTINGS' => "Optionale Einstellungen", + 'ADMIN_PAYOUT_OPTIONAL_SETTINGS' => "Optionale API-Einstellungen (nicht Werbenetzwerke!)", 'ADMIN_PAYOUT_YOUR_PASS_TRANSFER' => "Passwortverschlüsslung zur Übertragung", 'ADMIN_TASK_TYPE_PAYOUT_REQUEST' => "Auszahlungsanfrage", 'ADMIN_PAYOUT_LIST_REQUESTS' => "Jetzt alle Auszahlungsanfragen auflisten.", diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index efd9756206..fe27897052 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -219,7 +219,7 @@ SQL_FREERESULT($result_mem); // Add new payout type if ($display === true) { - loadTemplate('admin_payout_add_new'); + loadTemplate('admin_add_payout'); } // END - if // [EOF] diff --git a/templates/de/html/admin/admin_add_payout.tpl b/templates/de/html/admin/admin_add_payout.tpl new file mode 100644 index 0000000000..663756ee50 --- /dev/null +++ b/templates/de/html/admin/admin_add_payout.tpl @@ -0,0 +1,127 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {--ADMIN_PAYOUT_ADD_NEW_TITLE--}: +
({--ADMIN_PAYOUT_ADD_NEW_NOTE--})
+
{--ADMIN_PAYOUT_TITLE--}: + +
{--ADMIN_PAYOUT_RATE--} + + ({--ADMIN_PAYOUT_VALUE_NOTE--}) +
{--ADMIN_PAYOUT_MIN_POINTS--}: + + ({--ADMIN_PAYOUT_VALUE_NOTE--}) +
{--ADMIN_PAYOUT_ALLOW_URLS--}: + +
+ {--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}: +
{--ADMIN_PAYOUT_YOUR_ACCOUNT--}: + +
{--ADMIN_PAYOUT_YOUR_PASSWORD--}: + +
{--ADMIN_PAYOUT_YOUR_URL--}: + +
{--ADMIN_PAYOUT_YOUR_RET_DONE--}: + +
{--ADMIN_PAYOUT_YOUR_RET_FAILED--}: + +
{--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}: + +
+ + +
+
+ +
+
+ Wichtiger Hinweis zur Einstellung {--ADMIN_PAYOUT_ALLOW_URLS--}: +
+ +
+ Bei &euro-Auszahlungen (oder auch jede andere Währung; auch per + API) ist die Einstellung auf Nein zu lassen. Wollen Sie + hingegen, dass Ihre Mitglieder sich ihre {?POINTS?} in z.B. + Bannereinblendungen "auszahlen" lassen, ist hier + Ja zu wählen. Dann wird dem Mitglied ein Formular + angeboten, wo es Banner- und Ziel-URL eingeben kann. +
+ +
+ Wichtige Hinweise zur Nutzung der optionalen Parameter: +
+ +
+ Unter {--ADMIN_PAYOUT_YOUR_URL--} die komplette URL des Auszahlungsscriptes vom Fremdanbieter mit folgendem Aufbau eingetragen werden:
+ http://url/engine.php?action=trans&from_userid=$fuserid&from_pass=$fpass&to_userid=$tuserid&to_pass=$tpass&points=$points +
+ +
+ Hier gilt folgendes: +
    +
  • Die fettmarkieren Platzhalter (mit einem $-Zeichen vorweg) müsen genau so benannt sein, der Rest kann an das Auszahlunsscript angepasst werden.
    • +
  • $fuserid wird mit der Id aus der Einstellung {--ADMIN_PAYOUT_YOUR_ACCOUNT--} gesetzt.
    • +
  • Gleiches gilt für $fpass, dass mit der eingestellten Passwortkodierung kodiert wird.
    • +
  • $tuserid und $tpass (auch wieder kodiert) sind die vom Mitglied eingegebenen Daten beim Fremdanbieter.
    • +
  • Die Reihenfolge, in welcher die Daten an das Auszahlungsscript übergeben werden sollen, ist nur beispielhaft und kann angepasst werden.
    • +
+
+
+
diff --git a/templates/de/html/admin/admin_payout_add_new.tpl b/templates/de/html/admin/admin_payout_add_new.tpl index 8920ee3130..11f5d85d80 100644 --- a/templates/de/html/admin/admin_payout_add_new.tpl +++ b/templates/de/html/admin/admin_payout_add_new.tpl @@ -1,96 +1 @@ -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {--ADMIN_PAYOUT_ADD_NEW_TITLE--}: -
({--ADMIN_PAYOUT_ADD_NEW_NOTE--})
-
{--ADMIN_PAYOUT_TITLE--}: - -
{--ADMIN_PAYOUT_RATE--} - - ({--ADMIN_PAYOUT_VALUE_NOTE--}) -
{--ADMIN_PAYOUT_MIN_POINTS--}: - - ({--ADMIN_PAYOUT_VALUE_NOTE--}) -
{--ADMIN_PAYOUT_ALLOW_URLS--}: - -
- {--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}: -
{--ADMIN_PAYOUT_YOUR_ACCOUNT--}: - -
{--ADMIN_PAYOUT_YOUR_PASSWORD--}: - -
{--ADMIN_PAYOUT_YOUR_URL--}: - -
{--ADMIN_PAYOUT_YOUR_RET_DONE--}: - -
{--ADMIN_PAYOUT_YOUR_RET_FAILED--}: - -
{--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}: - -
- - -
-
- -
- {--ADMIN_PAYOUT_YOUR_URL_NOTE--} -
-
+ -- 2.39.5