diff options
| author | uid42062 <uid42062@users.sourceforge.net> | 2001-07-04 21:43:57 +0000 |
|---|---|---|
| committer | uid42062 <uid42062@users.sourceforge.net> | 2001-07-04 21:43:57 +0000 |
| commit | 5f20953aa6f196d0588bfe2f1142ca7ed6f63414 (patch) | |
| tree | 2cbd315b97e32219e3491712529aa3e7aef431b2 /phpBB/privmsg.php | |
| parent | a6723b8a1ba6ebf4a455a7a56b804d4973463402 (diff) | |
| download | forums-5f20953aa6f196d0588bfe2f1142ca7ed6f63414.tar forums-5f20953aa6f196d0588bfe2f1142ca7ed6f63414.tar.gz forums-5f20953aa6f196d0588bfe2f1142ca7ed6f63414.tar.bz2 forums-5f20953aa6f196d0588bfe2f1142ca7ed6f63414.tar.xz forums-5f20953aa6f196d0588bfe2f1142ca7ed6f63414.zip | |
More updates, added a previous x day select box
git-svn-id: file:///svn/phpbb/trunk@554 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/privmsg.php')
| -rw-r--r-- | phpBB/privmsg.php | 90 |
1 files changed, 70 insertions, 20 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 5c0c04ae9a..9a72a86b7e 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -1058,23 +1058,9 @@ $savebox_url .= ($folder != "savebox") ? "<a href=\"" . append_sid("privmsg.$php $post_new_mesg_url = "<a href=\"privmsg.$phpEx?mode=post\"><img src=\"templates/PSO/images/post.gif\" border=\"1\"></a>"; -$template->assign_vars(array( - "INBOX" => $inbox_url, - "SENTBOX" => $sentbox_url, - "OUTBOX" => $outbox_url, - "SAVEBOX" => $savebox_url, - - "L_MARK" => $lang['Mark'], - "L_FLAG" => $lang['Flag'], - "L_SUBJECT" => $lang['Subject'], - "L_DATE" => $lang['Date'], - "L_FROM_OR_TO" => (($folder == "inbox" || $folder == "savebox") ? $lang['From'] : $lang['To']), - - "S_HIDDEN_FIELDS" => "", - "S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), - "S_POST_NEW_MSG" => $post_new_mesg_url) -); - +// +// General SQL to obtain messages +// $sql_tot = "SELECT COUNT(privmsgs_id) AS total FROM " . PRIVMSGS_TABLE . " "; $sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u "; @@ -1088,7 +1074,7 @@ switch($folder) $sql .= "WHERE pm.privmsgs_to_userid = " . $userdata['user_id'] . " AND u.user_id = pm.privmsgs_from_userid AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " - OR pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " )"; + OR pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " )"; break; case 'outbox': @@ -1119,8 +1105,73 @@ switch($folder) break; } -$sql .= " ORDER BY pm.privmsgs_date DESC LIMIT $start, " . $board_config['topics_per_page']; +// +// Show messages over previous x days/months +// +if(!empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays'])) +{ + $msg_days = (!empty($HTTP_POST_VARS['msgdays'])) ? $HTTP_POST_VARS['msgdays'] : $HTTP_GET_VARS['msgdays']; + $min_msg_time = time() - ($msg_days * 86400); + + $limit_msg_time_total = " AND privmsgs_date > $min_msg_time"; + $limit_msg_time = " AND pm.privmsgs_date > $min_msg_time "; + + if(!empty($HTTP_POST_VARS['msgdays'])) + { + $start = 0; + } +} +else +{ + $limit_msg_time = ""; + $post_days = 0; +} + +$sql .= $limit_msg_time . " ORDER BY pm.privmsgs_date DESC LIMIT $start, " . $board_config['topics_per_page']; +$sql_tot .= $limit_msg_time_total; + +// +// Build select box +// +$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); +$previous_days_text = array($lang['All_Messages'], "1 " . $lang['Day'], "7 " . $lang['Days'], "2 " . $lang['Weeks'], "1 " . $lang['Month'], "3 ". $lang['Months'], "6 " . $lang['Months'], "1 " . $lang['Year']); + +$select_msg_days = "<select name=\"msgdays\">"; +for($i = 0; $i < count($previous_days); $i++) +{ + $selected = ($msg_days == $previous_days[$i]) ? " selected" : ""; + $select_msg_days .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>"; +} +$select_msg_days .= "</select>"; + +// +// Dump vars to template +// +$template->assign_vars(array( + "INBOX" => $inbox_url, + "SENTBOX" => $sentbox_url, + "OUTBOX" => $outbox_url, + "SAVEBOX" => $savebox_url, + "L_MARK" => $lang['Mark'], + "L_FLAG" => $lang['Flag'], + "L_SUBJECT" => $lang['Subject'], + "L_DATE" => $lang['Date'], + "L_DISPLAY_MESSAGES" => $lang['Display_messages'], + "L_FROM_OR_TO" => (($folder == "inbox" || $folder == "savebox") ? $lang['From'] : $lang['To']), + + "S_HIDDEN_FIELDS" => "", + "S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), + "S_POST_NEW_MSG" => $post_new_mesg_url, + "S_SELECT_MSG_DAYS" => $select_msg_days, + "S_MSG_DAYS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder&start=$start"), + + "U_POST_NEW_TOPIC" => $post_new_topic_url) +); + +// +// Get messages +// if(!$pm_tot_status = $db->sql_query($sql_tot)) { message_die(GENERAL_ERROR, "Could not query private message information.", "", __LINE__, __FILE__, $sql_tot); @@ -1135,7 +1186,6 @@ $pm_list = $db->sql_fetchrowset($pm_status); // // Okay, let's build the correct folder // - for($i = 0; $i < count($pm_list); $i++) { $privmsg_id = $pm_list[$i]['privmsgs_id']; |