X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=6762cc915fbf0a4b9b06d7c793ff0a38f3ad4954;hp=4cfcb50a70d0668806e62bbc6369298c28f50b6a;hb=26c2b865f004bf366690df9766f06faa2d713a34;hpb=fb54237bf1d0c0a7435ad4322a4ac40f3bd72eba diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php index 4cfcb50a70..6762cc915f 100644 --- a/inc/modules/admin/what-email_details.php +++ b/inc/modules/admin/what-email_details.php @@ -42,8 +42,7 @@ ************************************************************************/ // Some security stuff... -if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) -{ +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } @@ -54,9 +53,10 @@ ADD_DESCR("admin", basename(__FILE__)); // Normal mails ordered by your members // 0 1 2 3 4 5 6 7 8 9 10 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id - FROM "._MYSQL_PREFIX."_pool - WHERE data_type IN('ADMIN', 'TEMP', 'NEW', 'ACTIVE') - ORDER BY timestamp DESC"; +FROM "._MYSQL_PREFIX."_pool +WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE') +ORDER BY timestamp DESC"; + $WHO = _ALL; $SQL2 = ""; @@ -81,8 +81,7 @@ if (!empty($_GET['mid'])) $WHO = USER_ID.": ".$_GET['u_id']; } -if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) -{ +if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) { // Bonus mails sent by you // 0 1 2 3 4 5 6 7 8 9 10 11 12 $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks @@ -122,227 +121,114 @@ $PAGES = round(SQL_NUMROWS($result_normal) / $_CONFIG['mails_page'] + 0.3); SQL_FREERESULT($result_normal); $MAIL = false; -if (SQL_NUMROWS($result_list) > 0) -{ - // Mail orders are in pool so we can display them - OUTPUT_HTML("
- - - -"); +if (SQL_NUMROWS($result_list) > 0) { + // Init rows + $OUT = ""; $content = array(); - // Add navigation (with change box and colspan=3) - if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3"); - - while ($pool = SQL_FETCHROW($result_list)) - { + // Walk through all entries + while ($pool = SQL_FETCHARRAY($result_list)) { // Unconfirmed mails and sent mails $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1", - array(bigintval($pool[0])), __FILE__, __LINE__); - list($sent, $clicks) = SQL_FETCHROW($result_uncon); + array(bigintval($pool['id'])), __FILE__, __LINE__); + list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon); SQL_FREERESULT($result_uncon); // Unconfirmed mails - $unconfirmed = $sent - $clicks; - if ($unconfirmed > 0) - { + $pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks']; + if ($pool['unconfirmed'] > 0) { // Add link to list_unconfirmed what-file - $unconfirmed = "".$unconfirmed.""; - } - elseif ($unconfirmed < 0) - { + $pool['unconfirmed'] = "".$pool['unconfirmed'].""; + } elseif ($pool['unconfirmed'] < 0) { // Sometimes rarely displayed minus values will be "fixed" to zero - $unconfirmed = "0"; + $pool['unconfirmed'] = 0; } - // List mail - OUTPUT_HTML(" - - - - - - - - - - - - - - - - - - - - - - - -"); - } + // Prepare content + $content = $pool; + $content['sender_link'] = ADMIN_USER_PROFILE_LINK($pool['sender']); + $content['subject'] = COMPILE_CODE($pool['subject']); + $content['text'] = COMPILE_CODE($pool['text']); + $content['payment'] = GET_PAYMENT($pool['payment_id']); + $content['category'] = GET_CATEGORY($pool['cat_id']); + $content['receivers'] = str_replace(";", ", ", $pool['receivers']); + $content['type'] = TRANSLATE_POOL_TYPE($pool['data_type']); + $content['frametester'] = FRAMETESTER($pool['url']); + $content['url'] = COMPILE_CODE($pool['url']); + $content['timestamp'] = MAKE_DATETIME($pool['timestamp'], "0"); + + // Load row template + $OUT .= LOAD_TEMPLATE("admin_list_emails_row", true, $content); + } // END - while // Free memory SQL_FREERESULT($result_list); - // Add navigation (without change box but with colspan=3) - if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3"); + // Add navigation (with change box and colspan=3) + $content['nav'] = ""; + if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true); + + // Prepare content + $content['rows'] = $OUT; + $content['who'] = $WHO; + + // Mail orders are in pool so we can display them + LOAD_TEMPLATE("admin_list_emails", false, $content); - // Output footer - OUTPUT_HTML("
- ".ADMIN_POOL_CONTENT." (".$WHO.") -
- ".EMAIL_SENDER.":
- ".ADMIN_USER_PROFILE_LINK($pool[1])." - 		- ".EMAIL_SUBJECT.":
- ".COMPILE_CODE($pool[2])." - 		- ".EMAIL_TEXT.":
- ".COMPILE_CODE($pool[3])." -
- ".EMAIL_PAYMENT.":
- ".GET_PAYMENT($pool[5])." - 		- ".EMAIL_CATEGORY.":
- ".GET_CATEGORY($pool[10])." -
- ".EMAIL_RECEIVERS.":
- ".$sent." (".EMAIL_RUIDS.": ".str_replace(";", ", ", $pool[4]).") - 		- ".USERS_LINKS.":
- ".$unconfirmed." - 		- ".EMAIL_POOL_TYPE.":
- ".GET_POOL_TYPE($pool[6])." -
- ".EMAIL_TSEND.":
- ".$pool[9]." - 		- ".EMAIL_URL.":
- ".ADMIN_TEST_URL." - 		- ".EMAIL_TIMESTAMP.":
- ".MAKE_DATETIME($pool[7], "0")." -
- ".ADMIN_DELETE_NORMAL_MAIL." -
-
"); $MAIL = true; - if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) - { + if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) { // Check only if bonus extension is active if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML("

"); } } -if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) -{ +if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) { // Load bonus mails only when extension is active - if (SQL_NUMROWS($result_bonus) > 0) - { - // Mail orders are in pool so we can display them - OUTPUT_HTML("
- - - -"); + if (SQL_NUMROWS($result_bonus) > 0) { // Calculate pages $PAGES = round(SQL_NUMROWS($result_bonus) / $_CONFIG['mails_page'] + 0.5); - // Add navigation (with change box and colspan=3) - if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], true, "3"); - // List emails - while ($bonus = SQL_FETCHROW($result_bonus)) - { - // Unconfirmed mails - $unconfirmed = $bonus[11] - $bonus[12]; - if ($unconfirmed > 0) - { + $OUT = ""; $content = array(); + while ($bonus = SQL_FETCHARRAY($result_bonus)) { + // Calculate unconfirmed emails + $bonus['unconfirmed'] = $bonus['mails_sent'] - $bonus['clicks']; + + // Add link? + if ($bonus['unconfirmed'] > 0) { // Add link to list_unconfirmed what-file - $unconfirmed = "".$unconfirmed.""; - } - - OUTPUT_HTML(" - - - - - - - - - - - - - - - - - - - - - - - -"); + $bonus['unconfirmed'] = "".$bonus['unconfirmed'].""; + } // END - if + + // Prepare content + $content = $bonus; + $content['time'] = CREATE_FANCY_TIME($content['time']); + $content['category'] = GET_CATEGORY($content['cat_id']); + $content['receivers'] = str_replace(";", ", ", $content['receivers']); + $content['type'] = TRANSLATE_POOL_TYPE($content['data_type']); + $content['frametester'] = FRAMETESTER($content['url']); + $content['timestamp'] = MAKE_DATETIME($content['timestamp'], "0"); + + // Load row template + $OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content); } // Add navigation (without change box but with colspan=3) - if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3"); + $content['nav'] = ""; + if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true); + + // Prepare content + $content['rows'] = $OUT; - // Output footer - OUTPUT_HTML("
- ".ADMIN_BONUS_CONTENT." -
- ".EMAIL_SUBJECT.":
- ".$bonus[1]." - 		- ".EMAIL_TEXT.":
- ".$bonus[2]." -
- ".EMAIL_POINTS.":
- ".$bonus[4]." ".POINTS." - 		- ".EMAIL_SECONDS.":
- ".$bonus[5]." "._SECONDS." - 		- ".EMAIL_CATEGORY.":
- ".GET_CATEGORY($bonus[9])." -
- ".EMAIL_RECEIVERS.":
- ".$bonus[11]." (".EMAIL_RUIDS.": ".str_replace(";", ", ", $bonus[3]).") - 		- ".USERS_LINKS.":
- ".$unconfirmed." - 		- ".EMAIL_POOL_TYPE.":
- ".GET_POOL_TYPE($bonus[6])." -
- ".EMAIL_TSEND.":
- ".$bonus[10]." - 		- ".EMAIL_URL.":
- ".ADMIN_TEST_URL." - 		- ".EMAIL_TIMESTAMP.":
- ".MAKE_DATETIME($bonus[7], "0")." -
- ".ADMIN_DELETE_BONUS_MAIL." -
-
"); + // Load main template + LOAD_TEMPLATE("admin_list_bonus_emails", false, $content); $MAIL = true; } } -if (!$MAIL) -{ +if (!$MAIL) { // No mail orders fond OUTPUT_HTML("".ADMIN_NO_MAILS_IN_POOL.""); } + // ?>