more fixes for events

diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
index 054e57c73293d129f88b4e6ac7560618dd70a3cf..5ede26706b8f3fbe8139e8bd7c8abc6d226ea11c 100644 (file)
--- a/plugins/Event/Happening.php
+++ b/plugins/Event/Happening.php
@@ -112,7 +112,7 @@ class Happening extends Managed_DataObject
         );
     }
 
-    function saveNew($profile, $start_time, $end_time, $title, $location, $description, $options)
+    function saveNew($profile, $start_time, $end_time, $title, $location, $description, $options=array())
     {
         if (array_key_exists('uri', $options)) {
             $other = Happening::staticGet('uri', $options['uri']);

diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index 66b15ea41b0420a24e9f276657073aabb34ecd66..fe23e8825df00dd18f4d8ba1d24043262925e370 100644 (file)
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -93,6 +93,14 @@ class NeweventAction extends Action
         $this->location    = $this->trimmed('location');
         $this->description = $this->trimmed('description');
 
+        $start_date = $this->trimmed('start_date');
+        $start_time = $this->trimmed('start_time');
+        $end_date   = $this->trimmed('end_date');
+        $end_time   = $this->trimmed('end_time');
+
+        $this->start_time = strtotime($start_date . ' ' . $start_time);
+        $this->end_time   = strtotime($end_date . ' ' . $end_time);
+
         return true;
     }
 
@@ -130,16 +138,20 @@ class NeweventAction extends Action
                 throw new ClientException(_('Event must have a title.'));
             }
 
-            if (empty($this->url)) {
-                throw new ClientException(_('Event must have an URL.'));
+            if (empty($this->start_time)) {
+                throw new ClientException(_('Event must have a start time.'));
             }
 
+            if (empty($this->end_time)) {
+                throw new ClientException(_('Event must have an end time.'));
+            }
 
             $saved = Event::saveNew($this->user->getProfile(),
-                                              $this->title,
-                                              $this->url,
-                                              $this->tags,
-                                              $this->description);
+                                    $this->start_time,
+                                    $this->end_time,
+                                    $this->title,
+                                    $this->location,
+                                    $this->description);
 
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
@@ -147,7 +159,7 @@ class NeweventAction extends Action
             return;
         }
 
-        common_redirect($saved->bestUrl(), 303);
+
     }
 
     /**