From 1babb0e0e4d43eff74ed62cd5105febee2b17b8e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 30 Jan 2011 00:08:47 +0000
Subject: [PATCH] Some code cleanups
---
inc/modules/admin/what-edit_emails.php | 2 +-
inc/modules/admin/what-unlock_emails.php | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index cb75867f7b..383782306f 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -120,7 +120,7 @@ LIMIT 1",
}
} else {
// No mail orders left in pool
- loadTemplate('admin_settings_saved', false, '<span class="notice">{--ADMIN_NO_MAILS_IN_POOL--}</span>');
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
}
// [EOF]
diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index e59a2d251e..201cd9fe39 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -63,15 +63,15 @@ if ((!SQL_HASZERONUMS($result_main)) || (isFormSent('lock'))) {
// Order placed in queue...
$result = SQL_QUERY_ESC("SELECT
- po.url, po.subject, po.sender, pay.payment, po.payment_id
+ po.`url`, po.`subject`, po.`sender`, pay.`payment`, po.`payment_id`
FROM
- `{?_MYSQL_PREFIX?}_pool` AS po
+ `{?_MYSQL_PREFIX?}_pool` AS `po`
INNER JOIN
- `{?_MYSQL_PREFIX?}_payments` AS pay
+ `{?_MYSQL_PREFIX?}_payments` AS `pay`
ON
- po.payment_id=pay.id
+ po.`payment_id`=pay.`id`
WHERE
- po.id=%s
+ po.`id`=%s
LIMIT 1",
array($id), __FILE__, __LINE__);
@@ -144,10 +144,12 @@ LIMIT 1",
sendEmail($content['sender'], '{--MEMBER_ORDER_REJECTED--}', $message_user);
// If you do not enter an URL to redirect to, your URL will be set!
- if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) setPostRequestParameter('redirect', getUrl());
+ if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) {
+ setPostRequestParameter('redirect', getUrl());
+ } // END - if
// Redirect URL
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET url='%s', `data_type`='NEW' WHERE `id`=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `url`='%s', `data_type`='NEW' WHERE `id`=%s LIMIT 1",
array(postRequestParameter('redirect'), $id),__FILE__, __LINE__);
// Prepare data for the row template
--
2.39.5