X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=9dff0083b289d476f6235b8394b35f1e061703bb;hb=9d3e47c8ab6ff3ab7efca2a968d66a5ccf76728d;hp=7c934c13ec817037b7bd03c72ab9b277ac5da66a;hpb=46f2e389417a40f1029612b58cb285416ccae7a5;p=mailer.git diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 7c934c13ec..9dff0083b2 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -38,15 +38,15 @@ // 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(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "mailid"); +} elseif (!EXT_IS_ACTIVE('mailid')) { + addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), '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; @@ -60,25 +60,25 @@ ON p.id=s.pool_id 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 = REQUEST_GET('mid'); $LINK = "mailid"; -} elseif ((REQUEST_ISSET_GET(('bid'))) && (EXT_IS_ACTIVE("bonus"))) { + $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='".REQUEST_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 = REQUEST_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 { // @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')); + LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY')); } // Shall I display links or not? @@ -92,8 +92,8 @@ if ($listed === true) { 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; + 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 @@ -104,23 +104,24 @@ 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); if ($unconfirmed > 0) { // At least one link left to confirm - $OUT = ""; $SW = 2; + + $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($content['userid']), + 'u_link' => generateUserProfileLink($content['userid']), 'uid' => $content['userid'], 'link' => $LINK, 'id' => $ID, - 'email' => "".TRANSLATE_GENDER($content['gender'])." ".$content['surname']." ".$content['family']."", - 'status' => TRANSLATE_STATUS($content['status']), + 'email' => "".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."", + 'status' => translateUserStatus($content['status']), ); // Load row template and switch colors @@ -135,7 +136,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s", SQL_FREERESULT($result); } else { // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm. - $OUT = 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 @@ -146,7 +147,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s", 'text' => COMPILE_CODE($text), 'url' => FRAMETESTER($url), 'unconfirmed' => $unconfirmed, - 'stamp' => MAKE_DATETIME($stamp, "2"), + 'stamp' => generateDateTime($stamp, '2'), 'rows' => $OUT ); @@ -154,19 +155,19 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s", 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, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID)); + 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, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING'), $ID)); + 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 @@ -174,7 +175,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s", SQL_FREERESULT($result2); } 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')); } }