From fc32df035889dd74f2cfc1c62bb793d36f333ec2 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 9 Apr 2005 12:26:45 +0000
Subject: - 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
---
 phpBB/includes/mcp/mcp_forum.php | 31 ++++++++++++-----------
 phpBB/includes/mcp/mcp_front.php | 31 +++++++++--------------
 phpBB/includes/mcp/mcp_main.php  | 53 ++++++++++++++++++++++++----------------
 phpBB/includes/mcp/mcp_post.php  | 24 +++++++++---------
 phpBB/includes/mcp/mcp_queue.php | 40 ++++++++++++++----------------
 phpBB/includes/mcp/mcp_topic.php | 35 +++++++++++++-------------
 6 files changed, 107 insertions(+), 107 deletions(-)

(limited to 'phpBB/includes/mcp')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 7de44547e3..6478d02d54 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -1,20 +1,16 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : mcp_forum.php
-// STARTED   : Thu Jul 08, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
-//
-// TODO:
-//
-
+/** 
+*
+* @package mcp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* MCP Forum View
+*/
 function mcp_forum_view($id, $mode, $action, $url, $forum_info)
 {
 	global $SID, $phpEx, $phpbb_root_path, $config;
@@ -199,6 +195,9 @@ function mcp_forum_view($id, $mode, $action, $url, $forum_info)
 	unset($topic_rows);
 }
 
+/**
+* Resync topics
+*/
 function mcp_resync_topics($topic_ids)
 {
 	global $auth, $db, $template, $phpEx, $user, $SID, $phpbb_root_path;
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index b86afa74bb..2aafb49180 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -1,23 +1,16 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : mcp_front.php
-// STARTED   : Thu Jul 08, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
-//
-// TODO:
-//	- add list of forums user is moderator in (with links to common management facilities)
-//	- add statistics (how many reports handled, how many posts locked/moved... etc.? - 
-//			those would be only valid from the time the log is valid (and not purged)
-//
-
+/** 
+*
+* @package mcp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* MCP Front Panel
+*/
 function mcp_front_view($id, $mode, $action, $url)
 {
 	global $SID, $phpEx, $phpbb_root_path, $config;
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 743b745f8f..a86bc7c8fc 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1,16 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : mcp_main.php
-// STARTED   : Mon Sep 02, 2003
-// COPYRIGHT : © 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
+/** 
+*
+* @package mcp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package mcp
+* mcp_main
+* Handling mcp actions
+*/
 class mcp_main extends module
 {
 
@@ -196,10 +198,9 @@ class mcp_main extends module
 	}
 }
 
-
-
-
-// Lock/Unlock Topic/Post
+/**
+* Lock/Unlock Topic/Post
+*/
 function lock_unlock($mode, $ids)
 {
 	global $auth, $user, $db, $SID, $phpEx, $phpbb_root_path;
@@ -272,7 +273,9 @@ function lock_unlock($mode, $ids)
 	}
 }
 
-// Change Topic Type
+/**
+* Change Topic Type
+*/
 function change_topic_type($mode, $topic_ids)
 {
 	global $auth, $user, $db, $SID, $phpEx, $phpbb_root_path;
@@ -376,7 +379,9 @@ function change_topic_type($mode, $topic_ids)
 	}
 }
 
-// Move Topic
+/**
+* Move Topic
+*/
 function mcp_move_topic($topic_ids)
 {
 	global $auth, $user, $db, $template;
@@ -523,7 +528,9 @@ function mcp_move_topic($topic_ids)
 	}
 }
 
-// Delete Topics
+/**
+* Delete Topics
+*/
 function mcp_delete_topic($topic_ids)
 {
 	global $auth, $user, $db, $SID, $phpEx, $phpbb_root_path;
@@ -581,7 +588,9 @@ function mcp_delete_topic($topic_ids)
 	}
 }
 
-// Delete Posts
+/**
+* Delete Posts
+*/
 function mcp_delete_post($post_ids)
 {
 	global $auth, $user, $db, $SID, $phpEx, $phpbb_root_path;
@@ -690,7 +699,9 @@ function mcp_delete_post($post_ids)
 	}
 }
 
-// Fork Topic
+/**
+* Fork Topic
+*/
 function mcp_fork_topic($topic_ids)
 {
 	global $auth, $user, $db, $template, $config;
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index cb853aaef6..65ef3f7805 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -1,16 +1,16 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : mcp_post.php
-// STARTED   : Thu Jul 08, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
+/** 
+*
+* @package mcp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* Handling actions in post details screen
+*/
 function mcp_post_details($id, $mode, $action, $url)
 {
 	global $SID, $phpEx, $phpbb_root_path, $config;
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 1948a9bd49..c62e29ee38 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -1,16 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : mcp_queue.php
-// STARTED   : Mon Sep 02, 2003
-// COPYRIGHT : © 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
+/** 
+*
+* @package mcp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package mcp
+* mcp_queue
+* Handling the moderation queue
+*/
 class mcp_queue extends module
 {
 
@@ -460,12 +462,9 @@ function approve_post($post_id_list)
 
 				$messenger->send($post_data['user_notify_type']);
 				$messenger->reset();
-
-				if ($messenger->queue)
-				{
-					$messenger->queue->save();
-				}
 			}
+
+			$messenger->save_queue();
 		}
 
 		// Send out normal user notifications
@@ -669,12 +668,9 @@ function disapprove_post($post_id_list)
 
 				$messenger->send($post_data['user_notify_type']);
 				$messenger->reset();
-
-				if ($messenger->queue)
-				{
-					$messenger->queue->save();
-				}
 			}
+
+			$messenger->save_queue();
 		}
 		unset($post_info, $disapprove_reason);
 
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 48677b63aa..e73ddb51ad 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -1,20 +1,16 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : mcp_topic.php
-// STARTED   : Thu Jul 08, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
-//
-// TODO:
-//
-
+/** 
+*
+* @package mcp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* View topic in MCP
+*/
 function mcp_topic_view($id, $mode, $action, $url)
 {
 	global $SID, $phpEx, $phpbb_root_path, $config;
@@ -215,6 +211,9 @@ function mcp_topic_view($id, $mode, $action, $url)
 	);
 }
 
+/**
+* Split topic
+*/
 function split_topic($mode, $topic_id, $to_forum_id, $subject)
 {
 	global $db, $template, $user, $phpEx, $SID, $phpbb_root_path, $auth;
@@ -392,7 +391,9 @@ function split_topic($mode, $topic_id, $to_forum_id, $subject)
 	}
 }
 
-// Merge selected posts into selected topic
+/**
+* Merge selected posts into selected topic
+*/
 function merge_posts($topic_id, $to_topic_id)
 {
 	global $db, $template, $user, $phpEx, $SID, $phpbb_root_path, $auth;
-- 
cgit v1.2.1