Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

2016 -> 2017

Browse source 
+ Small fixes
This commit is contained in:
RainLoop Team 2017-02-15 00:06:51 +03:00
parent 39c07bfc13
commit 6a6f420c76
16 changed files with 297 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -20,4 +20,4 @@ It's not recommended to use in production environment.
**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**. **GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
http://www.gnu.org/licenses/agpl-3.0.html http://www.gnu.org/licenses/agpl-3.0.html
Copyright (c) 2016 Rainloop Team Copyright (c) 2017 Rainloop Team

2
build/owncloud/rainloop-app/INSTALL
View file

@ -3,7 +3,7 @@
* ownCloud/Nextcloud - RainLoop Webmail package * ownCloud/Nextcloud - RainLoop Webmail package
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
* *

38
build/owncloud/rainloop-app/admin.php
View file

@ -1,19 +1,19 @@
<?php <?php
/** /**
* ownCloud - RainLoop mail plugin * ownCloud - RainLoop mail plugin
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
*/ */
OCP\User::checkAdminUser(); OCP\User::checkAdminUser();
OCP\Util::addScript('rainloop', 'admin'); OCP\Util::addScript('rainloop', 'admin');
$oTemplate = new OCP\Template('rainloop', 'admin-local'); $oTemplate = new OCP\Template('rainloop', 'admin-local');
$oTemplate->assign('rainloop-admin-panel-link', OC_RainLoop_Helper::getAppUrl().'?admin'); $oTemplate->assign('rainloop-admin-panel-link', OC_RainLoop_Helper::getAppUrl().'?admin');
$oTemplate->assign('rainloop-autologin', OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false)); $oTemplate->assign('rainloop-autologin', OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false));
return $oTemplate->fetchPage(); return $oTemplate->fetchPage();

72
build/owncloud/rainloop-app/ajax/admin.php
View file

@ -1,36 +1,36 @@
<?php <?php
/** /**
* ownCloud - RainLoop mail plugin * ownCloud - RainLoop mail plugin
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
*/ */
OCP\JSON::checkAdminUser(); OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('rainloop'); OCP\JSON::checkAppEnabled('rainloop');
OCP\JSON::callCheck(); OCP\JSON::callCheck();
$sUrl = ''; $sUrl = '';
$sPath = ''; $sPath = '';
$bAutologin = false; $bAutologin = false;
if (isset($_POST['appname']) && 'rainloop' === $_POST['appname']) if (isset($_POST['appname']) && 'rainloop' === $_POST['appname'])
{ {
OCP\Config::setAppValue('rainloop', 'rainloop-autologin', isset($_POST['rainloop-autologin']) ? OCP\Config::setAppValue('rainloop', 'rainloop-autologin', isset($_POST['rainloop-autologin']) ?
'1' === $_POST['rainloop-autologin'] : false); '1' === $_POST['rainloop-autologin'] : false);
$bAutologin = OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false); $bAutologin = OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false);
} }
else else
{ {
sleep(1); sleep(1);
OC_JSON::error(array('Message' => 'Invalid Argument(s)')); OC_JSON::error(array('Message' => 'Invalid Argument(s)'));
return false; return false;
} }
sleep(1); sleep(1);
OCP\JSON::success(array('Message' => 'Saved successfully')); OCP\JSON::success(array('Message' => 'Saved successfully'));
return true; return true;

94
build/owncloud/rainloop-app/ajax/personal.php
View file

@ -1,47 +1,47 @@
<?php <?php
/** /**
* ownCloud - RainLoop mail plugin * ownCloud - RainLoop mail plugin
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
*/ */
OCP\JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('rainloop'); OCP\JSON::checkAppEnabled('rainloop');
OCP\JSON::callCheck(); OCP\JSON::callCheck();
$sEmail = ''; $sEmail = '';
$sLogin = ''; $sLogin = '';
if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email']) && 'rainloop' === $_POST['appname']) if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email']) && 'rainloop' === $_POST['appname'])
{ {
$sUser = OCP\User::getUser(); $sUser = OCP\User::getUser();
$sPostEmail = $_POST['rainloop-email']; $sPostEmail = $_POST['rainloop-email'];
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail); OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail);
$sPass = $_POST['rainloop-password']; $sPass = $_POST['rainloop-password'];
if ('******' !== $sPass && '' !== $sPass) if ('******' !== $sPass && '' !== $sPass)
{ {
include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php'; include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password', OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password',
OC_RainLoop_Helper::encodePassword($sPass, md5($sPostEmail))); OC_RainLoop_Helper::encodePassword($sPass, md5($sPostEmail)));
} }
$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', ''); $sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
} }
else else
{ {
sleep(1); sleep(1);
OC_JSON::error(array('Message' => 'Invalid argument(s)', 'Email' => $sEmail)); OC_JSON::error(array('Message' => 'Invalid argument(s)', 'Email' => $sEmail));
return false; return false;
} }
sleep(1); sleep(1);
OCP\JSON::success(array('Message' => 'Saved successfully', 'Email' => $sEmail)); OCP\JSON::success(array('Message' => 'Saved successfully', 'Email' => $sEmail));
return true; return true;

68
build/owncloud/rainloop-app/appinfo/app.php
View file

@ -1,34 +1,34 @@
<?php <?php
/** /**
* ownCloud - RainLoop mail plugin * ownCloud - RainLoop mail plugin
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/owncloud * https://github.com/RainLoop/owncloud
*/ */
OC::$CLASSPATH['OC_RainLoop_Helper'] = OC_App::getAppPath('rainloop') . '/lib/RainLoopHelper.php'; OC::$CLASSPATH['OC_RainLoop_Helper'] = OC_App::getAppPath('rainloop') . '/lib/RainLoopHelper.php';
OCP\App::registerAdmin('rainloop', 'admin'); OCP\App::registerAdmin('rainloop', 'admin');
OCP\App::registerPersonal('rainloop', 'personal'); OCP\App::registerPersonal('rainloop', 'personal');
if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false)) 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_login', 'OC_RainLoop_Helper', 'login');
OCP\Util::connectHook('OC_User', 'post_setPassword', 'OC_RainLoop_Helper', 'changePassword'); OCP\Util::connectHook('OC_User', 'post_setPassword', 'OC_RainLoop_Helper', 'changePassword');
} }
OCP\Util::connectHook('OC_User', 'logout', 'OC_RainLoop_Helper', 'logout'); OCP\Util::connectHook('OC_User', 'logout', 'OC_RainLoop_Helper', 'logout');
OCP\Util::addScript('rainloop', 'rainloop'); OCP\Util::addScript('rainloop', 'rainloop');
OCP\App::addNavigationEntry(array( OCP\App::addNavigationEntry(array(
'id' => 'rainloop_index', 'id' => 'rainloop_index',
'order' => 10, 'order' => 10,
'href' => OCP\Util::linkToRoute('rainloop_index'), 'href' => OCP\Util::linkToRoute('rainloop_index'),
'icon' => OCP\Util::imagePath('rainloop', 'mail.png'), 'icon' => OCP\Util::imagePath('rainloop', 'mail.png'),
'name' => 'Email' 'name' => 'Email'
)); ));

54
build/owncloud/rainloop-app/index.php
View file

@ -1,27 +1,27 @@
<?php <?php
/** /**
* ownCloud - RainLoop mail plugin * ownCloud - RainLoop mail plugin
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
*/ */
OCP\User::checkLoggedIn(); OCP\User::checkLoggedIn();
OCP\App::checkAppEnabled('rainloop'); OCP\App::checkAppEnabled('rainloop');
OCP\App::setActiveNavigationEntry('rainloop_index'); OCP\App::setActiveNavigationEntry('rainloop_index');
// Load the empty file ../css/style.css, that's needed to allow theming of // 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. // the ownCloud header and navigation if rainloop is the active app.
OCP\Util::addStyle('rainloop', 'style'); OCP\Util::addStyle('rainloop', 'style');
include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php'; include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
$sUrl = OC_RainLoop_Helper::normalizeUrl(OC_RainLoop_Helper::getAppUrl()); $sUrl = OC_RainLoop_Helper::normalizeUrl(OC_RainLoop_Helper::getAppUrl());
$oTemplate = new OCP\Template('rainloop', 'index', 'user'); $oTemplate = new OCP\Template('rainloop', 'index', 'user');
$oTemplate->assign('rainloop-iframe-url', OC_RainLoop_Helper::normalizeUrl($sUrl).'?OwnCloudAuth'); $oTemplate->assign('rainloop-iframe-url', OC_RainLoop_Helper::normalizeUrl($sUrl).'?OwnCloudAuth');
$oTemplate->printpage(); $oTemplate->printpage();

26
build/owncloud/rainloop-app/js/admin.js
View file

@ -1,13 +1,13 @@
/** /**
* ownCloud - RainLoop mail plugin * ownCloud - RainLoop mail plugin
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
*/ */
$(function() { $(function() {
RainLoopFormHelper('#mail-rainloop-admin-form', 'admin.php'); RainLoopFormHelper('#mail-rainloop-admin-form', 'admin.php');
}); });

26
build/owncloud/rainloop-app/js/personal.js
View file

@ -1,13 +1,13 @@
/** /**
* ownCloud - RainLoop mail plugin * ownCloud - RainLoop mail plugin
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
*/ */
$(function() { $(function() {
RainLoopFormHelper('#mail-rainloop-personal-form', 'personal.php'); RainLoopFormHelper('#mail-rainloop-personal-form', 'personal.php');
}); });

68
build/owncloud/rainloop-app/personal.php
View file

@ -1,34 +1,34 @@
<?php <?php
/** /**
* ownCloud - RainLoop mail plugin * ownCloud - RainLoop mail plugin
* *
* @author RainLoop Team * @author RainLoop Team
* @copyright 2016 RainLoop Team * @copyright 2017 RainLoop Team
* *
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud * https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
*/ */
OCP\User::checkLoggedIn(); OCP\User::checkLoggedIn();
OCP\App::checkAppEnabled('rainloop'); OCP\App::checkAppEnabled('rainloop');
OCP\Util::addScript('rainloop', 'personal'); OCP\Util::addScript('rainloop', 'personal');
if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false)) if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
{ {
$oTemplate = new OCP\Template('rainloop', 'empty'); $oTemplate = new OCP\Template('rainloop', 'empty');
} }
else else
{ {
$sUser = OCP\User::getUser(); $sUser = OCP\User::getUser();
$oTemplate = new OCP\Template('rainloop', 'personal'); $oTemplate = new OCP\Template('rainloop', 'personal');
$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', ''); $sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
$sPass = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-password', ''); $sPass = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-password', '');
$oTemplate->assign('rainloop-email', $sEmail); $oTemplate->assign('rainloop-email', $sEmail);
$oTemplate->assign('rainloop-password', 0 === strlen($sPass) && 0 === strlen($sEmail) ? '' : '******'); $oTemplate->assign('rainloop-password', 0 === strlen($sPass) && 0 === strlen($sEmail) ? '' : '******');
} }
return $oTemplate->fetchPage(); return $oTemplate->fetchPage();

12
dev/Styles/Compose.less
View file

@ -85,7 +85,10 @@
padding: 10px; padding: 10px;
background-color: #eee; background-color: #eee;
color: #333; color: #333;
overflow:scroll;
html.rl-mobile &{
overflow: scroll;
}
.e-identity { .e-identity {
@ -111,11 +114,12 @@
.e-label { .e-label {
text-align: right; text-align: right;
width: 1%; width: 1%;
min-width: 50px; min-width: 70px;
padding: 6px 10px 6px 0px; padding: 6px 10px;
html.rl-modal { html.rl-mobile &{
min-width: 50px; min-width: 50px;
padding: 6px 10px 6px 0px;
} }
} }

4
dev/View/Popup/Activate.js
View file

@ -86,7 +86,7 @@ class ActivatePopupView extends AbstractViewNext
this.key.focus(true); this.key.focus(true);
} }
}, this.domain(), this.key()); }, this.domain(), this.key().replace(/[^A-Z0-9\-]/gi, ''));
} }
else else
{ {
@ -122,7 +122,7 @@ class ActivatePopupView extends AbstractViewNext
*/ */
validateSubscriptionKey() { validateSubscriptionKey() {
const value = this.key(); 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, ''));
} }
} }

118
rainloop/v/0.0.0/app/libraries/MailSo/Version.php
View file

@ -1,59 +1,59 @@
<?php <?php
/* /*
* This file is part of MailSo. * This file is part of MailSo.
* *
* (c) 2016 Usenko Timur * (c) 2014 Usenko Timur
* *
* For the full copyright and license information, please view the LICENSE * For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
namespace MailSo; namespace MailSo;
/** /**
* @category MailSo * @category MailSo
*/ */
final class Version final class Version
{ {
/** /**
* @var string * @var string
*/ */
const APP_VERSION = '2.0.1'; const APP_VERSION = '2.0.1';
/** /**
* @var string * @var string
*/ */
const MIME_X_MAILER = 'MailSo'; const MIME_X_MAILER = 'MailSo';
/** /**
* @return string * @return string
*/ */
public static function AppVersion() public static function AppVersion()
{ {
return \MailSo\Version::APP_VERSION; return \MailSo\Version::APP_VERSION;
} }
/** /**
* @return string * @return string
*/ */
public static function XMailer() public static function XMailer()
{ {
return \MailSo\Version::MIME_X_MAILER.'/'.\MailSo\Version::APP_VERSION; return \MailSo\Version::MIME_X_MAILER.'/'.\MailSo\Version::APP_VERSION;
} }
/** /**
* @return string * @return string
*/ */
public static function Signature() public static function Signature()
{ {
$sSignature = ''; $sSignature = '';
if (\defined('MAILSO_LIBRARY_USE_PHAR')) if (\defined('MAILSO_LIBRARY_USE_PHAR'))
{ {
$oPhar = new \Phar('mailso.phar'); $oPhar = new \Phar('mailso.phar');
$sSignature = $oPhar->getSignature(); $sSignature = $oPhar->getSignature();
} }
return $sSignature; return $sSignature;
} }
} }

3
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1131,7 +1131,7 @@ class Actions
'][APC:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('apc_fetch') ? 'on' : 'off'). '][APC:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('apc_fetch') ? 'on' : 'off').
'][MB:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('mb_convert_encoding') ? 'on' : 'off'). '][MB:'.(\MailSo\Base\Utils::FunctionExistsAndEnabled('mb_convert_encoding') ? 'on' : 'off').
'][PDO:'.$sPdo. '][PDO:'.$sPdo.
(\RainLoop\Utils::IsOwnCloud() ? '][ownCloud:true' : ''). (\RainLoop\Utils::IsOwnCloud() ? '][cloud:true' : '').
'][Streams:'.\implode(',', \stream_get_transports()). '][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) && if (!empty($sAction) && !$bError && \is_array($aData) && 0 < \count($aData) &&
$oFilesProvider && $oFilesProvider->IsActive()) $oFilesProvider && $oFilesProvider->IsActive())
{ {
$bError = false; $bError = false;
switch (\strtolower($sAction)) switch (\strtolower($sAction))
{ {

2
rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
View file

@ -238,7 +238,7 @@ class Service
if (\RainLoop\Utils::IsOwnCloud()) if (\RainLoop\Utils::IsOwnCloud())
{ {
$sResult .= '][owncloud:true'; $sResult .= '][cloud:true';
} }
$sResult .= ']-->'; $sResult .= ']-->';

2
rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
View file

@ -5,7 +5,7 @@
<div class="span4"> <div class="span4">
<div class="rl-logo"></div> <div class="rl-logo"></div>
<div style="margin-left: 30px;"> <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 /> <br />
<a class="g-ui-link" href="http://www.rainloop.net/" target="_blank" style="padding-left: 0">http://rainloop.net/</a> <a class="g-ui-link" href="http://www.rainloop.net/" target="_blank" style="padding-left: 0">http://rainloop.net/</a>
</div> </div>