Merge commit 'merge-requests/192' into statusnet_1.1.x

[quix0rs-gnu-social.git] / plugins / Event / newevent.php

diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index cadf0e14331b9557a4de8a908a914124e1d072ab..4c2157e01eebbe7b63843e820959618300713ade 100644 (file)
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -52,8 +52,8 @@ class NeweventAction extends Action
     protected $title       = null;
     protected $location    = null;
     protected $description = null;
-    protected $startTime  = null;
-    protected $endTime    = null;
+    protected $startTime   = null;
+    protected $endTime     = null;
 
     /**
      * Returns the title of the action
@@ -89,67 +89,74 @@ class NeweventAction extends Action
             $this->checkSessionToken();
         }
 
-        $this->title       = $this->trimmed('title');
-
-        if (empty($this->title)) {
-            // TRANS: Client exception thrown when trying to post an event without providing a title.
-            throw new ClientException(_m('Title required.'));
-        }
-
-        $this->location    = $this->trimmed('location');
-        $this->url         = $this->trimmed('url');
-        $this->description = $this->trimmed('description');
-
-        $startDate = $this->trimmed('startdate');
+        try {
 
-        if (empty($startDate)) {
-            // TRANS: Client exception thrown when trying to post an event without providing a start date.
-            throw new ClientException(_m('Start date required.'));
-        }
+            $this->title = $this->trimmed('title');
 
-        $startTime = $this->trimmed('starttime');
+            if (empty($this->title)) {
+                // TRANS: Client exception thrown when trying to post an event without providing a title.
+                throw new ClientException(_m('Title required.'));
+            }
 
-        if (empty($startTime)) {
-            $startTime = '00:00';
-        }
+            $this->location    = $this->trimmed('location');
+            $this->url         = $this->trimmed('url');
+            $this->description = $this->trimmed('description');
+            $tz                = $this->trimmed('tz');
 
-        $endDate   = $this->trimmed('enddate');
+            $startDate = $this->trimmed('startdate');
 
-        if (empty($endDate)) {
-            // TRANS: Client exception thrown when trying to post an event without providing an end date.
-            throw new ClientException(_m('End date required.'));
-        }
+            if (empty($startDate)) {
+                // TRANS: Client exception thrown when trying to post an event without providing a start date.
+                throw new ClientException(_m('Start date required.'));
+            }
 
-        $endTime   = $this->trimmed('endtime');
+            $startTime = $this->trimmed('event-starttime');
 
-        if (empty($endTime)) {
-            $endTime = '00:00';
-        }
+            if (empty($startTime)) {
+                $startTime = '00:00';
+            }
 
-        $start = $startDate . ' ' . $startTime;
+            $endDate   = $this->trimmed('enddate');
 
-        common_debug("Event start: '$start'");
+            if (empty($endDate)) {
+                // TRANS: Client exception thrown when trying to post an event without providing an end date.
+                throw new ClientException(_m('End date required.'));
+            }
 
-        $end = $endDate . ' ' . $endTime;
+            $endTime   = $this->trimmed('event-endtime');
 
-        common_debug("Event start: '$end'");
+            if (empty($endTime)) {
+                $endTime = '00:00';
+            }
 
-        $this->startTime = strtotime($start);
-        $this->endTime   = strtotime($end);
+            $start = $startDate . ' ' . $startTime . ' ' . $tz;
+            $end   = $endDate . ' ' . $endTime . ' ' . $tz;
 
-        if ($this->startTime == 0) {
-            // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
-            // TRANS: %s is the data that could not be processed.
-            throw new Exception(sprintf(_m('Could not parse date "%s".'),
-                                        $start));
-        }
+            $this->startTime = strtotime($start);
+            $this->endTime   = strtotime($end);
 
+            if ($this->startTime == 0) {
+                // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+                // TRANS: %s is the data that could not be processed.
+                throw new ClientException(sprintf(_m('Could not parse date "%s".'),
+                                            $start));
+            }
 
-        if ($this->endTime == 0) {
-            // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
-            // TRANS: %s is the data that could not be processed.
-            throw new Exception(sprintf(_m('Could not parse date "%s".'),
-                                        $end));
+            if ($this->endTime == 0) {
+                // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+                // TRANS: %s is the data that could not be processed.
+                throw new ClientException(sprintf(_m('Could not parse date "%s".'),
+                                            $end));
+            }
+        } catch (ClientException $ce) {
+            if ($this->boolean('ajax')) {
+                $this->outputAjaxError($ce->getMessage());
+                return false;
+            } else {
+                $this->error = $ce->getMessage();
+                $this->showPage();
+                return false;
+            }
         }
 
         return true;
@@ -183,6 +190,7 @@ class NeweventAction extends Action
     function newEvent()
     {
         try {
+
             if (empty($this->title)) {
                 // TRANS: Client exception thrown when trying to post an event without providing a title.
                 throw new ClientException(_m('Event must have a title.'));
@@ -198,6 +206,11 @@ class NeweventAction extends Action
                 throw new ClientException(_m('Event must have an end time.'));
             }
 
+            if (!empty($this->url) && Validate::uri($this->url) === false) {
+                // TRANS: Client exception thrown when trying to post an event with an invalid URL.
+                throw new ClientException(_m('URL must be valid.'));
+            }
+
             $options = array();
 
             // Does the heavy-lifting for getting "To:" information
@@ -220,9 +233,14 @@ class NeweventAction extends Action
             RSVP::saveNew($profile, $event, RSVP::POSITIVE);
 
         } catch (ClientException $ce) {
-            $this->error = $ce->getMessage();
-            $this->showPage();
-            return;
+            if ($this->boolean('ajax')) {
+                $this->outputAjaxError($ce->getMessage());
+                return;
+            } else {
+                $this->error = $ce->getMessage();
+                $this->showPage();
+                return;
+            }
         }
 
         if ($this->boolean('ajax')) {
@@ -242,6 +260,23 @@ class NeweventAction extends Action
         }
     }
 
+    // @todo factor this out into a base class
+    function outputAjaxError($msg)
+    {
+        header('Content-Type: text/xml;charset=utf-8');
+        $this->xw->startDocument('1.0', 'UTF-8');
+        $this->elementStart('html');
+        $this->elementStart('head');
+        // TRANS: Page title after an AJAX error occurs
+        $this->element('title', null, _('Ajax Error'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+        $this->element('p', array('id' => 'error'), $msg);
+        $this->elementEnd('body');
+        $this->elementEnd('html');
+        return;
+    }
+
     /**
      * Show the event form
      *