aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_viewfolder.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-04-09 12:26:45 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-04-09 12:26:45 +0000
commitfc32df035889dd74f2cfc1c62bb793d36f333ec2 (patch)
tree12134eada004226d1ea5b31b420d1c63f05e7376 /phpBB/includes/ucp/ucp_pm_viewfolder.php
parent0ba3f620d4afb963b89c532b664693c974ec4f8a (diff)
downloadforums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar
forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.gz
forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.bz2
forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.xz
forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.zip
- Documentation related changes
- added resend activation email dialog - fixed issue in session code - log failed/successful admin re-authentication/login - fixed simple forum dropdown box (used in mcp and posting) git-svn-id: file:///svn/phpbb/trunk@5114 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewfolder.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewfolder.php34
1 files changed, 18 insertions, 16 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index 8edac192ad..89fe1d53c8 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -1,18 +1,17 @@
<?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME : viewfolder.php
-// STARTED : Sun Apr 11, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW : http://www.phpbb.com/
-// LICENCE : GPL vs2.0 [ see /docs/COPYING ]
-//
-// -------------------------------------------------------------
-
-// * Called from ucp_pm with mode == 'view_messages' && action == 'view_folder'
-
+/**
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* View message folder
+* Called from ucp_pm with mode == 'view_messages' && action == 'view_folder'
+*/
function view_folder($id, $mode, $folder_id, $folder, $type)
{
global $phpbb_root_path, $phpEx, $SID, $user, $template, $auth, $config, $db;
@@ -179,8 +178,11 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
}
}
-// Get PM's in folder x from user x
-// Get PM's in all folders from user x with type of x (unread, new)
+/**
+* Get Messages from folder/user
+*
+* @param unread|new|folder $type type of message
+*/
function get_pm_from($folder_id, $folder, $user_id, $url, $type = 'folder')
{
global $user, $db, $template, $config, $auth, $_POST;