Changeset 11346

Timestamp:

07/24/07 16:41:07 (1 year ago)

Author:

adrenalin

Message:

Added delete option for file attachments.

Files:

• trunk/midcom/midcom.admin.styleeditor/config/config.inc (modified) (1 diff)
• trunk/midcom/midcom.admin.styleeditor/handler/file.php (modified) (7 diffs)
• trunk/midcom/midcom.admin.styleeditor/locale/default.en.txt (modified) (1 diff)
• trunk/midcom/midcom.admin.styleeditor/style/midcom-admin-styleeditor-files-delete.php (added)
• trunk/midcom/midcom.admin.styleeditor/style/midcom-admin-styleeditor-files-file.php (modified) (5 diffs)
• trunk/midcom/midcom.admin.styleeditor/style/midcom-admin-styleeditor-files-header.php (modified) (1 diff)
• trunk/midcom/midcom.admin.styleeditor/viewer.php (modified) (1 diff)

trunk/midcom/midcom.admin.styleeditor/config/config.inc

@@ -1 +1 @@
-'text_types' => array
-(
-
-
-
-
+
+
+
+
+
+
-),

trunk/midcom/midcom.admin.styleeditor/handler/file.php

@@ -138 +138 @@
-            MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('style attachments', 'midcom.admin.styleeditor'),
-        );
-
+
-        switch ($handler_id)
-        {
-
+asgard_midcom.admin.
-                $tmp[] = Array
-                (
-                    MIDCOM_NAV_URL => "__mfa/asgard_midcom.admin.styleeditor/files/{$this->_request_data['filename']}/",
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                );
-                break;
@@ -295 +307 @@
-        $qb = midcom_baseclasses_database_attachment::new_query_builder();
-        $qb->add_constraint('parentguid', '=', $this->_style->guid);
+        
-        $qb->add_constraint('name', '=', $filename);
+        
-        $files = $qb->execute();
-        if (empty($files))
@@ -340 +354 @@
-        else
-        {
-
+/
-        }
-        
@@ -405 +419 @@
-     * Handler method for listing style elements for the currently used component topic
-     *
-rivate
+ublic
-     * @param string $handler_id Name of the used handler
-     * @param mixed $args Array containing the variable arguments passed to the handler
@@ -439 +453 @@
-            if ($filename != $data['filename'])
-            {
-
+/
-            }
-        }
@@ -452 +466 @@
-        // Skip the page styles
-        $_MIDCOM->skip_page_style = true;
+        
+        // Add the codepress syntax highlight
+        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.helper.datamanager2/codepress/codepress.js');
-        
-        // Add the page title
@@ -502 +519 @@
-        midcom_show_style('midgard_admin_asgard_footer');    
-    }
+    
+    /**
+     * Handler method for confirming file deleting for the requested file
+     *
+     * @access public
+     * @param string $handler_id Name of the used handler
+     * @param mixed $args Array containing the variable arguments passed to the handler
+     * @param mixed $data Data passed to the show method
+     * @return boolean Indicating successful request
+     */
+    function _handler_delete($handler_id, $args, &$data)
+    {
+        $this->_load_config();
+        $data['filename'] = $args[0];
+        if (!$this->_load_style())
+        {
+            return false;
+        }
+        $this->_topic->require_do('midcom.admin.styleeditor:template_management');
+        $this->_style->require_do('midgard:attachments');
+        
+        $this->_file = $this->_get_file($data['filename']);
+        if (!$this->_file)
+        {
+            return false;
+        }
+        
+        // Require delete privilege
+        $this->_file->require_do('midgard:delete');
+        
+        if (isset($_POST['f_cancel']))
+        {
+            $_MIDCOM->uimessages->add($_MIDCOM->i18n->get_string('midcom.admin.styleeditor', 'midcom.admin.styleeditor'), $_MIDCOM->i18n->get_string('delete cancelled', 'midcom.admin.styleeditor'));
+            $_MIDCOM->relocate("__mfa/asgard_midcom.admin.styleeditor/files/{$data['filename']}/");
+            // This will exit
+        }
+        
+        if (isset($_POST['f_confirm']))
+        {
+            if ($this->_file->delete())
+            {
+                $_MIDCOM->uimessages->add($_MIDCOM->i18n->get_string('midcom.admin.styleeditor', 'midcom.admin.styleeditor'), sprintf($_MIDCOM->i18n->get_string('file %s deleted', 'midcom.admin.styleeditor'), $data['filename']));
+                $_MIDCOM->relocate("__mfa/asgard_midcom.admin.styleeditor/files/");
+                // This will exit
+            }
+            
+            
+        }
+        
+        $_MIDCOM->bind_view_to_object($this->_file);
+        
+        // Ensure we get the correct styles
+        $_MIDCOM->style->prepend_component_styledir('midgard.admin.asgard');
+        $_MIDCOM->style->prepend_component_styledir('midcom.admin.styleeditor');
+        
+        $this->_update_breadcrumb($handler_id);
+        
+        // Skip the page styles
+        $_MIDCOM->skip_page_style = true;
+        
+        // Add the page title
+        $data['view_title'] = sprintf($_MIDCOM->i18n->get_string('delete file %s', 'midcom.admin.styleeditor'), "'{$args[0]}'");
+        
+        // Set the Asgard toolbar
+        $data['asgard_toolbar'] = new midcom_helper_toolbar();
+        
+        $data['asgard_toolbar']->add_item
+        (
+            array
+            (
+                MIDCOM_TOOLBAR_URL => "__mfa/asgard_midcom.admin.styleeditor/create/",
+                MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('create a new element', 'midcom.admin.styleeditor'),
+                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/text-x-generic-template.png',
+            )
+        );        
+        $data['asgard_toolbar']->add_item
+        (
+            array
+            (
+                MIDCOM_TOOLBAR_URL => "__mfa/asgard_midcom.admin.styleeditor/files/",
+                MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('style attachments', 'midcom.admin.styleeditor'),
+                MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/attach.png',
+            )
+        );
+        
+        return true;
+    }
+    
+    /**
+     * Show the delete request
+     * 
+     * @access private
+     * @param string $handler_id Name of the used handler
+     * @param mixed $data Data passed to the show method
+     */
+    function _show_delete($handler_id, &$data)
+    {
+        midcom_show_style('midgard_admin_asgard_header');
+        midcom_show_style('midgard_admin_asgard_middle');
+        
+        $data['file'] =& $this->_file;
+        $data['text_types'] = $this->_config->get('text_types');
+        midcom_show_style('midcom-admin-styleeditor-files-delete');
+        midcom_show_style('midgard_admin_asgard_footer');    
+    }
+    
-}
-?>

trunk/midcom/midcom.admin.styleeditor/locale/default.en.txt

@@ -127 +127 @@
-Style element %s created
----STRINGEND
+
+---STRING delete file %s
+Delete file '%s'
+---STRINGEND
+
+---STRING confirm delete of file %s
+Confirm delete of file '%s'
+---STRINGEND
+
+---STRING delete cancelled
+Delete cancelled
+---STRINGEND
+
+---STRING file %s deleted
+File '%s' deleted
+---STRINGEND

trunk/midcom/midcom.admin.styleeditor/style/midcom-admin-styleeditor-files-file.php

@@ -1 +1 @@
-<h1><?php echo sprintf($_MIDCOM->i18n->get_string('edit file %s', 'midcom.admin.styleeditor'), $data['filename']); ?></h1>
-
-
+ action="&(_MIDGARD['uri']:h);" onsubmit="midcom_admin_styleeditor_file_edit.toggleEditor();"
-    <fieldset>
-        <legend><?php echo $_MIDCOM->i18n->get_string('upload file', 'midcom.admin.styleeditor'); ?></legend>
@@ -10 +10 @@
-    if (array_key_exists($data['file']->mimetype, $data['text_types']))
-    {
+        switch(preg_replace('/.+?\//', '', $data['file']->mimetype))
+        {
+            case 'css':
+                $codepress_type = 'css';
+                break;
+            
+            case 'html':
+                $codepress_type = 'html';
+                break;
+            
+            case 'x-javascript':
+            case 'javascript':
+                $codepress_type = 'javascript';
+                break;
+            
+            default:
+                $codepress_type = 'text';
+        }
+        
-        // Show file for editing only if it is a text file
-        ?>
@@ -23 +42 @@
-            <label>
-                <span><?php echo $_MIDCOM->i18n->get_string('file contents', 'midcom.admin.styleeditor'); ?></span>
-
+ id="midcom_admin_styleeditor_file_edit" class="&(codepress_type); codepress"
-                    $f = $data['file']->open('r');
-                    if ($f)
@@ -41 +60 @@
-</form>
-
-
+ method="post" action="&(_MIDGARD['uri']:h);delete/"
-    <?php
-    $file_url = $_MIDCOM->get_host_prefix() . "midcom-serveattachmentguid-{$data['file']->guid}/{$data['file']->name}";
@@ -59 +78 @@
-            <input class="text" type="text" value="&(file_url);" readonly="readonly" />
-        </label>
+        <br />
+        <input type="submit" class="delete" name="f_delete" value="<?php echo $_MIDCOM->i18n->get_string('delete', 'midcom'); ?>" />
-    </fieldset>
-</form>

trunk/midcom/midcom.admin.styleeditor/style/midcom-admin-styleeditor-files-header.php

@@ -19 +19 @@
-                }
-                
-styleeditor/files/{$file->name}
+asgard_midcom.admin.styleeditor/files/{$file->name}/
-            }
-            echo "</ul>\n";

trunk/midcom/midcom.admin.styleeditor/viewer.php

@@ -95 +95 @@
-                'variable_args' => 1,
-            ),
+            /**
+             * Delete a file
+             * 
+             * Match /files/<filename>/delete/
+             */
+            'file_delete' => array
+            (
+                'handler' => array ('midcom_admin_styleeditor_handler_file', 'delete'),
+                'fixed_args' => array('files'),
+                'variable_args' => 2,
+            ),
-        );
-    }