mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 07:35:55 +08:00
Comply with Owncloud 10.3.2
This commit is contained in:
parent
b303170647
commit
796183d40d
|
@ -12,7 +12,9 @@ OCP\User::checkAdminUser();
|
||||||
|
|
||||||
OCP\Util::addScript('rainloop', 'admin');
|
OCP\Util::addScript('rainloop', 'admin');
|
||||||
|
|
||||||
|
include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
|
||||||
|
|
||||||
$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', \OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false));
|
||||||
return $oTemplate->fetchPage();
|
return $oTemplate->fetchPage();
|
||||||
|
|
|
@ -18,10 +18,10 @@ $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']) ?
|
\OC::$server->getConfig()->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 = \OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,18 +21,18 @@ if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email
|
||||||
|
|
||||||
$sPostEmail = $_POST['rainloop-email'];
|
$sPostEmail = $_POST['rainloop-email'];
|
||||||
|
|
||||||
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail);
|
\OC::$server->getConfig()->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',
|
\OC::$server->getConfig()->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 = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', '');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -15,15 +15,15 @@ if (@file_exists(__DIR__.'/app/index.php'))
|
||||||
|
|
||||||
$sUser = OCP\User::getUser();
|
$sUser = OCP\User::getUser();
|
||||||
|
|
||||||
if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
|
if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false))
|
||||||
{
|
{
|
||||||
$sEmail = $sUser;
|
$sEmail = $sUser;
|
||||||
$sEncodedPassword = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-autologin-password', '');
|
$sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-autologin-password', '');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
|
$sEmail = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', '');
|
||||||
$sEncodedPassword = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-password', '');
|
$sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-password', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
$sDecodedPassword = OC_RainLoop_Helper::decodePassword($sEncodedPassword, md5($sEmail));
|
$sDecodedPassword = OC_RainLoop_Helper::decodePassword($sEncodedPassword, md5($sEmail));
|
||||||
|
|
|
@ -13,7 +13,7 @@ OC::$CLASSPATH['OC_RainLoop_Helper'] = OC_App::getAppPath('rainloop') . '/lib/Ra
|
||||||
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 (\OC::$server->getConfig()->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');
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<ocsid>165254</ocsid>
|
<ocsid>165254</ocsid>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<php min-version="5.4" />
|
<php min-version="5.4" />
|
||||||
<owncloud min-version="6" max-version="9.2" />
|
<owncloud min-version="6" max-version="11" />
|
||||||
<nextcloud min-version="8" max-version="11" />
|
<nextcloud min-version="8" max-version="11" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<category>tools</category>
|
<category>tools</category>
|
||||||
|
|
|
@ -191,7 +191,7 @@ class OC_RainLoop_Helper
|
||||||
$sEmail = $sUser;
|
$sEmail = $sUser;
|
||||||
$sPassword = $aParams['password'];
|
$sPassword = $aParams['password'];
|
||||||
|
|
||||||
return OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-autologin-password',
|
return \OC::$server->getConfig()->setUserValue($sUser, 'rainloop', 'rainloop-autologin-password',
|
||||||
self::encodePassword($sPassword, md5($sEmail)));
|
self::encodePassword($sPassword, md5($sEmail)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@ class OC_RainLoop_Helper
|
||||||
|
|
||||||
public static function logout()
|
public static function logout()
|
||||||
{
|
{
|
||||||
OCP\Config::setUserValue(
|
\OC::$server->getConfig()->setUserValue(
|
||||||
OCP\User::getUser(), 'rainloop', 'rainloop-autologin-password', '');
|
OCP\User::getUser(), 'rainloop', 'rainloop-autologin-password', '');
|
||||||
|
|
||||||
$sApiPath = __DIR__.'/../app/index.php';
|
$sApiPath = __DIR__.'/../app/index.php';
|
||||||
|
@ -231,10 +231,10 @@ class OC_RainLoop_Helper
|
||||||
|
|
||||||
OCP\Util::writeLog('rainloop', 'rainloop|login: Setting new RainLoop password for '.$sEmail, OCP\Util::DEBUG);
|
OCP\Util::writeLog('rainloop', 'rainloop|login: Setting new RainLoop password for '.$sEmail, OCP\Util::DEBUG);
|
||||||
|
|
||||||
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-autologin-password',
|
\OC::$server->getConfig()->setUserValue($sUser, 'rainloop', 'rainloop-autologin-password',
|
||||||
self::encodePassword($sPassword, md5($sEmail)));
|
self::encodePassword($sPassword, md5($sEmail)));
|
||||||
|
|
||||||
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password',
|
\OC::$server->getConfig()->setUserValue($sUser, 'rainloop', 'rainloop-password',
|
||||||
self::encodePassword($sPassword, md5($sEmail)));
|
self::encodePassword($sPassword, md5($sEmail)));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -13,7 +13,7 @@ OCP\App::checkAppEnabled('rainloop');
|
||||||
|
|
||||||
OCP\Util::addScript('rainloop', 'personal');
|
OCP\Util::addScript('rainloop', 'personal');
|
||||||
|
|
||||||
if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
|
if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false))
|
||||||
{
|
{
|
||||||
$oTemplate = new OCP\Template('rainloop', 'empty');
|
$oTemplate = new OCP\Template('rainloop', 'empty');
|
||||||
}
|
}
|
||||||
|
@ -23,8 +23,8 @@ else
|
||||||
|
|
||||||
$oTemplate = new OCP\Template('rainloop', 'personal');
|
$oTemplate = new OCP\Template('rainloop', 'personal');
|
||||||
|
|
||||||
$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
|
$sEmail = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', '');
|
||||||
$sPass = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-password', '');
|
$sPass = \OC::$server->getConfig()->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) ? '' : '******');
|
||||||
|
|
Loading…
Reference in a new issue