diff options
| 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/ucp_pm_options.php | |
| parent | 0ba3f620d4afb963b89c532b664693c974ec4f8a (diff) | |
| download | forums-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_options.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 39 |
1 files changed, 27 insertions, 12 deletions
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; |