diff options
-rw-r--r-- | apps/dav/appinfo/routes.php | 29 | ||||
-rw-r--r-- | apps/dav/js/settings-admin-caldav.js | 10 | ||||
-rw-r--r-- | apps/dav/lib/Controller/BirthdayCalendarController.php | 81 | ||||
-rw-r--r-- | apps/dav/lib/Settings/CalDAVSettings.php | 1 | ||||
-rw-r--r-- | apps/dav/templates/settings-admin-caldav.php | 8 | ||||
-rw-r--r-- | apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php | 75 |
6 files changed, 204 insertions, 0 deletions
diff --git a/apps/dav/appinfo/routes.php b/apps/dav/appinfo/routes.php new file mode 100644 index 00000000000..e6785bfd4e6 --- /dev/null +++ b/apps/dav/appinfo/routes.php @@ -0,0 +1,29 @@ +<?php +/** + * @copyright 2017, Georg Ehrke <oc.list@georgehrke.com> + * + * @author Georg Ehrke <oc.list@georgehrke.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +return [ + 'routes' => [ + ['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'], + ['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'], + ] +]; diff --git a/apps/dav/js/settings-admin-caldav.js b/apps/dav/js/settings-admin-caldav.js index 10eb89ab61d..cf1a2006f69 100644 --- a/apps/dav/js/settings-admin-caldav.js +++ b/apps/dav/js/settings-admin-caldav.js @@ -26,3 +26,13 @@ $('#caldavSendInvitations').change(function() { OCP.AppConfig.setValue('dav', 'sendInvitations', val ? 'yes' : 'no'); }); + +$('#caldavGenerateBirthdayCalendar').change(function() { + var val = $(this)[0].checked; + + if (val) { + $.post(OC.generateUrl(OC.linkTo("dav", "enableBirthdayCalendar"))); + } else { + $.post(OC.generateUrl(OC.linkTo("dav", "disableBirthdayCalendar"))); + } +}); diff --git a/apps/dav/lib/Controller/BirthdayCalendarController.php b/apps/dav/lib/Controller/BirthdayCalendarController.php new file mode 100644 index 00000000000..c7172c29053 --- /dev/null +++ b/apps/dav/lib/Controller/BirthdayCalendarController.php @@ -0,0 +1,81 @@ +<?php +/** + * @copyright 2017, Georg Ehrke <oc.list@georgehrke.com> + * + * @author Georg Ehrke <oc.list@georgehrke.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\DAV\Controller; + +use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\Response; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\IRequest; + +class BirthdayCalendarController extends Controller { + + /** + * @var IDBConnection + */ + protected $db; + + /** + * @var IConfig + */ + protected $config; + + /** + * BirthdayCalendar constructor. + * + * @param string $appName + * @param IRequest $request + * @param IDBConnection $db + * @param IConfig $config + */ + public function __construct($appName, IRequest $request, + IDBConnection $db, IConfig $config){ + parent::__construct($appName, $request); + $this->db = $db; + $this->config = $config; + } + + /** + * @return Response + */ + public function enable() { + $this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'yes'); + + // TODO schedule background job to regenerate + + return new JSONResponse([]); + } + + /** + * @return Response + */ + public function disable() { + $this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'no'); + + // TODO delete all birthday calendars + + return new JSONResponse([]); + } +} diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php index 1c85d19432c..a419afa1c55 100644 --- a/apps/dav/lib/Settings/CalDAVSettings.php +++ b/apps/dav/lib/Settings/CalDAVSettings.php @@ -47,6 +47,7 @@ class CalDAVSettings implements ISettings { public function getForm() { $parameters = [ 'send_invitations' => $this->config->getAppValue('dav', 'sendInvitations', 'yes'), + 'generate_birthday_calendar' => $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes'), ]; return new TemplateResponse('dav', 'settings-admin-caldav', $parameters); diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index 8dbe5b38412..a3e3188fb4f 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -37,4 +37,12 @@ script('dav', [ <br> <em><?php p($l->t('Please make sure to properly set up the email settings above.')); ?></em> </p> + <p> + <input type="checkbox" name="caldav_generate_birthday_calendar" id="caldavGenerateBirthdayCalendar" class="checkbox" + <?php ($_['generate_birthday_calendar'] === 'yes') ? print_unescaped('checked="checked"') : null ?>/> + <label for="caldavGenerateBirthdayCalendar"><?php p($l->t('Automatically generate a birthday calendar')); ?></label> + <br> + <em><?php p($l->t('Birthday calendars will be generated by a background job.')); ?></em><br> + <em><?php p($l->t('Hence they will not be available immediately after enabling but will show up after some time.')); ?></em> + </p> </form> diff --git a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php new file mode 100644 index 00000000000..8963546ffee --- /dev/null +++ b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php @@ -0,0 +1,75 @@ +<?php +/** + * @copyright 2017, Georg Ehrke <oc.list@georgehrke.com> + * + * @author Georg Ehrke <oc.list@georgehrke.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\DAV\Tests\Unit\DAV\Controller; + +use OCA\DAV\Controller\BirthdayCalendarController; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\IRequest; +use Test\TestCase; + +class BirthdayCalendarControllerTest extends TestCase { + + /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + private $config; + + /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ + private $request; + + /** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ + private $db; + + /** @var BirthdayCalendarController|\PHPUnit_Framework_MockObject_MockObject */ + private $controller; + + public function setUp() { + parent::setUp(); + + $this->config = $this->createMock(IConfig::class); + $this->request = $this->createMock(IRequest::class); + $this->db = $this->createMock(IDBConnection::class); + + $this->controller = new BirthdayCalendarController('dav', + $this->request, $this->db, $this->config); + } + + public function testEnable() { + $this->config->expects($this->once()) + ->method('setAppValue') + ->with('dav', 'generateBirthdayCalendar', 'yes'); + + $response = $this->controller->enable(); + $this->assertInstanceOf('OCP\AppFramework\Http\JSONResponse', $response); + } + + public function testDisable() { + $this->config->expects($this->once()) + ->method('setAppValue') + ->with('dav', 'generateBirthdayCalendar', 'no'); + + $response = $this->controller->disable(); + $this->assertInstanceOf('OCP\AppFramework\Http\JSONResponse', $response); + } + +} |