From: Roland Häder Date: Thu, 10 Jan 2013 06:04:48 +0000 (+0000) Subject: Removed some column aliases as they make it harder to check which column was ment X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=132a12000d4bd4121e614f7b58024b676c89679f Removed some column aliases as they make it harder to check which column was ment --- diff --git a/doubler.php b/doubler.php index e3e4d073cc..04fb0d6a93 100644 --- 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 da8cd7350a..4ec9092ddf 100644 --- 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 b557952b0d..980b3744f7 100644 --- 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 be043aceac..2d8588f8e2 100644 --- 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'] = '{--CLICK_HERE--}'; + $content['target_bank'] = '{--CLICK_HERE--}'; } // END - if // Add/Translate some data diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index a79c6ebddd..eb2f9465c7 100644 --- 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 731a00f42c..90fbf010de 100644 --- 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'] = '{--CLICK_HERE--}'; + $content['target_bank'] = '{--CLICK_HERE--}'; } // 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 1bc745ba20..dfd8745d62 100644 --- 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 887eacbf27..eda0ba05df 100644 --- 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 ce6afd31be..1093e60012 100644 --- a/templates/de/html/admin/admin_list_payouts_banner.tpl +++ b/templates/de/html/admin/admin_list_payouts_banner.tpl @@ -1,6 +1,6 @@
{--PAYOUT_OPTIONAL_BANNER--}: - $content[banner] + $content[banner_url]
@@ -9,5 +9,5 @@
{--PAYOUT_TARGET_URL--}: - $content[url] + $content[target_url]
diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index 3faca827ca..2076cf368e 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -1,7 +1,9 @@
- + - +
$content[header] + {%template,LoadTemplate=doubler_header%} +
@@ -83,12 +85,14 @@ {--DOUBLER_YOUR_ADVERTISING_HERE--} {--DOUBLER_CONTACT_US--}

- $content[banner]
+ {%template,LoadTemplate=doubler_banner%}

$content[payout_history]
$content[footer] + {%template,LoadTemplate=doubler_footer%} +
diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl index c3166e732d..7bd049737e 100644 --- a/templates/de/html/mailid/mailid_confirm_buttom.tpl +++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl @@ -10,7 +10,7 @@ diff --git a/templates/de/html/mailid/mailid_enter_code.tpl b/templates/de/html/mailid/mailid_enter_code.tpl index 060cadc8fc..8be4b9d1ba 100644 --- a/templates/de/html/mailid/mailid_enter_code.tpl +++ b/templates/de/html/mailid/mailid_enter_code.tpl @@ -11,7 +11,7 @@ diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl index eaf014bfcd..fa0c003ccd 100644 --- a/templates/de/html/mailid/mailid_points_done.tpl +++ b/templates/de/html/mailid/mailid_points_done.tpl @@ -7,7 +7,7 @@ diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl index c2486900b0..ed62615933 100644 --- a/templates/de/html/mailid/mailid_points_done2.tpl +++ b/templates/de/html/mailid/mailid_points_done2.tpl @@ -11,7 +11,7 @@ diff --git a/templates/de/html/mailid/mailid_points_failed.tpl b/templates/de/html/mailid/mailid_points_failed.tpl index 87b1151d1e..c0c8c4ffa8 100644 --- a/templates/de/html/mailid/mailid_points_failed.tpl +++ b/templates/de/html/mailid/mailid_points_failed.tpl @@ -6,7 +6,7 @@ diff --git a/templates/de/html/mailid/mailid_points_failed2.tpl b/templates/de/html/mailid/mailid_points_failed2.tpl index 5520995f13..d7556c9eef 100644 --- a/templates/de/html/mailid/mailid_points_failed2.tpl +++ b/templates/de/html/mailid/mailid_points_failed2.tpl @@ -6,7 +6,7 @@ diff --git a/templates/de/html/mailid/mailid_points_locked.tpl b/templates/de/html/mailid/mailid_points_locked.tpl index a4b53e6d52..48b9fdccec 100644 --- a/templates/de/html/mailid/mailid_points_locked.tpl +++ b/templates/de/html/mailid/mailid_points_locked.tpl @@ -6,7 +6,7 @@ diff --git a/templates/de/html/mailid/mailid_points_locked2.tpl b/templates/de/html/mailid/mailid_points_locked2.tpl index 417a58ea96..648b340a52 100644 --- a/templates/de/html/mailid/mailid_points_locked2.tpl +++ b/templates/de/html/mailid/mailid_points_locked2.tpl @@ -10,7 +10,7 @@ diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl index 07bdbc878a..a98439a55d 100644 --- a/templates/de/html/mailid/mailid_timer.tpl +++ b/templates/de/html/mailid/mailid_timer.tpl @@ -37,7 +37,7 @@ function startCounter() {