Parser error fixed + some empty lines added between table rows (tr)

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 73ef671954c3326491af6e64d2980afa2668c5b1..6a2ca4e134f3b5da2fade398992f99f361e7bdf7 100644 (file)
--- 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 aca38bb87560fc31304b019731204aa7a756dc91..a6e6732c967d1799eaada5d7c5e8ca3ae3d05762 100644 (file)
--- 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 935236ece7c68bebd89e96c43d69c31200a51722..7e53b898e20ffcaa4629f678063a05b34a40bdb8 100644 (file)
--- 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 8fb63f90c26b1b15d8473fa596af087f5a4e82fb..a014461cdcb55966b3bf585fc9aea0b90bc74724 100644 (file)
--- a/templates/de/html/member/member_points.tpl
+++ b/templates/de/html/member/member_points.tpl
@@ -6,7 +6,9 @@
                <td align="center" class="header_column bottom">{--POINTS_ORDER--}</td>
                <td align="center" class="header_column bottom">{--REFERRAL_COUNT--}</td>
        </tr>
+
        $content[rows]
+
        <tr>
                <td class="member_data bottom top">
                        <strong>{--MEMBER_PART_POINTS--}</strong>
@@ -19,12 +21,14 @@
                </td>
                <td class="member_data bottom top" align="center">-</td>
        </tr>
+
        <tr>
                <td class="member_data bottom">{--POINTS_USED--}</td>
                <td class="member_data bottom">-{%user,used_points,translateComma=$content[userid]%} {?POINTS?}</td>
                <td class="member_data bottom">-</td>
                <td class="member_data bottom" align="center">-</td>
        </tr>
+
        <tr>
                <td class="member_data bottom">
                        <strong>{--MEMBER_TOTAL_POINTS--}</strong>
@@ -37,36 +41,43 @@
                        <strong>{%pipe,translateComma=$content[part_referrals]%}</strong>
                </td>
        </tr>
+
        <tr>
                <td class="member_data">{--LOCKED_POINTS--}</td>
                <td class="member_data">{%pipe,translateComma=$content[part_locked]%} {?POINTS?}</td>
                <td class="member_data">{%pipe,translateComma=$content[part_locked_order]%} {?POINTS?}</td>
                <td class="member_data" align="center">-</td>
        </tr>
+
        $content[special_rows]
+
        <tr>
                <td colspan="4" class="header_column bottom top">
                        <div align="center"><strong>{--MEMBER_CLICK_STATISTICS--}</strong></div>
                </td>
        </tr>
+
        <tr>
                <td class="member_data">{--MEMBER_RECEIVED_MAILS--}:</td>
                <td class="member_data" align="center">{%user,emails_received,translateComma%}</td>
                <td class="member_data">-</td>
                <td class="member_data" align="center">-</td>
        </tr>
+
        <tr>
                <td class="member_data">{--MEMBER_UNCONFIRMED_LOCKED--}:</td>
                <td class="member_data" align="center">{%user,ref_payout,translateComma%}</td>
                <td class="member_data">-</td>
                <td class="member_data" align="center">-</td>
        </tr>
+
        <tr>
                <td class="member_data">{--MEMBER_CONFIRMED_MAILS--}:</td>
                <td class="member_data" align="center">{%user,mails_confirmed,translateComma%}</td>
                <td class="member_data">-</td>
                <td class="member_data" align="center">-</td>
        </tr>
+
        <tr>
                <td class="member_data">{--MEMBER_SENT_MAILS--}:</td>
                <td class="member_data" align="center">{%user,emails_sent,translateComma%}</td>