Changeset 639

Timestamp:

2008-06-25 05:47:56 (2 months ago)

Author:

michaeltwofish

Message:

Fixes to the SQLite schema.

Files:

• plugins/blogroll/trunk/blogroll.plugin.php (modified) (27 diffs)

plugins/blogroll/trunk/blogroll.plugin.php

@@ -2 +2 @@
 /*
  * Blogroll Plugin
- * Usage: <?php $theme->show_blogroll(); ?> 
- * A sample blogroll.php template is included with the plugin.  This can be copied to your 
+ * Usage: <?php $theme->show_blogroll(); ?>
+ * A sample blogroll.php template is included with the plugin.  This can be copied to your
  * active theme and modified to fit your preference.
  *
@@ -20 +20 @@
     const VERSION= '0.5-beta';
     const DB_VERSION= 003;
-    
+
     public function info()
     {
         return array(
-        'name' => 'Blogroll',
-        'version' => self::VERSION,
-        'url' => 'http://wiki.habariproject.org/en/plugins/blogroll',
-        'author' => 'Habari Community',
-        'authorurl' => 'http://habariproject.org/',
-        'license' => 'Apache License 2.0',
-        'description' => 'Displays a blogroll on your blog'
+            'name' => 'Blogroll',
+            'version' => self::VERSION,
+            'url' => 'http://wiki.habariproject.org/en/plugins/blogroll',
+            'author' => 'Habari Community',
+            'authorurl' => 'http://habariproject.org/',
+            'license' => 'Apache License 2.0',
+            'description' => 'Displays a blogroll on your blog'
         );
     }
-    
+
     public function action_plugin_activation( $file )
     {
@@ -40 +40 @@
             DB::register_table( 'bloginfo' );
             DB::register_table( 'tag2blog' );
-            
+
             if ( ! CronTab::get_cronjob( 'blogroll:update' ) ) {
                 CronTab::add_hourly_cron( 'blogroll:update', 'blogroll_update_cron', 'Updates the blog updated timestamp from weblogs.com' );
             }
-            
+
             Options::set( 'blogroll__db_version', self::DB_VERSION );
             Options::set( 'blogroll__use_updated', true );
@@ -51 +51 @@
             Options::set( 'blogroll__direction', 'ASC' );
             Options::set( 'blogroll__list_title', 'Blogroll' );
-            
+
             if ( $this->install_db_tables() ) {
                 Session::notice( _t( 'Created the Blogroll database tables.', 'blogroll' ) );
@@ -60 +60 @@
         }
     }
-    
+
     public function action_plugin_deactivation( $file )
     {
@@ -68 +68 @@
         }
     }
-    
+
     public function install_db_tables()
     {
@@ -107 +107 @@
                 updated VARCHAR(12) NOT NULL,
                 rel VARCHAR(255) NOT NULL,
-                description TEXT,
+                description TEXT
                 );
                 CREATE TABLE " . DB::table('bloginfo') . " (
@@ -119 +119 @@
                 tag_id INTEGER UNSIGNED NOT NULL,
                 blog_id INTEGER UNSIGNED NOT NULL,
-                PRIMARY KEY (tag_id, post_id)
+                PRIMARY KEY (tag_id, blog_id)
                 );
                 CREATE INDEX IF NOT EXISTS tag2blog_blog_id ON " . DB::table('tag2blog') . "(blog_id);";
@@ -126 +126 @@
         return DB::dbdelta( $schema );
     }
-    
+
     public function action_update_check()
     {
         Update::add( 'blogroll', '0420cf10-db83-11dc-95ff-0800200c9a66',  $this->info->version );
     }
-    
+
     public function action_init()
     {
@@ -137 +137 @@
         DB::register_table( 'bloginfo' );
         DB::register_table( 'tag2blog' );
-        
+
         if ( Options::get( 'blogroll__db_version' ) && self::DB_VERSION > Options::get( 'blogroll__db_version' ) ) {
             $this->install_db_tables();
@@ -144 +144 @@
         }
     }
-    
+
     public function filter_plugin_config( $actions, $plugin_id )
     {
-        
+
         if ( $this->plugin_id() == $plugin_id ){
             $actions[]= _t( 'Configure', 'blogroll' );
@@ -153 +153 @@
         return $actions;
     }
-    
+
     public function action_plugin_ui( $plugin_id, $action )
     {
@@ -160 +160 @@
                 case _t( 'Configure', 'blogroll' ):
                     $form= new FormUI( 'blogroll' );
-                    
+
                     $title= $form->append( 'text', 'list_title', 'option:blogroll__list_title', _t( 'List title: ', 'blogroll' ) );
-                    
+
                     $max= $form->append( 'text', 'max_links', 'option:blogroll__max_links', _t( 'Max. displayed links: ', 'blogroll') );
-                    
-                    $sort_bys= array_merge( 
+
+                    $sort_bys= array_merge(
                         array_combine( array_keys( Blog::default_fields() ), array_map( 'ucwords', array_keys( Blog::default_fields() ) ) ),
                         array( 'random' => _t('Randomly', 'blogroll') )
                         );
                     $sortby= $form->append( 'select', 'sort_by', 'option:blogroll__sort_by', _t( 'Sort By: ', 'blogroll'), $sort_bys );
-                    
+
                     $orders= array( 'ASC' => _t('Ascending' ,'blogroll'), 'DESC' => _t('Descending' ,'blogroll') );
                     $order= $form->append( 'select', 'direction', 'option:blogroll__direction', _t( 'Order: ', 'blogroll'), $orders );
-                    
+
                     $update= $form->append( 'checkbox', 'use_update', 'option:blogroll__use_update', _t( 'Use Weblogs.com to get updates? ', 'blogroll') );
-                    
+
                     $form->append( 'submit', 'save', 'Save' );
                     $form->out();
@@ -182 +182 @@
         }
     }
-    
+
     public function filter_adminhandler_post_loadplugins_main_menu( $menus )
     {
@@ -189 +189 @@
         return $menus;
     }
-    
+
     public function action_admin_theme_post_blogroll_manage( $handler, $theme )
     {
         extract( $handler->handler_vars );
-        
+
         if ( isset( $change ) && isset( $blog_ids ) ) {
             $count= count( $blog_ids );
             $blog_ids= (array) $blog_ids;
-            
+
             switch ( $change ) {
                 case 'delete':
@@ -238 +238 @@
             }
         }
-        
+
         Utils::redirect( URL::get( 'admin', 'page=blogroll_manage' ) );
         exit;
     }
-    
+
     public function action_admin_theme_post_blogroll_publish( $handler, $theme )
     {
         $params= array_intersect_key( $handler->handler_vars, array_flip( array('name', 'url', 'feed', 'description', 'owner', 'tags') ) );
         extract( $handler->handler_vars );
-        
+
         if ( !empty( $quick_link ) ) {
             $link= $quick_link;
@@ -265 +265 @@
             }
         }
-        
+
         if ( ( empty( $params['name'] ) || empty( $params['url'] ) ) ) {
             Session::error( _t('Blog Name and URL are required feilds.', 'blogroll') );
@@ -292 +292 @@
             }
         }
-        
+
         if ( !empty( $quick_link ) && !empty( $redirect_to ) ) {
             $msg= sprintf( _t('Successfully added blog %s. Now going back.', 'blogroll'), htmlspecialchars( $blog->name ) );
@@ -300 +300 @@
             exit;
         }
-        
+
         Utils::redirect( URL::get( 'admin', 'page=blogroll_publish' ) );
         exit;
     }
-    
+
     public function action_admin_theme_get_blogroll_manage( $handler, $theme )
     {
         Stack::add( 'admin_stylesheet', array( $this->get_url() . '/templates/blogroll.css', 'screen' ) );
         $theme->feed_icon= $this->get_url() . '/templates/feed.png';
-        
+
         $theme->display( 'blogroll_manage' );
         exit;
     }
-    
+
     public function action_admin_theme_get_blogroll_publish( $handler, $theme )
     {
         Stack::add( 'admin_stylesheet', array( $this->get_url() . '/templates/blogroll.css', 'screen' ) );
         extract(  $handler->handler_vars );
-        
+
         if ( !empty( $quick_link_bookmarklet ) ) {
             Session::add_to_set( 'last_form_data', array('quick_link'=>$quick_link_bookmarklet, 'redirect_to'=>$quick_link_bookmarklet), 'post' );
@@ -324 +324 @@
             exit;
         }
-        
+
         if ( !empty( $id ) ) {
             $blog= Blog::get( $id );
@@ -336 +336 @@
             $theme->$key= $value;
         }
-        
+
         $theme->relationships= Plugins::filter( 'blogroll_relationships', array('external'=>'External', 'nofollow'=>'Nofollow', 'bookmark'=>'Bookmark') );
         $controls= array(
@@ -346 +346 @@
         exit;
     }
-    
+
     public function filter_available_templates( $templates, $class ) {
         $templates= array_merge( $templates, array('blogroll_manage','blogroll_publish','blogroll','blogroll_publish_extras') );
         return $templates;
     }
-    
+
     public function filter_include_template_file( $template_path, $template_name, $class )
     {
@@ -368 +368 @@
         return $template_path;
     }
-    
+
     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' ),
             'order_by' => $order_by . ' ' . $direction,
-            );
-            
+        );
+
         $theme->blogs= Blogs::get( $params );
-        
+
         return $theme->fetch( 'blogroll' );
     }
-    
+
     public function filter_blogroll_update_cron( $success )
     {
@@ -419 +419 @@
         }
     }
-    
+
     public function filter_habminbar( $menu )
     {
@@ -425 +425 @@
         return $menu;
     }
-    
+
     public function filter_rewrite_rules( $rules )
     {
@@ -441 +441 @@
         return $rules;
     }
-    
+
     private function import_opml( SimpleXMLElement $xml )
     {
@@ -459 +459 @@
         return $count;
     }
-    
+
     private function map_opml_atts( $atts )
     {