X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=b10c723aa538b93a64efd76276ea38c4950bf127;hb=f8da178ba4b2f0ed9bfd303d6d32f62b0919a442;hp=9616b698b04f37cabcc54956d1086bd47e8d4357;hpb=d70996f3e1e42dc259a9bdaf736592720fd0c7ce;p=mailer.git diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 9616b698b0..b10c723aa5 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -10,10 +10,10 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Unbestaetigte Mails * * -------------------------------------------------------------------- * - * $Revision:: 856 $ * - * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ * + * $Revision:: $ * + * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * - * $Author:: stelzi $ * + * $Author:: $ * * Needs to be in all Files and every File needs "svn propset * * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * @@ -38,46 +38,46 @@ // Some security stuff... if (!defined('__SECURITY')) { - $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 (!IS_MEMBER()) { - LOAD_URL("modules.php?module=index"); -} elseif ((!EXT_IS_ACTIVE("mailid")) && (!IS_ADMIN())) { - LOAD_URL("modules.php?module=login"); + redirectToUrl('modules.php?module=index'); +} elseif ((!EXT_IS_ACTIVE('mailid')) && (!IS_ADMIN())) { + redirectToUrl('modules.php?module=login'); } // Add description as navigation point -ADD_DESCR("member", __FILE__); +ADD_DESCR('member', __FILE__); // Shall we display a mail? -if ((REQUEST_ISSET_GET(('bonusid'))) && (EXT_IS_ACTIVE("bonus"))) { +if ((REQUEST_ISSET_GET(('bonusid'))) && (EXT_IS_ACTIVE('bonus'))) { // Display bonus mail by loading it's full data $result_data = SQL_QUERY_ESC("SELECT id, subject, timestamp, cat_id, points, text, is_notify, data_type, time, url FROM `{!_MYSQL_PREFIX!}_bonus` -WHERE id=%s LIMIT 1", - array(bigintval(REQUEST_GET('bonusid'))), __FILE__, __LINE__); +WHERE `id`=%s LIMIT 1", + array(bigintval(REQUEST_GET('bonusid'))), __FILE__, __LINE__); // Load data $content = SQL_FETCHARRAY($result_data); - // "Translate some data + // Translate some data $content['subject'] = COMPILE_CODE($content['subject']); $content['text'] = COMPILE_CODE($content['text']); - $content['timestamp'] = MAKE_DATETIME($content['timestamp'], "2"); - $content['category'] = GET_CATEGORY($content['cat_id']); - $content['points'] = TRANSLATE_COMMA($content['points']); - $content['is_notify'] = TRANSLATE_YESNO($content['is_notify']); - $content['sender'] = _ADMIN_SHORT; - $content['time'] = CREATE_FANCY_TIME($content['time']); + $content['timestamp'] = generateDateTime($content['timestamp'], '2'); + $content['category'] = getCategory($content['cat_id']); + $content['points'] = translateComma($content['points']); + $content['is_notify'] = translateYesNo($content['is_notify']); + $content['sender'] = getMessage('_ADMIN_SHORT'); + $content['time'] = createFancyTime($content['time']); $content['uid'] = getUserId(); // Get timestamp from insert $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'), - MAKE_DATETIME(USER_STATS_GET_TIMESTAMP("bonusid", $content['id']), "2") + generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), '2') ); // Display it depending on mail (data) type - LOAD_TEMPLATE("member_mail_bonus_".strtolower($content['data_type']), false, $content); + LOAD_TEMPLATE('member_mail_bonus_'.strtolower($content['data_type']), false, $content); // Free result SQL_FREERESULT($result_data); @@ -90,77 +90,77 @@ ON s.pool_id=p.id LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS pay ON p.payment_id=pay.id WHERE s.id=%s LIMIT 1", - array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__); + array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__); // Load data $content = SQL_FETCHARRAY($result_data); - // "Translate some data + // Translate some data $content['subject'] = COMPILE_CODE($content['subject']); $content['text'] = COMPILE_CODE($content['text']); - $content['timestamp'] = MAKE_DATETIME($content['timestamp'], "2"); - $content['category'] = GET_CATEGORY($content['cat_id']); - $content['points'] = TRANSLATE_COMMA($content['points']); - $content['time'] = CREATE_FANCY_TIME($content['time']); + $content['timestamp'] = generateDateTime($content['timestamp'], '2'); + $content['category'] = getCategory($content['cat_id']); + $content['points'] = translateComma($content['points']); + $content['time'] = createFancyTime($content['time']); $content['uid'] = getUserId(); // Get timestamp from insert $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'), - MAKE_DATETIME(USER_STATS_GET_TIMESTAMP("mailid", $content['id']), "2") + generateDateTime(getTimestampFromUserStats('mailid', $content['id']), '2') ); // Display it depending on mail (data) type - LOAD_TEMPLATE("member_mail_normal_".strtolower($content['data_type']), false, $content); + LOAD_TEMPLATE('member_mail_normal_'.strtolower($content['data_type']), false, $content); // Free result SQL_FREERESULT($result_data); } -if (EXT_IS_ACTIVE("bonus")) { +if (EXT_IS_ACTIVE('bonus')) { // Load bonus ID $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY bonus_id DESC, stats_id DESC", - array(getUserId()), __FILE__, __LINE__); + array(getUserId()), __FILE__, __LINE__); } else { // Don't load bonus ID $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY stats_id DESC", - array(getUserId()), __FILE__, __LINE__); + array(getUserId()), __FILE__, __LINE__); } // Mails left for confirmation? if (SQL_NUMROWS($result) > 0) { // Please confirm these mails! - $sum = 0; $OUT = ""; $SW = 2; + $sum = 0; $OUT = ''; $SW = 2; // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() while (list($id, $id2, $type) = SQL_FETCHROW($result)) { // Load data from stats table... - $cat = ""; $result_data = false; + $cat = ''; $result_data = false; switch ($type) { - case "NORMAL": - $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender + case 'NORMAL': + $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender FROM `{!_MYSQL_PREFIX!}_user_stats` AS s LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p ON s.pool_id=p.id WHERE s.id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); - $type = "mailid"; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM'); - break; + $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM'); + break; - case "BONUS": - $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1", + case 'BONUS': + $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1", array(bigintval($id2)), __FILE__, __LINE__); - $type = "bonusid"; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM'); - break; + $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM'); + break; - default: // Unknown type detected! - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type)); - break; + default: // Unknown type detected! + DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type)); + break; } // Data found to this mail? - if ((SQL_NUMROWS($result_data) == 1) && (($type == "mailid") || ($type == "bonusid"))) { + if ((SQL_NUMROWS($result_data) == 1) && (($type == 'mailid') || ($type == 'bonusid'))) { // Mail was found! list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data); @@ -174,10 +174,10 @@ LIMIT 1", } // Prepare sender id - if (($sender > 0) && ($type == "mailid")) { + if (($sender > 0) && ($type == 'mailid')) { // Sender id $sender = bigintval($sender); - } elseif ($type == "bonusid") { + } elseif ($type == 'bonusid') { // Is admin $sender = getMessage('_ADMIN_SHORT'); } else { @@ -193,16 +193,16 @@ LIMIT 1", 'type' => $type, 'subject' => $subject, 'sender' => $sender, - 'stamp' => MAKE_DATETIME($timestamp, "2"), - 'cat' => GET_CATEGORY($cat), - 'points' => TRANSLATE_COMMA($pay), + 'stamp' => generateDateTime($timestamp, '2'), + 'cat' => getCategory($cat), + 'points' => translateComma($pay), ); // Load row template - if (getConfig('show_points_unconfirmed') == "Y") { - $OUT .= LOAD_TEMPLATE("member_unconfirmed_row", true, $content); + if (getConfig('show_points_unconfirmed') == 'Y') { + $OUT .= LOAD_TEMPLATE('member_unconfirmed_row', true, $content); } else { - $OUT .= LOAD_TEMPLATE("member_unconfirmed_row_nopoints", true, $content); + $OUT .= LOAD_TEMPLATE('member_unconfirmed_row_nopoints', true, $content); } // Count points @@ -216,10 +216,10 @@ LIMIT 1", ); // Display points or not? - if (getConfig('show_points_unconfirmed') == "Y") { - $OUT .= LOAD_TEMPLATE("member_unconfirmed_404", true, $content); + if (getConfig('show_points_unconfirmed') == 'Y') { + $OUT .= LOAD_TEMPLATE('member_unconfirmed_404', true, $content); } else { - $OUT .= LOAD_TEMPLATE("member_unconfirmed_404_nopoints", true, $content); + $OUT .= LOAD_TEMPLATE('member_unconfirmed_404_nopoints', true, $content); } } @@ -234,20 +234,20 @@ LIMIT 1", SQL_FREERESULT($result); // Remember total points - define('__TOTAL_POINTS', TRANSLATE_COMMA($sum)); + define('__TOTAL_POINTS', translateComma($sum)); // Remember all generated rows in constant for the template define('__UNCONFIRMED_ROWS', $OUT); // Load main template - if (getConfig('show_points_unconfirmed') == "Y") { - LOAD_TEMPLATE("member_unconfirmed_table"); + if (getConfig('show_points_unconfirmed') == 'Y') { + LOAD_TEMPLATE('member_unconfirmed_table'); } else { - LOAD_TEMPLATE("member_unconfirmed_table_nopoints"); + LOAD_TEMPLATE('member_unconfirmed_table_nopoints'); } } else { // No mails left to confirm... :) - LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM')); + LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM')); } //