Changeset:
8df0c3c75cd4
https://sourceforge.net/p/mrbs/hg-code/ci/8df0c3c75cd4d023d49ed1253da12d1335682f56
Author:
Campbell Morrison <[email protected]>
Date:
Tue Sep 29 14:00:08 2015 +0100
Log message:
Merged latest changes from default
diffstat:
.hgignore | 11 +
.hgtags | 37 +
UPGRADE | 7 +
tables.my.sql | 4 +-
tables.pg.sql | 4 +-
web/Mail/RFC822.php | 951 ----
web/Mail/mail.php | 168 -
web/Mail/mime.php | 3121 ++++++++-------
web/Mail/mimePart.php | 2510 ++++++------
web/Mail/null.php | 84 -
web/Mail/sendmail.php | 171 -
web/Mail/smtp.php | 444 --
web/auth/auth_db.inc | 56 +-
web/auth/auth_ldap.inc | 8 +-
web/dbsys.inc | 2 +-
web/defaultincludes.inc | 2 +-
web/edit_entry.php | 34 +-
web/edit_users.php | 19 +-
web/functions.inc | 8 +
web/functions_mail.inc | 203 +-
web/internalconfig.inc.php | 2 +-
web/lang/lang.id | 5 +-
web/language.inc | 4 +-
web/lib/PHPMailer/LICENSE | 504 ++
web/lib/PHPMailer/PHPMailerAutoload.php | 49 +
web/lib/PHPMailer/VERSION | 1 +
web/lib/PHPMailer/class.phpmailer.php | 3722 +++++++++++++++++++
web/lib/PHPMailer/class.phpmaileroauth.php | 197 +
web/lib/PHPMailer/class.phpmaileroauthgoogle.php | 70 +
web/lib/PHPMailer/class.pop3.php | 397 ++
web/lib/PHPMailer/class.smtp.php | 1176 ++++++
web/lib/PHPMailer/get_oauth_token.php | 64 +
web/lib/PHPMailer/language/phpmailer.lang-am.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ar.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-az.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-be.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-bg.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-br.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-ca.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ch.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-cz.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-de.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-dk.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-el.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-eo.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-es.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-et.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-fa.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-fi.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-fo.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-fr.php | 29 +
web/lib/PHPMailer/language/phpmailer.lang-gl.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-he.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-hr.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-hu.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-id.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-it.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-ja.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-ka.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ko.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-lt.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-lv.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ms.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-nl.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-no.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-pl.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-pt.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ro.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ru.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-se.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-sk.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-sl.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-sr.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-tr.php | 29 +
web/lib/PHPMailer/language/phpmailer.lang-uk.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-vi.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-zh.php | 28 +
web/lib/PHPMailer/language/phpmailer.lang-zh_cn.php | 27 +
web/mrbs_sql.inc | 6 +-
web/mysql.inc | 8 +-
web/mysqli.inc | 14 +-
web/password_compat/password.php | 317 +
web/pending.php | 3 +-
web/pgsql.inc | 4 +-
web/report.php | 2 +-
web/systemdefaults.inc.php | 33 +-
web/upgrade/41/mysql.sql | 11 +-
web/upgrade/44/pgsql.sql | 10 +-
web/upgrade/45/mysql.sql | 6 +
web/upgrade/45/pgsql.sql | 8 +
web/version.inc | 20 +-
web/version_num.inc | 5 +
web/view_entry.php | 2 +-
93 files changed, 10971 insertions(+), 4721 deletions(-)
diffs (truncated from 16500 to 300 lines):
diff -r 22fdcf5865cc -r 8df0c3c75cd4 .hgignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Tue Sep 29 14:00:08 2015 +0100
@@ -0,0 +1,11 @@
+# Glob syntax
+syntax: glob
+
+*~
+*.bak
+
+# Regexp syntax rules
+syntax: regexp
+
+^\.settings$
+^\.project$
diff -r 22fdcf5865cc -r 8df0c3c75cd4 .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags Tue Sep 29 14:00:08 2015 +0100
@@ -0,0 +1,37 @@
+0b3986ba9ec9c6aac66bb5bfbf729a8cd9d8ef69 mrbs-1_4beta2
+0b53d6a3fc1477fbea3bdc0a5a124fa4d4f0d991 mrbs-1_2_1
+0f0bba215522908231a859a0834cdf4575b1dcf2 mrbs12_better_html_bp_mp1
+2458842b01509e3353e2b3de9e8e9cf92aab3db5 mrbs-1_2
+2458842b01509e3353e2b3de9e8e9cf92aab3db5 mrbs-1_2-branch_bp
+28c0e46d9b479ad40b49861655714b0ab7883f3c mrbs-1_2_2
+2ea121f178b4de09ef66e7d3d441ac1c7e38bb40 mrbs-1_4_b1
+2ea121f178b4de09ef66e7d3d441ac1c7e38bb40 mrbs-1_4beta1
+348287f84244f0331dd4ecacb0ae29808a0213f2 mrbs-1_4_4
+3bfb9313238fbbd98b74b341d5319924f5c3be91 rbs-branch
+4ec50ed438f2ee65e58c97ecba852d4eec62189a mrbs-1_4
+6378287427deab22e7adb068079056b032a79edf mrbs-1_2-branch_lastmerge
+75aab6138d889d5cc0506b0cc98bd94ed7303dd2 mrbs-1_2_6
+7701b1b8aac85a0aa54dc2ef16e0b22fa09c2626 mrbs12_better_html_mp1
+7d54c052732e3c8e6b7938e6c4c4d65372ebdd93 mrbs-1_4_2
+819c06245cb268b4c6c77bbcfe23037dca77d066 mrbs-1_4_11
+8268cc3be501dad05542ceb8c5265c77b056b7fb mrbs-1_4_1
+8e81a8abe0ab265d56fd892b59917fbb37f2fe58 mrbs-1_4_5rc1
+8e9ef0f09d140eb30c1156b21897c2529e2e5e6c mrbs-1_2_6_1
+8e9ef0f09d140eb30c1156b21897c2529e2e5e6c mrbs12_better_html_bp
+9f02df92eb1e9da0e12913e0bcab8b8fdfde5cb3 mrbs-1_4_2rc1
+a0cf97ae3924b50b79a860671d74cc87b9548f94 mrbs-0-9-1
+a1cdb2cf17c5df4def38c70a2a82421cdbcd0dc3 mrbs-1_4_5
+a94aa285045819a7930a94a8897d77a8f244c129 mrbs-1_2_3
+a995b17c4f413665d8037ff638ddd6f023aea2bf mrbs_MDB-latest
+b4910d4a447593b79cff65632b9fe44831102a6d start
+b492cc013da8aedd883b38af9f1e13d8132d6455 mrbs-1_4_7
+b588e63ee8f2aab0a6e1ec86e915821c864026f1 mrbs-1_4_10
+b96034dc235fc95aecfaa7108ae810be608440cb mrbs-1_4_5rc2
+bd4183ce5e93d0d4697dc34ffff7971c5935ab58 mrbs-1_4_3
+d7cb75164c5b05648322bc33003966dce78fcf8b mrbs-1_4_9
+dfd792cad6f6c7006685fa02e38b538cc2f86817 mrbs-1_2_5
+ed85b947a90176918bc579e9049bb88c74ef0e92 mrbs-1_4_8
+f3c48d86e0efc5c7de3543b3ec5eb3b45ac3efb0 Root-of-mrbs_MDB
+f4427483aa468123759459596e276681a16abb36 mrbs-1_4_4_1
+f4456a614903728b785eab85b24f47894ae471aa mrbs-1_2_4
+f896ab89ebd997150f99daa9e1c861a1369d8046 mrbs-1_4_6
diff -r 22fdcf5865cc -r 8df0c3c75cd4 UPGRADE
--- a/UPGRADE Tue Apr 14 16:46:22 2015 +0100
+++ b/UPGRADE Tue Sep 29 14:00:08 2015 +0100
@@ -9,6 +9,13 @@
It would be a sensible precaution to take a backup of your database before
the upgrade.
+1. Take a backup of your database, just in case
+2. Take a backup copy of your existing mrbs directory on your web server
+3. Upload all the files, except the config file, in the web directory of the
release
+ to your server, overwriting your existing files.
+4. Run MRBS. You'll be prompted for a database (note database, not MRBS)
username
+ and password.
+
MRBS database upgrades are in general intended to be backwards compatible,
so that you should still be able to run the old version of MRBS against the
new database schema. This will allow you to install the new version of MRBS
diff -r 22fdcf5865cc -r 8df0c3c75cd4 tables.my.sql
--- a/tables.my.sql Tue Apr 14 16:46:22 2015 +0100
+++ b/tables.my.sql Tue Sep 29 14:00:08 2015 +0100
@@ -181,7 +181,7 @@
id int NOT NULL auto_increment,
level smallint DEFAULT '0' NOT NULL, /* play safe and give no rights */
name varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci,
- password varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci,
+ password_hash varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci,
email varchar(75) CHARACTER SET utf8 COLLATE utf8_general_ci,
PRIMARY KEY (id),
@@ -189,6 +189,6 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ( 'db_version', '44');
+ VALUES ( 'db_version', '45');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ( 'local_db_version', '1');
diff -r 22fdcf5865cc -r 8df0c3c75cd4 tables.pg.sql
--- a/tables.pg.sql Tue Apr 14 16:46:22 2015 +0100
+++ b/tables.pg.sql Tue Sep 29 14:00:08 2015 +0100
@@ -173,13 +173,13 @@
id serial primary key,
level smallint DEFAULT '0' NOT NULL, /* play safe and give no rights */
name varchar(30),
- password varchar(40),
+ password_hash varchar(255),
email varchar(75),
CONSTRAINT mrbs_uq_name UNIQUE (name)
);
INSERT INTO mrbs_variables (variable_name, variable_content)
- VALUES ('db_version', '44');
+ VALUES ('db_version', '45');
INSERT INTO mrbs_variables (variable_name, variable_content)
VALUES ('local_db_version', '1');
diff -r 22fdcf5865cc -r 8df0c3c75cd4 web/Mail/RFC822.php
--- a/web/Mail/RFC822.php Tue Apr 14 16:46:22 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,951 +0,0 @@
-<?php
-/**
- * RFC 822 Email address list validation Utility
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2001-2010, Richard Heyes
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * o Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * o Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * o The names of the authors may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category Mail
- * @package Mail
- * @author Richard Heyes <[email protected]>
- * @author Chuck Hagenbuch <[email protected]
- * @copyright 2001-2010 Richard Heyes
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/Mail/
- */
-
-/**
- * RFC 822 Email address list validation Utility
- *
- * What is it?
- *
- * This class will take an address string, and parse it into it's consituent
- * parts, be that either addresses, groups, or combinations. Nested groups
- * are not supported. The structure it returns is pretty straight forward,
- * and is similar to that provided by the imap_rfc822_parse_adrlist(). Use
- * print_r() to view the structure.
- *
- * How do I use it?
- *
- * $address_string = 'My Group: "Richard" <richard@localhost> (A comment),
[email protected] (Ted Bloggs), Barney;';
- * $structure = Mail_RFC822::parseAddressList($address_string, 'example.com',
true)
- * print_r($structure);
- *
- * @author Richard Heyes <[email protected]>
- * @author Chuck Hagenbuch <[email protected]>
- * @version $Revision$
- * @license BSD
- * @package Mail
- */
-class Mail_RFC822 {
-
- /**
- * The address being parsed by the RFC822 object.
- * @var string $address
- */
- var $address = '';
-
- /**
- * The default domain to use for unqualified addresses.
- * @var string $default_domain
- */
- var $default_domain = 'localhost';
-
- /**
- * Should we return a nested array showing groups, or flatten everything?
- * @var boolean $nestGroups
- */
- var $nestGroups = true;
-
- /**
- * Whether or not to validate atoms for non-ascii characters.
- * @var boolean $validate
- */
- var $validate = true;
-
- /**
- * The array of raw addresses built up as we parse.
- * @var array $addresses
- */
- var $addresses = array();
-
- /**
- * The final array of parsed address information that we build up.
- * @var array $structure
- */
- var $structure = array();
-
- /**
- * The current error message, if any.
- * @var string $error
- */
- var $error = null;
-
- /**
- * An internal counter/pointer.
- * @var integer $index
- */
- var $index = null;
-
- /**
- * The number of groups that have been found in the address list.
- * @var integer $num_groups
- * @access public
- */
- var $num_groups = 0;
-
- /**
- * A variable so that we can tell whether or not we're inside a
- * Mail_RFC822 object.
- * @var boolean $mailRFC822
- */
- var $mailRFC822 = true;
-
- /**
- * A limit after which processing stops
- * @var int $limit
- */
- var $limit = null;
-
- /**
- * Sets up the object. The address must either be set here or when
- * calling parseAddressList(). One or the other.
- *
- * @access public
- * @param string $address The address(es) to validate.
- * @param string $default_domain Default domain/host etc. If not
supplied, will be set to localhost.
- * @param boolean $nest_groups Whether to return the structure with
groups nested for easier viewing.
- * @param boolean $validate Whether to validate atoms. Turn this
off if you need to run addresses through before encoding the personal names,
for instance.
- *
- * @return object Mail_RFC822 A new Mail_RFC822 object.
- */
- function Mail_RFC822($address = null, $default_domain = null, $nest_groups
= null, $validate = null, $limit = null)
- {
- if (isset($address)) $this->address = $address;
- if (isset($default_domain)) $this->default_domain = $default_domain;
- if (isset($nest_groups)) $this->nestGroups = $nest_groups;
- if (isset($validate)) $this->validate = $validate;
- if (isset($limit)) $this->limit = $limit;
- }
-
- /**
- * Starts the whole process. The address must either be set here
- * or when creating the object. One or the other.
- *
- * @access public
- * @param string $address The address(es) to validate.
- * @param string $default_domain Default domain/host etc.
- * @param boolean $nest_groups Whether to return the structure with
groups nested for easier viewing.
- * @param boolean $validate Whether to validate atoms. Turn this
off if you need to run addresses through before encoding the personal names,
for instance.
- *
- * @return array A structured array of addresses.
- */
- function parseAddressList($address = null, $default_domain = null,
$nest_groups = null, $validate = null, $limit = null)
- {
- if (!isset($this) || !isset($this->mailRFC822)) {
- $obj = new Mail_RFC822($address, $default_domain, $nest_groups,
$validate, $limit);
- return $obj->parseAddressList();
- }
-
- if (isset($address)) $this->address = $address;
- if (isset($default_domain)) $this->default_domain = $default_domain;
- if (isset($nest_groups)) $this->nestGroups = $nest_groups;
- if (isset($validate)) $this->validate = $validate;
- if (isset($limit)) $this->limit = $limit;
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
