Removed some column aliases as they make it harder to check which column was ment

diff --git a/doubler.php b/doubler.php
index e3e4d073ccc7e59713b0aa966de0640dce3d4288..04fb0d6a93596483fef630d8c6a0075c552dfda8 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -179,13 +179,6 @@ if (getDoublerSendMode() == 'DIRECT') {
 // Output header
 loadIncludeOnce('inc/header.php');
 
-// Banner in text
-$content['banner'] = loadTemplate('doubler_banner', TRUE);
-
-// Load header/footer templates
-$content['header'] = loadTemplate('doubler_header', TRUE);
-$content['footer'] = loadTemplate('doubler_footer', TRUE);
-
 if (isUserDataValid()) {
        // Transfer userid/nickname to constant
        $content['refid'] = getUserData('userid');

diff --git a/inc/libs/mailid_functions.php b/inc/libs/mailid_functions.php
index da8cd7350ac4f413848e16dbb08b1c68ddeb99d9..4ec9092ddf1fd4f35f0b4ae1fdd865d6151a6b3f 100644 (file)
--- a/inc/libs/mailid_functions.php
+++ b/inc/libs/mailid_functions.php
@@ -70,9 +70,6 @@ function handleMailIdErrorCode ($errorCode) {
 
 // Does the "mailid" call-back
 function doMailIdCallback ($data) {
-       // Load banner generically
-       $data['banner'] = loadTemplate('mailid_banner', TRUE);
-
        // Generate call-back function name
        $callbackName = 'doMailId' . trim(capitalizeUnderscoreString($data['do']));
 

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index b557952b0d90cce9bbeed0cc4ffa806fae5ea5fd..980b3744f783ac183d280ffa8b1954021eaf41cf 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -45,11 +45,11 @@ addYouAreHereLink('admin', __FILE__);
 
 // Start listing holiday requests
 $result = SQL_QUERY("SELECT
-       h.`id`,
-       h.`userid`,
-       h.`holiday_start`,
-       h.`holiday_end`,
-       h.`comments`,
+       `h`.`id`,
+       `h`.`userid`,
+       `h`.`holiday_start`,
+       `h`.`holiday_end`,
+       `h`.`comments`,
        `d`.`status`,
        `d`.`last_online`
 FROM
@@ -57,9 +57,9 @@ FROM
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       h.`userid`=`d`.`userid`
+       `h`.`userid`=`d`.`userid`
 ORDER BY
-       h.`userid` ASC", __FILE__, __LINE__);
+       `h`.`userid` ASC", __FILE__, __LINE__);
 
 if (!SQL_HASZERONUMS($result)) {
        // List all holiday requests

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index be043aceac4c6b3f2e5828de868aa42fd2436be8..2d8588f8e27f1fb2ff73c76fdc4e299e4797bfd8 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -232,10 +232,10 @@ LIMIT 1",
        `t`.`type`,
        `p`.`payout_timestamp`,
        `p`.`status`,
-       `t`.`allow_url` AS `allow`,
-       `p`.`target_url` AS `url`,
-       `p`.`link_text` AS `alt`,
-       `p`.`banner_url` AS `banner`
+       `t`.`allow_url`
+       `p`.`target_url`,
+       `p`.`link_text`
+       `p`.`banner_url`
 FROM
        `{?_MYSQL_PREFIX?}_user_payouts` AS `p`
 LEFT JOIN
@@ -258,9 +258,9 @@ ORDER BY
                        }
 
                        // Nothing entered must be secured in member/what-payputs.php !
-                       if ($content['allow'] == 'Y') {
+                       if ($content['allow_url'] == 'Y') {
                                // Banner/Textlink views/clicks request
-                               if (!empty($content['banner'])) {
+                               if (!empty($content['banner_url'])) {
                                        // Load template for the banner
                                        $content['target_account'] = loadTemplate('admin_list_payouts_banner', TRUE, $content);
                                } else {
@@ -269,7 +269,7 @@ ORDER BY
                                }
 
                                // Admins can addionally test the URL for framekillers
-                               $content['target_bank'] = '<a href="' . generateFrametesterUrl($content['url']) . '" target="_blank">{--CLICK_HERE--}</a>';
+                               $content['target_bank'] = '<a href="' . generateFrametesterUrl($content['target_url']) . '" target="_blank">{--CLICK_HERE--}</a>';
                        } // END - if
 
                        // Add/Translate some data

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index a79c6ebddded29999070cf9c168e043897ae537c..eb2f9465c7f233a6f975b9e999dacf22c1b2c515 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -227,13 +227,13 @@ if (isExtensionActive('doubler')) {
 if (isExtensionActive('holiday')) {
        // Total holiday requests
        $result = SQL_QUERY("SELECT
-       COUNT(h.`userid`) AS `count_holidays`
+       COUNT(`h`.`userid`) AS `count_holidays`
 FROM
        `{?_MYSQL_PREFIX?}_user_holidays` AS `h`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       h.`userid`=`d`.`userid`
+       `h`.`userid`=`d`.`userid`
 WHERE
        `d`.`holiday_active`='Y'
 " . runFilterChain('user_exclusion_sql', ' '),

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 731a00f42c421d303bbf780ed7e2040ebd6c23b0..90fbf010de0f3f3ff5e39ecbbd9c88b50a10437b 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -75,7 +75,7 @@ ORDER BY
                SQL_FREERESULT($result);
 
                // Check for his payouts
-               $result_payouts = SQL_QUERY_ESC("SELECT
+               $result_payouts = SQL_QUERY_ESC('SELECT
        `p`.`id`,
        `p`.`payout_total`,
        `p`.`target_account`,
@@ -83,10 +83,10 @@ ORDER BY
        `t`.`type`,
        `p`.`payout_timestamp`,
        `p`.`status`,
-       `t`.`allow_url` AS `allow`,
-       `p`.`target_url` AS `url`,
+       `t`.`allow_url`,
+       `p`.`target_url`,
        `p`.`link_text`,
-       `p`.`banner_url` AS `banner`
+       `p`.`banner_url`
 FROM
        `{?_MYSQL_PREFIX?}_user_payouts` AS `p`
 LEFT JOIN
@@ -96,14 +96,14 @@ ON
 WHERE
        `p`.`userid`=%s
 ORDER BY
-       `p`.`payout_timestamp` DESC",
+       `p`.`payout_timestamp` DESC',
                        array(getMemberId()), __FILE__, __LINE__);
                if (!SQL_HASZERONUMS($result_payouts)) {
                        // List all his requests
                        $OUT = '';
                        while ($content = SQL_FETCHARRAY($result_payouts)) {
                                // Nothing entered must be secured in member/what-payputs.php !
-                               if ($content['allow'] == 'Y') {
+                               if ($content['allow_url'] == 'Y') {
                                        // Banner/Textlink views/clicks request
                                        if (!empty($content['banner'])) {
                                                // Banner
@@ -112,7 +112,7 @@ ORDER BY
                                                // Textlink
                                                $content['target_account'] = $content['link_text'];
                                        }
-                                       $content['target_bank'] = '<a href="{%pipe,generateDereferrerUrl=' . $content['url'] . '%}" target="_blank">{--CLICK_HERE--}</a>';
+                                       $content['target_bank'] = '<a href="{%pipe,generateDereferrerUrl=' . $content['target_url'] . '%}" target="_blank">{--CLICK_HERE--}</a>';
                                } // END - if
 
                                // Prepare data for the template
@@ -137,7 +137,7 @@ ORDER BY
        }
 } else {
        // Chedk if he can get paid by selected type
-       $result = SQL_QUERY_ESC("SELECT `type`, `rate`, `min_points`, `allow_url` AS `allow` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `type`, `rate`, `min_points`, `allow_url` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestElement('payout'))), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1) {
@@ -167,7 +167,7 @@ ORDER BY
                                subtractPoints('payout', getMemberId(), $points);
 
                                // Add entry to his tranfer history
-                               if ($content['allow'] == 'Y') {
+                               if ($content['allow_url'] == 'Y') {
                                        // Banner/textlink ordered
                                        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_payouts` (`userid`, `payout_total`, `payout_id`, `payout_timestamp`, `status`, `target_url`, `link_text`, `banner_url`)
 VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
@@ -222,7 +222,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 
                                // Load template and output it
                                displayMessage('{--MEMBER_PAYOUT_REQUEST_SENT--}');
-                       } elseif ($content['allow'] == 'Y') {
+                       } elseif ($content['allow_url'] == 'Y') {
                                // Prepare content
                                $content = array(
                                        'max'    => $max,

diff --git a/templates/de/emails/admin/admin_payout_request_banner.tpl b/templates/de/emails/admin/admin_payout_request_banner.tpl
index 1bc745ba20fe929d891a43c510986c3c429951ec..dfd8745d627007d41f43e851508a04beb2bc2c18 100644 (file)
--- a/templates/de/emails/admin/admin_payout_request_banner.tpl
+++ b/templates/de/emails/admin/admin_payout_request_banner.tpl
@@ -24,7 +24,7 @@ Auszahlungshoehe: $content[payout]
 ------------------------------
 Ziel-URL: $content[turl]
 Linktext: $content[link_text]
-Banner-URL: $content[banner]
+Banner-URL: $content[banner_url]
 ------------------------------
 
 Bitte überprüfen Sie diese Daten und überweisen Sie dann den geforderten Betrag.

diff --git a/templates/de/emails/member/member_payout_request_banner.tpl b/templates/de/emails/member/member_payout_request_banner.tpl
index 887eacbf272f5269bf4f7c95dc407c5c7089c1f7..eda0ba05df47454b56099cd8841793d76f4254f2 100644 (file)
--- a/templates/de/emails/member/member_payout_request_banner.tpl
+++ b/templates/de/emails/member/member_payout_request_banner.tpl
@@ -16,7 +16,7 @@ Auszahlungshoehe: $content[payout]
 ------------------------------
 Ziel-URL: $content[turl]
 Linktext: $content[link_text]
-Banner-URL: $content[banner]
+Banner-URL: $content[banner_url]
 ------------------------------
 
 Die dazu nötigen $content[payout_points] haben wir Ihnen bereits abgezogen.

diff --git a/templates/de/html/admin/admin_list_payouts_banner.tpl b/templates/de/html/admin/admin_list_payouts_banner.tpl
index ce6afd31bea7fb4941368e5f780f3e7578ff03d3..1093e60012db03ee11377079deba86495dfd3330 100644 (file)
--- a/templates/de/html/admin/admin_list_payouts_banner.tpl
+++ b/templates/de/html/admin/admin_list_payouts_banner.tpl
@@ -1,6 +1,6 @@
 <div class="para">
        {--PAYOUT_OPTIONAL_BANNER--}:
-       <strong><a href="$content[banner]" title="$content[link_text]" target="_blank">$content[banner]</a></strong>
+       <strong><a href="$content[banner_url]" title="$content[link_text]" target="_blank">$content[banner_url]</a></strong>
 </div>
 
 <div class="para">
@@ -9,5 +9,5 @@
 </div>
 <div class="para">
        {--PAYOUT_TARGET_URL--}:
-       <strong>$content[url]</strong>
+       <strong>$content[target_url]</strong>
 </div>

diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl
index 3faca827ca135bd63f2daa002e9443fe36556981..2076cf368ef228033275efb0de5afbb5200b62e0 100644 (file)
--- a/templates/de/html/doubler/doubler_index.tpl
+++ b/templates/de/html/doubler/doubler_index.tpl
@@ -1,7 +1,9 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="table" width="100%">
        <tr>
-               <td height="80" align="center">$content[header]</td>
+               <td height="80" align="center">
+                       {%template,LoadTemplate=doubler_header%}
+               </td>
        </tr>
        <tr>
                <td align="center">
@@ -83,12 +85,14 @@
                {--DOUBLER_YOUR_ADVERTISING_HERE--} <a
                        href="{%url=modules.php?module=index&amp;what=impressum&amp;refid=$content[refid]%}">{--DOUBLER_CONTACT_US--}</a><br />
                <br />
-               $content[banner]<br />
+               {%template,LoadTemplate=doubler_banner%}<br />
                <br />
                $content[payout_history]</td>
        </tr>
        <tr>
-               <td height="80" align="center">$content[footer]</td>
+               <td height="80" align="center">
+                       {%template,LoadTemplate=doubler_footer%}
+               </td>
        </tr>
 </table>
 </div>

diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl
index c3166e732d47fd6b3e6aa6403e75fba3e54dd192..7bd049737e5c903ee8816684389d1dba2f669008 100644 (file)
--- a/templates/de/html/mailid/mailid_confirm_buttom.tpl
+++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl
@@ -10,7 +10,7 @@
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>

diff --git a/templates/de/html/mailid/mailid_enter_code.tpl b/templates/de/html/mailid/mailid_enter_code.tpl
index 060cadc8fc05597bf9df5f19489d4a10169262c4..8be4b9d1bad7f35cc0368d10a2292dadfae43533 100644 (file)
--- a/templates/de/html/mailid/mailid_enter_code.tpl
+++ b/templates/de/html/mailid/mailid_enter_code.tpl
@@ -11,7 +11,7 @@
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>

diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl
index eaf014bfcd696fe5e8606cd15e4fd160a2be5440..fa0c003ccd86ce8bfc5153dd902a12d88bf323d6 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done.tpl
+++ b/templates/de/html/mailid/mailid_points_done.tpl
@@ -7,7 +7,7 @@
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
 </tr>

diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl
index c2486900b0a7622439ecf5aa2713914b1322461e..ed6261593359fe0884aa6cf9cfdd900cf559ceef 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done2.tpl
+++ b/templates/de/html/mailid/mailid_points_done2.tpl
@@ -11,7 +11,7 @@
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>

diff --git a/templates/de/html/mailid/mailid_points_failed.tpl b/templates/de/html/mailid/mailid_points_failed.tpl
index 87b1151d1e4fb9cbfe8dcdaee8e95a0870f73320..c0c8c4ffa82e953b94702b10068f228036181210 100644 (file)
--- a/templates/de/html/mailid/mailid_points_failed.tpl
+++ b/templates/de/html/mailid/mailid_points_failed.tpl
@@ -6,7 +6,7 @@
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>

diff --git a/templates/de/html/mailid/mailid_points_failed2.tpl b/templates/de/html/mailid/mailid_points_failed2.tpl
index 5520995f13634f6f58cff9d6d94b504eaf42ace7..d7556c9eefc7f6d54c954e331d40c0960c91a506 100644 (file)
--- a/templates/de/html/mailid/mailid_points_failed2.tpl
+++ b/templates/de/html/mailid/mailid_points_failed2.tpl
@@ -6,7 +6,7 @@
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>

diff --git a/templates/de/html/mailid/mailid_points_locked.tpl b/templates/de/html/mailid/mailid_points_locked.tpl
index a4b53e6d52de2d58c540edbeed1ebf69ef0d906d..48b9fdccec36663750e88856f39c55aec7a6298e 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked.tpl
+++ b/templates/de/html/mailid/mailid_points_locked.tpl
@@ -6,7 +6,7 @@
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>

diff --git a/templates/de/html/mailid/mailid_points_locked2.tpl b/templates/de/html/mailid/mailid_points_locked2.tpl
index 417a58ea96f28706471f23fa4cbe13bcb6871742..648b340a52df0e790eb31881f8d07646c71e1a03 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked2.tpl
+++ b/templates/de/html/mailid/mailid_points_locked2.tpl
@@ -10,7 +10,7 @@
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>

diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl
index 07bdbc878aee575d7e65a5912bb394da8d2ef3af..a98439a55db8fc8dd9acb5a561e8ec1076f573b0 100644 (file)
--- a/templates/de/html/mailid/mailid_timer.tpl
+++ b/templates/de/html/mailid/mailid_timer.tpl
@@ -37,7 +37,7 @@ function startCounter() {
                </td>
                <td align="center">
                        <div class="banner dashed">
-                               $content[banner]
+                               {%template,LoadTemplate=mailid_banner%}
                        </div>
                </td>
        </tr>