X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=521cc90c12149b13d5a78719e5d1edf927fb9ef7;hp=1787b6f75d230cd7cac37bdffddaa8ecb76b394e;hb=1e2a4228e071a67a2d79e970a843e3e30476cfb8;hpb=77cdaff2afb97ed32985ced906a3a95ee078c2ef
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 1787b6f75d..521cc90c12 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Unbest. Mail-Links auflisten *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -33,68 +38,62 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
-} elseif (!EXT_IS_ACTIVE("mailid")) {
- addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "mailid");
+} elseif (!EXT_IS_ACTIVE('mailid')) {
+ addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('mailid'));
return;
}
// Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
// Don't load the admin_list_unconfirmed template by default
$listed = false;
-if (!empty($_GET['mid'])) {
- // List confirmation links from your member's mail orders
- define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_MEMBER_LINKS'));
-
+// List confirmation links from normal or bonus mails
+if (REQUEST_ISSET_GET(('mid'))) {
// SQL query for mail data
- $SQL = "SELECT DISTINCT s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec FROM `{!_MYSQL_PREFIX!}_pool` AS p
+ $sql = "SELECT DISTINCT s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec FROM `{!_MYSQL_PREFIX!}_pool` AS p
LEFT JOIN `{!_MYSQL_PREFIX!}_user_stats` AS s
ON p.id=s.pool_id
-WHERE p.id='".$_GET['mid']."' LIMIT 1";
+WHERE p.id='".REQUEST_GET('mid')."' LIMIT 1";
// Column, type and ID for member's mail
- $col = "stats_id"; $type = "NORMAL"; $ID = "-1";
+ $col = "stats_id"; $type = "NORMAL"; $ID = '-1';
// Load admin_list_unconfirmed template
- $listed = true; $DATA = $_GET['mid']; $LINK = "mailid";
-} elseif ((!empty($_GET['bid'])) && (EXT_IS_ACTIVE("bonus"))) {
- // List confirmation links from bonus mails
+ $listed = true; $DATA = REQUEST_GET('mid'); $LINK = 'mailid';
+} elseif ((REQUEST_ISSET_GET(('bid'))) && (EXT_IS_ACTIVE('bonus'))) {
+ // @TODO This constant might be unused?
define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
// SQL query for mail data (both ids are required for compatiblity to above normal mail
- $SQL = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id='".$_GET['bid']."' LIMIT 1";
+ $sql = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`='".REQUEST_GET('bid')."' LIMIT 1";
// Column, type and ID for member's mail
- $col = "bonus_id"; $type = "BONUS"; $ID = $_GET['bid'];
+ $col = 'bonus_id'; $type = "BONUS"; $ID = REQUEST_GET('bid');
// Load admin_list_unconfirmed template
- $listed = true; $DATA = $ID; $LINK = "bonusid";
+ $listed = true; $DATA = $ID; $LINK = 'bonusid';
} else {
- // "Please do not call me directly."
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));
+ // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));
}
// Shall I display links or not?
if ($listed === true) {
// Load mail data
- $result = SQL_QUERY($SQL, __FILE__, __LINE__);
+ $result = SQL_QUERY($sql, __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Mail order / bonus mail found!
+ // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
list($stats_id, $sender, $subj, $text, $url, $stamp, $max) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
// Transfer data to constants for the template
- if (($stats_id > 0) && ($ID == "-1")) $ID = $stats_id;
- if ($col == "bonus_id") $sender = 0;
- define('__LIST_UNCON_SENDER' , $sender);
- define('__LIST_UNCON_SUBJECT', COMPILE_CODE($subj));
- define('__LIST_UNCON_TEXT' , COMPILE_CODE($text));
- define('__LIST_UNCON_URL' , urlencode(base64_encode($url)));
- define('__LIST_UNCON_STAMP' , MAKE_DATETIME($stamp, "2"));
+ if (($stats_id > 0) && ($ID == '-1')) $ID = $stats_id;
+ if ($col == 'bonus_id') $sender = 0;
// Load unconfirmed mail links. Hmmm, this select query is pretty cool
// but it does only show unconfirmed mail links from existing user
@@ -105,67 +104,78 @@ FROM `{!_MYSQL_PREFIX!}_user_links` AS l
LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS u
ON l.userid=u.userid
WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
- array($col, $ID, bigintval($max)),__FILE__, __LINE__);
+ array($col, $ID, bigintval($max)),__FILE__, __LINE__);
$unconfirmed = SQL_NUMROWS($result);
- define('__LIST_UNCO_UNCONFIRMED', $unconfirmed);
if ($unconfirmed > 0) {
// At least one link left to confirm
- $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_header", true);
- $SW = 2;
- while (list($uid, $status, $sname, $fname, $gender, $email) = SQL_FETCHROW($result)) {
+
+ $OUT = ''; $SW = 2;
+ while ($content = SQL_FETCHARRAY($result)) {
// Prepare data for the row template
+ // @TODO Rewritings: uid->userid
$content = array(
'sw' => $SW,
- 'u_link' => ADMIN_USER_PROFILE_LINK($uid),
- 'uid' => $uid,
+ 'u_link' => generateUserProfileLink($content['userid']),
+ 'uid' => $content['userid'],
'link' => $LINK,
'id' => $ID,
- 'email' => "".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."",
- 'status' => TRANSLATE_STATUS($status),
+ 'email' => "".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."",
+ 'status' => translateUserStatus($content['status']),
);
// Load row template and switch colors
$OUT .= LOAD_TEMPLATE("admin_list_unconfirmed_row", true, $content);
$SW = 3 - $SW;
}
- $OUT .= "\n";
+
+ // Render it in our new listing
+ $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_list", true, $OUT);
// Free memory
SQL_FREERESULT($result);
-
- // Store table rows in a constant
- define('__LIST_UNCON_LISTING', $OUT);
} else {
// All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
- define('__LIST_UNCON_LISTING', LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT')));
+ $OUT = LOAD_TEMPLATE('admin_settings_saved', true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT'));
}
+ // Prepare content
+ $content = array(
+ 'sender_link' => ADMIN_CREATE_USERID_LINK($sender),
+ 'sender_userid' => $sender,
+ 'subject' => COMPILE_CODE($subj),
+ 'text' => COMPILE_CODE($text),
+ 'url' => FRAMETESTER($url),
+ 'unconfirmed' => $unconfirmed,
+ 'stamp' => generateDateTime($stamp, '2'),
+ 'rows' => $OUT
+ );
+
// Load final template
- LOAD_TEMPLATE("admin_list_unconfirmed");
- } elseif ($_GET['mid'] > 0) {
+ LOAD_TEMPLATE("admin_list_unconfirmed", false, $content);
+ } elseif (REQUEST_GET('mid') > 0) {
// Data in pool or in user_stats not found, so let's find out where data is missing
- $result1 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
- array(bigintval($ID)), __FILE__, __LINE__);
- $result2 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
- array(bigintval($ID)), __FILE__, __LINE__);
+ $result1 = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
+ array(bigintval($ID)), __FILE__, __LINE__);
+ $result2 = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+ array(bigintval($ID)), __FILE__, __LINE__);
if (SQL_NUMROWS($result1) == 1) {
// pool table
- LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_POOL_MISSING_1.$ID.ADMIN_UNCONFIRMED_POOL_MISSING_2);
+ LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID));
} elseif (SQL_NUMROWS($result2) == 1) {
// user_stats table
- LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_STATS_MISSING_1.$ID.ADMIN_UNCONFIRMED_STATS_MISSING_2);
+ LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING'), $ID));
} else {
// both or link is invalid
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
}
// Free memory
SQL_FREERESULT($result1);
SQL_FREERESULT($result2);
- } elseif (!empty($_GET['bid'])) {
+ } elseif (REQUEST_ISSET_GET(('bid'))) {
// Data in bonus table not found
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
}
}