Changeset 1357

Timestamp:

11/26/08 16:06:49 (6 weeks ago)

Author:

bcse

Message:

Plugin: Blogroll: Add XFN annotations, see #89.

Location:

plugins/blogroll/trunk

Files:

• blogroll.css (added)
• blogroll.plugin.php (modified) (38 diffs)
• templates/blogroll.php (modified) (1 diff)
• templates/tabcontrol_checkboxes.php (added)
• templates/tabcontrol_radio.php (added)

plugins/blogroll/trunk/blogroll.plugin.php

@@ -15 +15 @@
     const API_VERSION = 004;
     const CONTENT_TYPE = 'blogroll';
-    
+
     private $relationships = array(
         'external' => 'External',
@@ -21 +21 @@
         'bookmark' => 'Bookmark'
     );
-    
-    private $info_fields = array( 'feedurl', 'ownername', 'relationship', 'url' );
+
+    private $info_fields = array(
+        'feedurl',
+        'ownername',
+        'relationship',
+        'relationships',
+        'url',
+        'xfn_identity',
+        'xfn_friendship',
+        'xfn_physical',
+        'xfn_professional',
+        'xfn_geographical',
+        'xfn_family',
+        'xfn_romantic'
+    );
 
     public function info()
@@ -36 +49 @@
         );
     }
-    
+
     /**
      * Run activation routines, and setup default options.
@@ -57 +70 @@
         }
     }
-    
+
     /**
      * Run deactivation routines.
@@ -69 +82 @@
         }
     }
-    
+
+    public function filter_post_type_display($type, $foruse)
+    {
+        $names = array(
+            self::CONTENT_TYPE => array(
+                'singular' => _t( 'Link', self::CONTENT_TYPE ),
+                'plural' => _t( 'Links', self::CONTENT_TYPE ),
+            )
+        );
+        return isset($names[$type][$foruse]) ? $names[$type][$foruse] : $type;
+    }
+
     public function action_init() {
         // remove legacy tables and import
@@ -77 +101 @@
         $this->add_template( 'blogroll', dirname($this->get_file()) . '/templates/blogroll.php' );
         $this->add_template( 'formcontrol_opml_file', dirname($this->get_file()) . '/templates/formcontrol_file.php' );
-    }
-    
+        $this->add_template( 'blogroll__tabcontrol_checkboxes', dirname($this->get_file()) . '/templates/tabcontrol_checkboxes.php' );
+        $this->add_template( 'blogroll__tabcontrol_radio', dirname($this->get_file()) . '/templates/tabcontrol_radio.php' );
+    }
+
+    public function action_admin_header( $theme )
+    {
+        if ( 'publish' == $theme->page && $theme->form->content_type->value == Post::type(self::CONTENT_TYPE) ) {
+            Stack::add( 'admin_stylesheet', array( $this->get_url() . '/blogroll.css', 'screen' ), 'blogroll' );
+        }
+    }
+
     /**
-     * 
+     *
      */
-    public function action_update_check()
-    {
-        Update::add( 'blogroll', '0420cf10-db83-11dc-95ff-0800200c9a66',  $this->info->version );
-    }
-    
-    /**
-     * 
+    public function action_update_check()
+    {
+        Update::add( 'blogroll', '0420cf10-db83-11dc-95ff-0800200c9a66',  $this->info->version );
+    }
+
+    /**
+     *
      */
     public function filter_plugin_config( $actions, $plugin_id )
@@ -98 +131 @@
         return $actions;
     }
-    
+
     /**
-     * 
+     *
      */
     public function action_plugin_ui( $plugin_id, $action )
@@ -108 +141 @@
                 case _t( 'Configure', 'blogroll' ):
                     $form = new FormUI( 'blogroll' );
-                    
+
                     // display settings
                     $display_wrap = $form->append( 'fieldset', 'display', _t('Display Settings', 'blogroll') );
@@ -134 +167 @@
                         _t( 'Order: ', 'blogroll'), $orders
                     );
-                    
+
                     // other settings
                     $other_wrap = $form->append( 'fieldset', 'settings', _t('More Settings', 'blogroll') );
@@ -141 +174 @@
                         _t( 'Use Weblogs.com to get updates? ', 'blogroll')
                     );
-                    
+
                     $form->append( 'submit', 'save', 'Save' );
                     $form->on_success( array($this, 'formui_submit') );
@@ -149 +182 @@
         }
     }
-    
+
     public function formui_submit( FormUI $form )
     {
@@ -155 +188 @@
         $form->save();
     }
-    
+
     public function action_publish_post( Post $post, FormUI $form ) {
         if ( $post->content_type == Post::type(self::CONTENT_TYPE) ) {
             if(isset($form->quick_url) && $form->quick_url->value != '') {
                 $data= $this->get_info_from_url($form->quick_url->value);
-                
+
                 if (!$data) {
                     Session::error( _t("Could not find information for {$form->quick_url->value}", 'blogroll') );
@@ -173 +206 @@
                 $post->slug= Utils::slugify($data['name']);
                 $post->status= Post::status('published');
-                
+
             } else {
-                $post->info->url= $form->url->value;
-                $post->info->feedurl= $form->feedurl->value;
-                $post->info->ownername= $form->ownername->value;
-                $post->info->relationship= $form->relationship->value;
-            }
-        }
-    }
-    
-    public function action_form_publish( FormUI $form, Post $post) {    
-        
+                $relationships = array();
+                $relationships[] = $form->relationship->value;
+                if ( count($form->xfn_identity->value) > 0 ) {
+                    $relationships = array_merge($form->xfn_identity->value, $relationships);
+                } else {
+                    $relationships[] = $form->xfn_friendship->value;
+                    $relationships = array_merge($form->xfn_physical->value, $relationships);
+                    $relationships = array_merge($form->xfn_professional->value, $relationships);
+                    $relationships[] = $form->xfn_geographical->value;
+                    $relationships[] = $form->xfn_family->value;
+                    $relationships = array_merge($form->xfn_romantic->value, $relationships);
+                }
+                $relationships = str_replace( ' null:null', '', implode(' ', $relationships) );
+
+                foreach ($this->info_fields as $field_name) {
+                    $post->info->$field_name= $form->$field_name->value;
+                }
+                $post->info->relationships = $relationships;
+            }
+        }
+    }
+
+    public function action_form_publish( FormUI $form, Post $post) {
+
         if( $form->content_type->value == Post::type(self::CONTENT_TYPE) ) {
-        
+
             if ( !Controller::get_var('id') ) {
                 // Quick link button to automagically discover info
                 $quicklink_controls= $form->append('tabs', 'quicklink_controls');
-                
+
                 $quicklink_tab= $quicklink_controls->append('fieldset', 'quicklink_tab', _t('Quick Link'));
                 $quicklink_wrapper= $quicklink_tab->append('wrapper', 'quicklink_wrapper');
                 $quicklink_wrapper->class='container';
-                
+
                 $quicklink_wrapper->append('text', 'quick_url', 'null:null', _t('Quick URL'), 'tabcontrol_text');
                 $quicklink_wrapper->append('static', 'quick_url_info', '<p class="column span-15">Enter a url or feed url and other information will be automatically discovered.</p>');
                 $quicklink_wrapper->append('submit', 'addquick', _t('Add'), 'admincontrol_submit');
-                
+
                 $quicklink_controls->move_before($quicklink_controls, $form);
             }
-            
+
             // Remove fields we don't need
-            $form->silos->remove();
+            if ( $form->silos instanceof FormControl ) {
+                $form->silos->remove();
+            }
             $form->comments_enabled->remove();
             $form->newslug->remove();
@@ -214 +263 @@
             $form->url->value = $post->info->url;
             $form->url->move_after($form->title);
-            
+
             // Retitle fields
             $form->title->caption= _t('Blog Name');
@@ -220 +269 @@
             $form->content->tabindex= 3;
             $form->tags->tabindex= 4;
-            
+
             // Create the extras splitter & fields
             $extras = $form->settings;
@@ -226 +275 @@
             $extras->append('text', 'feedurl', 'null:null', _t('Feed URL'), 'tabcontrol_text');
             $extras->feedurl->value = $post->info->feedurl;
-            
+
             $extras->append('text', 'ownername', 'null:null', _t('Owner Name'), 'tabcontrol_text');
             $extras->ownername->value = $post->info->ownername;
-            
+
             $relationships = Plugins::filter( 'blogroll_relationships', $this->relationships );
             $extras->append('select', 'relationship', 'null:null', _t('Relationship'), $relationships, 'tabcontrol_select');
             $extras->relationship->value = $post->info->relationship;
-        }
-    }
-    
+
+            // Create the XFN Selector
+            $xfnselector = $form->publish_controls->append('fieldset', 'xfnselector', _t('XFN'));
+
+            $xfnselector->append('checkboxes', 'xfn_identity', 'null:null', _t('Identity'), array('me' => _t('Another web address of mine')), 'blogroll__tabcontrol_checkboxes');
+            $xfnselector->xfn_identity->value = $post->info->xfn_identity;
+
+            $xfnselector->append('radio', 'xfn_friendship', 'null:null', _t('Friendship'), array(
+                'contact' => _t('Contact'),
+                'acquaintance' => _t('Acquaintance'),
+                'friend' => _t('Friend'),
+                'null:null' => _t('None')
+            ), 'blogroll__tabcontrol_radio');
+            $xfnselector->xfn_friendship->value = $post->info->xfn_friendship;
+
+            $xfnselector->append('checkboxes', 'xfn_physical', 'null:null', _t('Physical'), array('met' => _t('Met')), 'blogroll__tabcontrol_checkboxes');
+            $xfnselector->xfn_physical->value = $post->info->xfn_physical;
+
+            $xfnselector->append('checkboxes', 'xfn_professional', 'null:null', _t('Professional'), array(
+                'co-worker' => _t('Co-worker'),
+                'colleague' => _t('Colleague'),
+            ), 'blogroll__tabcontrol_checkboxes');
+            $xfnselector->xfn_professional->value = $post->info->xfn_professional;
+
+            $xfnselector->append('radio', 'xfn_geographical', 'null:null', _t('Geographical'), array(
+                'co-resident' => _t('Co-resident'),
+                'neighbor' => _t('Neighbor'),
+                'null:null' => _t('None')
+            ), 'blogroll__tabcontrol_radio');
+            $xfnselector->xfn_geographical->value = $post->info->xfn_geographical;
+
+            $xfnselector->append('radio', 'xfn_family', 'null:null', _t('Family'), array(
+                'child' => _t('Child'),
+                'parent' => _t('Parent'),
+                'sibling' => _t('Sibling'),
+                'spouse' => _t('Spouse'),
+                'kin' => _t('Kin'),
+                'null:null' => _t('None')
+            ), 'blogroll__tabcontrol_radio');
+            $xfnselector->xfn_family->value = $post->info->xfn_family;
+
+            $xfnselector->append('checkboxes', 'xfn_romantic', 'null:null', _t('Romantic'), array(
+                'muse' => _t('Muse'),
+                'crush' => _t('Crush'),
+                'date' => _t('Date'),
+                'sweetheart' => _t('Sweetheart')
+            ), 'blogroll__tabcontrol_checkboxes');
+            $xfnselector->xfn_romantic->value = $post->info->xfn_romantic;
+
+        }
+    }
+
     public static function get_info_from_url( $url )
-    {       
+    {
         $info= array();
         $data= RemoteRequest::get_contents( $url );
         $feed= self::get_feed_location( $data, $url );
-        
+
         if ( $feed ) {
             $info['feed']= $feed;
@@ -277 +375 @@
         return $info;
     }
-    
+
     public static function get_feed_location( $html, $url )
     {
@@ -325 +423 @@
         return false;
     }
-    
+
     public function theme_show_blogroll( $theme, $user_params = array() )
     {
         $theme->blogroll_title = Options::get( 'blogroll__list_title' );
-        
+
         // Build the params array to pass it to the get() method
         $order_by = Options::get( 'blogroll__sort_by' );
         $direction = Options::get( 'blogroll__direction');
-        
+
         $params = array(
             'limit' => Options::get( 'blogroll__max_links' ),
@@ -340 +438 @@
             'content_type' => Post::type(self::CONTENT_TYPE),
         );
-        
+
         $theme->blogs = Posts::get( $params );
-        
+
         return $theme->fetch( 'blogroll' );
     }
-    
+
     public function filter_habminbar( $menu )
     {
@@ -367 +465 @@
         return $rules;
     }
-    
+
     public function action_handler_blogroll_opml( array $handler_vars )
     {
         $opml = new SimpleXMLElement( '<opml version="1.1"></opml>' );
-        
+
         $head = $opml->addChild( 'head' );
         $head->addChild( 'title', Options::get( 'title' ) );
         $head->addChild( 'dateCreated', gmdate( 'D, d M Y G:i:s e' ) );
-        
+
         $body = $opml->addChild( 'body' );
-        
+
         $blogs = Posts::get(
             array(
@@ -385 +483 @@
             )
         );
-        
+
         foreach ( $blogs as $blog ) {
             $outline = $body->addChild( 'outline' );
@@ -400 +498 @@
         $opml = Plugins::filter( 'blogroll_opml', $opml, $handler_vars );
         $opml = $opml->asXML();
-        
+
         ob_clean();
         header( 'Content-Type: application/opml+xml' );
         print $opml;
     }
-    
+
     public function filter_import_names( $import_names )
     {
         return array_merge( $import_names, array(_t('BlogRoll OPML file', 'blogroll')) );
     }
-    
+
     /**
      * Plugin filter that supplies the UI for the Blogroll importer
@@ -427 +525 @@
             return $stageoutput;
         }
-        
+
         $inputs = array();
 
@@ -463 +561 @@
         return $output;
     }
-    
+
     private function stage1( array $inputs )
     {
@@ -476 +574 @@
             Session::error($warning);
         }
-        
+
         $output = <<< BR_IMPORT_STAGE1
             </form><form method="post" action="" enctype="multipart/form-data">
@@ -491 +589 @@
             </div>
             <input type="hidden" name="stage" value="1">
-            
+
             <div class="item formcontrol"  id="apply"><input type="submit" name="import" class="button" value="Import">
             </div>
@@ -498 +596 @@
         return $output;
     }
-    
+
     private function stage2( array $inputs )
     {
@@ -531 +629 @@
         return $output;
     }
-    
+
     public function action_auth_ajax_blogroll_import_opml( ActionHandler $handler )
     {
@@ -537 +635 @@
         $inputs = array_intersect_key( $_POST, array_flip( $valid_fields ) );
         extract( $inputs );
-        
+
         if ( ! empty($opml_url) ) {
             $file = RemoteRequest::get_contents( $opml_url );
@@ -563 +661 @@
         }
     }
-    
+
     /**
      * Import the <outline> data from simplexml obj. $xml->body.
@@ -573 +671 @@
             throw new Exception('Not a valid OPML resource');
         }
-        
+
         $count = 0;
         foreach ( $xml->outline as $outline ) {
@@ -592 +690 @@
                 );
                 $blog = Post::create($params);
-                
+
                 foreach($this->info_fields as $field ) {
                     if ( isset(${$field}) && ${$field} ) {
@@ -607 +705 @@
         return $count;
     }
-    
+
     /**
      * Maps standard OPML link attributes to Post fields.
@@ -641 +739 @@
         return $valid_atts;
     }
-    
+
     /**
      * Grabs update times from weblogs.com
@@ -701 +799 @@
         }
     }
-    
+
     public function upgrade_pre_004()
     {
@@ -707 +805 @@
         DB::register_table('bloginfo');
         DB::register_table('tag2blog');
-        
+
         if ( ! in_array( DB::table('blogroll'), DB::list_tables() ) ) {
             Options::set( 'blogroll__api_version', self::API_VERSION );
             return;
         }
-        
+
         Post::add_new_type(self::CONTENT_TYPE);
-        
+
         $opml = new SimpleXMLElement( '<opml version="1.1"></opml>' );
         $head = $opml->addChild( 'head' );
@@ -720 +818 @@
         $head->addChild( 'dateCreated', gmdate( 'D, d M Y G:i:s e' ) );
         $body = $opml->addChild( 'body' );
-        
+
         $blogs = DB::get_results("SELECT * FROM {blogroll}", array());
         foreach ( $blogs as $blog ) {
@@ -752 +850 @@
             EventLog::log( _t('Could Import previous data. please import manually and drop tables.', 'blogroll') );
         }
-        
+
         Options::delete('blogroll__db_version');
         Options::set( 'blogroll__api_version', self::API_VERSION );

plugins/blogroll/trunk/templates/blogroll.php

@@ -4 +4 @@
     <ul>
     <?php if ( ! empty( $blogs ) ) { foreach( $blogs as $blog ) { ?>
-        <li><a href="<?php echo $blog->info->url; ?>"><?php echo $blog->title; ?></a></li>
+        <li class="vcard"><a href="<?php echo $blog->info->url; ?>" class="url" title="<?php echo $blog->content; ?>" rel="<?php echo $blog->info->relationships; ?>"><?php echo $blog->title; ?></a></li>
     <?php } } ?>
     </ul>
-    
 </div>