From 5f70ac9d208ca39e3381705afcad2654a700a850 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 3 Aug 2013 07:57:11 +0000 Subject: [PATCH] Parser error fixed + some empty lines added between table rows (tr) --- inc/classes/cachesystem.class.php | 2 +- inc/classes/resolver.class.php | 17 ++++++++++++++--- inc/modules/member/what-order.php | 2 +- templates/de/html/member/member_points.tpl | 11 +++++++++++ 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index 73ef671954..6a2ca4e134 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -491,7 +491,7 @@ class CacheSystem { // Debug messages if (isset($this->version[$this->name][$ext_name])) { // Does it match? - $GLOBALS[__METHOD__][$ext_name] = ((isset($this->version[$this->name][$ext_name])) && ($this->version[$this->name][$ext_name] == $ext_ver)); + $GLOBALS[__METHOD__][$ext_name] = ($this->version[$this->name][$ext_name] == $ext_ver); } elseif ($this->isCacheReadable()) { // No cache version found logDebugMessage(__METHOD__, __LINE__, 'Cache ' . $this->name . ' has missing version entry for extension ext-' . $ext_name . '! Purging cache...'); diff --git a/inc/classes/resolver.class.php b/inc/classes/resolver.class.php index aca38bb875..a6e6732c96 100644 --- a/inc/classes/resolver.class.php +++ b/inc/classes/resolver.class.php @@ -67,7 +67,10 @@ class HostnameResolver { // Search for hostname in cache $result = sqlQueryEscaped("SELECT `ip` FROM `{?_MYSQL_PREFIX?}_dns_cache` WHERE `hostname`='%s' LIMIT 1", - array($hostname), __METHOD__, __LINE__); + array( + $hostname + ), __METHOD__, __LINE__ + ); // Does an entry exist? if (sqlNumRows($result) == 1) { @@ -94,7 +97,11 @@ class HostnameResolver { if (($matches[0] == $ip) && ($matches[1] >= 0) && ($matches[1] <= 255) && ($matches[2] >= 0) && ($matches[2] <= 255) && ($matches[3] >= 0) && ($matches[3] <= 255) && ($matches[4] > 0) && ($matches[4] < 255)) { // We also cache IP addresses sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES ('%s', '%s', NOW())", - array($ip, $hostname), __METHOD__, __LINE__); + array( + $ip, + $hostname + ), __METHOD__, __LINE__ + ); // Set return value to $ip //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("IP detected, cache entry written: %s->%s", $hostname, $ip)); @@ -109,7 +116,11 @@ class HostnameResolver { } else { // Put entry in DB sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES ('%s', '%s', NOW())", - array($ip, $hostname), __METHOD__, __LINE__); + array( + $ip, + $hostname + ), __METHOD__, __LINE__ + ); // Set return value to $ip $ret = $ip; diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 935236ece7..7e53b898e2 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -324,7 +324,7 @@ ORDER BY $filterData = runFilterChain('pre_category_mail_order_check', $filterData); // Still all fine? - if ($filterData['pre_okay']) === TRUE) { + if ($filterData['pre_okay'] === TRUE) { // Check if the user want's to receive mails? $result_ver = sqlQueryEscaped("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s" . $HTML . " AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1", array(bigintval($userid)), __FILE__, __LINE__); diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index 8fb63f90c2..a014461cdc 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -6,7 +6,9 @@ {--POINTS_ORDER--} {--REFERRAL_COUNT--} + $content[rows] + {--MEMBER_PART_POINTS--} @@ -19,12 +21,14 @@ - + {--POINTS_USED--} -{%user,used_points,translateComma=$content[userid]%} {?POINTS?} - - + {--MEMBER_TOTAL_POINTS--} @@ -37,36 +41,43 @@ {%pipe,translateComma=$content[part_referrals]%} + {--LOCKED_POINTS--} {%pipe,translateComma=$content[part_locked]%} {?POINTS?} {%pipe,translateComma=$content[part_locked_order]%} {?POINTS?} - + $content[special_rows] +
{--MEMBER_CLICK_STATISTICS--}
+ {--MEMBER_RECEIVED_MAILS--}: {%user,emails_received,translateComma%} - - + {--MEMBER_UNCONFIRMED_LOCKED--}: {%user,ref_payout,translateComma%} - - + {--MEMBER_CONFIRMED_MAILS--}: {%user,mails_confirmed,translateComma%} - - + {--MEMBER_SENT_MAILS--}: {%user,emails_sent,translateComma%} -- 2.30.2