Changeset 4452

Timestamp:

10/23/06 17:14:55 (2 years ago)

Author:

bergie

Message:

Feed deletion support, fix for broken OPML subscription

Files:

• trunk/src/net.nemein.rss/config/manifest.inc (modified) (1 diff)
• trunk/src/net.nemein.rss/documentation/CHANGES (modified) (1 diff)
• trunk/src/net.nemein.rss/fetch.php (modified) (1 diff)
• trunk/src/net.nemein.rss/locale/default.en.txt (modified) (4 diffs)
• trunk/src/net.nemein.rss/locale/default.fi.txt (modified) (4 diffs)
• trunk/src/net.nemein.rss/manage.php (modified) (11 diffs)
• trunk/src/net.nemein.rss/style/net-nemein-rss-feed-delete.php (added)
• trunk/src/net.nemein.rss/style/net-nemein-rss-feed-fetch.php (modified) (2 diffs)

trunk/src/net.nemein.rss/config/manifest.inc

@@ -1 +1 @@
-'name' => 'net.nemein.rss',
-'purecode' => true,
-0
+1
-'state' => 'stable',
-'privileges' => array(),

trunk/src/net.nemein.rss/documentation/CHANGES

@@ -6 +6 @@
-  which might even break existing functionality.
-- All items marked with "+" represent completly new features.
+
+2006-10-23 bergie
+  + Added support for deleting feeds
+  - Fixed OPML subscription
-
-2006-10-06 bergie

trunk/src/net.nemein.rss/fetch.php

@@ -409 +409 @@
-            $item['title'] = $_MIDCOM->i18n->get_string('untitled', 'net.nemein.rss');
-
-$this->
+net_nemein_rss_fetch::
-
-            if (isset($item['description'])) 

trunk/src/net.nemein.rss/locale/default.en.txt

@@ -46 +46 @@
----STRING default author for items
-Default author for items
+---STRINGEND
+
+---STRING delete feed
+Delete feed
----STRINGEND
-
@@ -116 +120 @@
----STRINGEND
-
+---STRING no items found in feed
+No items found in feed.
+---STRINGEND
+
----STRING opml file
-OPML file
@@ -126 +134 @@
----STRING remote from feed
-Remote from feed
+---STRINGEND
+
+---STRING remote item
+Item in feed
----STRINGEND
-
@@ -172 +184 @@
----STRINGEND
-
-no items found in feed
-
+local item
+
----STRINGEND
-

trunk/src/net.nemein.rss/locale/default.fi.txt

@@ -46 +46 @@
----STRING default author for items
-Uutisten oletuskirjoittaja
+---STRINGEND
+
+---STRING delete feed
+Poista syöte
----STRINGEND
-
@@ -116 +120 @@
----STRINGEND
-
+---STRING no items found in feed
+SyötteestÀ ei löytynyt uutisia.
+---STRINGEND
+
----STRING opml file
-OPML-tiedosto
@@ -126 +134 @@
----STRING remote from feed
-Luetaan lÀhteestÀ
+---STRINGEND
+
+---STRING remote item
+Uutinen syötteessÀ
----STRINGEND
-
@@ -172 +184 @@
----STRINGEND
-
-no items found in feed
-
+local item
+
----STRINGEND
-

trunk/src/net.nemein.rss/manage.php

@@ -80 +80 @@
-        $qb->add_constraint('node', '=', $this->_topic->id);
-        $data['feeds'] = $qb->execute();
+        
+        $this->_update_breadcrumb_line($handler_id);
-
-        return true;
@@ -113 +115 @@
-                )
-            );
+            $data['feed_toolbar']->add_item
+            (
+                array
+                (
+                    MIDCOM_TOOLBAR_URL => "feeds/delete/{$feed->guid}",
+                    MIDCOM_TOOLBAR_LABEL => $_MIDCOM->i18n->get_string('delete feed', 'net.nemein.rss'),
+                    MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png',
+                    MIDCOM_TOOLBAR_ENABLED => $feed->can_do('midgard:delete'),
+                )
+            );
-
-            $qb = midcom_db_article::new_query_builder();
+            $qb->add_constraint('topic', '=', $this->_topic->id);
+            
-            $data['feed_category'] = md5($feed->url);
-            $qb->add_constraint('extra1', 'LIKE', "%|{$data['feed_category']}|%");
@@ -187 +201 @@
-
-        // Single feed addition
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            
-            $_MIDCOM->relocate('feeds/list/');
@@ -200 +212 @@
-
-        // OPML subscription list import support
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-            // We have OPML file, parse it
@@ -249 +245 @@
-        }
-        
+        $this->_update_breadcrumb_line($handler_id);
+        
-        return true;
-    }
@@ -258 +256 @@
-    }
-    
-
-
-
-
-
-
-
-
-
+
+
-        $data['schemadb'] = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_feed'));
-        $data['controller'] =& midcom_helper_datamanager2_controller::create('simple');
@@ -276 +267 @@
-            // This will exit.
-        }
+    }
+    
+    function _handler_edit($handler_id, $args, &$data)
+    {
+        $data['feed'] = new net_nemein_rss_feed_dba($args[0]);
+        if (!$data['feed'])
+        {
+            return false;
+        }
+        $data['feed']->require_do('midgard:update');
+    
+        $this->_load_controller(&$data);
-        
-        switch ($data['controller']->process_form())
@@ -291 +294 @@
-        $_MIDCOM->bind_view_to_object($data['feed']);
-        
+        $this->_update_breadcrumb_line($handler_id);
+        
-        return true;
-    }
@@ -297 +302 @@
-    {        
-        midcom_show_style('net-nemein-rss-feed-edit');
+    }
+    
+    /**
+     * Displays an downloadpage delete confirmation view.
+     *
+     * Note, that the downloadpage for non-index mode operation is automatically determined in the can_handle
+     * phase.
+     *
+     * If create privileges apply, we relocate to the index creation downloadpage,
+     */
+    function _handler_delete($handler_id, $args, &$data)
+    {
+        $data['feed'] = new net_nemein_rss_feed_dba($args[0]);
+        if (!$data['feed'])
+        {
+            return false;
+        }
+        $data['feed']->require_do('midgard:delete');
+
+        $this->_load_controller(&$data);
+
+        if (array_key_exists('net_nemein_rss_deleteok', $_REQUEST))
+        {
+            // Deletion confirmed.
+            
+            if (! midcom_helper_purge_object($data['feed']))
+            {
+                $_MIDCOM->generate_error(MIDCOM_ERRCRIT, "Failed to delete feed {$args[0]}, last Midgard error was: " . mgd_errstr());
+                // This will exit.
+            }
+
+            // Delete ok, relocating to welcome.
+            $_MIDCOM->relocate('feeds/list/');
+            // This will exit.
+        }
+
+        if (array_key_exists('net_nemein_rss_deletecancel', $_REQUEST))
+        {
+            // Redirect to view page.
+            $_MIDCOM->relocate('feeds/list/');
+            // This will exit()
+        }
+
+        $_MIDCOM->set_26_request_metadata($data['feed']->revised, $data['feed']->guid);
+        $this->_view_toolbar->bind_to($data['feed']);
+        $_MIDCOM->set_pagetitle("{$this->_topic->extra}: {$data['feed']->title}");
+        
+        $this->_update_breadcrumb_line($handler_id);
+
+        return true;
+    }
+
+
+    /**
+     * Shows the loaded downloadpage.
+     */
+    function _show_delete ($handler_id, &$data)
+    {   
+        midcom_show_style('net-nemein-rss-feed-delete');
-    }
-    
@@ -314 +378 @@
-        $_MIDCOM->bind_view_to_object($data['feed']);
-        
+        $this->_update_breadcrumb_line($handler_id);
+        
-        return true;
-    }
@@ -320 +386 @@
-    {        
-        midcom_show_style('net-nemein-rss-feed-fetch');
+    }
+    
+    /**
+     * Helper, updates the context so that we get a complete breadcrum line towards the current
+     * location.
+     *
+     */
+    function _update_breadcrumb_line($handler_id)
+    {
+        $tmp = Array();
+        
+        $tmp[] = Array
+        (
+            MIDCOM_NAV_URL => "feeds/list/",
+            MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('manage feeds', 'net.nemein.rss'),
+        );
+
+        switch ($handler_id)
+        {
+            case 'feeds_subscribe':
+                $tmp[] = Array
+                (
+                    MIDCOM_NAV_URL => "feeds/subscribe/",
+                    MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('subscribe feeds', 'net.nemein.rss'),
+                );
+                break;
+            case 'feeds_edit':
+                $tmp[] = Array
+                (
+                    MIDCOM_NAV_URL => "feeds/edit/{$this->_request_data['feed']->guid}/",
+                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('edit'),
+                );
+                break;
+            case 'feeds_delete':
+                $tmp[] = Array
+                (
+                    MIDCOM_NAV_URL => "feeds/delete/{$this->_request_data['feed']->guid}/",
+                    MIDCOM_NAV_NAME => $this->_l10n_midcom->get('delete'),
+                );
+                break;
+            case 'feeds_fetch':
+                $tmp[] = Array
+                (
+                    MIDCOM_NAV_URL => "feeds/fetch/{$this->_request_data['feed']->guid}/",
+                    MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('refresh feed', 'net.nemein.rss'),
+                );
+                break;
+        }
+
+        $_MIDCOM->set_custom_context_data('midcom.helper.nav.breadcrumb', $tmp);
-    }
-}

trunk/src/net.nemein.rss/style/net-nemein-rss-feed-fetch.php

@@ -12 +12 @@
-else
-{
-
+
+
+
+
+
+
+
+
-    foreach ($data['items'] as $item)
-    {
-li><a href=\"{$item['link']}\">{$item['title']}</a
-ul
+tr
+td><a href=\"{$item['link']}\">{$item['title']}</a></td
-        
-        if (!$item['local_guid'])
-        {
-    <li>" . $_MIDCOM->i18n->get_string('not in local database', 'net.nemein.rss') . "</li
+<td>" . $_MIDCOM->i18n->get_string('not in local database', 'net.nemein.rss') . "</td
-        }
-        else
@@ -26 +33 @@
-            $local_article = new midcom_db_article($item['local_guid']);
-            $local_link = $_MIDCOM->permalinks->create_permalink($item['local_guid']);
-    <li><a href=\"{$local_link}\">{$local_article->title}</a></li
+<td><a href=\"{$local_link}\">{$local_article->title}</a></td
-        }
-        
-
-
+
-    }
-
+
+
-}
-?>