Multiple reminders - Email & Popup

3rdparty/curl.php

@@ -0,0 +1,168 @@
+<?php
+/**
+ * This class is a handy wrapper for using curl
+ * @author original author http://php.net/manual/fr/book.curl.php#90821
+ * modified bye
+ * @author Jérémy Munsch <[email protected]>
+ * @copyright https://creativecommons.org/publicdomain/mark/1.0/
+ */
+class Curl
+{
+        protected $_useragent = 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1';
+        protected $_url;
+        protected $_followlocation;
+        protected $_timeout;
+        protected $_maxRedirects;
+        protected $_cookieFileLocation = null;
+        protected $_post;
+        protected $_postFields;
+        protected $_referer = "http://www.google.com";
+        protected $_debug = false;
+
+        protected $_session;
+        protected $_webpage;
+        protected $_includeHeader;
+        protected $_noBody;
+        protected $_status;
+        protected $_contentType;
+        protected $_infos;
+        protected $_binaryTransfer;
+        public $authentication = 0;
+        public $auth_name      = '';
+        public $auth_pass      = '';
+
+        public function useAuth($use)
+        {
+            $this->authentication = 0;
+            if ($use == true) {
+                $this->authentication = 1;
+            }
+        }
+
+        public function setName($name)
+        {
+            $this->auth_name = $name;
+        }
+
+        public function setPass($pass)
+        {
+            $this->auth_pass = $pass;
+        }
+
+        public function __construct($url, $followlocation = true, $timeOut = 30, $maxRedirecs = 4, $binaryTransfer = false, $includeHeader = false, $noBody = false)
+        {
+            $this->_url = $url;
+            $this->_followlocation = $followlocation;
+            $this->_timeout = $timeOut;
+            $this->_maxRedirects = $maxRedirecs;
+            $this->_noBody = $noBody;
+            $this->_includeHeader = $includeHeader;
+            $this->_binaryTransfer = $binaryTransfer;
+        }
+
+        public function setDebug($debug)
+        {
+            $this->_debug = $debug;
+        }
+
+        public function setReferer($referer)
+        {
+            $this->_referer = $referer;
+        }
+
+        public function setCookieFileLocation($path)
+        {
+            $this->_cookieFileLocation = $path;
+        }
+
+        public function setPost ($postFields)
+        {
+            $this->_post = true;
+            $this->_postFields = $postFields;
+        }
+
+        public function setUserAgent($userAgent)
+        {
+            $this->_useragent = $userAgent;
+        }
+
+        public function createCurl($url = null)
+        {
+            if ($url) {
+                $this->_url = $url;
+            }
+
+            $s = curl_init();
+
+            curl_setopt($s, CURLOPT_URL, $this->_url);
+            curl_setopt($s, CURLOPT_HTTPHEADER, array('Expect:'));
+            curl_setopt($s, CURLOPT_TIMEOUT, $this->_timeout);
+            curl_setopt($s, CURLOPT_MAXREDIRS, $this->_maxRedirects);
+            curl_setopt($s, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($s, CURLOPT_FOLLOWLOCATION, $this->_followlocation);
+
+            if ($this->_debug) {
+                curl_setopt($s, CURLOPT_VERBOSE, true);
+            }
+
+            if ($this->_cookieFileLocation) {
+                curl_setopt($s, CURLOPT_COOKIEJAR, $this->_cookieFileLocation);
+                curl_setopt($s, CURLOPT_COOKIEFILE, $this->_cookieFileLocation);
+            }
+
+            if ($this->authentication == 1) {
+                curl_setopt($s, CURLOPT_USERPWD, $this->auth_name.':'.$this->auth_pass);
+            }
+            if ($this->_post) {
+                curl_setopt($s, CURLOPT_POST, true);
+                curl_setopt($s, CURLOPT_POSTFIELDS, $this->_postFields);
+
+            }
+
+            if ($this->_includeHeader) {
+                curl_setopt($s, CURLOPT_HEADER, true);
+            }
+
+            if ($this->_noBody) {
+                curl_setopt($s, CURLOPT_NOBODY, true);
+            }
+            if($this->_binaryTransfer) {
+             curl_setopt($s,CURLOPT_BINARYTRANSFER,true);
+            }
+            curl_setopt($s, CURLOPT_USERAGENT, $this->_useragent);
+            curl_setopt($s, CURLOPT_REFERER, $this->_referer);
+
+            $this->_webpage = curl_exec($s);
+            $this->_status = curl_getinfo($s, CURLINFO_HTTP_CODE);
+            $this->_contentType = curl_getinfo($s, CURLINFO_CONTENT_TYPE);
+            $this->_infos = curl_getinfo($s);
+
+            curl_close($s);
+
+        }
+
+        public function getHttpStatus()
+        {
+            return $this->_status;
+        }
+
+        public function getContentType()
+        {
+            return $this->_contentType;
+        }
+
+        public function getInfos()
+        {
+            return $this->_infos;
+        }
+
+        public function getDebug()
+        {
+            return $this->_infos;
+        }
+
+        public function __tostring()
+        {
+            return $this->_webpage;
+        }
+}

README.md

@@ -1,28 +1,31 @@
 Calendar app
 ============
+Fork from the owncloud/calendar with Alarm/Reminder/Notifications.
 
-Maintainers:
-------------
-- [Georg Ehrke](https://github.com/georgehrke)
-- [Thomas Tanghus](https://github.com/tanghus)
-- [Bart Visscher](https://github.com/bartv2)
+Install
+=======
+```
+cd apps
+git clone https://github.com/ElieSauveterre/calendar.git
+```
 
-Developer setup info:
----------------------
-__Important note__: ownCloud 7 or ownCloud 8 will be last version to ship the master branch's codebase. It will be replaced by the rework branch. If you want to implement new features, please strongly consider implementing them based on the rework branch's codebase.
+In ownCloud:
+`Enable the Calendar app.`
 
-### Master branch:
-Just clone this repo into your apps directory.
-Get the lastest version of master:
-```bash
-git clone git://github.com/owncloud/calendar.git
-cd calendar
-```
+Database
+========
+If the `oc_clndr_alarms` does not exist after the install, you may manually create the table:
 
-### Rework branch:
-Get the lastest version of rework:
-```bash
-git clone git://github.com/owncloud/calendar.git
-cd calendar
-git checkout rework
+```
+CREATE TABLE `oc_clndr_alarms` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objid` int(10) unsigned NOT NULL DEFAULT '0',
+  `value` varchar(255) COLLATE utf8_bin NOT NULL,
+  `optionfield` varchar(1024) COLLATE utf8_bin NOT NULL,
+  `timetype` varchar(255) COLLATE utf8_bin NOT NULL,
+  `senddate` datetime NOT NULL DEFAULT '1970-01-01 00:00:00',
+  `type` varchar(255) COLLATE utf8_bin NOT NULL,
+  `sent` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 ```

ajax/alarms.php

@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
+$l = OC_L10N::get('calendar');
+
+$alarms = OC_Calendar_Object::getAlarmsToDisplay();
+
+$alarmsIdsSent = array();
+$ouput = array();
+$timeFormat = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'H:i' : 'h:i a';
+$dateFormat = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'dateformat', 'dd-mm-yy') == 'dd-mm-yy' ? 'd-m-Y' : 'm-d-Y';
+$tz = OC_Calendar_App::getTimezone();
+$midnight = new DateTime('now', new DateTimeZone($tz));
+$midnight->setTime(23, 59, 59);
+
+while($row = $alarms->fetchRow()){
+
+	$startDate = new DateTime($row['startdate'], new DateTimeZone('UTC'));
+	$startDate->setTimezone(new DateTimeZone($tz));
+	$oneDay = 60 * 60 * 24;
+
+	if($startDate->getTimestamp() <= $midnight->getTimestamp()){
+
+		$ouput[] = $l->t('Reminder (%s): %s is starting at %s', array(
+		  $row['displayname'],
+		  $row['summary'],
+		  $startDate->format($timeFormat)));
+	}else{
+
+		$ouput[] = $l->t('Reminder (%s): %s is starting at %s on %s', array(
+		  $row['displayname'],
+		  $row['summary'],
+		  $startDate->format($timeFormat),
+		  $startDate->format($dateFormat)
+		));
+	}
+
+
+	$alarmsIdsSent[] = $row['id'];
+}
+
+OC_Calendar_Object::setAlarmsSent($alarmsIdsSent);
+OCP\JSON::success(array('events' => $ouput));

ajax/event/edit.form.php

@@ -34,6 +34,10 @@
 $dtstart = $vevent->DTSTART;
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
 
+$summary = $vevent->SUMMARY;
+$location = $vevent->LOCATION;
+$description = $vevent->DESCRIPTION;
+
 // DATE
 if ($dtstart->hasTime()) {
 	// UTC ?
@@ -258,6 +262,9 @@
 $tmpl->assign('endtime', $endtime);
 $tmpl->assign('description', $description);
 
+$alarms = OC_Calendar_Object::getAlarms($id);
+$tmpl->assign('alarms', $alarms);
+
 $tmpl->assign('repeat', $repeat['repeat']);
 if($repeat['repeat'] != 'doesnotrepeat') {
 	if(array_key_exists('weekofmonth', $repeat) === false) {

ajax/event/edit.php

@@ -31,6 +31,7 @@
 
 	OC_Calendar_App::isNotModified($vcalendar->VEVENT, $_POST['lastmodified']);
 	OC_Calendar_Object::updateVCalendarFromRequest($_POST, $vcalendar);
+	OC_Calendar_Object::addAlarmsDB($_POST['alarmsDuration'], $_POST['alarmsOptionField'], $_POST['alarmsType'], $_POST['alarmsTimeType'], $vcalendar->VEVENT, $id);
 
 	try {
 		OC_Calendar_Object::edit($id, $vcalendar->serialize());

ajax/event/move.php

@@ -40,6 +40,7 @@
 
 try {
 	OC_Calendar_Object::edit($id, $vcalendar->serialize());
+	OC_Calendar_Object::moveAlarmsDB($id, $delta);
 } catch(Exception $e) {
 	OCP\JSON::error(array('message'=>$e->getMessage()));
 	exit;

ajax/event/new.form.php

@@ -44,6 +44,8 @@
 		array_push($calendar_options, $calendar);
 	}
 }
+
+
 $access_class_options = OC_Calendar_App::getAccessClassOptions();
 $repeat_options = OC_Calendar_App::getRepeatOptions();
 $repeat_end_options = OC_Calendar_App::getEndOptions();
@@ -72,6 +74,38 @@
 $tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
 $tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
 
+$_alarms = array();
+$_alarmsType = explode('|', OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'defaultalarms' ));
+
+if (in_array('DISPLAY', $_alarmsType)) {
+	$_alarms[] =   array(
+		'type' => 'DISPLAY',
+		'value' => 10,
+		'optionfield' => '',
+		'timetype' => 'M'
+	);
+}
+
+if (in_array('EMAIL', $_alarmsType)) {
+	$_alarms[] =   array(
+		'type' => 'EMAIL',
+		'value' => 10,
+		'optionfield' => '',
+		'timetype' => 'M'
+	);
+}
+
+if (in_array('WEBHOOK', $_alarmsType)) {
+	$_alarms[] =   array(
+		'type' => 'WEBHOOK',
+		'value' => 10,
+		'optionfield' => OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'webhookdefaulturl' ),
+		'timetype' => 'M'
+	);
+}
+
+$tmpl->assign('alarms', $_alarms);
+
 $tmpl->assign('eventid', 'new');
 $tmpl->assign('startdate', $start->format('d-m-Y'));
 $tmpl->assign('starttime', $start->format('H:i'));

ajax/event/new.php

@@ -21,10 +21,11 @@
 	$cal = $_POST['calendar'];
 	$vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
 	try {
-		OC_Calendar_Object::add($cal, $vcalendar->serialize());
+		$objectId = OC_Calendar_Object::add($cal, $vcalendar->serialize());
+		OC_Calendar_Object::addAlarmsDB($_POST['alarmsDuration'], $_POST['alarmsOptionField'], $_POST['alarmsType'], $_POST['alarmsTimeType'], $vcalendar->VEVENT, $objectId);
 	} catch(Exception $e) {
 		OCP\JSON::error(array('message'=>$e->getMessage()));
 		exit;
 	}
 	OCP\JSON::success();
-}
+}

ajax/event/resize.php

@@ -28,7 +28,7 @@
 OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
 
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-$dtend->getDateTime()->modify($delta);
+$dtend->getDateTime()->add($delta);
 unset($vevent->DURATION);
 
 

ajax/import/import.php

@@ -10,7 +10,7 @@
 OCP\JSON::callCheck();
 session_write_close();
 if (isset($_POST['progresskey']) && isset($_POST['getprogress'])) {
-	echo OCP\JSON::success(array('percent'=>\OC\Cache::get($_POST['progresskey'])));
+	echo OCP\JSON::success(array('percent'=>\OC::$server->getCache()->get($_POST['progresskey'])));
 	exit;
 }
 $file = \OC\Files\Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);