- Template renamed for better naming

- Notice in ext-payout for optional parameters (API call) updated
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 22227754c175a869aaf0b590e8b675b9f3154e2d..df6f01f0e29655681a316885c31f98b2c03315b7 100644 (file)
--- 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 6bd635e7b7f798bdd94f4910079b00f2f66ef8fa..4b4ee1c5924c916dd9f198ace71e06b2b73541e3 100644 (file)
--- 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:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_stats_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_stats.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_payout_add_new.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_send_reset_link.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/beg/beg_banner.tpl:1:<!-- @DEPRECATED //-->

diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php
index c3174a7b9cffc9856568f5f9af4a654b1007f77f..7c7333d7e10a3921139547a10cfad944d7686c27 100644 (file)
--- 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' => "<div class=\"notice\">
-  Wobei &#36;fuserid/&#36;fpass und &#36;f/&#36;fpass die Logindaten sind und &#36;points die zu &uuml;bberweisenden {?POINTS?} sind:<br />
-  http://url/engine.php?action=trans&amp;from_userid=&#36;fuserid&amp;from_pass=&#36;fpass&amp;to_userid=&#36;tuserid&amp;to_pass=&#36;tpass&amp;points=&#36;points<br />
-</div>",
        '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&uuml;sslung zur &Uuml;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 efd97562061f73404abc85a6a64567be01d98b29..fe278970522e639e90d581da1cefafdd41f971fb 100644 (file)
--- 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 (file)
index 0000000..663756e
--- /dev/null
+++ b/templates/de/html/admin/admin_add_payout.tpl
@@ -0,0 +1,127 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td colspan="3" align="center" class="table_header bottom">
+                       <strong>{--ADMIN_PAYOUT_ADD_NEW_TITLE--}:</strong>
+                       <div class="notice">({--ADMIN_PAYOUT_ADD_NEW_NOTE--})</div>
+               </td>
+       </tr>
+       <tr>
+               <td align="right">{--ADMIN_PAYOUT_TITLE--}:</td>
+               <td>
+                       <input type="text" class="form_field" name="title" size="20" maxlength="255" />
+               </td>
+       </tr>
+       <tr>
+               <td align="right">{--ADMIN_PAYOUT_RATE--}</td>
+               <td>
+                       <input type="text" class="form_field" name="rate" size="5" maxlength="10" />
+                       <span class="notice">({--ADMIN_PAYOUT_VALUE_NOTE--})</span>
+               </td>
+       </tr>
+       <tr>
+               <td align="right">{--ADMIN_PAYOUT_MIN_POINTS--}:</td>
+               <td>
+                       <input type="text" class="form_field" name="min_points" size="5" maxlength="10" />
+                       <span class="notice">({--ADMIN_PAYOUT_VALUE_NOTE--})</span>
+               </td>
+       </tr>
+       <tr>
+               <td class="bottom" align="right">{--ADMIN_PAYOUT_ALLOW_URLS--}:</td>
+               <td class="bottom">
+                       <select name="allow_url" class="form_select" size="1">
+                               <option value="N">{--NO--}</option>
+                               <option value="Y">{--YES--}</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+               <td colspan="3" align="center" class="table_header bottom" height="40">
+                       <strong>{--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}:</strong>
+               </td>
+       </tr>
+       <tr>
+               <td align="right">{--ADMIN_PAYOUT_YOUR_ACCOUNT--}:</td>
+               <td>
+                       <input type="text" class="form_field" name="yacc" size="5" maxlength="255" />
+               </td>
+       </tr>
+       <tr>
+               <td align="right">{--ADMIN_PAYOUT_YOUR_PASSWORD--}:</td>
+               <td>
+                       <input type="password" class="form_field" name="ypass" size="5" maxlength="255" />
+               </td>
+       </tr>
+       <tr>
+               <td width="250" align="right">{--ADMIN_PAYOUT_YOUR_URL--}:</td>
+               <td width="140">
+                       <input type="text" class="form_field" name="yurl" size="30" maxlength="255" />
+               </td>
+       </tr>
+       <tr>
+               <td align="right">{--ADMIN_PAYOUT_YOUR_RET_DONE--}:</td>
+               <td>
+                       <input type="text" class="form_field" name="yrdone" size="5" maxlength="255" />
+               </td>
+       </tr>
+       <tr>
+               <td align="right">{--ADMIN_PAYOUT_YOUR_RET_FAILED--}:</td>
+               <td>
+                       <input type="text" class="form_field" name="yrfailed" size="5" maxlength="255" />
+               </td>
+       </tr>
+       <tr>
+               <td class="bottom" align="right">{--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}:</td>
+               <td class="bottom">
+                       <select name="ytrans" size="1" class="form_select">
+                               <option value="md5">MD5</option>
+                               <option value="base64">Base64</option>
+                               <option value="xxx" selected="selected">None</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+               <td colspan="3" class="table_footer">
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="add" class="form_submit" value="{--ADMIN_PAYOUT_ADD_NEW--}" />
+               </td>
+       </tr>
+</table>
+</form>
+
+<div class="table dashed">
+       <div class="table_header bottom">
+               <strong>Wichtiger Hinweis zur Einstellung <u>{--ADMIN_PAYOUT_ALLOW_URLS--}</u>:</strong>
+       </div>
+
+       <div class="para">
+               Bei &euro-Auszahlungen (oder auch jede andere W&auml;hrung; auch per
+               API) ist die Einstellung auf <strong>Nein</strong> zu lassen. Wollen Sie
+               hingegen, dass Ihre Mitglieder sich ihre {?POINTS?} in z.B.
+               Bannereinblendungen &quot;auszahlen&quot; lassen, ist hier
+               <strong>Ja</strong> zu w&auml;hlen. Dann wird dem Mitglied ein Formular
+               angeboten, wo es Banner- und Ziel-URL eingeben kann.
+       </div>
+
+       <div class="table_header top bottom">
+               <strong>Wichtige Hinweise zur Nutzung der optionalen Parameter:</strong>
+       </div>
+
+       <div class="para">
+               Unter <strong>{--ADMIN_PAYOUT_YOUR_URL--}</strong> die komplette URL des Auszahlungsscriptes vom Fremdanbieter mit folgendem Aufbau eingetragen werden:<br />
+               http://url/engine.php?action=trans&amp;from_userid=<strong>&#36;fuserid</strong>&amp;from_pass=<strong>&#36;fpass</strong>&amp;to_userid=<strong>&#36;tuserid</strong>&amp;to_pass=<strong>&#36;tpass</strong>&amp;points=<strong>&#36;points</strong>
+       </div>
+
+       <div class="para">
+               Hier gilt folgendes:
+               <ul>
+                       <li>Die fettmarkieren Platzhalter (mit einem &#36;-Zeichen vorweg) m&uuml;sen genau so benannt sein, der Rest kann an das Auszahlunsscript angepasst werden.</li>
+                       <li><strong>&#36;fuserid</strong> wird mit der Id aus der Einstellung <strong>{--ADMIN_PAYOUT_YOUR_ACCOUNT--}</strong> gesetzt.</li>
+                       <li>Gleiches gilt f&uuml;r <strong>&#36;fpass</strong>, dass mit der eingestellten Passwortkodierung kodiert wird.</li>
+                       <li><strong>&#36;tuserid</strong> und <strong>&#36;tpass</strong> (auch wieder kodiert) sind die vom Mitglied eingegebenen Daten beim Fremdanbieter.</li>
+                       <li>Die Reihenfolge, in welcher die Daten an das Auszahlungsscript &uuml;bergeben werden sollen, ist nur beispielhaft und kann angepasst werden.</li>
+               </ul>
+       </div>
+</div>
+</div>

diff --git a/templates/de/html/admin/admin_payout_add_new.tpl b/templates/de/html/admin/admin_payout_add_new.tpl
index 8920ee31308ba9e3c84e5936ad90719cd703f2ff..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/admin/admin_payout_add_new.tpl
+++ b/templates/de/html/admin/admin_payout_add_new.tpl
@@ -1,96 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td colspan="3" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_PAYOUT_ADD_NEW_TITLE--}:</strong>
-                       <div class="notice">({--ADMIN_PAYOUT_ADD_NEW_NOTE--})</div>
-               </td>
-       </tr>
-       <tr>
-               <td align="right">{--ADMIN_PAYOUT_TITLE--}:</td>
-               <td>
-                       <input type="text" class="form_field" name="title" size="20" maxlength="255" />
-               </td>
-       </tr>
-       <tr>
-               <td align="right">{--ADMIN_PAYOUT_RATE--}</td>
-               <td>
-                       <input type="text" class="form_field" name="rate" size="5" maxlength="10" />
-                       <span class="notice">({--ADMIN_PAYOUT_VALUE_NOTE--})</span>
-               </td>
-       </tr>
-       <tr>
-               <td align="right">{--ADMIN_PAYOUT_MIN_POINTS--}:</td>
-               <td>
-                       <input type="text" class="form_field" name="min_points" size="5" maxlength="10" />
-                       <span class="notice">({--ADMIN_PAYOUT_VALUE_NOTE--})</span>
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom" align="right">{--ADMIN_PAYOUT_ALLOW_URLS--}:</td>
-               <td class="bottom">
-                       <select name="allow_url" class="form_select" size="1">
-                               <option value="N">{--NO--}</option>
-                               <option value="Y">{--YES--}</option>
-                       </select>
-               </td>
-       </tr>
-       <tr>
-               <td colspan="3" align="center" class="table_header bottom" height="40">
-                       <strong>{--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td align="right">{--ADMIN_PAYOUT_YOUR_ACCOUNT--}:</td>
-               <td>
-                       <input type="text" class="form_field" name="yacc" size="5" maxlength="255" />
-               </td>
-       </tr>
-       <tr>
-               <td align="right">{--ADMIN_PAYOUT_YOUR_PASSWORD--}:</td>
-               <td>
-                       <input type="password" class="form_field" name="ypass" size="5" maxlength="255" />
-               </td>
-       </tr>
-       <tr>
-               <td width="250" align="right">{--ADMIN_PAYOUT_YOUR_URL--}:</td>
-               <td width="140">
-                       <input type="text" class="form_field" name="yurl" size="30" maxlength="255" />
-               </td>
-       </tr>
-       <tr>
-               <td align="right">{--ADMIN_PAYOUT_YOUR_RET_DONE--}:</td>
-               <td>
-                       <input type="text" class="form_field" name="yrdone" size="5" maxlength="255" />
-               </td>
-       </tr>
-       <tr>
-               <td align="right">{--ADMIN_PAYOUT_YOUR_RET_FAILED--}:</td>
-               <td>
-                       <input type="text" class="form_field" name="yrfailed" size="5" maxlength="255" />
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom" align="right">{--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}:</td>
-               <td class="bottom">
-                       <select name="ytrans" size="1" class="form_select">
-                               <option value="md5">MD5</option>
-                               <option value="base64">Base64</option>
-                               <option value="xxx" selected="selected">None</option>
-                       </select>
-               </td>
-       </tr>
-       <tr>
-               <td colspan="3" class="table_footer">
-                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="add" class="form_submit" value="{--ADMIN_PAYOUT_ADD_NEW--}" />
-               </td>
-       </tr>
-</table>
-</form>
-
-<div class="notice">
-       {--ADMIN_PAYOUT_YOUR_URL_NOTE--}
-</div>
-</div>
+<!-- @DEPRECATED //-->