Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Commit 6a6f420

Browse files
RainLoopRainLoop
committed
2016 -> 2017
+ Small fixes
1 parent 39c07bf commit 6a6f420

File tree

16 files changed

+297
-294
lines changed

16 files changed

+297
-294
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ It's not recommended to use in production environment.
2020
**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
2121
http://www.gnu.org/licenses/agpl-3.0.html
2222

23-
Copyright (c) 2016 Rainloop Team
23+
Copyright (c) 2017 Rainloop Team

‎build/owncloud/rainloop-app/INSTALL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* ownCloud/Nextcloud - RainLoop Webmail package
44
*
55
* @author RainLoop Team
6-
* @copyright 2016 RainLoop Team
6+
* @copyright 2017 RainLoop Team
77
*
88
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
99
*

‎build/owncloud/rainloop-app/admin.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<?php
2-
3-
/**
4-
* ownCloud - RainLoop mail plugin
5-
*
6-
* @author RainLoop Team
7-
* @copyright 2016 RainLoop Team
8-
*
9-
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
10-
*/
11-
12-
OCP\User::checkAdminUser();
13-
14-
OCP\Util::addScript('rainloop', 'admin');
15-
16-
$oTemplate = new OCP\Template('rainloop', 'admin-local');
17-
$oTemplate->assign('rainloop-admin-panel-link', OC_RainLoop_Helper::getAppUrl().'?admin');
18-
$oTemplate->assign('rainloop-autologin', OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false));
19-
return $oTemplate->fetchPage();
1+
<?php
2+
3+
/**
4+
* ownCloud - RainLoop mail plugin
5+
*
6+
* @author RainLoop Team
7+
* @copyright 2017 RainLoop Team
8+
*
9+
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
10+
*/
11+
12+
OCP\User::checkAdminUser();
13+
14+
OCP\Util::addScript('rainloop', 'admin');
15+
16+
$oTemplate = new OCP\Template('rainloop', 'admin-local');
17+
$oTemplate->assign('rainloop-admin-panel-link', OC_RainLoop_Helper::getAppUrl().'?admin');
18+
$oTemplate->assign('rainloop-autologin', OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false));
19+
return $oTemplate->fetchPage();

‎build/owncloud/rainloop-app/ajax/admin.php‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
<?php
2-
3-
/**
4-
* ownCloud - RainLoop mail plugin
5-
*
6-
* @author RainLoop Team
7-
* @copyright 2016 RainLoop Team
8-
*
9-
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
10-
*/
11-
12-
OCP\JSON::checkAdminUser();
13-
OCP\JSON::checkAppEnabled('rainloop');
14-
OCP\JSON::callCheck();
15-
16-
$sUrl = '';
17-
$sPath = '';
18-
$bAutologin = false;
19-
20-
if (isset($_POST['appname']) && 'rainloop' === $_POST['appname'])
21-
{
22-
OCP\Config::setAppValue('rainloop', 'rainloop-autologin', isset($_POST['rainloop-autologin']) ?
23-
'1' === $_POST['rainloop-autologin'] : false);
24-
25-
$bAutologin = OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false);
26-
}
27-
else
28-
{
29-
sleep(1);
30-
OC_JSON::error(array('Message' => 'Invalid Argument(s)'));
31-
return false;
32-
}
33-
34-
sleep(1);
35-
OCP\JSON::success(array('Message' => 'Saved successfully'));
36-
return true;
1+
<?php
2+
3+
/**
4+
* ownCloud - RainLoop mail plugin
5+
*
6+
* @author RainLoop Team
7+
* @copyright 2017 RainLoop Team
8+
*
9+
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
10+
*/
11+
12+
OCP\JSON::checkAdminUser();
13+
OCP\JSON::checkAppEnabled('rainloop');
14+
OCP\JSON::callCheck();
15+
16+
$sUrl = '';
17+
$sPath = '';
18+
$bAutologin = false;
19+
20+
if (isset($_POST['appname']) && 'rainloop' === $_POST['appname'])
21+
{
22+
OCP\Config::setAppValue('rainloop', 'rainloop-autologin', isset($_POST['rainloop-autologin']) ?
23+
'1' === $_POST['rainloop-autologin'] : false);
24+
25+
$bAutologin = OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false);
26+
}
27+
else
28+
{
29+
sleep(1);
30+
OC_JSON::error(array('Message' => 'Invalid Argument(s)'));
31+
return false;
32+
}
33+
34+
sleep(1);
35+
OCP\JSON::success(array('Message' => 'Saved successfully'));
36+
return true;

‎build/owncloud/rainloop-app/ajax/personal.php‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
<?php
2-
3-
/**
4-
* ownCloud - RainLoop mail plugin
5-
*
6-
* @author RainLoop Team
7-
* @copyright 2016 RainLoop Team
8-
*
9-
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
10-
*/
11-
12-
OCP\JSON::checkLoggedIn();
13-
OCP\JSON::checkAppEnabled('rainloop');
14-
OCP\JSON::callCheck();
15-
16-
$sEmail = '';
17-
$sLogin = '';
18-
19-
if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email']) && 'rainloop' === $_POST['appname'])
20-
{
21-
$sUser = OCP\User::getUser();
22-
23-
$sPostEmail = $_POST['rainloop-email'];
24-
25-
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail);
26-
27-
$sPass = $_POST['rainloop-password'];
28-
if ('******' !== $sPass && '' !== $sPass)
29-
{
30-
include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
31-
32-
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password',
33-
OC_RainLoop_Helper::encodePassword($sPass, md5($sPostEmail)));
34-
}
35-
36-
$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
37-
}
38-
else
39-
{
40-
sleep(1);
41-
OC_JSON::error(array('Message' => 'Invalid argument(s)', 'Email' => $sEmail));
42-
return false;
43-
}
44-
45-
sleep(1);
46-
OCP\JSON::success(array('Message' => 'Saved successfully', 'Email' => $sEmail));
47-
return true;
1+
<?php
2+
3+
/**
4+
* ownCloud - RainLoop mail plugin
5+
*
6+
* @author RainLoop Team
7+
* @copyright 2017 RainLoop Team
8+
*
9+
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
10+
*/
11+
12+
OCP\JSON::checkLoggedIn();
13+
OCP\JSON::checkAppEnabled('rainloop');
14+
OCP\JSON::callCheck();
15+
16+
$sEmail = '';
17+
$sLogin = '';
18+
19+
if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email']) && 'rainloop' === $_POST['appname'])
20+
{
21+
$sUser = OCP\User::getUser();
22+
23+
$sPostEmail = $_POST['rainloop-email'];
24+
25+
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail);
26+
27+
$sPass = $_POST['rainloop-password'];
28+
if ('******' !== $sPass && '' !== $sPass)
29+
{
30+
include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
31+
32+
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password',
33+
OC_RainLoop_Helper::encodePassword($sPass, md5($sPostEmail)));
34+
}
35+
36+
$sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', '');
37+
}
38+
else
39+
{
40+
sleep(1);
41+
OC_JSON::error(array('Message' => 'Invalid argument(s)', 'Email' => $sEmail));
42+
return false;
43+
}
44+
45+
sleep(1);
46+
OCP\JSON::success(array('Message' => 'Saved successfully', 'Email' => $sEmail));
47+
return true;

‎build/owncloud/rainloop-app/appinfo/app.php‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<?php
2-
3-
/**
4-
* ownCloud - RainLoop mail plugin
5-
*
6-
* @author RainLoop Team
7-
* @copyright 2016 RainLoop Team
8-
*
9-
* https://github.com/RainLoop/owncloud
10-
*/
11-
12-
OC::$CLASSPATH['OC_RainLoop_Helper'] = OC_App::getAppPath('rainloop') . '/lib/RainLoopHelper.php';
13-
14-
OCP\App::registerAdmin('rainloop', 'admin');
15-
OCP\App::registerPersonal('rainloop', 'personal');
16-
17-
if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
18-
{
19-
OCP\Util::connectHook('OC_User', 'post_login', 'OC_RainLoop_Helper', 'login');
20-
OCP\Util::connectHook('OC_User', 'post_setPassword', 'OC_RainLoop_Helper', 'changePassword');
21-
}
22-
23-
OCP\Util::connectHook('OC_User', 'logout', 'OC_RainLoop_Helper', 'logout');
24-
25-
OCP\Util::addScript('rainloop', 'rainloop');
26-
27-
OCP\App::addNavigationEntry(array(
28-
'id' => 'rainloop_index',
29-
'order' => 10,
30-
'href' => OCP\Util::linkToRoute('rainloop_index'),
31-
'icon' => OCP\Util::imagePath('rainloop', 'mail.png'),
32-
'name' => 'Email'
33-
));
34-
1+
<?php
2+
3+
/**
4+
* ownCloud - RainLoop mail plugin
5+
*
6+
* @author RainLoop Team
7+
* @copyright 2017 RainLoop Team
8+
*
9+
* https://github.com/RainLoop/owncloud
10+
*/
11+
12+
OC::$CLASSPATH['OC_RainLoop_Helper'] = OC_App::getAppPath('rainloop') . '/lib/RainLoopHelper.php';
13+
14+
OCP\App::registerAdmin('rainloop', 'admin');
15+
OCP\App::registerPersonal('rainloop', 'personal');
16+
17+
if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false))
18+
{
19+
OCP\Util::connectHook('OC_User', 'post_login', 'OC_RainLoop_Helper', 'login');
20+
OCP\Util::connectHook('OC_User', 'post_setPassword', 'OC_RainLoop_Helper', 'changePassword');
21+
}
22+
23+
OCP\Util::connectHook('OC_User', 'logout', 'OC_RainLoop_Helper', 'logout');
24+
25+
OCP\Util::addScript('rainloop', 'rainloop');
26+
27+
OCP\App::addNavigationEntry(array(
28+
'id' => 'rainloop_index',
29+
'order' => 10,
30+
'href' => OCP\Util::linkToRoute('rainloop_index'),
31+
'icon' => OCP\Util::imagePath('rainloop', 'mail.png'),
32+
'name' => 'Email'
33+
));
34+

‎build/owncloud/rainloop-app/index.php‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
<?php
2-
3-
/**
4-
* ownCloud - RainLoop mail plugin
5-
*
6-
* @author RainLoop Team
7-
* @copyright 2016 RainLoop Team
8-
*
9-
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
10-
*/
11-
12-
OCP\User::checkLoggedIn();
13-
OCP\App::checkAppEnabled('rainloop');
14-
OCP\App::setActiveNavigationEntry('rainloop_index');
15-
16-
// Load the empty file ../css/style.css, that's needed to allow theming of
17-
// the ownCloud header and navigation if rainloop is the active app.
18-
OCP\Util::addStyle('rainloop', 'style');
19-
20-
include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
21-
22-
$sUrl = OC_RainLoop_Helper::normalizeUrl(OC_RainLoop_Helper::getAppUrl());
23-
24-
$oTemplate = new OCP\Template('rainloop', 'index', 'user');
25-
$oTemplate->assign('rainloop-iframe-url', OC_RainLoop_Helper::normalizeUrl($sUrl).'?OwnCloudAuth');
26-
27-
$oTemplate->printpage();
1+
<?php
2+
3+
/**
4+
* ownCloud - RainLoop mail plugin
5+
*
6+
* @author RainLoop Team
7+
* @copyright 2017 RainLoop Team
8+
*
9+
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
10+
*/
11+
12+
OCP\User::checkLoggedIn();
13+
OCP\App::checkAppEnabled('rainloop');
14+
OCP\App::setActiveNavigationEntry('rainloop_index');
15+
16+
// Load the empty file ../css/style.css, that's needed to allow theming of
17+
// the ownCloud header and navigation if rainloop is the active app.
18+
OCP\Util::addStyle('rainloop', 'style');
19+
20+
include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php';
21+
22+
$sUrl = OC_RainLoop_Helper::normalizeUrl(OC_RainLoop_Helper::getAppUrl());
23+
24+
$oTemplate = new OCP\Template('rainloop', 'index', 'user');
25+
$oTemplate->assign('rainloop-iframe-url', OC_RainLoop_Helper::normalizeUrl($sUrl).'?OwnCloudAuth');
26+
27+
$oTemplate->printpage();

‎build/owncloud/rainloop-app/js/admin.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
2-
/**
3-
* ownCloud - RainLoop mail plugin
4-
*
5-
* @author RainLoop Team
6-
* @copyright 2016 RainLoop Team
7-
*
8-
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
9-
*/
10-
11-
$(function() {
12-
RainLoopFormHelper('#mail-rainloop-admin-form', 'admin.php');
13-
});
1+
2+
/**
3+
* ownCloud - RainLoop mail plugin
4+
*
5+
* @author RainLoop Team
6+
* @copyright 2017 RainLoop Team
7+
*
8+
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
9+
*/
10+
11+
$(function() {
12+
RainLoopFormHelper('#mail-rainloop-admin-form', 'admin.php');
13+
});

‎build/owncloud/rainloop-app/js/personal.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
2-
/**
3-
* ownCloud - RainLoop mail plugin
4-
*
5-
* @author RainLoop Team
6-
* @copyright 2016 RainLoop Team
7-
*
8-
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
9-
*/
10-
11-
$(function() {
12-
RainLoopFormHelper('#mail-rainloop-personal-form', 'personal.php');
13-
});
1+
2+
/**
3+
* ownCloud - RainLoop mail plugin
4+
*
5+
* @author RainLoop Team
6+
* @copyright 2017 RainLoop Team
7+
*
8+
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
9+
*/
10+
11+
$(function() {
12+
RainLoopFormHelper('#mail-rainloop-personal-form', 'personal.php');
13+
});

0 commit comments

Comments
 (0)