- 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
author: Meik Sievertsen <acydburn@phpbb.com> 2005-04-09 12:26:45 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2005-04-09 12:26:45 +0000
commit: fc32df035889dd74f2cfc1c62bb793d36f333ec2 (patch)
tree: 12134eada004226d1ea5b31b420d1c63f05e7376 /phpBB/includes/ucp
parent: 0ba3f620d4afb963b89c532b664693c974ec4f8a (diff)
download: forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar
forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.gz
forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.bz2
forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.xz
forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.zip
15 files changed, 272 insertions, 236 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index f7d069e5de..0241ce7974 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -1,16 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_activate.php
-// STARTED   : Mon May 19, 2003
-// COPYRIGHT : © 2001, 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
- 
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_activate
+* User activation
+*/
 class ucp_activate extends module 
 {
 	function ucp_activate($id, $mode)
@@ -91,7 +93,7 @@ class ucp_activate extends module
 			);
 
 			$messenger->send($row['user_notify_type']);
-			$messenger->queue->save();
+			$messenger->save_queue();
 
 			$message = 'ACCOUNT_ACTIVE_ADMIN';
 		}
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index e499b3f907..2e479b0654 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -1,20 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_attachments.php
-// STARTED   : Mon Nov 03, 2003
-// COPYRIGHT : © 2001, 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
-//
-// * Use this for ACP integration - changeable user id
-//
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_attachments
+* User attachments
+*/
 class ucp_attachments extends module
 {
 	function ucp_attachments($id, $mode)
diff --git a/phpBB/includes/ucp/ucp_confirm.php b/phpBB/includes/ucp/ucp_confirm.php
index fdf0b8aeaf..d50a8b72cc 100644
--- a/phpBB/includes/ucp/ucp_confirm.php
+++ b/phpBB/includes/ucp/ucp_confirm.php
@@ -1,23 +1,25 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_confirm.php
-// STARTED   : Mon May 19, 2003
-// COPYRIGHT : © 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
-// Note to potential users of this code ...
-//
-// Remember this is released under the _GPL_ and is subject
-// to that licence. Do not incorporate this within software 
-// released or distributed in any way under a licence other
-// than the GPL. We will be watching ... ;)
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_confirm
+* Visual confirmation
+*
+* Note to potential users of this code ...
+*
+* Remember this is released under the _GPL_ and is subject
+* to that licence. Do not incorporate this within software 
+* released or distributed in any way under a licence other
+* than the GPL. We will be watching ... ;)
+*/
 class ucp_confirm extends module 
 {
 	function ucp_confirm($id, $mode)
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 75e0c8367e..68b6ad1c68 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -1,16 +1,17 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_groups.php
-// STARTED   : Sun Jun 6, 2004
-// COPYRIGHT : © 2001, 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
-//
-// -------------------------------------------------------------
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
 
+/**
+* @package ucp
+* ucp_groups
+*/
 class ucp_groups extends module
 {
 	function ucp_groups($id, $mode)
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 78aad9b61b..1c7752cda8 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -1,16 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_main.php
-// STARTED   : Mon May 19, 2003
-// COPYRIGHT : © 2001, 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_main
+* UCP Front Panel
+*/
 class ucp_main extends module  
 {
 	function ucp_main($id, $mode)
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index 21962ea215..0ec90c3886 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -1,45 +1,44 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_pm.php
-// STARTED   : Sat Mar 27, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
-// TODO:
-//
-// * Review of post when replying/quoting
-// * Handle delete flag (user deletes PM from outbox)
-// * Report PM
-// * Check Permissions (compose message - to user/group)
-
-/*
-	folder=
-		(int)		display folder with the id used
-		(string)	can be inbox, outbox or sentbox
-
-	Display Unread Messages - mode=unread
-	Display Messages (default to inbox) - mode=view_messages
-	Display single message - mode=view_messages&action=view_message&p=[msg_id] or &p=[msg_id] (short linkage)
-
-	if the folder id with (&f=[folder_id]) is used when displaying messages, one query will be saved. If it is not used, phpBB needs to grab
-	the folder id first in order to display the input boxes and folder names and such things. ;) phpBB always checks this against the database to make
-	sure the user is able to view the message.
-
-	Composing Messages (mode=compose):
-		To specific user (u=[user_id])
-		To specific group (g=[group_id])
-		Quoting a post (action=quote&q=1&p=[post_id])
-		Quoting a PM (action=quote&p=[msg_id])
-		Forwarding a PM (action=forward&p=[msg_id])
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
 */
 
+/**
+* @package ucp
+* ucp_pm
+*
+* Private Message Class
+*
+* @param int $folder display folder with the id used
+* @param inbox|outbox|sentbox display folder with the associated name
+*
+*
+*	Display Unread Messages - mode=unread
+*	Display Messages (default to inbox) - mode=view_messages
+*	Display single message - mode=view_messages&action=view_message&p=[msg_id] or &p=[msg_id] (short linkage)
+*
+*	if the folder id with (&f=[folder_id]) is used when displaying messages, one query will be saved. If it is not used, phpBB needs to grab
+*	the folder id first in order to display the input boxes and folder names and such things. ;) phpBB always checks this against the database to make
+*	sure the user is able to view the message.
+*
+*	Composing Messages (mode=compose):
+*		To specific user (u=[user_id])
+*		To specific group (g=[group_id])
+*		Quoting a post (action=quote&q=1&p=[post_id])
+*		Quoting a PM (action=quote&p=[msg_id])
+*		Forwarding a PM (action=forward&p=[msg_id])
+*
+*
+* @todo Review of post when replying/quoting
+* @todo Report PM
+* @todo Check Permissions (compose message - to user/group)
+*
+*/
 class ucp_pm extends module
 {
 	function ucp_pm($id, $mode)
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 10d6d6baae..33ee31b22c 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -1,18 +1,17 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : compose.php
-// STARTED   : Sat Mar 27, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
-// * Called from ucp_pm with mode == 'compose'
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* Compose private message
+* Called from ucp_pm with mode == 'compose'
+*/
 function compose_pm($id, $mode, $action)
 {
 	global $template, $db, $auth, $user;
@@ -763,7 +762,9 @@ function compose_pm($id, $mode, $action)
 	}
 }
 
-// For composing messages, handle list actions
+/**
+* For composing messages, handle list actions
+*/
 function handle_message_list_actions(&$address_list, $remove_u, $remove_g, $add_to, $add_bcc)
 {
 	global $_REQUEST;
@@ -832,7 +833,9 @@ function handle_message_list_actions(&$address_list, $remove_u, $remove_g, $add_
 
 }
 
-// Return number of recipients
+/**
+* Return number of private message recipients
+*/
 function num_recipients($address_list)
 {
 	$num_recipients = 0;
@@ -845,7 +848,9 @@ function num_recipients($address_list)
 	return $num_recipients;
 }
 
-// Get recipient at position 'pos'
+/**
+* Get recipient at position 'pos'
+*/
 function get_recipient_pos($address_list, $position = 1)
 {
 	$recipient = array();
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index a07b8e3aee..76ba3553f9 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -1,16 +1,16 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : options.php
-// STARTED   : Mon Apr 19, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* Execute message options
+*/
 function message_options($id, $mode, $global_privmsgs_rules, $global_rule_conditions)
 {
 	global $phpbb_root_path, $phpEx, $SID, $user, $template, $auth, $config, $db;
@@ -476,6 +476,9 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	show_defined_rules($user->data['user_id'], $check_lang, $rule_lang, $action_lang, $folder);
 }
 
+/**
+* Defining check option for message rules
+*/
 function define_check_option($hardcoded, $check_option, $check_lang)
 {
 	global $template;
@@ -498,6 +501,9 @@ function define_check_option($hardcoded, $check_option, $check_lang)
 	);
 }
 
+/**
+* Defining action option for message rules
+*/
 function define_action_option($hardcoded, $action_option, $action_lang, $folder)
 {
 	global $db, $template, $user;
@@ -542,6 +548,9 @@ function define_action_option($hardcoded, $action_option, $action_lang, $folder)
 	);
 }
 
+/**
+* Defining rule option for message rules
+*/
 function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
 {
 	global $template;
@@ -564,6 +573,9 @@ function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
 	);
 }
 
+/**
+* Defining condition option for message rules
+*/
 function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions)
 {
 	global $db, $template;
@@ -668,6 +680,9 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 	);
 }
 
+/**
+* Display defined message rules
+*/
 function show_defined_rules($user_id, $check_lang, $rule_lang, $action_lang, $folder)
 {
 	global $db, $template;
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;
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 217e0a646b..6dacb79b3b 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -1,16 +1,16 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : viewmessage.php
-// STARTED   : Mon Apr 12, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
-//
-// -------------------------------------------------------------
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* View private message
+*/
 function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 {
 	global $phpbb_root_path, $phpEx, $SID, $user, $template, $auth, $config, $db;
@@ -222,7 +222,9 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	}
 }
 
-// Display Message History
+/**
+* Display Message History
+*/
 function message_history($msg_id, $user_id, $message_row, $folder)
 {
 	global $db, $user, $config, $template, $phpbb_root_path, $phpEx, $SID, $auth, $bbcode;
@@ -356,7 +358,9 @@ function message_history($msg_id, $user_id, $message_row, $folder)
 	return true;
 }
 
-// Get User Informations (only for message display)
+/**
+* Get User Informations (only for message display)
+*/
 function get_user_informations($user_id, $user_row)
 {
 	global $config, $db, $auth, $user, $phpbb_root_path, $phpEx, $SID;
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index e90b28c46d..58c6e74e47 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -1,16 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_prefs.php
-// STARTED   : Mon May 19, 2003
-// COPYRIGHT : © 2001, 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
-//
-// -------------------------------------------------------------
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_prefs
+* Changing user preferences
+*/
 class ucp_prefs extends module
 {
 	function ucp_prefs($id, $mode)
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index a558e4b2b2..b8ec6fb0f5 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -1,16 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_profile.php
-// STARTED   : Mon May 19, 2003
-// COPYRIGHT : © 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
-//
-// -------------------------------------------------------------
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_profile
+* Changing profile settings
+*/
 class ucp_profile extends module
 {
 	function ucp_profile($id, $mode)
@@ -150,7 +152,7 @@ class ucp_profile extends module
 								$db->sql_freeresult($result);
 							}
 
-							$messenger->queue->save();
+							$messenger->save_queue();
 
 							$sql_ary += array(
 								'user_type'		=> USER_INACTIVE,
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 6dc10877fd..1a0c0e5eb9 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -1,16 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_register.php
-// STARTED   : Mon May 19, 2003
-// COPYRIGHT : © 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
-//
-// -------------------------------------------------------------
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_register
+* Board registration
+*/
 class ucp_register extends module
 {
 	function ucp_register($id, $mode)
@@ -69,7 +71,7 @@ class ucp_register extends module
 			else
 			{
 				$template->assign_vars(array(
-					'L_AGREEMENT'		=> $user->lang['UCP_AGREEMENT'],
+					'L_TERMS_OF_USE'	=> $user->lang['TERMS_OF_USE_CONTENT'],
 
 					'S_SHOW_COPPA'		=> false,
 					'S_REGISTER_ACTION'	=> "{$phpbb_root_path}ucp.$phpEx$SID&amp;mode=register")
@@ -413,7 +415,7 @@ class ucp_register extends module
 				$db->sql_freeresult($result);
 		
 				$code = gen_rand_string(6);
-				$confirm_id = md5(uniqid($user_ip));
+				$confirm_id = md5(uniqid($user->ip));
 
 				$sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
 					'confirm_id'	=> (string) $confirm_id,
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index 97dc2d5bfe..dea1027ce6 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -1,16 +1,18 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_remind.php
-// STARTED   : Mon May 19, 2003
-// COPYRIGHT : © 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_remind
+* Sending password reminders
+*/
 class ucp_remind extends module 
 {
 	function ucp_remind($id, $mode)
@@ -75,10 +77,7 @@ class ucp_remind extends module
 			);
 
 			$messenger->send($row['user_notify_type']);
-			if ($messenger->queue)
-			{
-				$messenger->queue->save();
-			}
+			$messenger->save_queue();
 
 
 			meta_refresh(3, "index.$phpEx$SID");
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index cdc5f9ca4b..ae0d5b496c 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -1,16 +1,17 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : ucp_zebra.php
-// STARTED   : Sun Sep 28, 2003
-// COPYRIGHT : © 2001, 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
+/** 
+*
+* @package ucp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package ucp
+* ucp_zebra
+*/
 class ucp_zebra extends module
 {
 	function ucp_zebra($id, $mode)
author	Meik Sievertsen <acydburn@phpbb.com>	2005-04-09 12:26:45 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2005-04-09 12:26:45 +0000
commit	fc32df035889dd74f2cfc1c62bb793d36f333ec2 (patch)
tree	12134eada004226d1ea5b31b420d1c63f05e7376 /phpBB/includes/ucp
parent	0ba3f620d4afb963b89c532b664693c974ec4f8a (diff)
download	forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.gz forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.bz2 forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.xz forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.zip