From 2fbe5fb8357e81e5542c6d067dc1edf9a7d7f8f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 15 Jul 2011 10:40:09 +0000 Subject: [PATCH] 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 --- DOCS/TODOs.txt | 2 +- inc/language/refback_de.php | 2 +- inc/modules/guest/what-mediadata.php | 8 +++++--- inc/modules/member/what-list_coupon.php | 5 ++++- inc/modules/member/what-points.php | 14 ++++++++------ templates/de/html/mediadata.tpl | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index cf8ac019ab..b382914394 100644 --- 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'] = '' . $login . ''; ./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 7c8ed71400..e1a8b622dc 100644 --- a/inc/language/refback_de.php +++ b/inc/language/refback_de.php @@ -56,7 +56,7 @@ addMessages(array( '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 nun aufgeteilt: Ihrem Referal werden 90 und Ihnen die restlichen 10 von den ursprünglichen 100 {?POINTS?} gutgeschrieben.", + '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_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 be3ef309c4..4582ca66d9 100644 --- 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 57563750dc..3a0e4e083f 100644 --- 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 3362d432df..5e7675ee2c 100644 --- 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 32775fcabf..a7ff5db10d 100644 --- a/templates/de/html/mediadata.tpl +++ b/templates/de/html/mediadata.tpl @@ -65,7 +65,7 @@ {--CLICK_RATE--}: - {%pipe,translateComma=$content[_clr]%} + {%pipe,translateComma=$content[click_rate]%}% {--MEDIA_DATA_POINTS--} -- 2.39.5