Changeset 15584

Timestamp:

03/14/08 11:09:30 (7 months ago)

Author:

rambo

Message:

refactoring and cleaning up the images and image datatypes to fix #226

Files:

• branches/MidCOM_2_8/midcom.helper.datamanager2/type/image.php (modified) (2 diffs)
• branches/MidCOM_2_8/midcom.helper.datamanager2/type/images.php (modified) (5 diffs)
• branches/MidCOM_2_8/midcom.helper.datamanager2/widget/images.php (modified) (8 diffs)

branches/MidCOM_2_8/midcom.helper.datamanager2/type/image.php

@@ -199 +199 @@
-     */
-    var $output_mode = 'html';
+
+    /**
+     * Whether this instance is handling single image or multiple images
+     *
+     * @var string
+     * @access private
+     */
+    var $_instance_mode = 'single';
-
-    function _on_initialize()
@@ -972 +980 @@
-    function convert_to_storage()
-    {
-// FIXME: better safety for image*s* datatype calling parent::convert_to_storage()
-if (
+if (   $this->_instance_mode === 'single'
+    && 
-        {
-            foreach ($this->attachments as $identifier => $copy)

branches/MidCOM_2_8/midcom.helper.datamanager2/type/images.php

@@ -156 +156 @@
-
-    /**
+     * Titles of each image, keyed by the MD5 identifier
+     */
+    var $titles = array();
+
+    /**
-     * Output mode
-     *
@@ -170 +175 @@
-     */
-    var $max_count = 0;
+
+    function _on_initialize()
+    {
+        $this->_instance_mode = 'multiple';
+        return parent::_on_initialize();
+    }
-
-    /**
@@ -247 +258 @@
-        $this->_identifier = $identifier;
-        $this->_title = $title;
+        $this->titles[$identifier] = $title;
-        if (array_key_exists($this->_identifier, $this->images))
-        {
@@ -356 +368 @@
-        parent::convert_from_storage($source);
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-
@@ -370 +380 @@
-    function convert_to_storage()
-    {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return parent::convert_to_storage();

branches/MidCOM_2_8/midcom.helper.datamanager2/widget/images.php

@@ -347 +347 @@
-        }
-
+        $img_title = '';
+        // Some reason we're kicking out-of-sync, check explicitly for POSTed value
+        if (   isset($_POST[$this->name])
+            && is_array($_POST[$this->name])
+            && isset($_POST[$this->name]["e_exist_{$identifier}_title"]))
+        {
+            $img_title = $_POST[$this->name]["e_exist_{$identifier}_title"];
+        }
+        // Otherwise use the type title if available
+        elseif (isset($this->_type->titles[$identifier]))
+        {
+            $img_title = $this->_type->titles[$identifier];
+        }
-
-        // Filename column
@@ -356 +369 @@
-
-        // Title Column, set the value explicitly, as we are sometimes called after the defaults kick in.
-nfo['description']
+mg_title
-        $this->_elements["s_exist_{$identifier}_title"] =& HTML_QuickForm::createElement('static', "s_exist_{$identifier}_title", '', $html);
-        $attributes = Array
@@ -364 +377 @@
-        );
-        $this->_elements["e_exist_{$identifier}_title"] =& HTML_QuickForm::createElement('text', "e_exist_{$identifier}_title", '', $attributes);
-nfo['description']
+mg_title
-
-        if (! $frozen)
@@ -467 +480 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-                debug_push_class(__CLASS__, __FUNCTION__);
-n attachment
+ttachments from compressed files
-                debug_pop();
-            }
+            return;
+        }
+
+        
+        if (   array_key_exists('e_new_title', $values)
+            && !empty($values['e_new_title']))
+        {
+            $title = $values['e_new_title'];
+        }
+        else
+        {
+            $title = $file['name'];
+        }
+        
+        if (   array_key_exists('e_new_filename', $values)
+            && !empty($values['e_new_filename']))
+        {
+            $filename = $values['e_new_filename'];
+        }
+        else
+        {
+            $filename = $file['name'];
+        }
+
+        if (! $this->_type->add_image($filename, $file['tmp_name'], $title))
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add("Failed to add an attachment to the field '{$this->name}'. Ignoring silently.", MIDCOM_LOG_WARN);
+            debug_pop();
-        }
-    }
@@ -520 +536 @@
-     * 1. If the delete button was clicked, the image is dropped.
-     * 2. If a new file has been uploaded, it replaces the current one.
-     * 3. If neither of the above is triggered, the title of the image is synchronized.
-     *
-     * Calls for images which are not listed in the form, will be silently ignored.
@@ -538 +553 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -629 +638 @@
-     * Nothing to do here.
-     */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**
@@ -639 +660 @@
-        foreach($this->_type->images as $identifier => $images)
-        {
-
-
+
-            {
-images['main']['description'
+this->_type->titles[$identifier
-            }
-            else