Changeset 16375

Timestamp:

05/14/08 11:21:48 (5 months ago)

Author:

rambo

Message:

forward port r16374

Files:

• trunk/midcom/net.nemein.calendar/config/config.inc (modified) (1 diff)
• trunk/midcom/net.nemein.calendar/event.php (modified) (6 diffs)
• trunk/midcom/net.nemein.calendar/handler/create.php (modified) (3 diffs)

trunk/midcom/net.nemein.calendar/config/config.inc

@@ -34 +34 @@
-),
-
+
-'language' => null,
+'allow_name_change' => false, // WARNING: Enabling this enables you to shoot your own foot

trunk/midcom/net.nemein.calendar/event.php

@@ -15 +15 @@
-class net_nemein_calendar_event_dba extends __net_nemein_calendar_event_dba
-{
+    var $_config = false;
+
-    function __construct($guid = null) 
-    {
-
+
+
+
+
-    }
-
@@ -139 +144 @@
-    }
-
+    /**
+     * Checks that the event time range is sane
+     * @return bool indicating sanity
+     */
-    function _check_time_range()
-    {
+        static $valid_date_format = '/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/';
+        // Safety against stupid mistakes (probably asgard)
+        if (   !preg_match($valid_date_format, $this->start)
+            && is_numeric($this->start))
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Start looks like UNIX timestamp, must be ISO date, rewriting ({$this->start})", MIDCOM_LOG_WARN);
+            debug_pop();
+            $this->start = date('Y-m-d H:i:s', $this->start);
+        }
+        if (   !preg_match($valid_date_format, $this->end)
+            && is_numeric($this->end))
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("End looks like UNIX timestamp, must be ISO date, rewriting ({$this->end})", MIDCOM_LOG_WARN);
+            debug_pop();
+            $this->end = date('Y-m-d H:i:s', $this->end);
+        }
+        // Final format safeguard
+        if (   !preg_match($valid_date_format, $this->start)
+            || !preg_match($valid_date_format, $this->end))
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Start or end not in valid format ({$this->start} & {$this->end})", MIDCOM_LOG_ERROR);
+            debug_pop();
+            return false;
+        }
-        if (   $this->start === '0000-00-00 00:00:00'
-            && $this->end === '0000-00-00 00:00:00')
@@ -151 +187 @@
-        if ($end_comparable < $start_comparable)
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Cannot end before starting ({$end_comparable} < {$start_comparable})", MIDCOM_LOG_ERROR);
+            debug_pop();
-            mgd_set_errno(MGD_ERR_RANGE);
-            return false;
-        }
-        // Avoid problems with events too close to the epoch (highly unlikely usage scenario in any case)
-
+static 
-        if (   $start_comparable < $epoch
-            || $end_comparable < $epoch)
-        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("start or end less than epoch ({$start_comparable} < {$epoch} || {$end_comparable} < {$epoch})", MIDCOM_LOG_ERROR);
+            debug_pop();
-            mgd_set_errno(MGD_ERR_RANGE);
-            return false;
@@ -165 +207 @@
-    }
-
+    /**
+     * Checks that the event name is unique (in node/event tree)
+     * @return bool indicating uniqueness
+     */
+    function name_is_unique()
+    {
+        if (empty($this->name))
+        {
+            return true;
+        }
+        $qb = new midgard_query_builder('net_nemein_calendar_event');
+        if (!empty($this->id))
+        {
+            $qb->add_constraint('id', '<>', $this->id);
+        }        
+        $qb->add_constraint('name', '=', $this->name);
+        $qb->add_constraint('node', '=', $this->node);
+        if (!empty($this->up))
+        {
+            $qb->add_constraint('up', '=', $this->up);
+        }        
+        
+        $results = $qb->count();
+        unset($qb);
+
+        if ($results === false)
+        {
+            // QB error (I wonder if this raises some specific error ?
+            //mgd_set_errno(MGD_ERR_ERROR);
+            return false;
+        }
+
+        if ($results > 0)
+        {
+            mgd_set_errno(MGD_ERR_OBJECT_NAME_EXISTS);
+            return false;
+        }
+
+        return true;
+    }
+
-    function _on_creating()
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    function _on_updating()
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -180 +296 @@
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Detected _on_created loop on #{$this->id}", MIDCOM_LOG_ERROR);
+            debug_pop();
+        }
+        else
+        {
+            $GLOBALS['net_nemein_calendar_event_dba__on_created_loop_{$this->guid}'] = true;
+            if (   !$this->_config->get('allow_name_change')
+                || empty($this->name))
+            {
+                /*
+                debug_push_class(__CLASS__, __FUNCTION__);
+                debug_add("Calling midcom_baseclasses_core_dbobject::generate_urlname(\$this) on #{$this->id}");
+                debug_pop();
+                */
+                midcom_baseclasses_core_dbobject::generate_urlname($this);
+            }
+            unset($GLOBALS['net_nemein_calendar_event_dba__on_updated_loop_{$this->guid}']);
+        }
+        return true;
+    }
+
+    function _on_updated()
+    {
+        if (isset($GLOBALS['net_nemein_calendar_event_dba__on_updated_loop_{$this->guid}']))
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Detected _on_updated loop on #{$this->id}", MIDCOM_LOG_ERROR);
-            debug_pop();
@@ -185 +327 @@
-        else
-        {
-            $GLOBALS['net_nemein_calendar_event_dba__on_created_loop_{$this->guid}'] = true;
-            midcom_baseclasses_core_dbobject::generate_urlname($this);
-            unset($GLOBALS['net_nemein_calendar_event_dba__on_updated_loop_{$this->guid}']);
-        }
-        return true;
-    }
-
-    function _on_updated()
-    {
-        if (isset($GLOBALS['net_nemein_calendar_event_dba__on_updated_loop_{$this->guid}']))
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
-            debug_add("Detected _on_updated loop on #{$this->id}", MIDCOM_LOG_ERROR);
-            debug_pop();
-        }
-        else
-        {
-            $GLOBALS['net_nemein_calendar_event_dba__on_updated_loop_{$this->guid}'] = true;
-
+
+
+
+
+
+
+
+
+
+
-            unset($GLOBALS['net_nemein_calendar_event_dba__on_updated_loop_{$this->guid}']);
-        }

trunk/midcom/net.nemein.calendar/handler/create.php

@@ -42 +42 @@
-        $this->_request_data['event']->start = $_POST['start'];
-        $this->_request_data['event']->end = $_POST['end'];
+        if (   $this->_config->get('allow_name_change')
+            && isset($_POST['name']))
+        {
+            $this->_request_data['event']->name = $_POST['name'];
+        }
-
-        if ($this->_request_data['master_event'])
@@ -136 +141 @@
-                $indexer =& $_MIDCOM->get_service('indexer');
-                net_nemein_calendar_viewer::index($this->_controller->datamanager, $indexer, $this->_topic);
-
-                // Generate URL name
-                if ($data['event']->name == '')
-                {
-                    $data['event']->name = midcom_generate_urlname_from_string($data['event']->title);
-                    $tries = 0;
-                    $maxtries = 999;
-                    while(   !$data['event']->update()
-                          && $tries < $maxtries)
-                    {
-                        $data['event']->name = midcom_generate_urlname_from_string($data['event']->title);
-                        if ($tries > 0)
-                        {
-                            // Append an integer if articles with same name exist
-                            $data['event']->name .= sprintf("-%03d", $tries);
-                        }
-                        $tries++;
-                    }
-                }
-
-                if ($handler_id != 'create_chooser')
@@ -192 +178 @@
-    }
-
-
-    /**
-     * Shows the loaded article.