Changeset 12903

Timestamp:

10/19/07 16:58:13 (1 year ago)

Author:

adrenalin

Message:

Added article linking support similar to the one of net.nehmer.blog

Files:

• trunk/midcom/net.nehmer.static/article_link.php (added)
• trunk/midcom/net.nehmer.static/config/config.inc (modified) (1 diff)
• trunk/midcom/net.nehmer.static/config/manifest.inc (modified) (1 diff)
• trunk/midcom/net.nehmer.static/config/mgdschema.xml (added)
• trunk/midcom/net.nehmer.static/config/midcom_dba_classes.inc (added)
• trunk/midcom/net.nehmer.static/documentation/CHANGES (modified) (1 diff)
• trunk/midcom/net.nehmer.static/handler/admin.php (modified) (5 diffs)
• trunk/midcom/net.nehmer.static/handler/create.php (modified) (1 diff)
• trunk/midcom/net.nehmer.static/handler/view.php (modified) (2 diffs)
• trunk/midcom/net.nehmer.static/locale/default.en.txt (modified) (1 diff)
• trunk/midcom/net.nehmer.static/locale/default.fi.txt (modified) (1 diff)
• trunk/midcom/net.nehmer.static/midcom/interfaces.php (modified) (1 diff)
• trunk/midcom/net.nehmer.static/navigation.php (modified) (2 diffs)
• trunk/midcom/net.nehmer.static/style/admin-delete-link.php (added)
• trunk/midcom/net.nehmer.static/viewer.php (modified) (1 diff)

trunk/midcom/net.nehmer.static/config/config.inc

@@ -27 +27 @@
-// Set this to true if you want to enable on-site AJAX editing
-'enable_ajax_editing' => false,
+
+// Page linking system
+'enable_article_links' => true,
+'enable_editing_of_linked_articles' => false,
+'include_linked_articles_to_feeds' => true,
+
+// Creation callback snippet for defining site-specific function
+'callback_snippet' => null,
+
+// Callback function will be called after creation e.g. to provide interface for page linking system
+// $callback_function($article, $topic)
+'callback_function' => null,

trunk/midcom/net.nehmer.static/config/manifest.inc

@@ -1 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    'summary' => 'Static article content display',
-    'description' => 'Static content display component emulating regular directory of HTML files',
-
-array 
-'torben' => 
-array
-
-
-
-
-
-'bergie' => 
-array
-
-
-
-
-
-'adrenalin' => 
-array
-
-
-
-
+array
+
+  'torben' => array
+ 
+    
+    
+    
+    
+  
+  'bergie' => array
+ 
+    
+    
+    
+    
+  
+  'adrenalin' => array
+ 
+    
+    
+    
+  
-    ),
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    ),
-  
+

trunk/midcom/net.nehmer.static/documentation/CHANGES

@@ -8 +8 @@
-  which might even break existing functionality.
-- All items marked with "+" represent completely new features.
+
+2007-10-19 adrenalin
+  ! Added article linking support similar to the one of net.nehmer.blog
-
-2007-04-24 adrenalin

trunk/midcom/net.nehmer.static/handler/admin.php

@@ -171 +171 @@
-    {
-        $tmp = Array();
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $_MIDCOM->set_custom_context_data('midcom.helper.nav.breadcrumb', $tmp);
-    }
@@ -193 +214 @@
-    {
-        $this->_article = new midcom_db_article($args[0]);
- 
+
-        {
-            $_MIDCOM->generate_error(MIDCOM_ERRNOTFOUND, "The article {$args[0]} was not found.");
+            // This will exit.
+        }
+        
+        // Relocate for the correct content topic, let the true content topic take care of the ACL
+        if ($this->_article->topic !== $this->_content_topic->id)
+        {
+            $nap = new midcom_helper_nav();
+            $node = $nap->get_node($this->_article->topic);
+            
+            if (   $node
+                && isset($node[MIDCOM_NAV_FULLURL]))
+            {
+                $_MIDCOM->relocate($node[MIDCOM_NAV_FULLURL] . "edit/{$args[0]}.html");
+                // This will exit
+            }
+            $_MIDCOM->generate_error(MIDCOM_ERRNOTFOUND, "The article with GUID {$args[0]} was not found.");
-            // This will exit.
-        }
@@ -238 +275 @@
-    }
-
+    
+    /**
+     * Displays article link delete confirmation
+     */
+    function _handler_deletelink($handler_id, $args, &$data)
+    {
+        $this->_article = new midcom_db_article($args[0]);
+        
+        if (   !$this->_article
+            || !isset($this->_article->guid)
+            || !$this->_article->guid)
+        {
+            $_MIDCOM->generate_error(MIDCOM_ERRNOTFOUND, "The article {$args[0]} was not found.");
+            // This will exit.
+        }
+        
+        $qb = net_nehmer_static_link_dba::new_query_builder();
+        $qb->add_constraint('topic', '=', $this->_content_topic->id);
+        $qb->add_constraint('article', '=', $this->_article->id);
+        
+        // No links were found
+        if ($qb->count() === 0)
+        {
+            return false;
+        }
+        
+        // Get the link
+        $results = $qb->execute_unchecked();
+        $this->_link =& $results[0];
+        $this->_link->require_do('midgard:delete');
+        
+        $this->_process_link_delete();
+        
+        $this->_prepare_request_data();
+        $_MIDCOM->set_26_request_metadata($this->_article->metadata->revised, $this->_article->guid);
+        $this->_view_toolbar->bind_to($this->_article);
+        $_MIDCOM->set_pagetitle("{$this->_topic->extra}: {$this->_article->title}");
+        $this->_update_breadcrumb_line($handler_id);
+        
+        return true;
+    }
+    
+    /**
+     * Internal helper method, which will check if the delete request has been
+     * confirmed
+     * 
+     * @access private
+     */
+    function _process_link_delete()
+    {
+        if (isset($_POST['f_cancel']))
+        {
+            $_MIDCOM->uimessages->add($this->_l10n->get('net.nehmer.static'), $this->_l10n->get('delete cancelled'));
+            
+            // Redirect to view page.
+            if ($this->_config->get('view_in_url'))
+            {
+                $_MIDCOM->relocate("view/{$this->_article->name}.html");
+            }
+            else
+            {
+                $_MIDCOM->relocate("{$this->_article->name}.html");
+            }
+            // This will exit
+        }
+        
+        if (!isset($_POST['f_delete']))
+        {
+            return;
+        }
+        
+        // Delete the link
+        if ($this->_link->delete())
+        {
+            $_MIDCOM->uimessages->add($this->_l10n->get('net.nehmer.static'), $this->_l10n->get('article link deleted'));
+            $_MIDCOM->relocate('');
+            // This will exit
+        }
+        else
+        {
+            $_MIDCOM->generate_error(MIDCOM_ERRCRIT, $this->_l10n->get('failed to delete the article link, contact the site administrator'));
+            // This will exit
+        }
+    }
+    
+    function _show_deletelink($handler_id, &$data)
+    {
+        $data['article'] =& $this->_article;
+        $nap = new midcom_helper_nav();
+        $node = $nap->get_node($this->_article->topic);
+        
+        $data['topic_url'] = $node[MIDCOM_NAV_FULLURL];
+        $data['topic_name'] = $node[MIDCOM_NAV_NAME];
+        $data['delete_url'] = "{$node[MIDCOM_NAV_FULLURL]}delete/{$this->_article->guid}.html";
+        
+        midcom_show_style('admin-delete-link');
+    }
+
-    /**
-     * Displays an article delete confirmation view.
@@ -249 +384 @@
-    {
-        $this->_article = new midcom_db_article($args[0]);
-
+
+
+
-        {
-            $_MIDCOM->generate_error(MIDCOM_ERRNOTFOUND, "The article {$args[0]} was not found.");
-            // This will exit.
+        }
+        
+        // Relocate to delete the link instead of the article itself
+        if ($this->_article->topic !== $this->_content_topic->id)
+        {
+            $_MIDCOM->relocate("delete/link/{$args[0]}.html");
+            // This will exit
-        }
-        $this->_article->require_do('midgard:delete');
@@ -266 +410 @@
-                // This will exit.
-            }
+
+            // Delete all the links pointing to the article
+            $qb = net_nehmer_static_link_dba::new_query_builder();
+            $qb->add_constraint('article', '=', $this->_article->id);
+            $links = $qb->execute_unchecked();
+            
+            $_MIDCOM->auth->request_sudo('net.nehmer.static');
+            foreach ($links as $link)
+            {
+                $link->delete();
+            }
+            $_MIDCOM->auth->drop_sudo();
-
-            // Update the index

trunk/midcom/net.nehmer.static/handler/create.php

@@ -173 +173 @@
-        }
-
+        // Callback possibility
+        if ($this->_config->get('callback_function'))
+        {
+            if ($this->_config->get('callback_snippet'))
+            {
+                // mgd_include_snippet($this->_config->get('callback_snippet'));
+                $eval = midcom_get_snippet_content($this->_config->get('callback_snippet'));
+                
+                if ($eval)
+                {
+                    eval($eval);
+                }
+            }
+            
+            $callback = $this->_config->get('callback_function');
+            $callback($this->_article, $this->_content_topic);
+        }
+        
-        return $this->_article;
-    }

trunk/midcom/net.nehmer.static/handler/view.php

@@ -102 +102 @@
-
-        $qb = midcom_baseclasses_database_article::new_query_builder();
-        $qb->add_constraint('topic', '=', $this->_content_topic->id);
-        $qb->add_constraint('name', '=', $args[0]);
-        $qb->add_constraint('up', '=', 0);
-        $qb->set_limit(1);
+        
+        // Include the article links to the indexes if enabled
+        if ($this->_config->get('enable_article_links'))
+        {
+            $mc = net_nehmer_static_link_dba::new_collector('topic', $this->_content_topic->id);
+            $mc->add_value_property('article');
+            $mc->add_constraint('topic', '=', $this->_content_topic->id);
+            
+            // Get the results
+            $mc->execute();
+            
+            $links = $mc->list_keys();
+            $qb->begin_group('OR');
+                foreach ($links as $guid => $link)
+                {
+                    $article_id = $mc->get_subkey($guid, 'article');
+                    $qb->add_constraint('id', '=', $article_id);
+                }
+                $qb->add_constraint('topic', '=', $this->_content_topic->id);
+            $qb->end_group();
+        }
+        else
+        {
+            $qb->add_constraint('topic', '=', $this->_content_topic->id);
+        }
-        
-        $result = $qb->execute();
@@ -135 +159 @@
-        {
-            $qb = midcom_db_article::new_query_builder();
-            $qb->add_constraint('topic', '=', $this->_content_topic->id);
-            $qb->add_constraint('name', '=', 'index');
-            $qb->set_limit(1);
+            
+            // Include the article links to the indexes if enabled
+            if ($this->_config->get('enable_article_links'))
+            {
+                $mc = net_nehmer_static_link_dba::new_collector('topic', $this->_content_topic->id);
+                $mc->add_value_property('article');
+                $mc->add_constraint('topic', '=', $this->_content_topic->id);
+                
+                // Get the results
+                $mc->execute();
+                
+                $links = $mc->list_keys();
+                $qb->begin_group('OR');
+                    foreach ($links as $guid => $link)
+                    {
+                        $article_id = $mc->get_subkey($guid, 'article');
+                        $qb->add_constraint('id', '=', $article_id);
+                    }
+                    $qb->add_constraint('topic', '=', $this->_content_topic->id);
+                $qb->end_group();
+            }
+            else
+            {
+                $qb->add_constraint('topic', '=', $this->_content_topic->id);
+            }
+            
-            $result = $qb->execute();
-

trunk/midcom/net.nehmer.static/locale/default.en.txt

@@ -148 +148 @@
----STRINGEND
-
+---STRING failed to delete the article link, contact the site administrator
+Failed to delete the article link, contact the site administrator
+---STRINGEND
+
+---STRING delete cancelled
+Delete cancelled
+---STRINGEND
+
+---STRING article link deleted
+Article link deleted
+---STRINGEND
+
+---STRING article %s deleted
+Article %s deleted
+---STRINGEND
+
+---STRING delete link
+Delete link
+---STRINGEND
+
+---STRING delete article link
+delete article link
+---STRINGEND
+
+---STRING this article has been linked from <a href="%s">%s</a> and confirming will delete only the link
+This article has been linked from <a href="%s">%s</a> and confirming will delete only the link.
+---STRINGEND
+
+---STRING if you want to delete the original article, <a href="%s">click here</a>
+If you want to delete the original article, <a href="%s">click here</a>.
+---STRINGEND
+
+---STRING delete article link
+Delete article link
+---STRINGEND
+
+---STRING from
+From
+---STRINGEND
+
+---STRING delete_link
+Delete link
+---STRINGEND

trunk/midcom/net.nehmer.static/locale/default.fi.txt

@@ -148 +148 @@
----STRINGEND
-
+---STRING failed to delete the article link, contact the site administrator
+Artikkelilinkin poistaminen epÀonnistui, ota yhteys sivuston yllÀpitÀjÀÀn.
+---STRINGEND
+
+---STRING delete cancelled
+Poistaminen peruutettu
+---STRINGEND
+
+---STRING article link deleted
+Artikkelilinkki poistettu
+---STRINGEND
+
+---STRING article %s deleted
+Artikkeli %s poistettu
+---STRINGEND
+
+---STRING delete link
+Poista linkki
+---STRINGEND
+
+---STRING delete article link
+Poista artikkelilinkki
+---STRINGEND
+
+---STRING this article has been linked from <a href="%s">%s</a> and confirming will delete only the link
+TÀmÀ artikkeli on linkitetty osoitteesta <a href="%s">%s</a> ja vahvistaminen poistaa vain linkin.
+---STRINGEND
+
+---STRING if you want to delete the original article, <a href="%s">click here</a>
+Jos haluat poistaa alkuperÀisen artikkelin, <a href="%s">klikkaa tÀstÀ</a>.
+---STRINGEND
+
+---STRING delete article link
+Poista artikkelilinkki
+---STRINGEND
+
+---STRING delete_link
+Poista linkki
+---STRINGEND

trunk/midcom/net.nehmer.static/midcom/interfaces.php

@@ -38 +38 @@
-        (
-            'viewer.php',
-
+
+
-        );
-        $this->_autoload_libraries = Array
-        (
-
+,
-        );
-    }

trunk/midcom/net.nehmer.static/navigation.php

@@ -48 +48 @@
-    {
-        // Get the required information with midgard_collector
-topic', $this->_content_topic->id
+up', 0
-        $mc->set_key_property('topic');
-        $mc->add_value_property('id');
@@ -56 +56 @@
-        
-        $mc->add_constraint('topic', '=', $this->_content_topic->id);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $mc->add_constraint('metadata.navnoentry', '=', 0);
-        

trunk/midcom/net.nehmer.static/viewer.php

@@ -57 +57 @@
-            'handler' => Array('net_nehmer_static_handler_admin', 'delete'),
-            'fixed_args' => Array('delete'),
+            'variable_args' => 1,
+        );
+        $this->_request_switch['delete_link'] = array
+        (
+            'handler' => array('net_nehmer_static_handler_admin', 'deletelink'),
+            'fixed_args' => array('delete', 'link'),
-            'variable_args' => 1,
-        );