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/functions_messenger.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/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 63 |
1 files changed, 41 insertions, 22 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 3dfc5897aa..1e731fecff 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1,16 +1,17 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : functions_messenger.php -// STARTED : Sat Feb 13, 2001 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- - +/** +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +* @package phpBB3 +* Messenger +*/ class messenger { var $vars, $msg, $extra_headers, $replyto, $from, $subject, $necoding; @@ -230,12 +231,19 @@ class messenger $user->start(); include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx); - add_log('critical', $type . '_ERROR', $msg); + add_log('critical', 'LOG_' . $type . '_ERROR', $msg); } // // Messenger methods // + function save_queue() + { + if ($this->use_queue) + { + $this->queue->save(); + } + } function msg_email() { @@ -404,7 +412,11 @@ class messenger } } -// At the moment it is only handling the email queue +/** +* @package phpBB3 +* Queue +* At the moment it is only handling the email queue +*/ class queue { var $data = array(); @@ -636,7 +648,9 @@ class queue } -// Replacement or substitute for PHP's mail command +/** +* Replacement or substitute for PHP's mail command +*/ function smtpmail($addresses, $subject, $message, &$err_msg, $encoding, $headers = '') { global $config, $user; @@ -828,9 +842,12 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $encoding, $headers return true; } -// SMTP Class -// Auth Mechanisms originally taken from the AUTH Modules found within the PHP Extension and Application Repository (PEAR) -// See docs/AUTHORS for more details +/** +* @package phpBB3 +* SMTP Class +* Auth Mechanisms originally taken from the AUTH Modules found within the PHP Extension and Application Repository (PEAR) +* See docs/AUTHORS for more details +*/ class smtp_class { var $server_response = ''; @@ -1171,10 +1188,12 @@ class smtp_class } } -// Encodes the given string for proper display for this encoding ... nabbed -// from php.net and modified. There is an alternative encoding method which -// may produce less output but it's questionable as to its worth in this -// scenario IMO +/** +* Encodes the given string for proper display for this encoding ... nabbed +* from php.net and modified. There is an alternative encoding method which +* may produce less output but it's questionable as to its worth in this +* scenario IMO +*/ function mail_encode($str, $encoding) { if ($encoding == '') |