From 6a6f420c76cca632c76289258f3d1930b40dfea7 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Wed, 15 Feb 2017 00:06:51 +0300
Subject: [PATCH] 2016 -> 2017 + Small fixes

---
 README.md                                     |   2 +-
 build/owncloud/rainloop-app/INSTALL           |   2 +-
 build/owncloud/rainloop-app/admin.php         |  38 +++---
 build/owncloud/rainloop-app/ajax/admin.php    |  72 +++++------
 build/owncloud/rainloop-app/ajax/personal.php |  94 +++++++-------
 build/owncloud/rainloop-app/appinfo/app.php   |  68 +++++-----
 build/owncloud/rainloop-app/index.php         |  54 ++++----
 build/owncloud/rainloop-app/js/admin.js       |  26 ++--
 build/owncloud/rainloop-app/js/personal.js    |  26 ++--
 build/owncloud/rainloop-app/personal.php      |  68 +++++-----
 dev/Styles/Compose.less                       |  12 +-
 dev/View/Popup/Activate.js                    |   4 +-
 .../v/0.0.0/app/libraries/MailSo/Version.php  | 118 +++++++++---------
 .../0.0.0/app/libraries/RainLoop/Actions.php  |   3 +-
 .../0.0.0/app/libraries/RainLoop/Service.php  |   2 +-
 .../Views/Admin/AdminSettingsAbout.html       |   2 +-
 16 files changed, 297 insertions(+), 294 deletions(-)

diff --git a/README.md b/README.md
index de8747543..a7b215429 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,4 @@ It's not recommended to use in production environment.
 **GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
 http://www.gnu.org/licenses/agpl-3.0.html
 
-Copyright (c) 2016 Rainloop Team
+Copyright (c) 2017 Rainloop Team
diff --git a/build/owncloud/rainloop-app/INSTALL b/build/owncloud/rainloop-app/INSTALL
index 130a60308..eb8d31943 100755
--- a/build/owncloud/rainloop-app/INSTALL
+++ b/build/owncloud/rainloop-app/INSTALL
@@ -3,7 +3,7 @@
 * ownCloud/Nextcloud - RainLoop Webmail package
 *
 * @author RainLoop Team
-* @copyright 2016 RainLoop Team
+* @copyright 2017 RainLoop Team
 *
 * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
 *
diff --git a/build/owncloud/rainloop-app/admin.php b/build/owncloud/rainloop-app/admin.php
index 136155eae..9b4c82e0d 100644
--- a/build/owncloud/rainloop-app/admin.php
+++ b/build/owncloud/rainloop-app/admin.php
@@ -1,19 +1,19 @@
-<?php
-
-/**
- * ownCloud - RainLoop mail plugin
- *
- * @author RainLoop Team
- * @copyright 2016 RainLoop Team
- *
- * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
- */
-
-OCP\User::checkAdminUser();
-
-OCP\Util::addScript('rainloop', 'admin');
-
-$oTemplate = new OCP\Template('rainloop', 'admin-local');
-$oTemplate->assign('rainloop-admin-panel-link', OC_RainLoop_Helper::getAppUrl().'?admin');
-$oTemplate->assign('rainloop-autologin', OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false));
-return $oTemplate->fetchPage();
+<?php
+
+/**
+ * ownCloud - RainLoop mail plugin
+ *
+ * @author RainLoop Team
+ * @copyright 2017 RainLoop Team
+ *
+ * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
+ */
+
+OCP\User::checkAdminUser();
+
+OCP\Util::addScript('rainloop', 'admin');
+
+$oTemplate = new OCP\Template('rainloop', 'admin-local');
+$oTemplate->assign('rainloop-admin-panel-link', OC_RainLoop_Helper::getAppUrl().'?admin');
+$oTemplate->assign('rainloop-autologin', OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false));
+return $oTemplate->fetchPage();
diff --git a/build/owncloud/rainloop-app/ajax/admin.php b/build/owncloud/rainloop-app/ajax/admin.php
index eacaa6651..7cd42061f 100644
--- a/build/owncloud/rainloop-app/ajax/admin.php
+++ b/build/owncloud/rainloop-app/ajax/admin.php
@@ -1,36 +1,36 @@
-<?php
-
-/**
- * ownCloud - RainLoop mail plugin
- *
- * @author RainLoop Team
- * @copyright 2016 RainLoop Team
- *
- * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
- */
-
-OCP\JSON::checkAdminUser();
-OCP\JSON::checkAppEnabled('rainloop');
-OCP\JSON::callCheck();
-
-$sUrl = '';
-$sPath = '';
-$bAutologin = false;
-
-if (isset($_POST['appname']) &&	'rainloop' === $_POST['appname'])
-{
-	OCP\Config::setAppValue('rainloop', 'rainloop-autologin', isset($_POST['rainloop-autologin']) ?
-		'1' === $_POST['rainloop-autologin'] : false);
-
-	$bAutologin = OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false);
-}
-else
-{
-	sleep(1);
-	OC_JSON::error(array('Message' => 'Invalid Argument(s)'));
-	return false;
-}
-
-sleep(1);
-OCP\JSON::success(array('Message' => 'Saved successfully'));
-return true;
+<?php
+
+/**
+ * ownCloud - RainLoop mail plugin
+ *
+ * @author RainLoop Team
+ * @copyright 2017 RainLoop Team
+ *
+ * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
+ */
+
+OCP\JSON::checkAdminUser();
+OCP\JSON::checkAppEnabled('rainloop');
+OCP\JSON::callCheck();
+
+$sUrl = '';
+$sPath = '';
+$bAutologin = false;
+
+if (isset($_POST['appname']) &&	'rainloop' === $_POST['appname'])
+{
+	OCP\Config::setAppValue('rainloop', 'rainloop-autologin', isset($_POST['rainloop-autologin']) ?
+		'1' === $_POST['rainloop-autologin'] : false);
+
+	$bAutologin = OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false);
+}
+else
+{
+	sleep(1);
+	OC_JSON::error(array('Message' => 'Invalid Argument(s)'));
+	return false;
+}
+
+sleep(1);
+OCP\JSON::success(array('Message' => 'Saved successfully'));
+return true;
diff --git a/build/owncloud/rainloop-app/ajax/personal.php b/build/owncloud/rainloop-app/ajax/personal.php
index 6118bcbf0..8cb4062a6 100644
--- a/build/owncloud/rainloop-app/ajax/personal.php
+++ b/build/owncloud/rainloop-app/ajax/personal.php
@@ -1,47 +1,47 @@
-<?php
-
-/**
- * ownCloud - RainLoop mail plugin
- *
- * @author RainLoop Team
- * @copyright 2016 RainLoop Team
- *
- * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
- */
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('rainloop');
-OCP\JSON::callCheck();
-
-$sEmail = '';
-$sLogin = '';
-
-if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email']) && 'rainloop' === $_POST['appname'])
-{
-	$sUser = OCP\User::getUser();
-
-	$sPostEmail = $_POST['rainloop-email'];
-
-	OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail);
-
-	$sPass = $_POST['rainloop-password'];
-	if ('******' !== $sPass && '' !== $sPass)
-	{
-		include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
-
-		OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password',
-			OC_RainLoop_Helper::encodePassword($sPass, md5($sPostEmail)));
-	}
-
-	$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
-}
-else
-{
-	sleep(1);
-	OC_JSON::error(array('Message' => 'Invalid argument(s)', 'Email' => $sEmail));
-	return false;
-}
-
-sleep(1);
-OCP\JSON::success(array('Message' => 'Saved successfully', 'Email' => $sEmail));
-return true;
+<?php
+
+/**
+ * ownCloud - RainLoop mail plugin
+ *
+ * @author RainLoop Team
+ * @copyright 2017 RainLoop Team
+ *
+ * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
+ */
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('rainloop');
+OCP\JSON::callCheck();
+
+$sEmail = '';
+$sLogin = '';
+
+if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email']) && 'rainloop' === $_POST['appname'])
+{
+	$sUser = OCP\User::getUser();
+
+	$sPostEmail = $_POST['rainloop-email'];
+
+	OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail);
+
+	$sPass = $_POST['rainloop-password'];
+	if ('******' !== $sPass && '' !== $sPass)
+	{
+		include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
+
+		OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password',
+			OC_RainLoop_Helper::encodePassword($sPass, md5($sPostEmail)));
+	}
+
+	$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
+}
+else
+{
+	sleep(1);
+	OC_JSON::error(array('Message' => 'Invalid argument(s)', 'Email' => $sEmail));
+	return false;
+}
+
+sleep(1);
+OCP\JSON::success(array('Message' => 'Saved successfully', 'Email' => $sEmail));
+return true;
diff --git a/build/owncloud/rainloop-app/appinfo/app.php b/build/owncloud/rainloop-app/appinfo/app.php
index 6fb6dc04a..e1e2d2e34 100644
--- a/build/owncloud/rainloop-app/appinfo/app.php
+++ b/build/owncloud/rainloop-app/appinfo/app.php
@@ -1,34 +1,34 @@
-<?php
-
-/**
- * ownCloud - RainLoop mail plugin
- *
- * @author RainLoop Team
- * @copyright 2016 RainLoop Team
- *
- * https://github.com/RainLoop/owncloud
- */
-
-OC::$CLASSPATH['OC_RainLoop_Helper'] = OC_App::getAppPath('rainloop') . '/lib/RainLoopHelper.php';
-
-OCP\App::registerAdmin('rainloop', 'admin');
-OCP\App::registerPersonal('rainloop', 'personal');
-
-if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
-{
-	OCP\Util::connectHook('OC_User', 'post_login', 'OC_RainLoop_Helper', 'login');
-	OCP\Util::connectHook('OC_User', 'post_setPassword', 'OC_RainLoop_Helper', 'changePassword');
-}
-
-OCP\Util::connectHook('OC_User', 'logout', 'OC_RainLoop_Helper', 'logout');
-
-OCP\Util::addScript('rainloop', 'rainloop');
-
-OCP\App::addNavigationEntry(array(
-	'id' => 'rainloop_index',
-	'order' => 10,
-	'href' => OCP\Util::linkToRoute('rainloop_index'),
-	'icon' => OCP\Util::imagePath('rainloop', 'mail.png'),
-	'name' => 'Email'
-));
-
+<?php
+
+/**
+ * ownCloud - RainLoop mail plugin
+ *
+ * @author RainLoop Team
+ * @copyright 2017 RainLoop Team
+ *
+ * https://github.com/RainLoop/owncloud
+ */
+
+OC::$CLASSPATH['OC_RainLoop_Helper'] = OC_App::getAppPath('rainloop') . '/lib/RainLoopHelper.php';
+
+OCP\App::registerAdmin('rainloop', 'admin');
+OCP\App::registerPersonal('rainloop', 'personal');
+
+if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
+{
+	OCP\Util::connectHook('OC_User', 'post_login', 'OC_RainLoop_Helper', 'login');
+	OCP\Util::connectHook('OC_User', 'post_setPassword', 'OC_RainLoop_Helper', 'changePassword');
+}
+
+OCP\Util::connectHook('OC_User', 'logout', 'OC_RainLoop_Helper', 'logout');
+
+OCP\Util::addScript('rainloop', 'rainloop');
+
+OCP\App::addNavigationEntry(array(
+	'id' => 'rainloop_index',
+	'order' => 10,
+	'href' => OCP\Util::linkToRoute('rainloop_index'),
+	'icon' => OCP\Util::imagePath('rainloop', 'mail.png'),
+	'name' => 'Email'
+));
+
diff --git a/build/owncloud/rainloop-app/index.php b/build/owncloud/rainloop-app/index.php
index 29fc11d83..b47d9e3cd 100644
--- a/build/owncloud/rainloop-app/index.php
+++ b/build/owncloud/rainloop-app/index.php
@@ -1,27 +1,27 @@
-<?php
-
-/**
- * ownCloud - RainLoop mail plugin
- *
- * @author RainLoop Team
- * @copyright 2016 RainLoop Team
- *
- * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
- */
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('rainloop');
-OCP\App::setActiveNavigationEntry('rainloop_index');
-
-// Load the empty file ../css/style.css, that's needed to allow theming of
-// the ownCloud header and navigation if rainloop is the active app.
-OCP\Util::addStyle('rainloop', 'style');
-
-include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
-
-$sUrl = OC_RainLoop_Helper::normalizeUrl(OC_RainLoop_Helper::getAppUrl());
-
-$oTemplate = new OCP\Template('rainloop', 'index', 'user');
-$oTemplate->assign('rainloop-iframe-url', OC_RainLoop_Helper::normalizeUrl($sUrl).'?OwnCloudAuth');
-
-$oTemplate->printpage();
+<?php
+
+/**
+ * ownCloud - RainLoop mail plugin
+ *
+ * @author RainLoop Team
+ * @copyright 2017 RainLoop Team
+ *
+ * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
+ */
+
+OCP\User::checkLoggedIn();
+OCP\App::checkAppEnabled('rainloop');
+OCP\App::setActiveNavigationEntry('rainloop_index');
+
+// Load the empty file ../css/style.css, that's needed to allow theming of
+// the ownCloud header and navigation if rainloop is the active app.
+OCP\Util::addStyle('rainloop', 'style');
+
+include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
+
+$sUrl = OC_RainLoop_Helper::normalizeUrl(OC_RainLoop_Helper::getAppUrl());
+
+$oTemplate = new OCP\Template('rainloop', 'index', 'user');
+$oTemplate->assign('rainloop-iframe-url', OC_RainLoop_Helper::normalizeUrl($sUrl).'?OwnCloudAuth');
+
+$oTemplate->printpage();
diff --git a/build/owncloud/rainloop-app/js/admin.js b/build/owncloud/rainloop-app/js/admin.js
index 315aaa565..96344b95a 100755
--- a/build/owncloud/rainloop-app/js/admin.js
+++ b/build/owncloud/rainloop-app/js/admin.js
@@ -1,13 +1,13 @@
-
-/**
- * ownCloud - RainLoop mail plugin
- *
- * @author RainLoop Team
- * @copyright 2016 RainLoop Team
- *
- * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
- */
-
-$(function() {
-	RainLoopFormHelper('#mail-rainloop-admin-form', 'admin.php');
-});
+
+/**
+ * ownCloud - RainLoop mail plugin
+ *
+ * @author RainLoop Team
+ * @copyright 2017 RainLoop Team
+ *
+ * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
+ */
+
+$(function() {
+	RainLoopFormHelper('#mail-rainloop-admin-form', 'admin.php');
+});
diff --git a/build/owncloud/rainloop-app/js/personal.js b/build/owncloud/rainloop-app/js/personal.js
index fe1b20230..575ac6de2 100755
--- a/build/owncloud/rainloop-app/js/personal.js
+++ b/build/owncloud/rainloop-app/js/personal.js
@@ -1,13 +1,13 @@
-
-/**
- * ownCloud - RainLoop mail plugin
- *
- * @author RainLoop Team
- * @copyright 2016 RainLoop Team
- *
- * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
- */
-
-$(function() {
-	RainLoopFormHelper('#mail-rainloop-personal-form', 'personal.php');
-});
+
+/**
+ * ownCloud - RainLoop mail plugin
+ *
+ * @author RainLoop Team
+ * @copyright 2017 RainLoop Team
+ *
+ * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
+ */
+
+$(function() {
+	RainLoopFormHelper('#mail-rainloop-personal-form', 'personal.php');
+});
diff --git a/build/owncloud/rainloop-app/personal.php b/build/owncloud/rainloop-app/personal.php
index 3864d2963..585a8b09e 100644
--- a/build/owncloud/rainloop-app/personal.php
+++ b/build/owncloud/rainloop-app/personal.php
@@ -1,34 +1,34 @@
-<?php
-
-/**
- * ownCloud - RainLoop mail plugin
- *
- * @author RainLoop Team
- * @copyright 2016 RainLoop Team
- *
- * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
- */
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('rainloop');
-
-OCP\Util::addScript('rainloop', 'personal');
-
-if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
-{
-	$oTemplate = new OCP\Template('rainloop', 'empty');
-}
-else
-{
-	$sUser = OCP\User::getUser();
-
-	$oTemplate = new OCP\Template('rainloop', 'personal');
-
-	$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
-	$sPass = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-password', '');
-
-	$oTemplate->assign('rainloop-email', $sEmail);
-	$oTemplate->assign('rainloop-password', 0 === strlen($sPass) && 0 === strlen($sEmail) ? '' : '******');
-}
-
-return $oTemplate->fetchPage();
+<?php
+
+/**
+ * ownCloud - RainLoop mail plugin
+ *
+ * @author RainLoop Team
+ * @copyright 2017 RainLoop Team
+ *
+ * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
+ */
+
+OCP\User::checkLoggedIn();
+OCP\App::checkAppEnabled('rainloop');
+
+OCP\Util::addScript('rainloop', 'personal');
+
+if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
+{
+	$oTemplate = new OCP\Template('rainloop', 'empty');
+}
+else
+{
+	$sUser = OCP\User::getUser();
+
+	$oTemplate = new OCP\Template('rainloop', 'personal');
+
+	$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
+	$sPass = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-password', '');
+
+	$oTemplate->assign('rainloop-email', $sEmail);
+	$oTemplate->assign('rainloop-password', 0 === strlen($sPass) && 0 === strlen($sEmail) ? '' : '******');
+}
+
+return $oTemplate->fetchPage();
diff --git a/dev/Styles/Compose.less b/dev/Styles/Compose.less
index 79b6322d9..958faf8b1 100644
--- a/dev/Styles/Compose.less
+++ b/dev/Styles/Compose.less
@@ -85,7 +85,10 @@
 		padding: 10px;
 		background-color: #eee;
 		color: #333;
-		overflow:scroll;
+
+		html.rl-mobile &{
+			overflow: scroll;
+		}
 
 		.e-identity {
 
@@ -111,11 +114,12 @@
 		.e-label {
 			text-align: right;
 			width: 1%;
-			min-width: 50px;
-			padding: 6px 10px 6px 0px;
+			min-width: 70px;
+			padding: 6px 10px;
 
-			html.rl-modal {
+			html.rl-mobile &{
 				min-width: 50px;
+				padding: 6px 10px 6px 0px;
 			}
 		}
 
diff --git a/dev/View/Popup/Activate.js b/dev/View/Popup/Activate.js
index 5f8f5a4b6..08cfe4332 100644
--- a/dev/View/Popup/Activate.js
+++ b/dev/View/Popup/Activate.js
@@ -86,7 +86,7 @@ class ActivatePopupView extends AbstractViewNext
 					this.key.focus(true);
 				}
 
-			}, this.domain(), this.key());
+			}, this.domain(), this.key().replace(/[^A-Z0-9\-]/gi, ''));
 		}
 		else
 		{
@@ -122,7 +122,7 @@ class ActivatePopupView extends AbstractViewNext
 	 */
 	validateSubscriptionKey() {
 		const value = this.key();
-		return '' === value || RAINLOOP_TRIAL_KEY === value || !!(/^RL[\d]+-[A-Z0-9\-]+Z$/).test(trim(value));
+		return '' === value || RAINLOOP_TRIAL_KEY === value || !!(/^RL[\d]+-[A-Z0-9\-]+Z$/).test(trim(value).replace(/[^A-Z0-9\-]/gi, ''));
 	}
 }
 
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Version.php b/rainloop/v/0.0.0/app/libraries/MailSo/Version.php
index bc9ad1619..f17b2871a 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Version.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Version.php
@@ -1,59 +1,59 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2016 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo;
-
-/**
- * @category MailSo
- */
-final class Version
-{
-	/**
-	 * @var string
-	 */
-	const APP_VERSION = '2.0.1';
-
-	/**
-	 * @var string
-	 */
-	const MIME_X_MAILER = 'MailSo';
-
-	/**
-	 * @return string
-	 */
-	public static function AppVersion()
-	{
-		return \MailSo\Version::APP_VERSION;
-	}
-
-	/**
-	 * @return string
-	 */
-	public static function XMailer()
-	{
-		return \MailSo\Version::MIME_X_MAILER.'/'.\MailSo\Version::APP_VERSION;
-	}
-
-	/**
-	 * @return string
-	 */
-	public static function Signature()
-	{
-		$sSignature = '';
-		if (\defined('MAILSO_LIBRARY_USE_PHAR'))
-		{
-			$oPhar = new \Phar('mailso.phar');
-			$sSignature = $oPhar->getSignature();
-		}
-
-		return $sSignature;
-	}
-}
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2014 Usenko Timur
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo;
+
+/**
+ * @category MailSo
+ */
+final class Version
+{
+	/**
+	 * @var string
+	 */
+	const APP_VERSION = '2.0.1';
+
+	/**
+	 * @var string
+	 */
+	const MIME_X_MAILER = 'MailSo';
+
+	/**
+	 * @return string
+	 */
+	public static function AppVersion()
+	{
+		return \MailSo\Version::APP_VERSION;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function XMailer()
+	{
+		return \MailSo\Version::MIME_X_MAILER.'/'.\MailSo\Version::APP_VERSION;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function Signature()
+	{
+		$sSignature = '';
+		if (\defined('MAILSO_LIBRARY_USE_PHAR'))
+		{
+			$oPhar = new \Phar('mailso.phar');
+			$sSignature = $oPhar->getSignature();
+		}
+
+		return $sSignature;
+	}
+}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index ac01f1dec..2b5c33058 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1131,7 +1131,7 @@ class Actions
 					'][APC:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('apc_fetch') ? 'on' : 'off').
 					'][MB:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('mb_convert_encoding') ? 'on' : 'off').
 					'][PDO:'.$sPdo.
-					(\RainLoop\Utils::IsOwnCloud() ? '][ownCloud:true' : '').
+					(\RainLoop\Utils::IsOwnCloud() ? '][cloud:true' : '').
 					'][Streams:'.\implode(',', \stream_get_transports()).
 				']');
 
@@ -2951,7 +2951,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 		if (!empty($sAction) && !$bError && \is_array($aData) && 0 < \count($aData) &&
 			$oFilesProvider && $oFilesProvider->IsActive())
 		{
-
 			$bError = false;
 			switch (\strtolower($sAction))
 			{
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
index 914b659f0..5a8bd760b 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -238,7 +238,7 @@ class Service
 
 			if (\RainLoop\Utils::IsOwnCloud())
 			{
-				$sResult .= '][owncloud:true';
+				$sResult .= '][cloud:true';
 			}
 
 			$sResult .= ']-->';
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index ab82ccf96..c4abfc688 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -5,7 +5,7 @@
 			<div class="span4">
 				<div class="rl-logo"></div>
 				<div style="margin-left: 30px;">
-					2016 &copy; <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
+					2017 &copy; <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
 					<br />
 					<a class="g-ui-link" href="http://www.rainloop.net/" target="_blank" style="padding-left: 0">http://rainloop.net/</a>
 				</div>