Naming convention applied, ext-refback description updated:

- ext-mediadata: renamed _clr to click_rate (better naming)
- ext-refback: Description for refback updated (which the member can see)
- Some minor improvements here and there
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index cf8ac019abcd9ebe07ce11077a1816241970c71f..b382914394050f9b8a381c03e153d911917a4399 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -147,7 +147,7 @@
 ./inc/modules/admin/what-usr_online.php:49:    // @TODO Add a filter for sponsor
 ./inc/modules/guest/what-beg.php:51:// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
 ./inc/modules/guest/what-login.php:125:        // @TODO Move this HTML code into a template
-./inc/modules/guest/what-mediadata.php:180:// @TODO Rewrite all these if-blocks to filters
+./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'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $adminId . '%}">' . $login . '</a>';
 ./inc/modules/guest/what-sponsor_reg.php:287:                  // @TODO Maybe a default referal id?

diff --git a/inc/language/refback_de.php b/inc/language/refback_de.php
index 7c8ed7140033c7965c219688e6e26ac54a323149..e1a8b622dc351e2f2a9b0feecb98210be412d002 100644 (file)
--- a/inc/language/refback_de.php
+++ b/inc/language/refback_de.php
@@ -56,7 +56,7 @@ addMessages(array(
        'MEMBER_REFBACK_LIST_TITLE_3' => "&#37;</u>)",
        'MEMBER_REFBACK_TITLE' => "Refback und Referal-&Uuml;bersicht",
        'MEMBER_REFBACK_NOTE' => "Hier k&ouml;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&auml;lt Ihr Referal die eingestellten Prozente von Ihrem Referalverdienst aufgebucht. Ihnen wird daf&uuml;r sein Anteil (=eingestellte Prozente) von Ihrem Referalverdienst abgezogen. Unter <strong>{--MEMBER_REFBACK_POINTS--}</strong> sind die {?POINTS?}-Gutschriften durch Refback an das jeweilige Mitglied zu verstehen.",
-       'MEMBER_REFBACK_EXAMPLE' => "Ein Rechenbeispiel: Ihr Referal <strong>X</strong> verdient 1.000 {?POINTS?}, es sind 10&#37; in Ref-Ebene 1 eingestellt. Ohne Refback erhalten Sie 100 {?POINTS?} in Referal-Ebene 1 gutgeschrieben. Nun haben Sie einen Refback von 90&#37; dem Referal <strong>X</strong> gegeben. Die 100 {?POINTS?} werden nun aufgeteilt: Ihrem Referal werden 90 und Ihnen die restlichen 10 von den urspr&uuml;nglichen 100 {?POINTS?} gutgeschrieben.",
+       'MEMBER_REFBACK_EXAMPLE' => "Ein Rechenbeispiel: Ihr Referal <strong>X</strong> verdient 1.000 {?POINTS?}, es sind 10&#37; in Ref-Ebene 1 eingestellt. Ohne Refback erhalten Sie 100 {?POINTS?} in Referal-Ebene 1 gutgeschrieben. Nun haben Sie einen Refback von 90&#37; dem Referal <strong>X</strong> gegeben. Die 100 {?POINTS?} werden dann aufgeteilt: Ihrem Referal werden 90 und Ihnen die restlichen 10 von den urspr&uuml;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' => "Mitglieder-Id",

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index be3ef309c4ea3742169e3f4520feb504205513e2..4582ca66d9026972b7dcbe5d4e7657e72774671f 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -121,9 +121,11 @@ $content['sent']       = $sent;
 // All clicks
 $content['user_links'] = abs($sent - $clicks);
 
-$clr = '0.00000';
-if ($sent > 0) $clr = $clicks / $sent * 100;
-$content['_clr'] = $clr;
+// Click rate
+$content['click_rate'] = '0';
+if ($sent > 0) {
+       $content['click_rate'] = $clicks / $sent * 100;
+} // END - if
 
 // Load jackpot
 $jackpot = '0';

diff --git a/inc/modules/member/what-list_coupon.php b/inc/modules/member/what-list_coupon.php
index 57563750dcda86621044f13d5d2148f6bf197a58..3a0e4e083f14895af1f4c06cfb365fbc7043e5ed 100644 (file)
--- a/inc/modules/member/what-list_coupon.php
+++ b/inc/modules/member/what-list_coupon.php
@@ -56,7 +56,10 @@ $result = SQL_QUERY_ESC("SELECT
        UNIX_TIMESTAMP(u.`cashed_on`) AS `cashed_on`,
        UNIX_TIMESTAMP(d.`coupon_created`) AS `coupon_created`,
        UNIX_TIMESTAMP(d.`coupon_expired`) AS `coupon_expired`,
-       d.`points`, d.`total_created`, d.`total_cashed`, d.`coupon_description`
+       d.`points`,
+       d.`total_created`,
+       d.`total_cashed`,
+       d.`coupon_description`
 FROM
        `{?_MYSQL_PREFIX?}_user_coupons` AS u
 INNER JOIN

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 3362d432df591839f204f74c07f2f16fdc0f1af1..5e7675ee2c170b9e41b6ab433683da3d311b2da9 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 // Query for referal levels and percents
-$result_depths = SQL_QUERY("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__);
+$result_depths = SQL_QUERY('SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC', __FILE__, __LINE__);
 
 // Get total depths
 $numDepths = SQL_NUMROWS($result_depths);
@@ -66,17 +66,19 @@ $content['part_referals']       = '0';
 $content['part_locked']         = '0.00000';
 $content['part_order']          = '0.00000';
 $content['part_locked_order']   = '0.00000';
-$content['counter']             = '0';
-$content['points']              = '0.00000';
-$content['order_points']        = '0.00000';
-$content['locked_points']       = '0.00000';
-$content['locked_order_points'] = '0.00000';
 
 // And output variable
 $OUT = '';
 
 // Load ref levels
 while ($data = SQL_FETCHARRAY($result_depths)) {
+       // Init points and counter here
+       $content['counter']             = '0';
+       $content['points']              = '0.00000';
+       $content['order_points']        = '0.00000';
+       $content['locked_points']       = '0.00000';
+       $content['locked_order_points'] = '0.00000';
+
        // Merge it together
        $content = merge_array($content, $data);
 

diff --git a/templates/de/html/mediadata.tpl b/templates/de/html/mediadata.tpl
index 32775fcabfa6218947bec8e9eea7185785c6b5a4..a7ff5db10d848be2130f8594bba2d0aabaa3296f 100644 (file)
--- a/templates/de/html/mediadata.tpl
+++ b/templates/de/html/mediadata.tpl
@@ -65,7 +65,7 @@
        </tr>
        <tr>
                <td class="bottom media_left" align="right">{--CLICK_RATE--}:</td>
-               <td class="bottom media_right">{%pipe,translateComma=$content[_clr]%}</td>
+               <td class="bottom media_right">{%pipe,translateComma=$content[click_rate]%}&#37;</td>
        </tr>
        <tr>
                <td class="media_header bottom" colspan="2" align="center">{--MEDIA_DATA_POINTS--}</td>