Changeset 638877

Timestamp:

12/13/2012 10:25:08 PM (13 years ago)

Author:

codepress

Message:

1.4.9

Location:

codepress-admin-columns

Files:

• tags/1.4.9 (added)
• tags/1.4.9/assets (added)
• tags/1.4.9/assets/css (added)
• tags/1.4.9/assets/css/admin-column.css (added)
• tags/1.4.9/assets/css/column.css (added)
• tags/1.4.9/assets/images (added)
• tags/1.4.9/assets/images/addon_sortable_1.png (added)
• tags/1.4.9/assets/images/arrows.png (added)
• tags/1.4.9/assets/images/checkbox.png (added)
• tags/1.4.9/assets/images/checkmark.png (added)
• tags/1.4.9/assets/images/checkmark_single.png (added)
• tags/1.4.9/assets/images/comment_edit.png (added)
• tags/1.4.9/assets/images/cross.png (added)
• tags/1.4.9/assets/images/facebook.png (added)
• tags/1.4.9/assets/images/icon.png (added)
• tags/1.4.9/assets/images/import_export.png (added)
• tags/1.4.9/assets/images/information.png (added)
• tags/1.4.9/assets/images/loading.gif (added)
• tags/1.4.9/assets/images/no.png (added)
• tags/1.4.9/assets/images/reorder.png (added)
• tags/1.4.9/assets/images/reorder_arrow.png (added)
• tags/1.4.9/assets/images/settings.png (added)
• tags/1.4.9/assets/images/sort.png (added)
• tags/1.4.9/assets/images/square.png (added)
• tags/1.4.9/assets/images/trash.png (added)
• tags/1.4.9/assets/images/twitter.png (added)
• tags/1.4.9/assets/js (added)
• tags/1.4.9/assets/js/admin-column.js (added)
• tags/1.4.9/assets/js/jquery.qtip.js (added)
• tags/1.4.9/assets/ui-theme (added)
• tags/1.4.9/assets/ui-theme/images (added)
• tags/1.4.9/assets/ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-bg_flat_75_ffffff_40x100.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-bg_glass_65_ffffff_1x400.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-bg_glass_75_dadada_1x400.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-icons_222222_256x240.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-icons_2e83ff_256x240.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-icons_454545_256x240.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-icons_888888_256x240.png (added)
• tags/1.4.9/assets/ui-theme/images/ui-icons_cd0a0a_256x240.png (added)
• tags/1.4.9/assets/ui-theme/jquery-ui-1.8.18.custom.css (added)
• tags/1.4.9/classes (added)
• tags/1.4.9/classes/license.php (added)
• tags/1.4.9/classes/sortable.php (added)
• tags/1.4.9/classes/third_party.php (added)
• tags/1.4.9/classes/values (added)
• tags/1.4.9/classes/values.php (added)
• tags/1.4.9/classes/values/comments.php (added)
• tags/1.4.9/classes/values/link.php (added)
• tags/1.4.9/classes/values/media.php (added)
• tags/1.4.9/classes/values/posts.php (added)
• tags/1.4.9/classes/values/users.php (added)
• tags/1.4.9/codepress-admin-columns.php (added)
• tags/1.4.9/languages (added)
• tags/1.4.9/languages/codepress-admin-columns-da_DK.mo (added)
• tags/1.4.9/languages/codepress-admin-columns-da_DK.po (added)
• tags/1.4.9/languages/codepress-admin-columns-de_DE.mo (added)
• tags/1.4.9/languages/codepress-admin-columns-de_DE.po (added)
• tags/1.4.9/languages/codepress-admin-columns-fr_FR.mo (added)
• tags/1.4.9/languages/codepress-admin-columns-fr_FR.po (added)
• tags/1.4.9/languages/codepress-admin-columns-nl_NL.mo (added)
• tags/1.4.9/languages/codepress-admin-columns-nl_NL.po (added)
• tags/1.4.9/languages/codepress-admin-columns-pl_PL.mo (added)
• tags/1.4.9/languages/codepress-admin-columns-pl_PL.po (added)
• tags/1.4.9/languages/codepress-admin-columns.po (added)
• tags/1.4.9/readme.txt (added)
• tags/1.4.9/screenshot-1.png (added)
• tags/1.4.9/screenshot-2.png (added)
• tags/1.4.9/screenshot-3.png (added)
• tags/1.4.9/screenshot-4.png (added)
• tags/1.4.9/screenshot-5.png (added)
• tags/1.4.9/screenshot-6.png (added)
• tags/1.4.9/screenshot-7.png (added)
• trunk/classes/license.php (modified) (8 diffs)
• trunk/classes/sortable.php (modified) (76 diffs)
• trunk/classes/third_party.php (added)
• trunk/classes/utility.php (deleted)
• trunk/classes/values.php (modified) (31 diffs)
• trunk/classes/values/comments.php (modified) (9 diffs)
• trunk/classes/values/link.php (modified) (5 diffs)
• trunk/classes/values/media.php (modified) (9 diffs)
• trunk/classes/values/posts.php (modified) (16 diffs)
• trunk/classes/values/users.php (modified) (6 diffs)
• trunk/codepress-admin-columns.php (modified) (161 diffs)
• trunk/readme.txt (modified) (7 diffs)

codepress-admin-columns/trunk/classes/license.php

@@ -5 +5 @@
     /**
      * The type of licence to check or activate
-     * 
+     *
      * @var string $type
      */
     public $type;
-    
-    public function __construct($type) 
+
+    public function __construct($type)
     {
         $this->type = $type;
     }
-    
+
     /**
      * Unlocks
@@ -23 +23 @@
     {
         return preg_match( '/^[a-f0-9]{40}$/i', $this->get_license_key( $this->type ) );
-    }   
-    
+    }
+
     /**
      * Check license key with API
@@ -31 +31 @@
      */
     public function check_remote_key( $key )
-    {   
+    {
         if ( empty( $key ) ) {
             return false;
         }
-        
-        // check key with remote API        
-        $response = wp_remote_post( 'http://www.codepress.nl/', array(          
+
+        // check key with remote API
+        $response = wp_remote_post( 'http://www.codepress.nl/', array(
             'body'  => array(
                 'api'   => 'addon',
                 'key'   => $key,
-                'type'  => $this->type              
+                'type'  => $this->type
             )
         ));
@@ -49 +49 @@
             return true;
         }
-    
+
         return false;
     }
-    
+
     /**
      * Set masked license key
@@ -58 +58 @@
      * @since 1.3.1
      */
-    public function get_masked_license_key() 
+    public function get_masked_license_key()
     {
-        return '**************************'.substr( $this->get_license_key(), -4 );     
-    }   
-        
+        return '**************************'.substr( $this->get_license_key(), -4 );
+    }
+
     /**
      * Get license key
@@ -72 +72 @@
         return get_option("cpac_{$this->type}_ac");
     }
-    
+
     /**
      * Set license key
@@ -79 +79 @@
      */
     public function set_license_key( $key )
-    {           
+    {
         update_option( "cpac_{$this->type}_ac", trim( $key ) );
     }
-    
+
     /**
      * Remove license key
@@ -92 +92 @@
         delete_option( "cpac_{$this->type}_ac" );
         delete_transient("cpac_{$this->type}_trnsnt");
-    }    
+    }
 }

codepress-admin-columns/trunk/classes/sortable.php

@@ -8 +8 @@
  */
 class Codepress_Sortable_Columns extends Codepress_Admin_Columns
-{   
-    private $post_types, 
-            $unlocked, 
+{
+    private $post_types,
+            $unlocked,
             $show_all_results,
             $current_user_id;
-    
+
     /**
      * Constructor
@@ -23 +23 @@
         add_action( 'wp_loaded', array( $this, 'init') );
     }
-    
+
     /**
      * Initialize
@@ -32 +32 @@
     {
         $licence = new cpac_licence('sortable');
-        
+
         // vars
         $this->unlocked         = $licence->is_unlocked();
@@ -38 +38 @@
         $this->show_all_results = false;
         $this->current_user_id  = get_current_user_id();
-        
+
         // init sorting
         add_action( 'admin_init', array( $this, 'register_sortable_columns' ) );
-        
+
         // init filtering
         add_action( 'admin_init', array( $this, 'register_filtering_columns' ) );
-        
+
         // handle requests for sorting columns
         add_filter( 'request', array( $this, 'handle_requests_orderby_column'), 1 );
@@ -50 +50 @@
         add_action( 'admin_init', array( $this, 'handle_requests_orderby_links_column'), 1 );
         add_action( 'admin_init', array( $this, 'handle_requests_orderby_comments_column'), 1 );
-    }   
-    
+    }
+
     /**
      *  Register sortable columns
@@ -63 +63 @@
         if ( ! $this->unlocked )
             return false;
-    
+
         /** Posts */
         foreach ( $this->post_types as $post_type ) {
-            add_filter( "manage_edit-{$post_type}_sortable_columns", array($this, 'callback_add_sortable_posts_column'));               
-        }
-        
+            add_filter( "manage_edit-{$post_type}_sortable_columns", array($this, 'callback_add_sortable_posts_column'));
+        }
+
         /** Users */
         add_filter( "manage_users_sortable_columns", array($this, 'callback_add_sortable_users_column'));
-        
+
         /** Media */
         add_filter( "manage_upload_sortable_columns", array($this, 'callback_add_sortable_media_column'));
-        
+
         /** Links */
         add_filter( "manage_link-manager_sortable_columns", array($this, 'callback_add_sortable_links_column'));
-        
+
         /** Comments */
         add_filter( "manage_edit-comments_sortable_columns", array($this, 'callback_add_sortable_comments_column'));
     }
-    
+
     /**
      *  Callback add Posts sortable column
@@ -87 +87 @@
      *  @since     1.0
      */
-    public function callback_add_sortable_posts_column($columns) 
+    public function callback_add_sortable_posts_column($columns)
     {
         global $post_type;
-        
+
         // in some cases post_type is an array ( when clicking a tag inside the overview screen icm CCTM ), then we use this as a fallback so we get a string
         if ( is_array($post_type) )
             $post_type = $_REQUEST['post_type'];
-        
+
         return $this->add_managed_sortable_columns($post_type, $columns);
     }
@@ -103 +103 @@
      *  @since     1.1
      */
-    public function callback_add_sortable_users_column($columns) 
+    public function callback_add_sortable_users_column($columns)
     {
         return $this->add_managed_sortable_columns('wp-users', $columns);
     }
-    
+
     /**
      *  Callback add Media sortable column
@@ -113 +113 @@
      *  @since     1.3
      */
-    public function callback_add_sortable_media_column($columns) 
+    public function callback_add_sortable_media_column($columns)
     {
         return $this->add_managed_sortable_columns('wp-media', $columns);
     }
-    
+
     /**
      *  Callback add Links sortable column
@@ -123 +123 @@
      *  @since     1.3.1
      */
-    public function callback_add_sortable_links_column($columns) 
+    public function callback_add_sortable_links_column($columns)
     {
         return $this->add_managed_sortable_columns('wp-links', $columns);
     }
-    
+
     /**
      *  Callback add Comments sortable column
@@ -133 +133 @@
      *  @since     1.3.1
      */
-    public function callback_add_sortable_comments_column($columns) 
+    public function callback_add_sortable_comments_column($columns)
     {
         return $this->add_managed_sortable_columns('wp-comments', $columns);
     }
-    
+
     /**
      *  Add managed sortable columns by Type
@@ -143 +143 @@
      *  @since     1.1
      */
-    private function add_managed_sortable_columns( $type = 'post', $columns ) 
-    {       
+    private function add_managed_sortable_columns( $type = 'post', $columns )
+    {
         $display_columns    = $this->get_merged_columns($type);
-        
+
         if ( ! $display_columns )
             return $columns;
-        
+
         foreach ( $display_columns as $id => $vars ) {
-            if ( isset($vars['options']['sortorder']) && $vars['options']['sortorder'] == 'on' ){           
-                
+            if ( isset($vars['options']['sortorder']) && $vars['options']['sortorder'] == 'on' ){
+
                 // register format
-                $columns[$id] = $this->sanitize_string($vars['label']);         
+                $columns[$id] = $this->sanitize_string($vars['label']);
             }
-        }   
+        }
 
         return $columns;
     }
-    
+
     /**
      * Admin requests for orderby column
@@ -168 +168 @@
      * @since     1.0
      */
-    public function handle_requests_orderby_column( $vars ) 
+    public function handle_requests_orderby_column( $vars )
     {
         /** Users */
-        // You would expect to see get_orderby_users_vars(), but sorting for 
+        // You would expect to see get_orderby_users_vars(), but sorting for
         // users is handled through a different filter. Not 'request', but 'pre_user_query'.
         // See handle_requests_orderby_users_column().
-                        
+
         /** Media */
         if ( $this->request_uri_is('upload') ) {
             $vars = $this->get_orderby_media_vars($vars);
         }
-        
+
         /** Posts */
         elseif ( !empty($vars['post_type']) ) {
-            $vars = $this->get_orderby_posts_vars($vars);   
-        }
-                
+            $vars = $this->get_orderby_posts_vars($vars);
+        }
+
         return $vars;
-    }   
-    
+    }
+
     /**
      * Orderby Users column
@@ -194 +194 @@
      */
     public function handle_requests_orderby_users_column($user_query)
-    {       
+    {
         // query vars
-        $vars = $user_query->query_vars;    
-        
+        $vars = $user_query->query_vars;
+
         // Column
         $column = $this->get_orderby_type( $vars['orderby'], 'wp-users' );
 
         if ( empty($column) )
-            return $user_query;     
-        
+            return $user_query;
+
         // id
         $type = $id = key($column);
-        
+
         // Check for user custom fields: column-meta-[customfieldname]
         if ( Codepress_Admin_Columns::is_column_meta($type) )
             $type = 'column-user-meta';
-        
+
         // Check for post count: column-user_postcount-[posttype]
         if ( Codepress_Admin_Columns::get_posttype_by_postcount_column($type) )
             $type = 'column-user_postcount';
-        
+
         // var
-        $cusers = array();      
+        $cusers = array();
         switch( $type ) :
-            
+
             case 'column-user_id':
                 $user_query->query_orderby = "ORDER BY ID {$user_query->query_vars['order']}";
                 $user_query->query_vars['orderby'] = 'ID';
                 break;
-                
-            case 'column-user_registered':              
+
+            case 'column-user_registered':
                 $user_query->query_orderby = "ORDER BY user_registered {$user_query->query_vars['order']}";
                 $user_query->query_vars['orderby'] = 'registered';
                 break;
-            
+
             case 'column-nickname' :
                 $sort_flag = SORT_REGULAR;
@@ -235 +235 @@
                         $cusers[$u->ID] = $this->prepare_sort_string_value($u->nickname);
                     }
-                }               
-                break;
-            
+                }
+                break;
+
             case 'column-first_name' :
                 $sort_flag = SORT_REGULAR;
@@ -244 +244 @@
                         $cusers[$u->ID] = $this->prepare_sort_string_value($u->first_name);
                     }
-                }               
-                break;
-            
+                }
+                break;
+
             case 'column-last_name' :
                 $sort_flag = SORT_REGULAR;
@@ -253 +253 @@
                         $cusers[$u->ID] = $this->prepare_sort_string_value($u->last_name);
                     }
-                }               
-                break;
-                
+                }
+                break;
+
             case 'column-user_url' :
                 $sort_flag = SORT_REGULAR;
@@ -262 +262 @@
                         $cusers[$u->ID] = $this->prepare_sort_string_value($u->user_url);
                     }
-                }               
-                break;
-            
+                }
+                break;
+
             case 'column-user_description' :
                 $sort_flag = SORT_REGULAR;
@@ -271 +271 @@
                         $cusers[$u->ID] = $this->prepare_sort_string_value($u->user_description);
                     }
-                }               
-                break;
-            
-            case 'column-user_postcount' :              
+                }
+                break;
+
+            case 'column-user_postcount' :
                 $post_type  = Codepress_Admin_Columns::get_posttype_by_postcount_column($id);
                 if ( $post_type ) {
@@ -281 +281 @@
                         $count = Codepress_Admin_Columns::get_post_count( $post_type, $u->ID );
                         $cusers[$u->ID] = $this->prepare_sort_string_value($count);
-                    }                   
-                }
-                break;
-            
-            case 'column-user-meta' :   
+                    }
+                }
+                break;
+
+            case 'column-user-meta' :
                 $field = $column[$id]['field'];
                 if ( $field ) {
-                
+
                     // order numeric or string
                     $sort_flag = SORT_REGULAR;
@@ -294 +294 @@
                         $sort_flag = SORT_NUMERIC;
                     }
-                    
+
                     // sort by metavalue
                     foreach ( $this->get_users_data() as $u ) {
                         $value = get_metadata('user', $u->ID, $field, true);
                         $cusers[$u->ID] = $this->prepare_sort_string_value($value);
-                    }                   
-                }
-                break;
-            
+                    }
+                }
+                break;
+
             /** native WP columns */
-            
+
             // role column
             case 'role' :
@@ -314 +314 @@
                     }
                 }
-                break;          
-        
-        endswitch;      
-        
+                break;
+
+        endswitch;
+
         if ( isset($sort_flag) ) {
             $user_query = $this->get_users_query_vars( $user_query, $cusers, $sort_flag );
         }
-        
+
         return $user_query;
     }
-    
+
     /**
      *  Orderby Links column
      *
-     *  Makes use of filter 'get_bookmarks' from bookmark.php to change the result set of the links  
+     *  Makes use of filter 'get_bookmarks' from bookmark.php to change the result set of the links
      *
      *  @since     1.3.1
@@ -337 +337 @@
         if ( $this->request_uri_is('link-manager') )
             add_filter( 'get_bookmarks', array( $this, 'callback_requests_orderby_links_column'), 10, 2);
-    }   
-    
+    }
+
     /**
      *  Orderby Links column
-     *  
+     *
      *  @since     1.3.1
      */
-    public function callback_requests_orderby_links_column($results, $vars) 
-    {   
-        global $wpdb;       
-        
+    public function callback_requests_orderby_links_column($results, $vars)
+    {
+        global $wpdb;
+
         // apply sorting preference
         $this->apply_sorting_preference( $vars, 'wp-links' );
-        
+
         // Column
         $column = $this->get_orderby_type( $vars['orderby'], 'wp-links' );
 
         if ( empty($column) )
-            return $results;        
-        
+            return $results;
+
         // id
         $type = $id = key($column);
 
         // var
-        $length = '';       
+        $length = '';
         switch( $type ) :
-            
+
             case 'column-link_id':
                 if ( version_compare( get_bloginfo('version'), '3.2', '>' ) )
@@ -370 +370 @@
                     $vars['orderby'] = 'id';
                 break;
-                
+
             case 'column-owner':
                 $vars['orderby'] = 'link_owner';
                 break;
-            
+
             case 'column-length':
                 $vars['orderby'] = 'length';
                 $length = ", CHAR_LENGTH(link_name) AS length";
                 break;
-            
+
             case 'column-target':
                 $vars['orderby'] = 'link_target';
                 break;
-            
+
             case 'column-description':
                 $vars['orderby'] = 'link_description';
                 break;
-                
+
             case 'column-notes':
                 $vars['orderby'] = 'link_notes';
                 break;
-            
+
             case 'column-rss':
                 $vars['orderby'] = 'link_rss';
                 break;
-            
+
             /** native WP columns */
-            
+
             // Relationship
-            case 'rel':             
+            case 'rel':
                 $vars['orderby'] = 'link_rel';
                 break;
-            
+
             default:
-                $vars['orderby'] = '';          
-        
+                $vars['orderby'] = '';
+
         endswitch;
-        
+
         // get bookmarks by orderby vars
         if ( $vars['orderby'] ) {
-            $vars['order']  = mysql_escape_string($vars['order']);          
-            $sql            = "SELECT * {$length} FROM {$wpdb->links} WHERE 1=1 ORDER BY {$vars['orderby']} {$vars['order']}";  
+            $vars['order']  = mysql_escape_string($vars['order']);
+            $sql            = "SELECT * {$length} FROM {$wpdb->links} WHERE 1=1 ORDER BY {$vars['orderby']} {$vars['order']}";
             $results        = $wpdb->get_results($sql);
-            
+
             // check for errors
             if( is_wp_error($results) )
@@ -421 +421 @@
         return $results;
     }
-    
+
     /**
      *  Orderby Comments column
-     *  
+     *
      *  @since     1.3.1
      */
-    public function callback_requests_orderby_comments_column($pieces, $ref_comment) 
-    {
-        // get query vars       
+    public function callback_requests_orderby_comments_column($pieces, $ref_comment)
+    {
+        // get query vars
         $vars = $ref_comment->query_vars;
-        
+
         // Column
         $column = $this->get_orderby_type( $vars['orderby'], 'wp-comments' );
 
         if ( empty($column) )
-            return $pieces;     
-        
+            return $pieces;
+
         // id
         $type = $id = key($column);
 
-        // var  
+        // var
         switch( $type ) :
-            
+
             case 'column-comment_id':
                 $pieces['orderby'] = 'comment_ID';
                 break;
-            
+
             case 'column-author_author':
                 $pieces['orderby'] = 'comment_author';
                 break;
-            
+
             case 'column-author_ip':
                 $pieces['orderby'] = 'comment_author_IP';
                 break;
-                
+
             case 'column-author_url':
                 $pieces['orderby'] = 'comment_author_url';
                 break;
-            
+
             case 'column-author_email':
                 $pieces['orderby'] = 'comment_author_email';
                 break;
-            
+
             case 'column-reply_to':
                 break;
-            
+
             case 'column-approved':
                 $pieces['orderby'] = 'comment_approved';
                 break;
-            
+
             case 'column-date':
                 $pieces['orderby'] = 'comment_date';
                 break;
-            
+
             case 'column-agent':
                 $pieces['orderby'] = 'comment_agent';
                 break;
-            
+
             case 'column-excerpt':
                 $pieces['orderby'] = 'comment_content';
                 break;
-            
+
             case 'column-date_gmt':
                 break;
-            
+
             /** native WP columns */
-            
+
             // Relationship
-            case 'comment':             
+            case 'comment':
                 $pieces['orderby'] = 'comment_content';
                 break;
-            
+
             default:
-                $vars['orderby'] = '';          
-        
+                $vars['orderby'] = '';
+
         endswitch;
 
         return $pieces;
     }
-    
+
     /**
      *  Orderby Comments column
@@ -507 +507 @@
      */
     public function handle_requests_orderby_comments_column()
-    {       
+    {
         // fire only when we are in the admins edit-comments
         if ( $this->request_uri_is('edit-comments') ) {
@@ -513 +513 @@
         }
     }
-    
+
     /**
      * Get sorting vars in User Query Object
@@ -520 +520 @@
      */
     private function get_users_query_vars( $user_query, $sortusers, $sort_flags = SORT_REGULAR )
-    {   
+    {
         global $wpdb;
-        
+
         // vars
         $vars = $user_query->query_vars;
@@ -532 +532 @@
             arsort($sortusers, $sort_flags);
 
-        // alter orderby SQL        
-        if ( ! empty ( $sortusers ) ) {         
+        // alter orderby SQL
+        if ( ! empty ( $sortusers ) ) {
             $ids = implode(',', array_keys($sortusers));
             $user_query->query_where    .= " AND {$wpdb->prefix}users.ID IN ({$ids})";
             $user_query->query_orderby  = "ORDER BY FIELD({$wpdb->prefix}users.ID,{$ids})";
         }
-        
+
         // cleanup the vars we dont need
         $vars['order']      = '';
         $vars['orderby']    = '';
-        
+
         // set query vars
         $user_query->query_vars = $vars;
-        
+
         return $user_query;
-    }   
-    
+    }
+
     /**
      * Orderby Media column
@@ -555 +555 @@
      */
     private function get_orderby_media_vars($vars)
-    {       
+    {
         // apply sorting preference
         $this->apply_sorting_preference( $vars, 'wp-media' );
-        
+
         // when sorting still isn't set we will just return the requested vars
         if ( empty( $vars['orderby'] ) )
             return $vars;
-        
+
         // Column
-        $column = $this->get_orderby_type( $vars['orderby'], 'wp-media' );      
+        $column = $this->get_orderby_type( $vars['orderby'], 'wp-media' );
 
         if ( empty($column) )
             return $vars;
-        
+
         $id = key($column);
-        
+
         // var
-        $cposts = array();      
+        $cposts = array();
         switch( $id ) :
-        
+
             case 'column-mediaid' :
                 $vars['orderby'] = 'ID';
                 break;
-            
+
             case 'column-width' :
                 $sort_flag = SORT_NUMERIC;
@@ -588 +588 @@
                 }
                 break;
-                
+
             case 'column-height' :
                 $sort_flag = SORT_NUMERIC;
@@ -598 +598 @@
                 }
                 break;
-            
+
             case 'column-dimensions' :
                 $sort_flag = SORT_NUMERIC;
@@ -606 +606 @@
                     $width   = !empty($meta['width'])   ? $meta['width']    : 0;
                     $surface = $height*$width;
-                    
+
                     if ( $surface || $this->show_all_results )
                         $cposts[$p->ID] = $surface;
                 }
                 break;
-            
+
             case 'column-caption' :
                 $sort_flag = SORT_STRING;
@@ -620 +620 @@
                 }
                 break;
-                
+
             case 'column-description' :
                 $sort_flag = SORT_STRING;
@@ -629 +629 @@
                 }
                 break;
-            
+
             case 'column-mime_type' :
                 $sort_flag = SORT_STRING;
@@ -636 +636 @@
                         $cposts[$p->ID] = $this->prepare_sort_string_value( $p->post_mime_type );
                     }
-                }       
-                break;
-            
+                }
+                break;
+
             case 'column-file_name' :
                 $sort_flag = SORT_STRING;
-                foreach ( $this->get_any_posts_by_posttype('attachment') as $p ) {          
-                    $meta   = get_post_meta($p->ID, '_wp_attached_file', true);                 
+                foreach ( $this->get_any_posts_by_posttype('attachment') as $p ) {
+                    $meta   = get_post_meta($p->ID, '_wp_attached_file', true);
                     $file   = !empty($meta) ? basename($meta) : '';
                     if ( $file || $this->show_all_results ) {
                         $cposts[$p->ID] = $file;
                     }
-                }               
+                }
                 break;
 
@@ -659 +659 @@
                 }
                 break;
-                
+
             case 'column-filesize' :
                 $sort_flag = SORT_NUMERIC;
                 foreach ( $this->get_any_posts_by_posttype('attachment') as $p ) {
-                    $file   = wp_get_attachment_url($p->ID);                    
+                    $file   = wp_get_attachment_url($p->ID);
                     if ( $file || $this->show_all_results ) {
                         $abs            = str_replace( WP_CONTENT_URL, WP_CONTENT_DIR, $file);
@@ -670 +670 @@
                 }
                 break;
-        
+
         endswitch;
-        
+
         // we will add the sorted post ids to vars['post__in'] and remove unused vars
         if ( isset($sort_flag) ) {
@@ -680 +680 @@
         return $vars;
     }
-    
+
     /**
      * Orderby Posts column
@@ -689 +689 @@
     {
         $post_type = $vars['post_type'];
-        
+
         // apply sorting preference
         $this->apply_sorting_preference( $vars, $post_type );
-    
+
         // no sorting
-        if ( empty( $vars['orderby'] ) ) {              
-            return $vars;       
-        }
-        
+        if ( empty( $vars['orderby'] ) ) {
+            return $vars;
+        }
+
         // Column
-        $column = $this->get_orderby_type( $vars['orderby'], $post_type );      
+        $column = $this->get_orderby_type( $vars['orderby'], $post_type );
 
         if ( empty($column) )
             return $vars;
-        
+
         // id
         $type = $id = key($column);
-    
-        // Check for taxonomies, such as column-taxonomy-[taxname]  
+
+        // Check for taxonomies, such as column-taxonomy-[taxname]
         if ( strpos($type, 'column-taxonomy-') !== false )
             $type = 'column-taxonomy';
-        
+
         // Check for Custom Field
         if ( Codepress_Admin_Columns::is_column_meta($type) )
@@ -716 +716 @@
 
         // var
-        $cposts = array();      
+        $cposts = array();
         switch( $type ) :
-        
+
             case 'column-postid' :
                 $vars['orderby'] = 'ID';
                 break;
-                
-            case 'column-order' : 
+
+            case 'column-order' :
                 $vars['orderby'] = 'menu_order';
                 break;
-                
-            case 'column-modified' : 
+
+            case 'column-modified' :
                 $vars['orderby'] = 'modified';
                 break;
-            
-            case 'column-comment-count' : 
+
+            case 'column-comment-count' :
                 $vars['orderby'] = 'comment_count';
                 break;
-            
-            case 'column-post-meta' :               
-                $field      = $column[$id]['field'];                
-                
+
+            case 'column-post-meta' :
+                $field      = $column[$id]['field'];
+
                 // orderby type
                 $field_type = 'meta_value';
@@ -748 +748 @@
                 ));
                 break;
-                
+
             case 'column-excerpt' :
                 $sort_flag = SORT_STRING;
                 foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
                     $cposts[$p->ID] = $this->prepare_sort_string_value($p->post_content);
-                }               
-                break;
-                
+                }
+                break;
+
             case 'column-word-count' :
                 $sort_flag = SORT_NUMERIC;
-                foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {        
+                foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
                     $cposts[$p->ID] = str_word_count( Codepress_Admin_Columns::strip_trim( $p->post_content ) );
                 }
                 break;
-                
+
             case 'column-page-template' :
                 $sort_flag = SORT_STRING;
                 $templates      = get_page_templates();
-                foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {                    
+                foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
                     $page_template  = get_post_meta($p->ID, '_wp_page_template', true);
                     $cposts[$p->ID] = array_search($page_template, $templates);
-                }               
-                break;
-            
+                }
+                break;
+
             case 'column-post_formats' :
                 $sort_flag = SORT_REGULAR;
-                foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {                    
+                foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
                     $cposts[$p->ID] = get_post_format($p->ID);
                 }
                 break;
-                
+
             case 'column-attachment' :
             case 'column-attachment-count' :
@@ -785 +785 @@
                     $cposts[$p->ID] = count( Codepress_Admin_Columns::get_attachment_ids($p->ID) );
                 }
-                break;              
-                
+                break;
+
             case 'column-page-slug' :
                 $sort_flag = SORT_REGULAR;
                 foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
                     $cposts[$p->ID] = $p->post_name;
-                }               
-                break;
-            
+                }
+                break;
+
             case 'column-sticky' :
                 $sort_flag = SORT_REGULAR;
@@ -804 +804 @@
                 }
                 break;
-            
+
             case 'column-featured_image' :
                 $sort_flag = SORT_REGULAR;
@@ -815 +815 @@
                 }
                 break;
-            
+
             case 'column-roles' :
                 $sort_flag = SORT_STRING;
@@ -826 +826 @@
                 }
                 break;
-            
+
             case 'column-status' :
                 $sort_flag = SORT_STRING;
@@ -833 +833 @@
                 }
                 break;
-            
-            case 'column-comment-status' : 
+
+            case 'column-comment-status' :
                 $sort_flag = SORT_STRING;
                 foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
@@ -840 +840 @@
                 }
                 break;
-            
-            case 'column-ping-status' : 
+
+            case 'column-ping-status' :
                 $sort_flag = SORT_STRING;
                 foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
@@ -847 +847 @@
                 }
                 break;
-            
+
             case 'column-taxonomy' :
                 $sort_flag  = SORT_STRING; // needed to sort
@@ -853 +853 @@
                 $cposts     = $this->get_posts_sorted_by_taxonomy($post_type, $taxonomy);
                 break;
-                
+
             case 'column-author-name' :
                 $sort_flag  = SORT_STRING;
@@ -862 +862 @@
                 foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
                     if ( !empty($p->post_author) ) {
-                        $name = Codepress_Admin_Columns::get_author_field_by_nametype($display_as, $p->post_author);                            
+                        $name = Codepress_Admin_Columns::get_author_field_by_nametype($display_as, $p->post_author);
                         $cposts[$p->ID] = $name;
                     }
                 }
                 break;
-                
+
             case 'column-before-moretag' :
                 $sort_flag = SORT_STRING;
                 foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
                     $extended   = get_extended($p->post_content);
-                    $content    = !empty($extended['extended']) ? $extended['main'] : '';                   
+                    $content    = !empty($extended['extended']) ? $extended['main'] : '';
                     $cposts[$p->ID] = $this->prepare_sort_string_value($content);
                 }
                 break;
-            
+
             /** native WP columns */
-            
+
             // categories
             case 'categories' :
@@ -884 +884 @@
                 $cposts     = $this->get_posts_sorted_by_taxonomy($post_type, 'category');
                 break;
-                
+
             // tags
             case 'tags' :
@@ -890 +890 @@
                 $cposts     = $this->get_posts_sorted_by_taxonomy($post_type, 'post_tag');
                 break;
-            
-        endswitch;          
-        
+
+        endswitch;
+
         // we will add the sorted post ids to vars['post__in'] and remove unused vars
         if ( isset($sort_flag) ) {
@@ -900 +900 @@
         return $vars;
     }
-    
+
     /**
      * Set sorting preference
      *
      * after sorting we will save this sorting preference to the column item
-     * we set the default_order to either asc, desc or empty. 
+     * we set the default_order to either asc, desc or empty.
      * only ONE column item PER type can have a default_order
      *
@@ -914 +914 @@
         if ( !$orderby )
             return false;
-                
+
         $options = get_user_meta( $this->current_user_id, 'cpac_sorting_preference', true );
-        
+
         $options[$type] = array(
             'orderby'   => $orderby,
             'order'     => $order
         );
-        
+
         update_user_meta( $this->current_user_id, 'cpac_sorting_preference', $options );
     }
-    
+
     /**
      *  Get sorting preference
@@ -936 +936 @@
     {
         $options = get_user_meta( $this->current_user_id, 'cpac_sorting_preference', true );
-        
-        if ( empty($options[$type]) ) 
+
+        if ( empty($options[$type]) )
             return false;
-        
+
         return $options[$type];
     }
-    
+
     /**
      * Apply sorting preference
@@ -952 +952 @@
         // user has not sorted
         if ( empty( $vars['orderby'] ) ) {
-        
+
             // did the user sorted this column some other time?
             if ( $preference = $this->get_sorting_preference($type) ) {
                 $vars['orderby']    = $preference['orderby'];
                 $vars['order']      = $preference['order'];
-                
+
                 // used by active state in column header
                 $_GET['orderby'] = $preference['orderby'];
@@ -969 +969 @@
         }
     }
-    
+
     /**
      * Get posts sorted by taxonomy
@@ -977 +977 @@
      * @since     1.4.5
      */
-    function get_posts_sorted_by_taxonomy($post_type, $taxonomy = 'category') 
+    function get_posts_sorted_by_taxonomy($post_type, $taxonomy = 'category')
     {
         $cposts     = array();
         foreach ( $this->get_any_posts_by_posttype($post_type) as $p ) {
-            $cposts[$p->ID] = '';                       
+            $cposts[$p->ID] = '';
             $terms = get_the_terms($p->ID, $taxonomy);
             if ( !is_wp_error($terms) && !empty($terms) ) {
@@ -988 +988 @@
                 if ( isset($term->term_id) ) {
                     $cposts[$p->ID] = sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display');
-                }                       
+                }
             }
         }
         return $cposts;
     }
-    
+
     /**
      * Set post__in for use in WP_Query
@@ -1016 +1016 @@
         $vars['order']      = '';
         $vars['orderby']    = '';
-        
+
         // add the sorted post ids to the query with the use of post__in
         $vars['post__in'] = array_keys($sortposts);
-        
+
         return $vars;
     }
-    
+
     /**
      * Get orderby type
@@ -1029 +1029 @@
      */
     private function get_orderby_type($orderby, $type)
-    {       
+    {
         $db_columns = Codepress_Admin_Columns::get_stored_columns($type);
 
         if ( $db_columns ) {
             foreach ( $db_columns as $id => $vars ) {
-            
+
                 // check which custom column was clicked
                 if ( isset( $vars['label'] ) && $orderby ==  $this->sanitize_string( $vars['label'] ) ) {
                     $column[$id] = $vars;
-                    return $column;
+                    return apply_filters( 'cpac-get-orderby-type', $column, $orderby, $type );
                 }
             }
         }
-        return false;
-    }
-    
-    /**
-     * Maintain order of ids that are set in the post__in var. 
-     *
-     * This will force the returned posts to use the order of the ID's that 
+        return apply_filters( 'cpac-get-orderby-type', false, $orderby, $type );
+    }
+
+    /**
+     * Maintain order of ids that are set in the post__in var.
+     *
+     * This will force the returned posts to use the order of the ID's that
      * have been set in post__in. Without this the ID's will be set in numeric order.
      * See the WP_Query object for more info about the use of post__in.
@@ -1054 +1054 @@
      * @since     1.2.1
      */
-    public function filter_orderby_post__in($orderby, $wp) 
+    public function filter_orderby_post__in($orderby, $wp)
     {
         global $wpdb;
 
         // we need the query vars
-        $vars = $wp->query_vars;    
-        if ( ! empty ( $vars['post__in'] ) ) {          
+        $vars = $wp->query_vars;
+        if ( ! empty ( $vars['post__in'] ) ) {
             // now we can get the ids
             $ids = implode(',', $vars['post__in']);
-            
+
             // by adding FIELD to the SQL query we are forcing the order of the ID's
             return "FIELD({$wpdb->prefix}posts.ID,{$ids})";
         }
     }
-    
+
     /**
      * Get any posts by post_type
@@ -1081 +1081 @@
             'post_type'     => $post_type
         ));
-        
+
         // trash posts are not included in the posts_status 'any' by default
         $trash_posts = (array) get_posts(array(
@@ -1087 +1087 @@
             'post_status'   => 'trash',
             'post_type'     => $post_type
-        ));     
-        
+        ));
+
         $all_posts = array_merge($any_posts, $trash_posts);
-        
-        return (array) $all_posts;      
-    }
-    
+
+        return (array) $all_posts;
+    }
+
     /**
      * Request URI is
@@ -1101 +1101 @@
     private function request_uri_is( $screen_id = '' )
     {
-        if (strpos( $_SERVER['REQUEST_URI'], "/{$screen_id}.php" ) !== false ) 
+        if (strpos( $_SERVER['REQUEST_URI'], "/{$screen_id}.php" ) !== false )
             return true;
-        
+
         return false;
     }
-    
+
     /**
      * Prepare the value for being by sorting
@@ -1116 +1116 @@
         // remove tags and only get the first 20 chars and force lowercase.
         $string = strtolower( substr( Codepress_Admin_Columns::strip_trim($string),0 ,20 ) );
-        
+
         return $string;
     }
-    
+
     /**
      * Get users data
@@ -1125 +1125 @@
      * @since     1.3
      */
-    function get_users_data() 
+    function get_users_data()
     {
         $userdatas = array();
         $wp_users = get_users( array(
-            'blog_id' => $GLOBALS['blog_id'],       
+            'blog_id' => $GLOBALS['blog_id'],
         ));
         foreach ( $wp_users as $u ) {
@@ -1136 +1136 @@
         return $userdatas;
     }
-    
+
     /**
      *  Register filtering columns
@@ -1146 +1146 @@
         if ( ! $this->unlocked || apply_filters( 'cpac-remove-filtering-columns', true ) )
             return false;
-        
+
         // hook into wordpress
         add_action('restrict_manage_posts', array($this, 'callback_restrict_posts'));
     }
-    
+
     /**
      *  Add taxonomy filters to posts
@@ -1159 +1159 @@
     {
         global $post_type_object;
-        
+
         if ( !isset($post_type_object->name) )
             return false;
@@ -1165 +1165 @@
         // make a filter foreach taxonomy
         $taxonomies = get_object_taxonomies($post_type_object->name, 'names');
-        
+
         // get stored columns
         $db_columns = Codepress_Admin_Columns::get_stored_columns($post_type_object->name);
@@ -1171 +1171 @@
         if ( $taxonomies ) {
             foreach ( $taxonomies as $tax ) {
-            
+
                 // ignore core taxonomies
                 if ( in_array($tax, array('post_tag','category','post_format') ) ) {
                     continue;
                 }
-                
+
                 // only display taxonomy that is active as a column
                 if ( isset($db_columns['column-taxonomy-'.$tax]) && $db_columns['column-taxonomy-'.$tax]['state'] == 'on' ) {
-                    
+
                     $terms = get_terms($tax);
                     $terms = $this->indent($terms, 0, 'parent', 'term_id');
                     $terms = $this->apply_dropdown_markup($terms);
-                     
+
                     $select = "<option value=''>".__('Show all ', CPAC_TEXTDOMAIN)."{$tax}</option>";
                     if (!empty($terms)) {
                         foreach( $terms as $term_slug => $term) {
-                            
+
                             $selected = isset($_GET[$tax]) && $term_slug == $_GET[$tax] ? " selected='selected'" : '';
                             $select .= "<option value='{$term_slug}'{$selected}>{$term}</option>";
                         }
                         echo "<select class='postform' name='{$tax}'>{$select}</select>";
-                    }                   
+                    }
                 }
             }
         }
     }
-    
+
     /**
      *  Applies dropdown markup for taxonomy dropdown
@@ -1204 +1204 @@
      */
     private function apply_dropdown_markup($array, $level = 0, $output = array())
-    {                
+    {
         foreach($array as $v) {
-            
-            $prefix = '';        
+
+            $prefix = '';
             for($i=0; $i<$level; $i++) {
-                $prefix .= '&nbsp;&nbsp;';  
+                $prefix .= '&nbsp;&nbsp;';
             }
 
             $output[$v->slug] = $prefix . $v->name;
-            
+
             if ( !empty($v->children) ) {
                 $output = $this->apply_dropdown_markup($v->children, ($level + 1), $output);
             }
         }
-        
+
         return $output;
     }
-    
+
     /**
      * Indents any object as long as it has a unique id and that of its parent.
@@ -1227 +1227 @@
      * @since     1.4.2
      */
-    private function indent($array, $parentId = 0, $parentKey = 'post_parent', $selfKey = 'ID', $childrenKey = 'children') 
+    private function indent($array, $parentId = 0, $parentKey = 'post_parent', $selfKey = 'ID', $childrenKey = 'children')
     {
         $indent = array();
-        
+
         // clean counter
         $i = 0;
-        
+
         foreach($array as $v) {
 
@@ -1239 +1239 @@
                 $indent[$i] = $v;
                 $indent[$i]->$childrenKey = $this->indent($array, $v->$selfKey, $parentKey, $selfKey);
-                
+
                 $i++;
             }

codepress-admin-columns/trunk/classes/values.php

@@ -8 +8 @@
  */
 class CPAC_Values
-{   
+{
     protected $excerpt_length, $thumbnail_size;
-    
+
     /**
      * Constructor
@@ -17 +17 @@
      */
     function __construct()
-    {   
+    {
         // number of words
-        $this->excerpt_length   = 20;       
+        $this->excerpt_length   = 20;
         $this->thumbnail_size   = apply_filters( 'cpac_thumbnail_size', array(80,80) );
     }
-    
+
     /**
      * Admin requests for orderby column
@@ -29 +29 @@
      */
     public function get_stored_columns($type)
-    { 
+    {
         return Codepress_Admin_Columns::get_stored_columns($type);
     }
-    
+
     /**
      * Checks if column-meta key exists
@@ -38 +38 @@
      * @since     1.0
      */
-    public static function is_column_meta( $id = '' ) 
+    public static function is_column_meta( $id = '' )
     {
         return Codepress_Admin_Columns::is_column_meta( $id );
     }
-    
+
     /**
      * Returns excerpt
@@ -48 +48 @@
      * @since     1.0
      */
-    protected function get_post_excerpt($post_id) 
+    protected function get_post_excerpt($post_id)
     {
         global $post;
-            
+
         $save_post  = $post;
         $post       = get_post($post_id);
         $excerpt    = get_the_excerpt();
         $post       = $save_post;
-        
-        $output = $this->get_shortened_string($excerpt, $this->excerpt_length );    
-        
+
+        $output = $this->get_shortened_string($excerpt, $this->excerpt_length );
+
         return $output;
     }
-    
+
     /**
      * Returns shortened string
@@ -67 +67 @@
      * @since     1.0
      */
-    protected function get_shortened_string($string = '', $num_words = 55, $more = null) 
+    protected function get_shortened_string($string = '', $num_words = 55, $more = null)
     {
         if (!$string)
             return false;
-        
+
         return wp_trim_words( $string, $num_words, $more );
     }
@@ -84 +84 @@
         if ( $name )
             return sprintf("<img alt='' src='%s' title='%s'/>", CPAC_URL."/assets/images/{$name}", $title);
-    }   
-    
+    }
+
     /**
      *  Shorten URL
@@ -95 +95 @@
         if ( !$url )
             return false;
-            
+
         // shorten url
         $short_url  = url_shorten( $url );
-        
-        return "<a title='{$url}' href='{$url}'>{$short_url}</a>";      
-    }
-    
+
+        return "<a title='{$url}' href='{$url}'>{$short_url}</a>";
+    }
+
     /**
      *  Get column value of post attachments
@@ -107 +107 @@
      *  @since     1.0
      */
-    protected function get_column_value_attachments( $post_id ) 
+    protected function get_column_value_attachments( $post_id )
     {
         $result         = '';
@@ -119 +119 @@
         return $result;
     }
-    
+
     /**
      *  Get column value of post attachments
@@ -125 +125 @@
      *  @since     1.2.1
      */
-    protected function get_attachment_ids( $post_id ) 
+    protected function get_attachment_ids( $post_id )
     {
         return Codepress_Admin_Columns::get_attachment_ids( $post_id );
     }
-    
+
     /**
      * Get a thumbnail
@@ -135 +135 @@
      * @since     1.0
      */
-    protected function get_thumbnail( $image = '' ) 
-    {       
+    protected function get_thumbnail( $image = '' )
+    {
         if ( empty($image) )
             return false;
-        
+
         // get thumbnail image size
         $image_size = $this->thumbnail_size; // w, h
-        
+
         // incase the thumbnail dimension is set by name
         if ( !is_array($image_size) ) {
@@ -151 +151 @@
             }
         }
-        
+
         // fallback for image size incase the passed size name does not exists
         if ( !isset($image_size[0]) || !isset($image_size[1]) ) {
             $image_size = array(80, 80);
         }
-        
+
         // get correct image path
         $image_path = str_replace( WP_CONTENT_URL, WP_CONTENT_DIR, $image);
-        
-        // resize image     
+
+        // resize image
         if ( file_exists($image_path) && $this->is_image($image_path) ) {
             $resized = image_resize( $image_path, $image_size[0], $image_size[1], true);
-            
+
             // resize worked
             if ( ! is_wp_error( $resized ) ) {
                 $image  = str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $resized);
-                
+
                 return "<img src='{$image}' alt='' width='{$image_size[0]}' height='{$image_size[1]}' />";
             }
-            
+
             // resizing failed so let's return full image with maxed dimensions
             else {
-                return "<img src='{$image}' alt='' style='max-width:{$image_size[0]}px;max-height:{$image_size[1]}px' />";              
-            }           
-        }
-        
+                return "<img src='{$image}' alt='' style='max-width:{$image_size[0]}px;max-height:{$image_size[1]}px' />";
+            }
+        }
+
         return false;
     }
-    
+
     /**
      * Checks an URL for image extension
@@ -185 +185 @@
      * @since     1.2
      */
-    protected function is_image($url) 
+    protected function is_image($url)
     {
         $validExt   = array('.jpg', '.jpeg', '.gif', '.png', '.bmp');
         $ext        = strrchr($url, '.');
-        
+
         return in_array($ext, $validExt);
-    }   
-    
+    }
+
     /**
      * Get a thumbnail
@@ -198 +198 @@
      * @since     1.3.1
      */
-    protected function get_media_thumbnails($meta) 
+    protected function get_media_thumbnails($meta)
     {
         $meta = $this->strip_trim( str_replace(' ','', $meta) );
-        
+
         // split media ids
         $media_ids = array($meta);
-        if ( strpos($meta, ',') !== false )         
+        if ( strpos($meta, ',') !== false )
             $media_ids = explode(',', $meta);
-        
+
         // check if media exists
         $thumbs = '';
@@ -212 +212 @@
             if ( is_numeric($media_id) )
                 $thumbs .= wp_get_attachment_url($media_id) ? "<span class='cpac-column-value-image'>".wp_get_attachment_image( $media_id, array(80,80), true )."</span>" : '';
-        
-        return $thumbs;     
-    }   
-    
+
+        return $thumbs;
+    }
+
     /**
      *  Convert file size to readable format
@@ -226 +226 @@
         return $size ? round($size/pow(1024, ($i = floor(log($size, 1024)))), 2) . $filesizename[$i] : '0 Bytes';
     }
-    
+
     /**
      *  Get column value of Custom Field
      *
      *  @since     1.0
-     */ 
-    protected function get_column_value_custom_field($object_id, $column_name, $meta_type = 'post') 
+     */
+    protected function get_column_value_custom_field($object_id, $column_name, $meta_type = 'post')
     {
         /** Users */
-        if ( $meta_type == 'user' ) {
+        if ( 'user' == $meta_type ) {
             $type = 'wp-users';
         }
-        
+
         /** Media */
-        if ( $meta_type == 'media' ) {
+        elseif ( 'media' == $meta_type ) {
             $type = 'wp-media';
             $meta_type = 'post';
         }
-        
+
         /** Posts */
         else {
             $type   = get_post_type($object_id);
         }
-        
+
         // get column
         $columns    = $this->get_stored_columns($type);
-        
+
         // inputs
         $field      = isset($columns[$column_name]['field'])      ? $columns[$column_name]['field']         : '';
@@ -258 +258 @@
         $before     = isset($columns[$column_name]['before'])     ? $columns[$column_name]['before']        : '';
         $after      = isset($columns[$column_name]['after'])      ? $columns[$column_name]['after']         : '';
-        
+
         // rename hidden custom fields to their original name
         $field = substr($field,0,10) == "cpachidden" ? str_replace('cpachidden','',$field) : $field;
-        
+
         // Get meta field value
         $meta       = get_metadata($meta_type, $object_id, $field, true);
 
         // multiple meta values
-        if ( ( $fieldtype == 'array' && is_array($meta) ) || is_array($meta) ) {            
+        if ( ( $fieldtype == 'array' && is_array($meta) ) || is_array($meta) ) {
             $meta   = get_metadata($meta_type, $object_id, $field, true);
             $meta   = $this->recursive_implode(', ', $meta);
@@ -272 +272 @@
 
         // make sure there are no serialized arrays or null data
-        if ( !is_string($meta) )    
-            return false;
-        
+        if ( !is_string($meta) )
+            return false;
+
         // handles each field type differently..
-        switch ($fieldtype) :           
-        
+        switch ($fieldtype) :
+
             // Image
             case "image" :
                 $meta = $this->get_thumbnail($meta);
                 break;
-                
+
             // Media Library ID
             case "library_id" :
-                $meta = $this->get_media_thumbnails($meta);             
-                break;
-            
+                $meta = $this->get_media_thumbnails($meta);
+                break;
+
             // Excerpt
             case "excerpt" :
                 $meta = $this->get_shortened_string($meta, $this->excerpt_length);
                 break;
-            
+
             // Date
             case "date" :
                 $meta = $this->get_date($meta);
                 break;
-            
+
             // Post Title
             case "title_by_id" :
@@ -304 +304 @@
                     $meta = $titles;
                 break;
-            
+
             // User Name
             case "user_by_id" :
                 $names = $this->get_custom_field_value_user($meta);
                 if ( $names )
-                    $meta = $names;     
-                break;
-                
+                    $meta = $names;
+                break;
+
             // Checkmark
             case "checkmark" :
                 $checkmark = $this->get_asset_image('checkmark.png');
-                
+
                 if ( empty($meta) || 'false' === $meta || '0' === $meta ) {
                     $checkmark = '';
                 }
-                
-                $meta = $checkmark;             
-                break;
-            
+
+                $meta = $checkmark;
+                break;
+
             // Color
             case "color" :
@@ -329 +329 @@
                 }
                 break;
-            
-        endswitch;      
+
+        endswitch;
 
         // filter for customization
         $meta = apply_filters('cpac_get_column_value_custom_field', $meta, $fieldtype, $field, $type, $object_id );
-        
+
         // add before and after string
         if ( $meta ) {
             $meta = "{$before}{$meta}{$after}";
         }
-        
+
         return $meta;
     }
-    
+
     /**
      *  Get custom field value 'Title by ID'
@@ -348 +348 @@
      *  @since     1.3
      */
-    protected function get_custom_field_value_title($meta) 
+    protected function get_custom_field_value_title($meta)
     {
         //remove white spaces and strip tags
         $meta = $this->strip_trim( str_replace(' ','', $meta) );
-        
+
         // var
         $ids = $titles = array();
-        
+
         // check for multiple id's
         if ( strpos($meta, ',') !== false )
-            $ids = explode(',',$meta);          
+            $ids = explode(',',$meta);
         elseif ( is_numeric($meta) )
-            $ids[] = $meta;         
-        
+            $ids[] = $meta;
+
         // display title with link
         if ( $ids && is_array($ids) ) {
-            foreach ( $ids as $id ) {               
+            foreach ( $ids as $id ) {
                 $title = is_numeric($id) ? get_the_title($id) : '';
                 $link  = get_edit_post_link($id);
@@ -371 +371 @@
             }
         }
-        
+
         return implode('<span class="cpac-divider"></span>', $titles);
     }
-    
+
     /**
      *  Get custom field value 'User by ID'
@@ -380 +380 @@
      *  @since     1.4.6.3
      */
-    protected function get_custom_field_value_user($meta) 
+    protected function get_custom_field_value_user($meta)
     {
         //remove white spaces and strip tags
         $meta = $this->strip_trim( str_replace(' ','', $meta) );
-        
+
         // var
         $ids = $names = array();
-        
+
         // check for multiple id's
         if ( strpos($meta, ',') !== false )
             $ids = explode(',',$meta);
         elseif ( is_numeric($meta) )
-            $ids[] = $meta;         
-        
+            $ids[] = $meta;
+
         // display username
         if ( $ids && is_array($ids) ) {
@@ -399 +399 @@
                 if ( !is_numeric($id) )
                     continue;
-                
+
                 $userdata = get_userdata($id);
                 if ( is_object($userdata) && !empty( $userdata->display_name ) ) {
                     $names[] = $userdata->display_name;
-                }               
-            }
-        }
-        
+                }
+            }
+        }
+
         return implode('<span class="cpac-divider"></span>', $names);
     }
-    
+
     /**
      *  Get column value of Custom Field
@@ -415 +415 @@
      *  @since     1.2
      */
-    protected function get_user_column_value_custom_field($user_id, $id) 
-    {       
+    protected function get_user_column_value_custom_field($user_id, $id)
+    {
         $columns    = $this->get_stored_columns('wp-users');
-        
+
         // inputs
         $field      = isset($columns[$id]['field'])      ? $columns[$id]['field']       : '';
@@ -424 +424 @@
         $before     = isset($columns[$id]['before'])     ? $columns[$id]['before']      : '';
         $after      = isset($columns[$id]['after'])      ? $columns[$id]['after']       : '';
-        
+
         // Get meta field value
         $meta       = get_user_meta($user_id, $field, true);
-        
+
         // multiple meta values
-        if ( ( $fieldtype == 'array' && is_array($meta) ) || is_array($meta) ) {            
+        if ( ( $fieldtype == 'array' && is_array($meta) ) || is_array($meta) ) {
             $meta   = get_user_meta($user_id, $field);
             $meta   = $this->recursive_implode(', ', $meta);
         }
-        
+
         // make sure there are no serialized arrays or empty meta data
-        if ( empty($meta) || !is_string($meta) )    
-            return false;
-                    
+        if ( empty($meta) || !is_string($meta) )
+            return false;
+
         // handles each field type differently..
-        switch ($fieldtype) :           
-        
+        switch ($fieldtype) :
+
             // Image
-            case "image" :              
+            case "image" :
                 $meta = $this->get_thumbnail($meta);
                 break;
-                
+
             // Media Library ID
             case "library_id" :
                 $meta = $this->get_media_thumbnails($meta);
                 break;
-            
+
             // Excerpt
             case "excerpt" :
                 $meta = $this->get_shortened_string($meta, $this->excerpt_length);
                 break;
-                                
-        endswitch;      
-        
+
+        endswitch;
+
         // filter for customization
         $meta = apply_filters('cpac_get_user_column_value_custom_field', $meta, $fieldtype, $field );
-        
+
         // add before and after string
         $meta = "{$before}{$meta}{$after}";
-        
+
         return $meta;
     }
@@ -472 +472 @@
      *  @since     1.0
      */
-    protected function recursive_implode( $glue, $pieces ) 
+    protected function recursive_implode( $glue, $pieces )
     {
         foreach( $pieces as $r_pieces ) {
@@ -484 +484 @@
         if ( isset($retVal) && is_array($retVal) )
             return implode( $glue, $retVal );
-        
+
         return false;
     }
-    
+
     /**
      * Strip tags and trim
@@ -493 +493 @@
      * @since     1.3
      */
-    protected function strip_trim($string) 
+    protected function strip_trim($string)
     {
         return Codepress_Admin_Columns::strip_trim($string);
     }
-    
+
     /**
      * Get date
@@ -503 +503 @@
      * @since     1.3.1
      */
-    protected function get_date($date) 
+    protected function get_date( $date )
+    {
+        if ( empty( $date ) || in_array( $date, array( '0000-00-00 00:00:00', '0000-00-00', '00:00:00' ) ) )
+            return false;
+
+        return date_i18n( get_option('date_format'), strtotime($date) );
+    }
+
+    /**
+     * Get time
+     *
+     * @since     1.3.1
+     */
+    protected function get_time($date)
     {
         if ( ! $date )
             return false;
-            
-        return date_i18n( get_option('date_format'), strtotime($date) );
-    }
-    
-    /**
-     * Get time
-     *
-     * @since     1.3.1
-     */
-    protected function get_time($date) 
-    {
-        if ( ! $date )
-            return false;
-            
+
         if ( ! is_numeric($date) )
             $date = strtotime($date);
-        
+
         return date_i18n( get_option('time_format'), $date );
     }

codepress-admin-columns/trunk/classes/values/comments.php

@@ -8 +8 @@
  */
 class CPAC_Comments_Values extends CPAC_Values
-{   
+{
     /**
      * Constructor
@@ -17 +17 @@
     {
         parent::__construct();
-        
+
         add_action( 'manage_comments_custom_column', array( $this, 'manage_comments_column_value'), 10, 2 );
     }
-    
+
     /**
      * Manage custom column for Comments
@@ -29 +29 @@
     {
         $type = $column_name;
-        
+
         // comments object
         $comment = get_comment($comment_id);
-        
+
         // Check for custom fields, such as column-meta-[customfieldname]
         if ( $this->is_column_meta($type) )
             $type = 'column-comment-meta';
-        
-        // Hook 
+
+        // Hook
         do_action('cpac-manage-comments-column', $type, $column_name, $comment_id);
-        
+
         $result = '';
-        switch ($type) :            
-            
+        switch ($type) :
+
             // comment id
             case "column-comment_id" :
                 $result = $comment_id;
                 break;
-            
+
             // author
             case "column-author_author" :
                 $result = $comment->comment_author;
                 break;
-                
+
             // avatar
             case "column-author_avatar" :
-                $result = get_avatar( $comment, 80 );               
-                break;
-                
+                $result = get_avatar( $comment, 80 );
+                break;
+
             // url
-            case "column-author_url" :              
-                $result = $this->get_shorten_url($comment->comment_author_url);             
-                break;
-                
+            case "column-author_url" :
+                $result = $this->get_shorten_url($comment->comment_author_url);
+                break;
+
             // ip
             case "column-author_ip" :
                 $result = $comment->comment_author_IP;
                 break;
-                
+
             // email
             case "column-author_email" :
                 $result = $comment->comment_author_email;
                 break;
-                
+
             // parent
             case "column-reply_to" :
-                if ( $comment->comment_approved ) {             
+                if ( $comment->comment_approved ) {
                     $parent         = get_comment( $comment->comment_parent );
                     $parent_link    = esc_url( get_comment_link( $comment->comment_parent ) );
@@ -81 +81 @@
                     $result         = sprintf( '<a href="%1$s">%2$s</a>', $parent_link, $name );
                 }
-                break;  
-            
+                break;
+
             // approved
             case "column-approved" :
@@ -89 +89 @@
                     $result = $this->get_asset_image('checkmark.png');
                 break;
-            
+
             // date
             case "column-date" :
                 $comment_url = esc_url( get_comment_link( $comment_id ) );
-                $result      = sprintf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), 
+                $result      = sprintf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ),
                     $comment_url,
                     $this->get_date($comment->comment_date),
@@ -100 +100 @@
                 $result      = "<div class='submitted-on'>{$result}</div>";
                 break;
-            
+
             // date GMT
             case "column-date_gmt" :
                 $comment_url = esc_url( get_comment_link( $comment_id ) );
-                $result      = sprintf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), 
+                $result      = sprintf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ),
                     $comment_url,
                     $this->get_date($comment->comment_date_gmt),
@@ -111 +111 @@
                 $result      = "<div class='submitted-on'>{$result}</div>";
                 break;
-                
+
             // custom field
             case "column-comment-meta" :
-                $result = $this->get_column_value_custom_field($comment_id, $column_name, 'comment');       
-                break;
-                
+                $result = $this->get_column_value_custom_field($comment_id, $column_name, 'comment');
+                break;
+
             // agent
             case "column-agent" :
-                $result = $comment->comment_agent;      
-                break;  
-                
+                $result = $comment->comment_agent;
+                break;
+
             // excerpt
             case "column-excerpt" :
                 $comment    = get_comment($comment_id);
                 $result     = $this->get_shortened_string($comment->comment_content, $this->excerpt_length);
-                break;  
-            
+                break;
+
             // actions
             case "column-actions" :
                 $result = $this->get_column_value_actions($comment);
                 break;
-            
+
             // word count
             case "column-word-count" :
                 $result = str_word_count( $this->strip_trim( $comment->comment_content ) );
                 break;
-            
+
             default :
                 $result = '';
-            
+
         endswitch;
-        
+
         // Filter for customizing the result output
         apply_filters('cpac-comments-column-result', $result, $type, $column_name, $comment_id);
-        
+
         echo $result;
     }
-    
+
     /**
      *  Get column value of comments actions
@@ -156 +156 @@
      *  @since     1.4.2
      */
-    private function get_column_value_actions( $comment ) 
-    {   
+    private function get_column_value_actions( $comment )
+    {
         global $post, $comment_status;
-        
+
         // set uased vars
         $user_can           = current_user_can( 'edit_comment', $comment->comment_ID );
         $the_comment_status = wp_get_comment_status( $comment->comment_ID );
-        
+
         if ( $user_can ) {
             $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
@@ -178 +178 @@
             $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" );
         }
-        
+
         /** begin - copied from class-wp-comments-list-table */
         if ( $user_can ) {

codepress-admin-columns/trunk/classes/values/link.php

@@ -8 +8 @@
  */
 class CPAC_Link_Values extends CPAC_Values
-{   
+{
     /**
      * Constructor
@@ -17 +17 @@
     {
         parent::__construct();
-        
+
         add_action( 'manage_link_custom_column', array( $this, 'manage_link_column_value'), 10, 2 );
     }
-    
+
     /**
      * Manage custom column for Links
@@ -29 +29 @@
     {
         $type = $column_name;
-        
+
         // links object... called bookmark
         $bookmark = get_bookmark($link_id);
 
-        // Hook 
+        // Hook
         do_action('cpac-manage-link-column', $type, $column_name, $link_id);
-        
+
         $result = '';
-        switch ($type) :            
-            
+        switch ($type) :
+
             // link id
             case "column-link_id" :
                 $result = $link_id;
                 break;
-            
+
             // description
             case "column-description" :
                 $result = $bookmark->link_description;
                 break;
-            
+
             // target
             case "column-target" :
                 $result = $bookmark->link_target;
                 break;
-            
+
             // notes
             case "column-notes" :
                 $result = $this->get_shortened_string($bookmark->link_notes, $this->excerpt_length);
                 break;
-            
+
             // rss
             case "column-rss" :
                 $result     = $this->get_shorten_url($bookmark->link_rss);
                 break;
-                
+
             // image
             case "column-image" :
                 $result = $this->get_thumbnail($bookmark->link_image);
                 break;
-                
+
             // name length
-            case "column-length" :              
+            case "column-length" :
                 $result = strlen($bookmark->link_name);
                 break;
-                
+
             // owner
             case "column-owner" :
                 $result = $bookmark->link_owner;
-                
+
                 // add user link
-                $userdata = get_userdata( $bookmark->link_owner );              
+                $userdata = get_userdata( $bookmark->link_owner );
                 if (!empty($userdata->data)) {
                     $result = $userdata->data->user_nicename;
@@ -85 +85 @@
                 }
                 break;
-            
+
             // link actions
             case "column-actions" :
                 $result = $this->get_column_value_actions($bookmark);
                 break;
-            
+
             default :
                 $result = '';
-            
+
         endswitch;
-        
+
         // Filter for customizing the result output
         apply_filters('cpac-link-column-result', $result, $type, $column_name, $link_id);
-        
+
         echo $result;
     }
-    
+
     /**
      *  Get column value of link actions
@@ -109 +109 @@
      *  @since     1.4.2
      */
-    private function get_column_value_actions( $link ) 
+    private function get_column_value_actions( $link )
     {
         $actions = array();
-        
+
         $edit_link = get_edit_bookmark_link( $link );
-        
+
         $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
         $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ) . "' onclick=\"if ( confirm( '" . esc_js( sprintf( __( "You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ) . "' ) ) { return true;}return false;\">" . __( 'Delete' ) . "</a>";
-        
+
         return implode(' | ', $actions);
     }

codepress-admin-columns/trunk/classes/values/media.php

@@ -8 +8 @@
  */
 class CPAC_Media_Values extends CPAC_Values
-{   
+{
     /**
      * Constructor
@@ -17 +17 @@
     {
         parent::__construct();
-        
-        add_action( 'manage_media_custom_column', array( $this, 'manage_media_column_value'), 10, 2 );      
+
+        add_action( 'manage_media_custom_column', array( $this, 'manage_media_column_value'), 10, 2 );
     }
-    
+
     /**
      * Manage custom column for Media.
@@ -29 +29 @@
     {
         $type   = $column_name;
-        
+
         //$meta     = wp_get_attachment_metadata($media_id);
         $meta   = get_post_meta( $media_id, '_wp_attachment_metadata', true );
         $p      = get_post($media_id);
-        
+
         // Check for custom fields, such as column-meta-[customfieldname]
         if ( $this->is_column_meta($type) )
             $type = 'column-meta';
-        
-        // Hook 
+
+        // Hook
         do_action('cpac-manage-media-column', $type, $column_name, $media_id);
-        
+
         $result = '';
-        switch ($type) :            
-            
+        switch ($type) :
+
             // media id
             case "column-mediaid" :
                 $result = $media_id;
-                break;          
-            
+                break;
+
             // dimensions
             case "column-dimensions" :
@@ -54 +54 @@
                     $result = "{$meta['width']} x {$meta['height']}";
                 break;
-            
+
             // width
             case "column-width" :
                 $result = !empty($meta['width']) ? $meta['width'] : '';
                 break;
-            
+
             // height
             case "column-height" :
                 $result = !empty($meta['height']) ? $meta['height'] : '';
                 break;
-            
+
             // description
             case "column-description" :
                 $result = $p->post_content;
                 break;
-                
+
             // caption
             case "column-caption" :
                 $result = $p->post_excerpt;
                 break;
-                
+
             // alternate text
             case "column-alternate_text" :
@@ -80 +80 @@
                 $result = $this->strip_trim($alt);
                 break;
-                
+
             // mime type
-            case "column-mime_type" :               
+            case "column-mime_type" :
                 $result = $p->post_mime_type;
                 break;
-            
+
             // file name
             case "column-file_name" :
@@ -92 +92 @@
                 $result     = "<a title='{$filename}' href='{$file}'>{$filename}</a>";
                 break;
-                
+
             // file paths
             case "column-file_paths" :
                 $sizes      = get_intermediate_image_sizes();
                 $url        = wp_get_attachment_url($p->ID);
-                $filename   = basename($url);               
+                $filename   = basename($url);
                 $paths[]    = "<a title='{$filename}' href='{$url}'>" . __('original', CPAC_TEXTDOMAIN) . "</a>";
                 if ( $sizes ) {
                     foreach ( $sizes as $size ) {
-                        $src    = wp_get_attachment_image_src( $media_id, $size );                      
+                        $src    = wp_get_attachment_image_src( $media_id, $size );
                         if (!empty($src[0])) {
                             $filename = basename($src[0]);
@@ -107 +107 @@
                         }
                     }
-                }               
+                }
                 $result = implode('<span class="cpac-divider"></span>', $paths);
                 break;
-            
+
             case "column-actions" :
                 $result = $this->get_column_value_actions($media_id);
                 break;
-                
+
             case "column-filesize" :
                 $file   = wp_get_attachment_url($p->ID);
@@ -122 +122 @@
                 }
                 break;
-            
+
             // Custom Field
             case "column-meta" :
-                $result = $this->get_column_value_custom_field($media_id, $column_name, 'media');       
-                break;
-            
-            // Image metadata EXIF or IPTC data         
+                $result = $this->get_column_value_custom_field($media_id, $column_name, 'media');
+                break;
+
+            // Image metadata EXIF or IPTC data
             case "column-image-aperture" :
-                $result = !empty( $meta['image_meta']['aperture'] ) ? $meta['image_meta']['aperture'] : '';             
-                break;
-                
+                $result = !empty( $meta['image_meta']['aperture'] ) ? $meta['image_meta']['aperture'] : '';
+                break;
+
             case "column-image-credit" :
-                $result = !empty( $meta['image_meta']['credit'] ) ? $meta['image_meta']['credit'] : '';             
-                break;
-                
+                $result = !empty( $meta['image_meta']['credit'] ) ? $meta['image_meta']['credit'] : '';
+                break;
+
             case "column-image-camera" :
-                $result = !empty( $meta['image_meta']['camera'] ) ? $meta['image_meta']['camera'] : '';             
-                break;
-            
+                $result = !empty( $meta['image_meta']['camera'] ) ? $meta['image_meta']['camera'] : '';
+                break;
+
             case "column-image-caption" :
-                $result = !empty( $meta['image_meta']['caption'] ) ? $meta['image_meta']['caption'] : '';               
-                break;
-            
+                $result = !empty( $meta['image_meta']['caption'] ) ? $meta['image_meta']['caption'] : '';
+                break;
+
             case "column-image-created_timestamp" :
                 if ( !empty( $meta['image_meta']['created_timestamp'] ) ) {
                     $result = date_i18n( get_option('date_format') . ' ' . get_option('time_format') , strtotime($meta['image_meta']['created_timestamp']) );
-                }       
-                break;
-                
+                }
+                break;
+
             case "column-image-copyright" :
-                $result = !empty( $meta['image_meta']['copyright'] ) ? $meta['image_meta']['copyright'] : '';               
-                break;
-                
+                $result = !empty( $meta['image_meta']['copyright'] ) ? $meta['image_meta']['copyright'] : '';
+                break;
+
             case "column-image-focal_length" :
-                $result = !empty( $meta['image_meta']['focal_length'] ) ? $meta['image_meta']['focal_length'] : '';             
-                break;
-            
+                $result = !empty( $meta['image_meta']['focal_length'] ) ? $meta['image_meta']['focal_length'] : '';
+                break;
+
             case "column-image-iso" :
-                $result = !empty( $meta['image_meta']['iso'] ) ? $meta['image_meta']['iso'] : '';               
-                break;
-            
+                $result = !empty( $meta['image_meta']['iso'] ) ? $meta['image_meta']['iso'] : '';
+                break;
+
             case "column-image-shutter_speed" :
-                $result = !empty( $meta['image_meta']['shutter_speed'] ) ? $meta['image_meta']['shutter_speed'] : '';               
-                break;
-            
+                $result = !empty( $meta['image_meta']['shutter_speed'] ) ? $meta['image_meta']['shutter_speed'] : '';
+                break;
+
             case "column-image-title" :
-                $result = !empty( $meta['image_meta']['title'] ) ? $meta['image_meta']['title'] : '';               
-                break;
-                
+                $result = !empty( $meta['image_meta']['title'] ) ? $meta['image_meta']['title'] : '';
+                break;
+
             default :
                 $result = '';
-            
+
         endswitch;
-        
+
         // Filter for customizing the result output
         apply_filters('cpac-media-column-result', $result, $type, $column_name, $media_id);
-        
+
         echo $result;
     }
-    
+
     /**
      *  Get column value of media actions
@@ -189 +189 @@
      *  @since     1.4.2
      */
-    private function get_column_value_actions( $id ) 
-    {   
+    private function get_column_value_actions( $id )
+    {
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-list-table.php') )
             require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-media-list-table.php') )
             require_once(ABSPATH . 'wp-admin/includes/class-wp-media-list-table.php');
-        
+
         // we need class to get the object actions
         $m = new WP_Media_List_Table;
-        
+
         // prevent php notice
         $m->is_trash = isset( $_REQUEST['status'] ) && 'trash' == $_REQUEST['status'];
-        
+
         // get media actions
         $media      = get_post($id);
         $actions    = $m->_get_row_actions( $media, _draft_or_post_title($id) );
-        
+
         return implode(' | ', $actions);
     }

codepress-admin-columns/trunk/classes/values/posts.php

@@ -8 +8 @@
  */
 class CPAC_Posts_Values extends CPAC_Values
-{   
+{
     /**
      * Constructor
@@ -15 +15 @@
      */
     function __construct()
-    {       
+    {
         parent::__construct();
-        
-        add_action( 'manage_pages_custom_column', array( $this, 'manage_posts_column_value'), 10, 2 );  
+
+        add_action( 'manage_pages_custom_column', array( $this, 'manage_posts_column_value'), 10, 2 );
         add_action( 'manage_posts_custom_column', array( $this, 'manage_posts_column_value'), 10, 2 );
     }
-    
+
     /**
      * Manage custom column for Post Types.
@@ -27 +27 @@
      * @since     1.0
      */
-    public function manage_posts_column_value($column_name, $post_id) 
+    public function manage_posts_column_value($column_name, $post_id)
     {
         $type = $column_name;
 
-        // Check for taxonomies, such as column-taxonomy-[taxname]  
+        // Check for taxonomies, such as column-taxonomy-[taxname]
         if ( strpos($type, 'column-taxonomy-') !== false )
             $type = 'column-taxonomy';
-        
+
         // Check for custom fields, such as column-meta-[customfieldname]
         if ( $this->is_column_meta($type) )
             $type = 'column-post-meta';
-        
-        // Hook 
+
+        // Hook
         do_action('cpac-manage-posts-column', $type, $column_name, $post_id);
-    
+
         // Switch Types
         $result = '';
-        switch ($type) :            
-            
+        switch ($type) :
+
             // Post ID
             case "column-postid" :
                 $result = $post_id;
                 break;
-            
+
             // Excerpt
             case "column-excerpt" :
                 $result = $this->get_post_excerpt($post_id);
                 break;
-            
+
             // Featured Image
             case "column-featured_image" :
@@ -61 +61 @@
                     $result = get_the_post_thumbnail($post_id, $this->thumbnail_size);
                 break;
-                
+
             // Sticky Post
             case "column-sticky" :
-                if ( is_sticky($post_id) )                  
+                if ( is_sticky($post_id) )
                     $result = $this->get_asset_image('checkmark.png');
                 break;
-            
+
             // Order
             case "column-order" :
-                $result = get_post_field('menu_order', $post_id);           
-                break;
-                
+                $result = get_post_field('menu_order', $post_id);
+                break;
+
             // Post Formats
             case "column-post_formats" :
-                $result = get_post_format($post_id);            
-                break;
-            
+                $result = get_post_format($post_id);
+                break;
+
             // Page template
             case "column-page-template" :
                 // file name
-                $page_template  = get_post_meta($post_id, '_wp_page_template', true);           
+                $page_template  = get_post_meta($post_id, '_wp_page_template', true);
 
                 // get template nice name
-                $result = array_search($page_template, get_page_templates());           
-                break;
-            
+                $result = array_search($page_template, get_page_templates());
+                break;
+
             // Slug
             case "column-page-slug" :
                 $result = get_post($post_id)->post_name;
                 break;
-            
+
             // Slug
             case "column-word-count" :
                 $result = str_word_count( $this->strip_trim( get_post($post_id)->post_content ) );
                 break;
-            
+
             // Taxonomy
             case "column-taxonomy" :
@@ -102 +102 @@
                 $tags   = get_the_terms($post_id, $tax);
                 $tarr   = array();
-                
+
                 // for post formats we will display standard instead of empty
                 if ( $tax == 'post_format' && empty($tags) ) {
                     $result = __('Standard');
                 }
-                
+
                 // add name with link
-                elseif ( !empty($tags) ) {  
+                elseif ( !empty($tags) ) {
                     $post_type = get_post_type($post_id);
                     foreach($tags as $tag) {
@@ -119 +119 @@
                     }
                     $result = implode(', ', $tarr);
-                }           
-                break;
-            
+                }
+                break;
+
             // Custom Field
             case "column-post-meta" :
-                $result = $this->get_column_value_custom_field($post_id, $column_name, 'post');     
-                break;
-            
+                $result = $this->get_column_value_custom_field($post_id, $column_name, 'post');
+                break;
+
             // Attachment
             case "column-attachment" :
                 $result = $this->get_column_value_attachments($post_id);
                 break;
-                
+
             // Attachment count
             case "column-attachment-count" :
                 $result = count($this->get_attachment_ids($post_id));
                 break;
-                
+
             // Roles
             case "column-roles" :
@@ -144 +144 @@
                     $result = implode(', ',$userdata->roles);
                 break;
-            
+
             // Post status
             case "column-status" :
@@ -152 +152 @@
                     $result = $result . " <p class='description'>" . date_i18n( get_option('date_format') . ' ' . get_option('time_format') , strtotime($p->post_date) ) . "</p>";
                 break;
-                
+
             // Post comment status
             case "column-comment-status" :
@@ -160 +160 @@
                     $result = $this->get_asset_image('checkmark.png', $p->comment_status);
                 break;
-                
+
             // Post ping status
             case "column-ping-status" :
@@ -168 +168 @@
                     $result = $this->get_asset_image('checkmark.png', $p->ping_status);
                 break;
-            
+
             // Post actions ( delete, edit etc. )
             case "column-actions" :
                 $result = $this->get_column_value_actions($post_id);
                 break;
-            
+
             // Post Last modified
             case "column-modified" :
@@ -179 +179 @@
                 $result = $this->get_date($p->post_modified) . ' ' . $this->get_time($p->post_modified);
                 break;
-                
+
             // Post Comment count
             case "column-comment-count" :
-                $result = WP_List_Table::comments_bubble( $post_id, get_pending_comments_num( $post_id ) );                 
-                $result .= $this->get_comment_count_details( $post_id );                
-                break;          
-            
+                $result = WP_List_Table::comments_bubble( $post_id, get_pending_comments_num( $post_id ) );
+                $result .= $this->get_comment_count_details( $post_id );
+                break;
+
             // Author Name
             case "column-author-name" :
-                $result = $this->get_column_value_authorname($post_id, $column_name);                   
-                break;
-            
+                $result = $this->get_column_value_authorname($post_id, $column_name);
+                break;
+
             // Before More Tag
             case "column-before-moretag" :
                 $p          = get_post($post_id);
                 $extended   = get_extended($p->post_content);
-                
+
                 if ( !empty($extended['extended']) ) {
                     $result = $this->get_shortened_string($extended['main'], $this->excerpt_length );
                 }
                 break;
-            
+
             default :
                 $result = '';
-                        
+
         endswitch;
-        
+
         // Filter for customizing the result output
         apply_filters('cpac-posts-column-result', $result, $type, $column_name, $post_id);
-        
-        echo $result;   
-    }
-    
+
+        echo $result;
+    }
+
     /**
      * Returns the friendly name for a given status
@@ -217 +217 @@
      * @since     1.4.4
      */
-    private function get_post_status_friendly_name( $status ) 
+    private function get_post_status_friendly_name( $status )
     {
         $builtin = array(
@@ -227 +227 @@
             'trash'     => __( 'Trash', CPAC_TEXTDOMAIN )
         );
-        
+
         if ( isset($builtin[$status]) )
             $status = $builtin[$status];
-        
-        return $status;         
-    }
-    
+
+        return $status;
+    }
+
     /**
      * Comment count extended
@@ -260 +260 @@
             $details .= "<a href='{$url}' class='cp-trash' title='".__('trash', CPAC_TEXTDOMAIN) . "'>{$c->trash}</a>";
         }
-        
-        if ( $details ) 
+
+        if ( $details )
             return "<p class='description row-actions'>{$details}</p>";
-        
+
         return false;
     }
-    
+
     /**
      *  Get column value of post actions
@@ -274 +274 @@
      *  @since     1.4.2
      */
-    protected function get_column_value_actions( $post_id ) 
-    {   
+    protected function get_column_value_actions( $post_id )
+    {
         $actions = array();
-        
+
         $post               = get_post($post_id);
         $title              = _draft_or_post_title();
         $post_type_object   = get_post_type_object( $post->post_type );
         $can_edit_post      = current_user_can( $post_type_object->cap->edit_post, $post->ID );
-        
+
         if ( $can_edit_post && 'trash' != $post->post_status ) {
             $actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ) ) . '">' . __( 'Edit' ) . '</a>';
@@ -302 +302 @@
                 $actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
             }
-        }   
-        
+        }
+
         return implode(' | ', $actions);
     }
-    
+
     /**
      *  Get column value of Custom Field
      *
      *  @since     1.4.6.1
-     */ 
-    protected function get_column_value_authorname($post_id, $column_name) 
-    {       
+     */
+    protected function get_column_value_authorname($post_id, $column_name)
+    {
         $type = get_post_type($post_id);
-        
+
         // get column
         $columns    = $this->get_stored_columns($type);
-        
+
         // get the type of author name
         $display_as = isset($columns[$column_name]['display_as']) ? $columns[$column_name]['display_as'] : '';
-        
+
         // get the author
         $post = get_post($post_id);
         if ( !isset( $post->post_author) )
             return false;
-        
+
         $name = Codepress_Admin_Columns::get_author_field_by_nametype($display_as, $post->post_author);
-        
+
         // filter for customization
         $name = apply_filters('cpac_get_column_value_authorname', $name, $column_name, $post_id );
-        
+
         // add link filter
         $class  = isset( $_GET['author'] ) && $_GET['author'] == $userdata->ID ? ' class="current"' : '';
-        
+
         $name = "<a href='edit.php?post_type={$type}&author={$post->post_author}'{$class}>{$name}</a>";
-        
+
         return $name;
     }

codepress-admin-columns/trunk/classes/values/users.php

@@ -8 +8 @@
  */
 class CPAC_Users_Values extends CPAC_Values
-{   
+{
     /**
      * Constructor
@@ -17 +17 @@
     {
         parent::__construct();
-        
+
         add_filter( 'manage_users_custom_column', array( $this, 'manage_users_column_value'), 10, 3 );
     }
-    
+
     /**
      * Manage custom column for Users.
@@ -29 +29 @@
     {
         $type = $column_name;
-        
+
         $userdata = get_userdata( $user_id );
 
         if ( ! $userdata )
             return false;
-        
+
         // Check for user custom fields: column-meta-[customfieldname]
         if ( $this->is_column_meta($type) )
             $type = 'column-user-meta';
-            
+
         // Check for post count: column-user_postcount-[posttype]
         if ( Codepress_Admin_Columns::get_posttype_by_postcount_column($type) )
             $type = 'column-user_postcount';
-        
-        // Hook 
+
+        // Hook
         do_action('cpac-manage-users-column', $type, $column_name, $user_id);
-        
+
         $result = '';
-        switch ($type) :            
-            
+        switch ($type) :
+
             // user id
             case "column-user_id" :
                 $result = $user_id;
                 break;
-            
+
             // first name
             case "column-nickname" :
                 $result = $userdata->nickname;
                 break;
-            
+
             // first name
             case "column-first_name" :
                 $result = $userdata->first_name;
                 break;
-                
+
             // last name
             case "column-last_name" :
                 $result = $userdata->last_name;
                 break;
-            
+
             // user url
             case "column-user_url" :
                 $result = $userdata->user_url;
                 break;
-                
+
             // user registration date
             case "column-user_registered" :
                 $result = $userdata->user_registered;
                 break;
-                
+
             // user description
             case "column-user_description" :
                 $result = $this->get_shortened_string( get_the_author_meta('user_description', $user_id), $this->excerpt_length );
                 break;
-                
+
             // user description
             case "column-user_postcount" :
                 $post_type  = Codepress_Admin_Columns::get_posttype_by_postcount_column($column_name);
-                
+
                 // get post count
                 $count      = Codepress_Admin_Columns::get_post_count( $post_type, $user_id );
-                
+
                 // set result
                 $result     = $count > 0 ? "<a href='edit.php?post_type={$post_type}&author={$user_id}'>{$count}</a>" : (string) $count;
-                break; 
-            
+                break;
+
             // user actions
             case "column-actions" :
                 $result = $this->get_column_value_actions($user_id, 'users');
                 break;
-            
+
             // user meta data ( custom field )
             case "column-user-meta" :
                 $result = $this->get_column_value_custom_field($user_id, $column_name, 'user');
                 break;
-            
+
             default :
                 $result = $value;
-                
+
         endswitch;
-        
+
         // Filter for customizing the result output
         apply_filters('cpac-users-column-result', $result, $type, $column_name, $user_id);
-        
+
         return $result;
     }
-    
+
     /**
      *  Get column value of user actions
@@ -123 +123 @@
      *  @since     1.4.2
      */
-    private function get_column_value_actions( $id ) 
-    {   
+    private function get_column_value_actions( $id )
+    {
         $actions = array();
-                
+
         $user_object = new WP_User( $id );
         $screen      = get_current_screen();
-        
+
         if ( 'site-users-network' == $screen->id )
             $url = "site-users.php?id={$this->site_id}&amp;";
         else
             $url = 'users.php?';
-        
+
         if ( get_current_user_id() == $user_object->ID ) {
             $edit_link = 'profile.php';
@@ -140 +140 @@
             $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), "user-edit.php?user_id=$user_object->ID" ) );
         }
-        
+
         if ( current_user_can( 'edit_user',  $user_object->ID ) ) {
             $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
@@ -152 +152 @@
         if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
             $actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
-            
+
         return implode(' | ', $actions);
     }

codepress-admin-columns/trunk/codepress-admin-columns.php

@@ -3 +3 @@
 
 Plugin Name:        Codepress Admin Columns
-Version:            1.4.8
+Version:            1.4.9
 Description:        Customise columns on the administration screens for post(types), pages, media, comments, links and users with an easy to use drag-and-drop interface.
 Author:             Codepress
@@ -28 +28 @@
 */
 
-define( 'CPAC_VERSION',     '1.4.8' );
+define( 'CPAC_VERSION',     '1.4.9' );
 define( 'CPAC_TEXTDOMAIN',  'codepress-admin-columns' );
 define( 'CPAC_SLUG',        'codepress-admin-columns' );
@@ -42 +42 @@
  * @since     1.3
  */
-require_once dirname( __FILE__ ) . '/classes/utility.php';
 require_once dirname( __FILE__ ) . '/classes/sortable.php';
-require_once dirname( __FILE__ ) . '/classes/values.php';       
+require_once dirname( __FILE__ ) . '/classes/values.php';
 require_once dirname( __FILE__ ) . '/classes/values/posts.php';
 require_once dirname( __FILE__ ) . '/classes/values/users.php';
@@ -51 +50 @@
 require_once dirname( __FILE__ ) . '/classes/values/comments.php';
 require_once dirname( __FILE__ ) . '/classes/license.php';
+require_once dirname( __FILE__ ) . '/classes/third_party.php';
 
 /**
@@ -58 +58 @@
  *
  */
-class Codepress_Admin_Columns 
-{   
+class Codepress_Admin_Columns
+{
     private $post_types,
             $codepress_url,
@@ -65 +65 @@
             $admin_page,
             $use_hidden_custom_fields;
-    
+
     /**
      * Constructor
@@ -72 +72 @@
      */
     function __construct()
-    {       
+    {
         // wp is loaded
         add_action( 'wp_loaded', array( $this, 'init') );
     }
-    
+
     /**
      * Initialize plugin.
@@ -91 +91 @@
         // set
         $this->codepress_url    = 'http://www.codepress.nl/plugins/codepress-admin-columns';
-        $this->plugins_url      = 'http://wordpress.org/extend/plugins/codepress-admin-columns/';           
-        $this->wordpress_url    = 'http://wordpress.org/tags/codepress-admin-columns';              
-        
+        $this->plugins_url      = 'http://wordpress.org/extend/plugins/codepress-admin-columns/';
+        $this->wordpress_url    = 'http://wordpress.org/tags/codepress-admin-columns';
+
         // enable the use of custom hidden fields
         $this->use_hidden_custom_fields = apply_filters('cpac_use_hidden_custom_fields', false);
-        
+
         // translations
         load_plugin_textdomain( CPAC_TEXTDOMAIN, false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
-        
+
         // register settings
-        add_action( 'admin_menu', array( $this, 'settings_menu') );     
+        add_action( 'admin_menu', array( $this, 'settings_menu') );
         add_action( 'admin_init', array( $this, 'register_settings') );
 
@@ -108 +108 @@
         add_filter( 'admin_body_class', array( $this, 'admin_class' ) );
         add_action( 'admin_head', array( $this, 'admin_css') );
-        
+
         // register columns
         add_action( 'admin_init', array( $this, 'register_columns_headings' ) );
-        add_action( 'admin_init', array( $this, 'register_columns_values' ) );  
-        
+        add_action( 'admin_init', array( $this, 'register_columns_values' ) );
+
         // action ajax
         add_action( 'wp_ajax_cpac_addon_activation', array( $this, 'ajax_activation'));
-        
+
         // handle requests gets a low priority so it will trigger when all other plugins have loaded their columns
-        add_action( 'admin_init', array( $this, 'handle_requests' ), 1000 );        
-        
+        add_action( 'admin_init', array( $this, 'handle_requests' ), 1000 );
+
         // filters
-        add_filter( 'plugin_action_links',  array( $this, 'add_settings_link'), 1, 2);      
-    }   
+        add_filter( 'plugin_action_links',  array( $this, 'add_settings_link'), 1, 2);
+    }
 
     /**
@@ -130 +130 @@
      * @since     1.0
      */
-    public function settings_menu() 
+    public function settings_menu()
     {
         $page = add_options_page(
             // Page title
-            esc_html__( 'Admin Columns Settings', CPAC_TEXTDOMAIN ), 
+            esc_html__( 'Admin Columns Settings', CPAC_TEXTDOMAIN ),
             // Menu Title
-            esc_html__( 'Admin Columns', CPAC_TEXTDOMAIN ), 
+            esc_html__( 'Admin Columns', CPAC_TEXTDOMAIN ),
             // Capability
             'manage_options',
@@ -143 +143 @@
             // Callback
             array( $this, 'plugin_settings_page')
-        );      
+        );
 
         // set admin page
         $this->admin_page = $page;
-        
+
         // settings page specific styles and scripts
         add_action( "admin_print_styles-$page", array( $this, 'admin_styles') );
         add_action( "admin_print_scripts-$page", array( $this, 'admin_scripts') );
-        
+
         // add help tabs
         add_action("load-$page", array( $this, 'help_tabs'));
     }
-    
+
     /**
      * Add Settings link to plugin page
@@ -164 +164 @@
      * @return  string - link to settings page
      */
-    function add_settings_link( $links, $file ) 
+    function add_settings_link( $links, $file )
     {
         if ( $file != plugin_basename( __FILE__ ))
@@ -171 +171 @@
         array_unshift($links, '<a href="' . admin_url("admin.php") . '?page=' . CPAC_SLUG . '">' . __( 'Settings' ) . '</a>');
         return $links;
-    }   
-        
-    /**
-     *  Register Column Values  
+    }
+
+    /**
+     *  Register Column Values
      *
      *  initializes each Class per type
@@ -196 +196 @@
      */
     public function register_columns_headings()
-    {   
-        /** Posts */        
+    {
+        /** Posts */
         foreach ( $this->post_types as $post_type ) {
 
             // register column per post type
             add_filter("manage_edit-{$post_type}_columns", array($this, 'callback_add_posts_column_headings'));
-        } 
-        
+        }
+
         /** Users */
-        add_filter( "manage_users_columns", array($this, 'callback_add_users_column_headings'), 9); 
+        add_filter( "manage_users_columns", array($this, 'callback_add_users_column_headings'), 9);
         // give higher priority, so it will load just before other plugins to prevent conflicts
-        
+
         /** Media */
         add_filter( "manage_upload_columns", array($this, 'callback_add_media_column_headings'));
-        
+
         /** Links */
         add_filter( "manage_link-manager_columns", array($this, 'callback_add_links_column_headings'));
-        
+
         /** Comments */
         add_filter( "manage_edit-comments_columns", array($this, 'callback_add_comments_column_headings'));
     }
-    
+
     /**
      *  Callback add Posts Column
@@ -223 +223 @@
      *  @since     1.0
      */
-    public function callback_add_posts_column_headings($columns) 
-    {
-        return $this->add_columns_headings( get_post_type(), $columns);     
-    }
-    
+    public function callback_add_posts_column_headings($columns)
+    {
+        return $this->add_columns_headings( get_post_type(), $columns);
+    }
+
     /**
      *  Callback add Users column
@@ -233 +233 @@
      *  @since     1.1
      */
-    public function callback_add_users_column_headings($columns) 
+    public function callback_add_users_column_headings($columns)
     {
         return $this->add_columns_headings('wp-users', $columns);
     }
-    
+
     /**
      *  Callback add Media column
@@ -243 +243 @@
      *  @since     1.3
      */
-    public function callback_add_media_column_headings($columns) 
+    public function callback_add_media_column_headings($columns)
     {
         return $this->add_columns_headings('wp-media', $columns);
     }
-    
+
     /**
      *  Callback add Links column
@@ -253 +253 @@
      *  @since     1.3.1
      */
-    public function callback_add_links_column_headings($columns) 
+    public function callback_add_links_column_headings($columns)
     {
         return $this->add_columns_headings('wp-links', $columns);
     }
-    
+
     /**
      *  Callback add Comments column
@@ -263 +263 @@
      *  @since     1.3.1
      */
-    public function callback_add_comments_column_headings($columns) 
+    public function callback_add_comments_column_headings($columns)
     {
         return $this->add_columns_headings('wp-comments', $columns);
     }
-    
-    
-    
+
+
+
     /**
      *  Add managed columns by Type
@@ -275 +275 @@
      *  @since 1.4.6.5
      */
-    private function get_comment_icon() 
+    private function get_comment_icon()
     {
         return "<span class='vers'><img src='" . trailingslashit( get_admin_url() ) . 'images/comment-grey-bubble.png' . "' alt='Comments'></span>";
     }
-    
+
     /**
      *  Add managed columns by Type
@@ -285 +285 @@
      *  @since     1.1
      */
-    protected function add_columns_headings( $type, $columns ) 
+    protected function add_columns_headings( $type, $columns )
     {
         // only get stored columns.. the rest we don't need
@@ -292 +292 @@
         if ( !$db_columns )
             return $columns;
-        
+
         // filter already loaded columns by plugins
         $set_columns = $this->filter_preset_columns( $type, $columns );
 
         // loop through columns
-        foreach ( $db_columns as $id => $values ) {         
+        foreach ( $db_columns as $id => $values ) {
             // is active
-            if ( isset($values['state']) && $values['state'] == 'on' ){             
-                
+            if ( isset($values['state']) && $values['state'] == 'on' ){
+
                 $label = $values['label'];
-                
+
                 // exception for comments
                 if( 'comments' == $id ) {
                     $label = $this->get_comment_icon();
                 }
-                
+
                 // register format
                 $set_columns[$id] = $label;
             }
         }
-        
+
         return $set_columns;
     }
-    
+
     /**
      * Filter preset columns. These columns apply either for every post or set by a plugin.
@@ -321 +321 @@
      * @since     1.0
      */
-    private function filter_preset_columns( $type, $columns ) 
+    private function filter_preset_columns( $type, $columns )
     {
         $options    = get_option('cpac_options_default');
-        
+
         if ( !$options )
             return $columns;
-        
+
         // we use the wp default columns for filtering...
         $stored_wp_default_columns  = $options[$type];
@@ -333 +333 @@
         // ... the ones that are set by plugins, theme functions and such.
         $dif_columns    = array_diff(array_keys($columns), array_keys($stored_wp_default_columns));
-            
+
         // we add those to the columns
         $pre_columns = array();
@@ -341 +341 @@
             }
         }
-        
+
         return $pre_columns;
     }
-    
+
     /**
      * Get a list of Column options per post type
@@ -350 +350 @@
      * @since     1.0
      */
-    private function get_column_boxes($type) 
-    {   
+    private function get_column_boxes($type)
+    {
         // merge all columns
         $display_columns    = $this->get_merged_columns($type);
-        
+
         // define
-        $list = ''; 
-        
+        $list = '';
+
         // loop throught the active columns
         if ( $display_columns ) {
-            foreach ( $display_columns as $id => $values ) {        
-                
+            foreach ( $display_columns as $id => $values ) {
+
                 $classes = array();
 
                 // set state
                 $state  = isset($values['state']) ? $values['state'] : '';
-                
+
                 // class
                 $classes[] = "cpac-box-{$id}";
@@ -376 +376 @@
                 }
                 $class = implode(' ', $classes);
-                    
-                // more box options 
+
+                // more box options
                 $more_options   = $this->get_additional_box_options($type, $id, $values);
                 $action         = "<a class='cpac-action' href='#open'>open</a>";
-                        
+
                 // type label
                 $type_label = isset($values['options']['type_label']) ? $values['options']['type_label'] : '';
-                
+
                 // label
                 $label = isset($values['label']) ? str_replace("'", '"', $values['label']) : '';
-                
+
                 // main label
-                $main_label = $values['label']; 
-                
+                $main_label = $values['label'];
+
                 // main label exception for comments
                 if ( 'comments' == $id ) {
                     $main_label = $this->get_comment_icon();
                 }
-                
+
                 // width
                 $width          = isset($values['width']) ? $values['width'] : 0;
                 $width_descr    = isset($values['width']) && $values['width'] > 0 ? $values['width'] . '%' : __('default', CPAC_TEXTDOMAIN);
-                
+
                 // hide box options
                 $label_hidden = '';
@@ -404 +404 @@
                     $label_hidden = ' style="display:none"';
                 }
-                
+
                 $list .= "
                     <li class='{$class}'>
                         <div class='cpac-sort-handle'></div>
-                        <div class='cpac-type-options'>                 
+                        <div class='cpac-type-options'>
                             <div class='cpac-checkbox'></div>
                             <input type='hidden' class='cpac-state' name='cpac_options[columns][{$type}][{$id}][state]' value='{$state}'/>
@@ -417 +417 @@
                             <span>{$type_label}</span>
                         </div>
-                        <div class='cpac-type-inside'>              
+                        <div class='cpac-type-inside'>
                             <label for='cpac_options-{$type}-{$id}-label'{$label_hidden}>Label: </label>
                             <input type='text' name='cpac_options[columns][{$type}][{$id}][label]' id='cpac_options-{$type}-{$id}-label' value='{$label}' class='text'{$label_hidden}/>
-                            <label for='cpac_options-{$type}-{$id}-width'>" . __('Width', CPAC_TEXTDOMAIN) . ":</label>         
+                            <label for='cpac_options-{$type}-{$id}-width'>" . __('Width', CPAC_TEXTDOMAIN) . ":</label>
                             <input type='hidden' maxlength='4' class='input-width' name='cpac_options[columns][{$type}][{$id}][width]' id='cpac_options-{$type}-{$id}-width' value='{$width}' />
                             <div class='description width-decription' title='" . __('default', CPAC_TEXTDOMAIN) . "'>{$width_descr}</div>
@@ -428 +428 @@
                         </div>
                     </li>
-                ";          
+                ";
             }
         }
-        
+
         // custom field button
         $button_add_column = '';
         if ( $this->get_meta_by_type($type) )
             $button_add_column = "<a href='javacript:;' class='cpac-add-customfield-column button'>+ " . __('Add Custom Field Column', CPAC_TEXTDOMAIN) . "</a>";
-        
+
         return "
             <div class='cpac-box'>
                 <ul class='cpac-option-list'>
-                    {$list}         
+                    {$list}
                 </ul>
                 {$button_add_column}
-                <div class='cpac-reorder-msg'>" . __('drag and drop to reorder', CPAC_TEXTDOMAIN) . "</div>     
+                <div class='cpac-reorder-msg'>" . __('drag and drop to reorder', CPAC_TEXTDOMAIN) . "</div>
             </div>
             ";
@@ -453 +453 @@
      * @since     1.0
      */
-    protected function get_merged_columns( $type ) 
+    protected function get_merged_columns( $type )
     {
         /** Comments */
@@ -460 +460 @@
             $wp_custom_columns  = $this->get_custom_comments_columns();
         }
-        
+
         /** Links */
         elseif ( $type == 'wp-links' ) {
@@ -466 +466 @@
             $wp_custom_columns  = $this->get_custom_links_columns();
         }
-        
+
         /** Users */
         elseif ( $type == 'wp-users' ) {
@@ -472 +472 @@
             $wp_custom_columns  = $this->get_custom_users_columns();
         }
-        
+
         /** Media */
         elseif ( $type == 'wp-media' ) {
@@ -478 +478 @@
             $wp_custom_columns  = $this->get_custom_media_columns();
         }
-        
+
         /** Posts */
         else {
@@ -484 +484 @@
             $wp_custom_columns  = $this->get_custom_posts_columns($type);
         }
-        
+
         // merge columns
         $display_columns = $this->parse_columns($wp_custom_columns, $wp_default_columns, $type);
-        
-        return $display_columns;        
-    }
-    
+
+        return $display_columns;
+    }
+
     /**
      * Merge the default columns (set by WordPress) and the added custom columns (set by plugins, theme etc.)
@@ -496 +496 @@
      * @since     1.3.3
      */
-    function parse_columns($wp_custom_columns, $wp_default_columns, $type) 
+    function parse_columns($wp_custom_columns, $wp_default_columns, $type)
     {
         // merge columns
         $default_columns = wp_parse_args($wp_custom_columns, $wp_default_columns);
-        
+
         //get saved database columns
         $db_columns = self::get_stored_columns($type);
         if ( $db_columns ) {
-            
+
             // let's remove any unavailable columns.. such as disabled plugins
             $db_columns      = $this->remove_unavailable_columns($db_columns, $default_columns);
-            
+
             // loop throught the active columns
             foreach ( $db_columns as $id => $values ) {
-            
+
                 // get column meta options from custom columns
-                if ( $this->is_column_meta($id) && !empty($wp_custom_columns['column-meta-1']['options']) ) {                   
-                    $db_columns[$id]['options'] = $wp_custom_columns['column-meta-1']['options'];           
+                if ( $this->is_column_meta($id) && !empty($wp_custom_columns['column-meta-1']['options']) ) {
+                    $db_columns[$id]['options'] = $wp_custom_columns['column-meta-1']['options'];
                 }
-                
+
                 // add static options
                 elseif ( isset($default_columns[$id]['options']) )
                     $db_columns[$id]['options'] = $default_columns[$id]['options'];
-                
-                unset($default_columns[$id]);           
+
+                unset($default_columns[$id]);
             }
-        }   
-        
+        }
+
         // merge all
         return wp_parse_args($db_columns, $default_columns);
     }
-    
+
     /**
      * Remove deactivated (plugin) columns
@@ -540 +540 @@
         // check or differences
         $diff = array_diff( array_keys($db_columns), array_keys($default_columns) );
-        
-        if ( ! empty($diff) && is_array($diff) ) {                      
-            foreach ( $diff as $column_name ){              
+
+        if ( ! empty($diff) && is_array($diff) ) {
+            foreach ( $diff as $column_name ){
                 // make an exception for column-meta-xxx
                 if ( ! $this->is_column_meta($column_name) ) {
@@ -549 +549 @@
             }
         }
-        
+
         return $db_columns;
     }
-    
+
     /**
      * Get checkbox
@@ -558 +558 @@
      * @since     1.0
      */
-    private function get_box($type, $id, $values) 
+    private function get_box($type, $id, $values)
     {
         $classes = array();
@@ -564 +564 @@
         // set state
         $state  = isset($values['state']) ? $values['state'] : '';
-        
+
         // class
         $classes[] = "cpac-box-{$id}";
@@ -574 +574 @@
         }
         $class = implode(' ', $classes);
-            
-        // more box options 
+
+        // more box options
         $more_options   = $this->get_additional_box_options($type, $id, $values);
         $action         = "<a class='cpac-action' href='#open'>open</a>";
-                
+
         // type label
         $type_label = isset($values['options']['type_label']) ? $values['options']['type_label'] : '';
-        
+
         // label
         $label = isset($values['label']) ? str_replace("'", '"', $values['label']) : '';
-        
+
         // main label
-        $main_label = $values['label']; 
-        
+        $main_label = $values['label'];
+
         // main label exception for comments
         if ( 'comments' == $id ) {
             $main_label = $this->get_comment_icon();
         }
-        
+
         // width
         $width          = isset($values['width']) ? $values['width'] : 0;
         $width_descr    = isset($values['width']) && $values['width'] > 0 ? $values['width'] . '%' : __('default', CPAC_TEXTDOMAIN);
-        
+
         // hide box options
         $label_hidden = '';
@@ -602 +602 @@
             $label_hidden = ' style="display:none"';
         }
-        
+
         $list = "
             <li class='{$class}'>
                 <div class='cpac-sort-handle'></div>
-                <div class='cpac-type-options'>                 
+                <div class='cpac-type-options'>
                     <div class='cpac-checkbox'></div>
                     <input type='hidden' class='cpac-state' name='cpac_options[columns][{$type}][{$id}][state]' value='{$state}'/>
@@ -615 +615 @@
                     <span>{$type_label}</span>
                 </div>
-                <div class='cpac-type-inside'>              
+                <div class='cpac-type-inside'>
                     <label for='cpac_options-{$type}-{$id}-label'{$label_hidden}>Label: </label>
                     <input type='text' name='cpac_options[columns][{$type}][{$id}][label]' id='cpac_options-{$type}-{$id}-label' value='{$label}' class='text'{$label_hidden}/>
-                    <label for='cpac_options-{$type}-{$id}-width'>" . __('Width', CPAC_TEXTDOMAIN) . ":</label>         
+                    <label for='cpac_options-{$type}-{$id}-width'>" . __('Width', CPAC_TEXTDOMAIN) . ":</label>
                     <input type='hidden' maxlength='4' class='input-width' name='cpac_options[columns][{$type}][{$id}][width]' id='cpac_options-{$type}-{$id}-width' value='{$width}' />
                     <div class='description width-decription' title='" . __('default', CPAC_TEXTDOMAIN) . "'>{$width_descr}</div>
@@ -627 +627 @@
             </li>
         ";
-        
+
         return $list;
     }
@@ -636 +636 @@
      * @since     1.0
      */
-    private function get_additional_box_options($type, $id, $values) 
+    private function get_additional_box_options($type, $id, $values)
     {
         $fields = '';
-        
+
         // Custom Fields
         if( $this->is_column_meta($id) ) {
             $fields = $this->get_box_options_customfields($type, $id, $values);
         }
-            
+
         // Author Fields
         if( 'column-author-name' == $id) {
             $fields = $this->get_box_options_author($type, $id, $values);
         }
-        
+
         return $fields;
     }
@@ -658 +658 @@
      * @since     1.0
      */
-    private function get_box_options_customfields($type, $id, $values) 
-    {
-        // get post meta fields 
+    private function get_box_options_customfields($type, $id, $values)
+    {
+        // get post meta fields
         $fields = $this->get_meta_by_type($type);
-        
-        if ( empty($fields) ) 
+
+        if ( empty($fields) )
             return false;
-        
+
         // set meta field options
         $current = ! empty($values['field']) ? $values['field'] : '' ;
         $field_options = '';
         foreach ($fields as $field) {
-            
+
             $field_options .= sprintf
             (
@@ -676 +676 @@
                 $field,
                 $field == $current? ' selected="selected"':'',
-                
+
                 // change label on hidden fields
-                substr($field,0,10) == "cpachidden" ? str_replace('cpachidden','',$field) : $field      
-            );      
-        }
-        
+                substr($field,0,10) == "cpachidden" ? str_replace('cpachidden','',$field) : $field
+            );
+        }
+
         // set meta fieldtype options
         $currenttype = ! empty($values['field_type']) ? $values['field_type'] : '' ;
@@ -698 +698 @@
             'color'         => __('Color', CPAC_TEXTDOMAIN),
         );
-        
+
         // add filter
         $fieldtypes = apply_filters('cpac-field-types', $fieldtypes );
-        
+
         // set select options
         foreach ( $fieldtypes as $fkey => $fieldtype ) {
@@ -712 +712 @@
             );
         }
-        
+
         // before and after string
         $before = ! empty($values['before'])    ? $values['before'] : '' ;
         $after  = ! empty($values['after'])     ? $values['after']  : '' ;
-        
+
         if ( empty($field_options) )
             return false;
-        
+
         // add remove button
         $remove = '<p class="remove-description description">'.__('This field can not be removed', CPAC_TEXTDOMAIN).'</p>';
@@ -729 +729 @@
             ";
         }
-        
+
         $inside = "
             <label for='cpac-{$type}-{$id}-field'>".__('Custom Field', CPAC_TEXTDOMAIN).": </label>
@@ -738 +738 @@
             <br/>
             <label for='cpac-{$type}-{$id}-before'>".__('Before', CPAC_TEXTDOMAIN).": </label>
-            <input type='text' class='cpac-before' name='cpac_options[columns][{$type}][{$id}][before]' id='cpac-{$type}-{$id}-before' value='{$before}'/>              
-            <br/>   
+            <input type='text' class='cpac-before' name='cpac_options[columns][{$type}][{$id}][before]' id='cpac-{$type}-{$id}-before' value='{$before}'/>
+            <br/>
             <label for='cpac-{$type}-{$id}-after'>".__('After', CPAC_TEXTDOMAIN).": </label>
-            <input type='text' class='cpac-after' name='cpac_options[columns][{$type}][{$id}][after]' id='cpac-{$type}-{$id}-after' value='{$after}'/>              
-            <br/>       
+            <input type='text' class='cpac-after' name='cpac_options[columns][{$type}][{$id}][after]' id='cpac-{$type}-{$id}-after' value='{$after}'/>
+            <br/>
             {$remove}
         ";
-        
+
         return $inside;
     }
-    
+
     /**
      * Box Options: Custom Fields
@@ -754 +754 @@
      * @since     1.0
      */
-    private function get_box_options_author($type, $id, $values) 
+    private function get_box_options_author($type, $id, $values)
     {
         $options = '';
@@ -772 +772 @@
             $options .= "<option value='{$k}' {$selected}>{$name}</option>";
         }
-        
+
         $inside = "
             <label for='cpac-{$type}-{$id}-display_as'>".__('Display name as', CPAC_TEXTDOMAIN).": </label>
             <select name='cpac_options[columns][{$type}][{$id}][display_as]' id='cpac-{$type}-{$id}-display_as'>
                 {$options}
-            </select>           
+            </select>
         ";
-        
+
         return $inside;
     }
@@ -788 +788 @@
      * @since     1.0
      */
-    private function get_meta_by_type($type = 'post') 
+    private function get_meta_by_type($type = 'post')
     {
         global $wpdb;
@@ -796 +796 @@
             $sql = "SELECT DISTINCT meta_key FROM {$wpdb->commentmeta} ORDER BY 1";
         }
-        
+
         /** Users */
         elseif ( $type == 'wp-users') {
             $sql = "SELECT DISTINCT meta_key FROM {$wpdb->usermeta} ORDER BY 1";
         }
-        
+
         /** Media */
         elseif ( $type == 'wp-media') {
             $sql = "SELECT DISTINCT meta_key FROM {$wpdb->postmeta} pm JOIN {$wpdb->posts} p ON pm.post_id = p.ID WHERE p.post_type = 'attachment' ORDER BY 1";
         }
-        
+
         /** Posts */
         else {
             $sql = $wpdb->prepare( "SELECT DISTINCT meta_key FROM {$wpdb->postmeta} pm JOIN {$wpdb->posts} p ON pm.post_id = p.ID WHERE p.post_type = %s ORDER BY 1", $type);
         }
-        
+
         // run sql
         $fields = $wpdb->get_results($sql, ARRAY_N);
-        
+
         // filter out hidden meta fields
         $meta_fields = array();
-        if ( $fields ) {            
+        if ( $fields ) {
             foreach ($fields as $field) {
-                
+
                 // give hidden fields a prefix for identifaction
                 if ( $this->use_hidden_custom_fields && substr($field[0],0,1) == "_") {
                     $meta_fields[] = 'cpachidden'.$field[0];
                 }
-                
+
                 // non hidden fields are saved as is
                 elseif ( substr($field[0],0,1) != "_" ) {
                     $meta_fields[] = $field[0];
-                }   
-            }           
-        }
-        
-        if ( !empty($meta_fields) )
-            return $meta_fields;
-        
-        return false;
+                }
+            }
+        }
+
+        if ( empty($meta_fields) )
+            $meta_fields = false;
+
+        return apply_filters( 'cpac-get-meta-by-type', $meta_fields, $type );
     }
 
@@ -843 +843 @@
      * @since     1.0
      */
-    public function admin_scripts() 
+    public function admin_scripts()
     {
         wp_enqueue_script( 'wp-pointer' );
-        wp_enqueue_script( 'jquery-ui-slider' );        
+        wp_enqueue_script( 'jquery-ui-slider' );
         wp_enqueue_script( 'cpac-qtip2', CPAC_URL.'/assets/js/jquery.qtip.js', array('jquery'), CPAC_VERSION );
         wp_enqueue_script( 'cpac-admin', CPAC_URL.'/assets/js/admin-column.js', array('jquery', 'dashboard', 'jquery-ui-sortable'), CPAC_VERSION );
-    }   
-    
+    }
+
     /**
      *  Get column types
@@ -863 +863 @@
         $types['wp-links']      = 'wp-links';
         $types['wp-comments']   = 'wp-comments';
-        
+
         return $types;
     }
-    
+
     /**
      * Get post types
@@ -879 +879 @@
         $post_types['post'] = 'post';
         $post_types['page'] = 'page';
-        
+
         return apply_filters('cpac-get-post-types', $post_types);
     }
@@ -891 +891 @@
     {
         wp_enqueue_style( 'wp-pointer' );
-        wp_enqueue_style( 'jquery-ui-lightness', CPAC_URL.'/assets/ui-theme/jquery-ui-1.8.18.custom.css', array(), CPAC_VERSION, 'all' );   
-        wp_enqueue_style( 'cpac-admin', CPAC_URL.'/assets/css/admin-column.css', array(), CPAC_VERSION, 'all' );    
-    }
-    
+        wp_enqueue_style( 'jquery-ui-lightness', CPAC_URL.'/assets/ui-theme/jquery-ui-1.8.18.custom.css', array(), CPAC_VERSION, 'all' );
+        wp_enqueue_style( 'cpac-admin', CPAC_URL.'/assets/css/admin-column.css', array(), CPAC_VERSION, 'all' );
+    }
+
     /**
      * Register column css
@@ -902 +902 @@
     public function column_styles()
     {
-        wp_enqueue_style( 'cpac-columns', CPAC_URL.'/assets/css/column.css', array(), CPAC_VERSION, 'all' );    
+        wp_enqueue_style( 'cpac-columns', CPAC_URL.'/assets/css/column.css', array(), CPAC_VERSION, 'all' );
     }
 
@@ -910 +910 @@
      * @since     1.0
      */
-    public function register_settings() 
+    public function register_settings()
     {
         // If we have no options in the database, let's add them now.
@@ -916 +916 @@
             add_option( 'cpac_options', $this->get_default_plugin_options() );
         }
-        
+
         register_setting( 'cpac-settings-group', 'cpac_options', array($this, 'options_callback') );
-    }   
+    }
 
     /**
@@ -925 +925 @@
      * @since     1.0
      */
-    public function get_default_plugin_options() 
+    public function get_default_plugin_options()
     {
         return apply_filters( 'cpac_default_plugin_options', array() );
@@ -936 +936 @@
      */
     public function options_callback($options)
-    {   
+    {
         return $options;
     }
@@ -945 +945 @@
      * @since     1.0
      */
-    public function handle_requests() 
+    public function handle_requests()
     {
         // only handle updates from the admin columns page
         if ( isset($_REQUEST['page']) && CPAC_SLUG == $_REQUEST['page'] ) {
-                
+
             // settings updated
             if ( ! empty($_REQUEST['settings-updated']) ) {
                 $this->store_wp_default_columns();
             }
-            
-            // restore defaults 
+
+            // restore defaults
             if ( ! empty($_REQUEST['cpac-restore-defaults']) ) {
                 $this->restore_defaults();
@@ -961 +961 @@
         }
     }
-    
+
     /**
      * Stores WP default columns
@@ -969 +969 @@
      * @since     1.2
      */
-    private function store_wp_default_columns() 
-    {   
+    private function store_wp_default_columns()
+    {
         // stores the default columns that are set by WP or theme.
         $wp_default_columns = array();
-        
+
         // Posts
         foreach ( $this->post_types as $post_type ) {
             $wp_default_columns[$post_type] = $this->get_wp_default_posts_columns($post_type);
         }
-        
+
         // Users
         $wp_default_columns['wp-users'] = $this->get_wp_default_users_columns();
-        
+
         // Media
         $wp_default_columns['wp-media'] = $this->get_wp_default_media_columns();
-        
+
         // Links
         $wp_default_columns['wp-links'] = $this->get_wp_default_links_columns();
-        
+
         // Comments
-        $wp_default_columns['wp-comments'] = $this->get_wp_default_comments_columns();      
-        
+        $wp_default_columns['wp-comments'] = $this->get_wp_default_comments_columns();
+
         update_option( 'cpac_options_default', $wp_default_columns );
     }
@@ -999 +999 @@
      * @since     1.0
      */
-    private function restore_defaults() 
-    {   
+    private function restore_defaults()
+    {
         delete_option( 'cpac_options' );
-        delete_option( 'cpac_options_default' );        
-    }   
-    
+        delete_option( 'cpac_options_default' );
+    }
+
     /**
      * Get author field by nametype
@@ -1015 +1015 @@
     {
         $userdata = get_userdata( $user_id );
-    
+
         switch ( $nametype ) :
-            
+
             case "display_name" :
                 $name = $userdata->display_name;
                 break;
-                
+
             case "first_name" :
                 $name = $userdata->first_name;
-                break;      
-                
+                break;
+
             case "last_name" :
                 $name = $userdata->last_name;
                 break;
-                
+
             case "first_last_name" :
                 $first = !empty($userdata->first_name) ? $userdata->first_name : '';
@@ -1035 +1035 @@
                 $name = $first.$last;
                 break;
-                
+
             case "nickname" :
                 $name = $userdata->nickname;
-                break;      
-                
+                break;
+
             case "username" :
                 $name = $userdata->user_login;
                 break;
-            
+
             case "email" :
                 $name = $userdata->user_email;
                 break;
-                
+
             case "userid" :
                 $name = $userdata->ID;
                 break;
-                
+
             default :
                 $name = $userdata->display_name;
-            
+
         endswitch;
-        
+
         return $name;
     }
-    
+
     /**
      *  Get WP default supported admin columns per post type.
@@ -1065 +1065 @@
      *  @since     1.0
      */
-    private function get_wp_default_posts_columns($post_type = 'post') 
-    {
-        // we need to change the current screen
-        global $current_screen;
-            
-        // some plugins depend on settings the $_GET['post_type'] variable such as ALL in One SEO
-        $_GET['post_type'] = $post_type;
-        
-        // to prevent possible warning from initializing load-edit.php 
-        // we will set a dummy screen object
-        if ( empty($current_screen->post_type) ) {
-            $current_screen = (object) array( 'post_type' => $post_type, 'id' => '', 'base' => '' );            
-        }       
-        
-        // for 3rd party plugin support we will call load-edit.php so all the 
-        // additional columns that are set by them will be avaible for us       
-        do_action('load-edit.php');
-        
+    private function get_wp_default_posts_columns($post_type = 'post')
+    {
+        // You can use this filter to add thirdparty columns by hooking into this. See classes/third_party.php for an example.
+        do_action( 'cpac-get-default-columns-posts', $post_type );
+
         // some plugins directly hook into get_column_headers, such as woocommerce
         $columns = get_column_headers( 'edit-'.$post_type );
-        
-        // get default columns      
-        if ( empty($columns) ) {        
-            
+
+        // get default columns
+        if ( empty($columns) ) {
+
             // deprecated as of wp3.3
             if ( file_exists(ABSPATH . 'wp-admin/includes/template.php') )
                 require_once(ABSPATH . 'wp-admin/includes/template.php');
-                
+
             // introduced since wp3.3
             if ( file_exists(ABSPATH . 'wp-admin/includes/screen.php') )
                 require_once(ABSPATH . 'wp-admin/includes/screen.php');
-                
+
             // used for getting columns
             if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-list-table.php') )
@@ -1102 +1089 @@
             if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-posts-list-table.php') )
                 require_once(ABSPATH . 'wp-admin/includes/class-wp-posts-list-table.php');
-                        
+
             // As of WP Release 3.5 we can use the following.
             if ( version_compare( get_bloginfo('version'), '3.4.10', '>=' ) ) {
-                
+
                 $table      = new WP_Posts_List_Table( array( 'screen' => $post_type ) );
                 $columns    = $table->get_columns();
             }
-            
+
             // WP versions older then 3.5
             // @todo: make this deprecated
-            else {          
-            
+            else {
+
                 // we need to change the current screen... first lets save original
                 $org_current_screen = $current_screen;
-                
-                // prevent php warning 
+
+                // prevent php warning
                 if ( !isset($current_screen) ) $current_screen = new stdClass;
-                
+
                 // overwrite current_screen global with our post type of choose...
                 $current_screen->post_type = $post_type;
-                
-                // ...so we can get its columns     
-                $columns = WP_Posts_List_Table::get_columns();              
-                
+
+                // ...so we can get its columns
+                $columns = WP_Posts_List_Table::get_columns();
+
                 // reset current screen
                 $current_screen = $org_current_screen;
             }
         }
-        
+
         if ( empty ( $columns ) )
             return false;
-            
+
         // change to uniform format
-        $columns = $this->get_uniform_format($columns);     
+        $columns = $this->get_uniform_format($columns);
 
         // add sorting to some of the default links columns
         $columns = $this->set_sorting_to_default_posts_columns($columns);
-        
+
         return $columns;
     }
-    
+
     /**
      *  Add Sorting to WP default Posts columns
@@ -1149 +1136 @@
      */
     private function set_sorting_to_default_posts_columns($columns)
-    {   
+    {
         //  categories
         if ( !empty($columns['categories']) ) {
@@ -1160 +1147 @@
         return $columns;
     }
-    
+
     /**
      *  Get WP default users columns per post type.
@@ -1168 +1155 @@
     private function get_wp_default_users_columns()
     {
+        // You can use this filter to add third_party columns by hooking into this.
+        do_action( 'cpac-get-default-columns-users' );
+
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-list-table.php') )
             require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-users-list-table.php') )
             require_once(ABSPATH . 'wp-admin/includes/class-wp-users-list-table.php');
-        
+
         // turn off site users
         $this->is_site_users = false;
-        
+
         // get users columns
         $columns = WP_Users_List_Table::get_columns();
-        
+
         // change to uniform format
         $columns = $this->get_uniform_format($columns);
@@ -1184 +1174 @@
         return apply_filters('cpac-default-users-columns', $columns);
     }
-    
+
     /**
      *  Get WP default media columns.
@@ -1191 +1181 @@
      */
     private function get_wp_default_media_columns()
-    {       
+    {
+        // You can use this filter to add third_party columns by hooking into this.
+        do_action( 'cpac-get-default-columns-media' );
+
         // @todo could use _get_list_table('WP_Media_List_Table') ?
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-list-table.php') )
@@ -1197 +1190 @@
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-media-list-table.php') )
             require_once(ABSPATH . 'wp-admin/includes/class-wp-media-list-table.php');
-        
+
         // As of WP Release 3.5 we can use the following.
         if ( version_compare( get_bloginfo('version'), '3.4.10', '>=' ) ) {
-            
+
             $table      = new WP_Media_List_Table(array( 'screen' => 'upload' ));
             $columns    = $table->get_columns();
         }
-        
+
         // WP versions older then 3.5
         // @todo: make this deprecated
-        else {  
-        
+        else {
+
             global $current_screen;
 
             // save original
             $org_current_screen = $current_screen;
-            
-            // prevent php warning 
+
+            // prevent php warning
             if ( !isset($current_screen) ) $current_screen = new stdClass;
-            
+
             // overwrite current_screen global with our media id...
             $current_screen->id = 'upload';
-            
+
             // init media class
             $wp_media = new WP_Media_List_Table;
-            
-            // get media columns        
+
+            // get media columns
             $columns = $wp_media->get_columns();
-            
+
             // reset current screen
             $current_screen = $org_current_screen;
         }
-        
+
         // change to uniform format
         $columns = $this->get_uniform_format($columns);
-        
+
         return apply_filters('cpac-default-media-columns', $columns);
     }
-    
+
     /**
      *  Get WP default links columns.
@@ -1243 +1236 @@
     private function get_wp_default_links_columns()
     {
+        // You can use this filter to add third_party columns by hooking into this.
+        do_action( 'cpac-get-default-columns-links' );
+
         // dependencies
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-list-table.php') )
@@ -1248 +1244 @@
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-links-list-table.php') )
             require_once(ABSPATH . 'wp-admin/includes/class-wp-links-list-table.php');
-        
+
         // get links columns
         $columns = WP_Links_List_Table::get_columns();
@@ -1254 +1250 @@
         // change to uniform format
         $columns = $this->get_uniform_format($columns);
-        
+
         // add sorting to some of the default links columns
         $columns = $this->set_sorting_to_default_links_columns($columns);
-        
+
         return apply_filters('cpac-default-links-columns', $columns);
     }
-    
+
     /**
      *  Add Sorting to WP default links columns
@@ -1274 +1270 @@
         return $columns;
     }
-    
+
     /**
      *  Get WP default links columns.
@@ -1281 +1277 @@
      */
     private function get_wp_default_comments_columns()
-    {       
+    {
+        // You can use this filter to add third_party columns by hooking into this.
+        do_action( 'cpac-get-default-columns-comments' );
+
         // dependencies
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-list-table.php') )
@@ -1287 +1286 @@
         if ( file_exists(ABSPATH . 'wp-admin/includes/class-wp-comments-list-table.php') )
             require_once(ABSPATH . 'wp-admin/includes/class-wp-comments-list-table.php');
-        
+
         // As of WP Release 3.5 we can use the following.
         if ( version_compare( get_bloginfo('version'), '3.4.10', '>=' ) ) {
-            
+
             $table      = new WP_Comments_List_Table( array( 'screen' => 'edit-comments' ) );
             $columns    = $table->get_columns();
         }
-        
+
         // WP versions older then 3.5
         // @todo: make this deprecated
         else {
-        
+
             global $current_screen;
 
-            // save original        
+            // save original
             $org_current_screen = $current_screen;
-            
-            // prevent php warning 
+
+            // prevent php warning
             if ( !isset($current_screen) ) $current_screen = new stdClass;
-            
+
             // overwrite current_screen global with our media id...
             $current_screen->id = 'edit-comments';
-            
+
             // init table object
-            $wp_comment = new WP_Comments_List_Table;       
-            
+            $wp_comment = new WP_Comments_List_Table;
+
             // get comments
             $columns = $wp_comment->get_columns();
-            
+
             // reset current screen
             $current_screen = $org_current_screen;
         }
-        
+
         // change to uniform format
         $columns = $this->get_uniform_format($columns);
-        
+
         // add sorting to some of the default links columns
         $columns = $this->set_sorting_to_default_comments_columns($columns);
-        
+
         return apply_filters('cpac-default-comments-columns', $columns);
     }
-    
+
     /**
      *  Add Sorting to WP default comments columns
@@ -1348 +1347 @@
      * @since     1.0
      */
-    private function get_uniform_format($columns) 
-    {
-        // we remove the checkbox column as an option... 
+    private function get_uniform_format($columns)
+    {
+        // we remove the checkbox column as an option...
         if ( isset($columns['cb']) )
             unset($columns['cb']);
-        
+
         // change to uniform format
         $uniform_columns = array();
@@ -1359 +1358 @@
             $hide_options   = false;
             $type_label     = $label;
-            
-            // comment exception        
-            if ( 'comments' == $id ) {                  
+
+            // comment exception
+            if ( 'comments' == $id ) {
                 $label          = '';
                 $type_label     = __('Comments', CPAC_TEXTDOMAIN);
                 $hide_options   = true;
             }
-            
+
             // user icon exception
             if ( $id == 'icon' ) {
                 $type_label     = __('Icon', CPAC_TEXTDOMAIN);
             }
-            
+
             $uniform_columns[$id] = array(
                 'label'         => $label,
@@ -1384 +1383 @@
         return $uniform_columns;
     }
-    
+
     /**
      * Custom posts columns
@@ -1390 +1389 @@
      * @since     1.0
      */
-    private function get_custom_posts_columns($post_type) 
+    private function get_custom_posts_columns($post_type)
     {
         $custom_columns = array(
@@ -1446 +1445 @@
             ),
             'column-before-moretag' => array(
-                'label' => __('Before More Tag', CPAC_TEXTDOMAIN)               
+                'label' => __('Before More Tag', CPAC_TEXTDOMAIN)
             )
         );
-        
+
         // Word count support
         if ( post_type_supports($post_type, 'editor') ) {
@@ -1456 +1455 @@
             );
         }
-        
+
         // Sticky support
-        if ( $post_type == 'post' ) {       
+        if ( $post_type == 'post' ) {
             $custom_columns['column-sticky'] = array(
                 'label'         => __('Sticky', CPAC_TEXTDOMAIN)
             );
         }
-        
+
         // Order support
         if ( post_type_supports($post_type, 'page-attributes') ) {
             $custom_columns['column-order'] = array(
-                'label'         => __('Page Order', CPAC_TEXTDOMAIN),               
+                'label'         => __('Page Order', CPAC_TEXTDOMAIN),
                 'options'       => array(
                     'type_label'    => __('Order', CPAC_TEXTDOMAIN)
-                )           
+                )
             );
         }
-        
+
         // Page Template
-        if ( $post_type == 'page' ) { 
+        if ( $post_type == 'page' ) {
             $custom_columns['column-page-template'] = array(
                 'label' => __('Page Template', CPAC_TEXTDOMAIN)
-            );  
-        }
-        
+            );
+        }
+
         // Post Formats
         if ( post_type_supports($post_type, 'post-formats') ) {
@@ -1487 +1486 @@
             );
         }
-        
+
         // Taxonomy support
         $taxonomies = get_object_taxonomies($post_type, 'objects');
@@ -1499 +1498 @@
                             'type_label'    => __('Taxonomy', CPAC_TEXTDOMAIN)
                         )
-                    );              
+                    );
                 }
             }
         }
-        
+
         // Custom Field support
         if ( $this->get_meta_by_type($post_type) ) {
@@ -1515 +1514 @@
                     'type_label'    => __('Field', CPAC_TEXTDOMAIN),
                     'class'         => 'cpac-box-metafield'
-                )           
+                )
             );
-        }   
-        
+        }
+
         // merge with defaults
         $custom_columns = $this->parse_defaults($custom_columns);
-        
+
         return apply_filters('cpac-custom-posts-columns', $custom_columns);
     }
-    
+
     /**
      * Custom users columns
@@ -1530 +1529 @@
      * @since     1.1
      */
-    private function get_custom_users_columns() 
+    private function get_custom_users_columns()
     {
         $custom_columns = array(
@@ -1561 +1560 @@
             ),
         );
-        
+
         // User total number of posts
         foreach ( self::get_post_types() as $post_type ) {
@@ -1572 +1571 @@
             );
         }
-        
+
         // Custom Field support
         $custom_columns['column-meta-1'] = array(
@@ -1584 +1583 @@
                 'class'         => 'cpac-box-metafield'
             )
-        );  
-        
+        );
+
         // merge with defaults
         $custom_columns = $this->parse_defaults($custom_columns);
-        
+
         return apply_filters('cpac-custom-users-columns', $custom_columns);
     }
-    
+
     /**
      * Custom media columns
@@ -1597 +1596 @@
      * @since     1.3
      */
-    private function get_custom_media_columns() 
+    private function get_custom_media_columns()
     {
         $custom_columns = array(
@@ -1641 +1640 @@
             'column-filesize' => array(
                 'label' => __('File size', CPAC_TEXTDOMAIN)
-            )           
+            )
         );
-        
+
         // Get extended image metadata, exif or iptc as available.
         // uses exif_read_data()
@@ -1710 +1709 @@
             ));
         }
-        
+
         // Custom Field support
         if ( $this->get_meta_by_type('wp-media') ) {
@@ -1725 +1724 @@
             );
         }
-        
+
         // merge with defaults
         $custom_columns = $this->parse_defaults($custom_columns);
-        
+
         return apply_filters('cpac-custom-media-columns', $custom_columns);
     }
-    
+
     /**
      * Custom links columns
@@ -1737 +1736 @@
      * @since     1.3.1
      */
-    private function get_custom_links_columns() 
+    private function get_custom_links_columns()
     {
         $custom_columns = array(
@@ -1769 +1768 @@
                     'sortorder' => false
                 )
-            )           
-        );  
-        
+            )
+        );
+
         // merge with defaults
         $custom_columns = $this->parse_defaults($custom_columns);
-        
+
         return apply_filters('cpac-custom-links-columns', $custom_columns);
     }
-    
+
     /**
      * Custom comments columns
@@ -1783 +1782 @@
      * @since     1.3.1
      */
-    private function get_custom_comments_columns() 
+    private function get_custom_comments_columns()
     {
         $custom_columns = array(
@@ -1805 +1804 @@
             ),
             'column-reply_to' => array(
-                'label'         => __('In Reply To', CPAC_TEXTDOMAIN),  
-                'options'       => array(                   
+                'label'         => __('In Reply To', CPAC_TEXTDOMAIN),
+                'options'       => array(
                     'sortorder'     => false
                 )
@@ -1837 +1836 @@
                 )
             )
-        );      
-        
+        );
+
         // Custom Field support
         if ( $this->get_meta_by_type('wp-comments') ) {
@@ -1853 +1852 @@
                 )
             );
-        }       
-        
+        }
+
         // merge with defaults
         $custom_columns = $this->parse_defaults($custom_columns);
-        
+
         return apply_filters('cpac-custom-comments-columns', $custom_columns);
     }
-    
+
     /**
      * Parse defaults
@@ -1866 +1865 @@
      * @since     1.1
      */
-    private function parse_defaults($columns) 
+    private function parse_defaults($columns)
     {
         // default arguments
-        $defaults = array(  
-            
+        $defaults = array(
+
             // stored values
             'label'         => '', // custom label
             'state'         => '', // display state
-            'width'         => '', // column width          
-            
+            'width'         => '', // column width
+
             // static values
-            'options'       => array(               
+            'options'       => array(
                 'type_label'    => __('Custom', CPAC_TEXTDOMAIN),
                 'hide_options'  => false,
@@ -1884 +1883 @@
             )
         );
-        
+
         // parse args
         foreach ( $columns as $k => $column ) {
             $c[$k] = wp_parse_args( $column, $defaults);
-            
+
             // parse options args
             if ( isset($column['options']) )
                 $c[$k]['options'] = wp_parse_args( $column['options'], $defaults['options']);
-                
+
             // set type label
             if ( empty($column['options']['type_label']) && !empty($column['label']) )
                 $c[$k]['options']['type_label'] = $column['label'];
         }
-        
+
         return $c;
     }
@@ -1907 +1906 @@
      */
     public static function get_stored_columns($type)
-    { 
+    {
         // get plugin options
         $options        = get_option('cpac_options');
@@ -1914 +1913 @@
         if ( !empty($options['columns'][$type]) )
             return $options['columns'][$type];
-        
+
         return false;
     }
@@ -1923 +1922 @@
      * @since     1.0
      */
-    private function get_menu() 
+    private function get_menu()
     {
         // set
         $menu   = '';
         $count  = 1;
-        
+
         // referer
         $referer = ! empty($_REQUEST['cpac_type']) ? $_REQUEST['cpac_type'] : '';
-            
+
         // loop
         foreach ( $this->get_types() as $type ) {
             $label       = $this->get_singular_name($type);
             $clean_label = $this->sanitize_string($type);
-            
+
             // divider
             $divider    = $count++ == 1 ? '' : ' | ';
-            
-            // current      
+
+            // current
             $current = '';
             if ( $this->is_menu_type_current($type) )
                 $current = ' class="current"';
-            
+
             // menu list
             $menu .= "
@@ -1950 +1949 @@
             ";
         }
-        
+
         // settings url
         $class_current_settings = $this->is_menu_type_current('plugin_settings') ? ' current': '';
-        
+
         // options button
         $options_btn = "<a href='#cpac-box-plugin_settings' class='cpac-settings-link{$class_current_settings}'>".__('Addons', CPAC_TEXTDOMAIN)."</a>";
         //$options_btn = '';
-        
+
         return "
         <div class='cpac-menu'>
@@ -1973 +1972 @@
      * @since     1.0
      */
-    private function is_menu_type_current( $type ) 
-    {   
+    private function is_menu_type_current( $type )
+    {
         // referer
         $referer = ! empty($_REQUEST['cpac_type']) ? $_REQUEST['cpac_type'] : '';
-        
+
         // get label
         $clean_label = $this->sanitize_string($type);
-        
+
         // get first element from post-types
         $first      = array_shift( array_values($this->post_types) );
-        
+
         // display the page that was being viewed before saving
         if ( $referer ) {
@@ -1989 +1988 @@
                 return true;
             }
-        
+
         // settings page has not yet been saved
         } elseif ( $first == $type  ) {
             return true;
         }
-        
-        return false;   
+
+        return false;
     }
 
@@ -2003 +2002 @@
      * @since     1.0
      */
-    private function get_singular_name( $type ) 
+    private function get_singular_name( $type )
     {
         // Links
         if ( $type == 'wp-links' )
             $label = __('Links');
-            
+
         // Comments
         elseif ( $type == 'wp-comments' )
             $label = __('Comments');
-            
+
         // Users
         elseif ( $type == 'wp-users' )
             $label = __('Users');
-        
+
         // Media
         elseif ( $type == 'wp-media' )
             $label = __('Media Library');
-        
+
         // Posts
         else {
@@ -2026 +2025 @@
             $label          = $posttype_obj->labels->singular_name;
         }
-        
+
         return $label;
     }
-    
+
     /**
      * Get plural name of post type
@@ -2035 +2034 @@
      * @since     1.3.1
      */
-    private function get_plural_name( $type ) 
+    private function get_plural_name( $type )
     {
         $posttype_obj = get_post_type_object($type);
         if ( $posttype_obj )
             return $posttype_obj->labels->name;
-        
+
         return false;
     }
-    
+
     /**
      * Get screen link to overview screen
@@ -2049 +2048 @@
      * @since     1.3.1
      */
-    private function get_type_screen_link( $type ) 
-    {       
+    private function get_type_screen_link( $type )
+    {
         // Links
         if ( $type == 'wp-comments' )
             $link = get_admin_url() . 'edit-comments.php';
-            
+
             // Links
         if ( $type == 'wp-links' )
             $link = get_admin_url() . 'link-manager.php';
-        
+
         // Users
         if ( $type == 'wp-users' )
             $link = get_admin_url() . 'users.php';
-        
+
         // Media
         elseif ( $type == 'wp-media' )
             $link = get_admin_url() . 'upload.php';
-        
+
         // Posts
-        else    
-            $link = get_admin_url() . "edit.php?post_type={$type}";     
-                
+        else
+            $link = get_admin_url() . "edit.php?post_type={$type}";
+
         return $link;
     }
@@ -2081 +2080 @@
      * @since     1.0
      */
-    protected function sanitize_string($string) 
-    {   
+    protected function sanitize_string($string)
+    {
         $string = esc_url($string);
         $string = str_replace('http://','', $string);
         $string = str_replace('https://','', $string);
-        
+
         return $string;
     }
-    
+
     /**
      * Checks if column-meta key exists
@@ -2095 +2094 @@
      * @since     1.0
      */
-    public static function is_column_meta( $id = '' ) 
+    public static function is_column_meta( $id = '' )
     {
         if ( strpos($id, 'column-meta-') !== false )
             return true;
-        
+
         return false;
     }
-    
+
     /**
      * Get the posttype from columnname
@@ -2108 +2107 @@
      * @since     1.3.1
      */
-    public static function get_posttype_by_postcount_column( $id = '' ) 
-    {
-        if ( strpos($id, 'column-user_postcount-') !== false )          
+    public static function get_posttype_by_postcount_column( $id = '' )
+    {
+        if ( strpos($id, 'column-user_postcount-') !== false )
             return str_replace('column-user_postcount-', '', $id);
-                
+
         return false;
     }
-    
+
     /**
      *  Get column value of post attachments
@@ -2121 +2120 @@
      *  @since     1.2.1
      */
-    public static function get_attachment_ids( $post_id ) 
+    public static function get_attachment_ids( $post_id )
     {
         return get_posts(array(
@@ -2131 +2130 @@
         ));
     }
-    
+
     /**
      * Strip tags and trim
@@ -2137 +2136 @@
      * @since     1.3
      */
-    public static function strip_trim($string) 
+    public static function strip_trim($string)
     {
         return trim(strip_tags($string));
     }
-    
+
     /**
      * Admin body class
@@ -2147 +2146 @@
      * @since     1.4
      */
-    function admin_class( $classes ) 
-    {       
+    function admin_class( $classes )
+    {
         global $current_screen;
-        
+
         // we dont need the 'edit-' part
         $screen = str_replace('edit-', '', $current_screen->id);
-        
+
         // media library exception
         if ( $current_screen->base == 'upload' && $current_screen->id == 'upload' ) {
             $screen = 'media';
         }
-        
+
         // link exception
         if ( $current_screen->base == 'link-manager' && $current_screen->id == 'link-manager' ) {
@@ -2165 +2164 @@
 
         // loop the available types
-        foreach ( $this->get_types() as $type => $label ) {         
-            
+        foreach ( $this->get_types() as $type => $label ) {
+
             // match against screen or wp-screen
             if ( $type == $screen || $type == "wp-{$screen}" )
@@ -2175 +2174 @@
     }
 
-    
+
     /**
      * Admin CSS for Column width
@@ -2181 +2180 @@
      * @since     1.4
      */
-    function admin_css() 
-    {   
+    function admin_css()
+    {
         $css = '';
-        
+
         // loop throug the available types...
         foreach ( $this->get_types() as $type ) {
-            $cols = self::get_stored_columns($type);    
+            $cols = self::get_stored_columns($type);
             if ( $cols ) {
-            
+
                 // loop through each available column...
                 foreach ( $cols as $col_name => $col ) {
-                
+
                     // and check for stored width and add it to the css
                     if (!empty($col['width']) && is_numeric($col['width']) && $col['width'] > 0 ) {
@@ -2200 +2199 @@
             }
         }
-        
+
         echo "<style type='text/css'>{$css}</style>";
     }
-    
+
     /**
      * Ajax activation
@@ -2214 +2213 @@
         $key    = $_POST['key'];
         $type   = $_POST['type'];
-        
+
         $licence = new cpac_licence( $type );
-        
+
         // update key
         if ( $key == 'remove' ) {
             $licence->remove_license_key();
         }
-            
+
         // set license key
         elseif ( $licence->check_remote_key( $key ) ) {
-        
+
             // set key
             $licence->set_license_key( $key );
-            
+
             // returned masked key
             echo json_encode( $licence->get_masked_license_key() );
@@ -2234 +2233 @@
         exit;
     }
-    
+
     /**
      * Add help tabs
@@ -2240 +2239 @@
      * @since     1.3
      */
-    public function help_tabs($page) 
-    {       
+    public function help_tabs($page)
+    {
         $screen = get_current_screen();
 
         if ( $screen->id != $this->admin_page || ! method_exists($screen,'add_help_tab') )
             return;
-        
+
         $admin_url = get_admin_url();
-        
+
         // add help content
         $tabs = array(
@@ -2257 +2256 @@
                     <p>
                         This plugin is for adding and removing additional columns to the administration screens for post(types), pages, media library, comments, links and users. Change the column's label and reorder them.
-                    </p>    
-                    
+                    </p>
+
                 "
             ),
@@ -2300 +2299 @@
                     </ul>
                 "
-            )           
+            )
         );
-        
+
         foreach ( $tabs as $k => $tab ) {
-            $screen->add_help_tab(array(                
+            $screen->add_help_tab(array(
                 'id'        => 'cpac-tab-'.$k,  // unique id
                 'title'     => $tab['title'],   // label
@@ -2311 +2310 @@
         }
     }
-    
+
     /**
      * Plugin Settings
@@ -2317 +2316 @@
      * @since     1.3.1
      */
-    private function plugin_settings() 
+    private function plugin_settings()
     {
         $class_current_settings = $this->is_menu_type_current('plugin_settings') ? ' current' : ' hidden'; '';
-        
+
         /** Sortable */
         $masked_key                 = '';
         $class_sortorder_activate   = '';
         $class_sortorder_deactivate = ' hidden';
-        
+
         // is unlocked
         $licence = new cpac_licence('sortable');
-        
+
         if ( $licence->is_unlocked() ) {
             $masked_key      = $licence->get_masked_license_key('sortable');
@@ -2334 +2333 @@
             $class_sortorder_deactivate = '';
         }
-        
+
         // find out more
         $find_out_more = "<a href='{$this->codepress_url}/sortorder-addon/' class='button-primary alignright' target='_blank'>".__('find out more', CPAC_TEXTDOMAIN)." &raquo</a>";
-        
+
         // info box
         $sortable_tooltip = "
@@ -2343 +2342 @@
             <p>".__('By default WordPress let\'s you sort by title, date, comments and author. This will make you be able to <strong>sort by any column of any type!</strong>', CPAC_TEXTDOMAIN)."</p>
             <p>".__('Perfect for sorting your articles, media files, comments, links and users', CPAC_TEXTDOMAIN).".</p>
-            <p class='description'>".__('(columns that are added by other plugins are not supported)', CPAC_TEXTDOMAIN).".</p>          
+            <p class='description'>".__('(columns that are added by other plugins are not supported)', CPAC_TEXTDOMAIN).".</p>
             <img src='" . CPAC_URL.'/assets/images/addon_sortable_1.png' . "' alt='' />
             {$find_out_more}
         ";
-        
-        // addons 
+
+        // addons
         $addons = "
             <tr>
@@ -2395 +2394 @@
                                 <td class='activation_more'>{$find_out_more}</td>
                             </tr><!-- #cpac-activation-sortable -->
-                        </tbody>                    
+                        </tbody>
                     </table>
                     <div class='addon-translation-string hidden'>
@@ -2404 +2403 @@
             </tr>
         ";
-                
+
         // general options
         $general_options = "
@@ -2414 +2413 @@
                         <li>
                             <div class='cpac-option-label'>Thumbnail size</div>
-                            <div class='cpac-option-inputs'>                                        
+                            <div class='cpac-option-inputs'>
                                 <input type='text' id='thumbnail_size_w' class='small-text' name='cpac_options[settings][thumb_width]' value='80'/>
                                 <label for='thumbnail_size_w'>Width</label>
-                                <br/>                                       
+                                <br/>
                                 <input type='text' id='thumbnail_size_h' class='small-text' name='cpac_options[settings][thumb_height]' value='80'/>
                                 <label for='thumbnail_size_h'>Height</label>
@@ -2424 +2423 @@
                         <li>
                             <div class='cpac-option-label'>Excerpt length</div>
-                            <div class='cpac-option-inputs'>                                        
-                                
+                            <div class='cpac-option-inputs'>
+
                                 <input type='text' id='excerpt_length' class='small-text' name='cpac_options[settings][excerpt_length]' value='15'/>
                                 <label for='excerpt_length'>Number of words</label>
                             </div>
                         </li>
-                    </ul>                       
+                    </ul>
                 </td>
             </tr>
             -->
         ";
-        
+
         // settings
         $row = "
@@ -2441 +2440 @@
             <td colspan='2'>
                 <table class='nopadding'>
-                    {$addons}                   
+                    {$addons}
                     {$general_options}
                 </table>
@@ -2447 +2446 @@
         </tr><!-- #cpac-box-plugin_settings -->
         ";
-        
+
         return $row;
     }
-    
+
     /**
      *  Get post count
@@ -2459 +2458 @@
     {
         global $wpdb;
-        
+
         if ( ! post_type_exists($post_type) || empty($user_id) )
             return false;
-        
+
         $sql = "
             SELECT COUNT(ID)
@@ -2470 +2469 @@
             AND post_type = %s
         ";
-        
+
         return $wpdb->get_var( $wpdb->prepare($sql, $user_id, $post_type) );
     }
-    
+
     /**
      * Settings Page Template.
@@ -2479 +2478 @@
      * This function in conjunction with others uses the WordPress
      * Settings API to create a settings page where users can adjust
-     * the behaviour of this plugin. 
-     *
-     * @since     1.0
-     */
-    public function plugin_settings_page() 
+     * the behaviour of this plugin.
+     *
+     * @since     1.0
+     */
+    public function plugin_settings_page()
     {
         // loop through post types
         $rows = '';
         foreach ( $this->get_types() as $type ) {
-            
+
             // post type label
             $label = $this->get_singular_name($type);
-            
+
             // id
-            $id = $this->sanitize_string($type); 
-            
+            $id = $this->sanitize_string($type);
+
             // build draggable boxes
             $boxes = $this->get_column_boxes($type);
@@ -2500 +2499 @@
             // class
             $class = $this->is_menu_type_current($type) ? ' current' : ' hidden';
-            
+
             $rows .= "
                 <tr id='cpac-box-{$id}' valign='top' class='cpac-box-row{$class}'>
@@ -2508 +2507 @@
                     <td>
                         <h3 class='cpac_post_type hidden'>{$label}</h3>
-                        {$boxes}                        
+                        {$boxes}
                     </td>
                 </tr>
             ";
         }
-        
+
         // General Setttings
         $general_settings = $this->plugin_settings();
-        
+
         // Post Type Menu
         $menu = $this->get_menu();
-        
+
         // Help screen message
         $help_text = '';
         if ( version_compare( get_bloginfo('version'), '3.2', '>' ) )
             $help_text = '<p>'.__('You will find a short overview at the <strong>Help</strong> section in the top-right screen.', CPAC_TEXTDOMAIN).'</p>';
-        
+
         // find out more
         $find_out_more = "<a href='{$this->codepress_url}/sortorder-addon/' class='alignright green' target='_blank'>".__('find out more', CPAC_TEXTDOMAIN)." &raquo</a>";
-        
+
     ?>
         <div id="cpac" class="wrap">
@@ -2533 +2532 @@
             <h2><?php _e('Codepress Admin Columns', CPAC_TEXTDOMAIN); ?></h2>
             <?php echo $menu ?>
-            
+
             <div class="postbox-container cpac-col-right">
-                <div class="metabox-holder">    
-                    <div class="meta-box-sortables">                        
-                        
+                <div class="metabox-holder">
+                    <div class="meta-box-sortables">
+
                         <div id="addons-cpac-settings" class="postbox">
                             <div title="Click to toggle" class="handlediv"><br></div>
@@ -2550 +2549 @@
                             </div>
                         </div><!-- addons-cpac-settings -->
-                                                
+
                         <div id="likethisplugin-cpac-settings" class="postbox">
                             <div title="Click to toggle" class="handlediv"><br></div>
@@ -2560 +2559 @@
                                 <ul>
                                     <li><a href="<?php echo $this->plugins_url ?>"><?php _e('Give it a 5 star rating on WordPress.org.', CPAC_TEXTDOMAIN) ?></a></li>
-                                    <li><a href="<?php echo $this->codepress_url ?>/"><?php _e('Link to it so other folks can find out about it.', CPAC_TEXTDOMAIN) ?></a></li>                                 
+                                    <li><a href="<?php echo $this->codepress_url ?>/"><?php _e('Link to it so other folks can find out about it.', CPAC_TEXTDOMAIN) ?></a></li>
                                     <li class="donate_link"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZDZRSYLQ4Z76J"><?php _e('Donate a token of your appreciation.', CPAC_TEXTDOMAIN) ?></a></li>
-                                </ul>                               
+                                </ul>
                             </div>
                         </div><!-- likethisplugin-cpac-settings -->
-                        
+
                         <div id="latest-news-cpac-settings" class="postbox">
                             <div title="Click to toggle" class="handlediv"><br></div>
@@ -2571 +2570 @@
                                 <span><?php _e('Follow us', CPAC_TEXTDOMAIN) ?></span>
                             </h3>
-                            <div class="inside">                                
+                            <div class="inside">
                                 <ul>
                                     <li class="twitter"><a href="http://twitter.com/codepressNL"><?php _e('Follow Codepress on Twitter.', CPAC_TEXTDOMAIN) ?></a></li>
                                     <li class="facebook"><a href="https://www.facebook.com/codepressNL"><?php _e('Like Codepress on Facebook.', CPAC_TEXTDOMAIN) ?></a></li>
-                        
-                                </ul>                               
+
+                                </ul>
                             </div>
                         </div><!-- latest-news-cpac-settings -->
-                        
+
                         <div id="side-cpac-settings" class="postbox">
                             <div title="Click to toggle" class="handlediv"><br></div>
@@ -2585 +2584 @@
                                 <span><?php _e('Need support?', CPAC_TEXTDOMAIN) ?></span>
                             </h3>
-                            <div class="inside">                                
+                            <div class="inside">
                                 <?php echo $help_text ?>
                                 <p><?php printf(__('If you are having problems with this plugin, please talk about them in the <a href="%s">Support forums</a> or send me an email %s.', CPAC_TEXTDOMAIN), $this->wordpress_url, '<a href="mailto:[email protected]">[email protected]</a>' );?></p>
@@ -2591 +2590 @@
                             </div>
                         </div><!-- side-cpac-settings -->
-                    
+
                     </div>
                 </div>
             </div><!-- .postbox-container -->
-            
+
             <div class="postbox-container cpac-col-left">
-                <div class="metabox-holder">    
+                <div class="metabox-holder">
                     <div class="meta-box-sortables">
-                    
+
                         <div id="general-cpac-settings" class="postbox">
                             <div title="Click to toggle" class="handlediv"><br></div>
@@ -2607 +2606 @@
                             <div class="inside">
                                 <form method="post" action="options.php">
-                                
+
                                 <?php settings_fields( 'cpac-settings-group' ); ?>
-                                
+
                                 <table class="form-table">
                                     <!-- columns -->
-                                    <?php echo $rows; ?>                                
-                                    
+                                    <?php echo $rows; ?>
+
                                     <!-- activation -->
                                     <?php echo $general_settings; ?>
-                                    
+
                                     <tr class="bottom" valign="top">
                                         <th scope="row"></th>
@@ -2624 +2623 @@
                                             </p>
                                         </td>
-                                    </tr>               
-                                </table>            
-                                </form>                     
-                            </div>                      
+                                    </tr>
+                                </table>
+                                </form>
+                            </div>
                         </div><!-- general-settings -->
-                        
+
                         <div id="restore-cpac-settings" class="postbox">
                             <div title="Click to toggle" class="handlediv"><br></div>
@@ -2636 +2635 @@
                             </h3>
                             <div class="inside">
-                                <form method="post" action="">                  
+                                <form method="post" action="">
                                     <input type="submit" class="button" name="cpac-restore-defaults" value="<?php _e('Restore default settings', CPAC_TEXTDOMAIN ) ?>" onclick="return confirm('<?php _e("Warning! ALL saved admin columns data will be deleted. This cannot be undone. \'OK\' to delete, \'Cancel\' to stop", CPAC_TEXTDOMAIN); ?>');" />
                                 </form>
@@ -2642 +2641 @@
                             </div>
                         </div><!-- restore-cpac-settings -->
-                    
+
                     </div>
                 </div>
-            </div><!-- .postbox-container -->           
+            </div><!-- .postbox-container -->
         </div>
     <?php

codepress-admin-columns/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.1
 Tested up to: 3.5
-Stable tag: 1.4.8
+Stable tag: 1.4.9
 
 Customise columns on the administration screens for post(types), pages, media, comments, links and users with an easy to use drag-and-drop interface.
@@ -11 +11 @@
 == Description ==
 
-Completely customise the columns on the administration screens with a nice drag and drop interface. 
-
-By default, WordPress only shows a few built-in columns. This plugin will give you many additional columns. You will have full control over all columns for pages, posts, posttypes, media, links, comments and users. 
+Completely customise the columns on the administration screens with a nice drag and drop interface.
+
+By default, WordPress only shows a few built-in columns. This plugin will give you many additional columns. You will have full control over all columns for pages, posts, posttypes, media, links, comments and users.
 
 Add or remove columns, change their label, change their width and reorder them.
@@ -35 +35 @@
 * Status
 * Number of Attachments
-* Last Modified 
+* Last Modified
 * Comment count
 * Before More Tag Content
@@ -114 +114 @@
 It will work nice with other plugins and support their additional custom columns. A few examples of plugins that are supported: WordPress SEO by Yoast (Robots Meta), Post Admin Shortcuts (Pin), WP Show IDs (ID) and User Access Manager (Access), Co-Authors Plus and Advanced Custom Fields.
 
-= Translations = 
+= Translations =
 
 If you like to contrinute a language, please send them to <a href="mailto:[email protected]">[email protected]</a>.
@@ -165 +165 @@
 add_image_size( 'admin-columns', $my_width, $my_height, true );
 add_filter('cpac_thumbnail_size', 'cb_cpac_thumbnail_size' );
-function cb_cpac_thumbnail_size() { 
+function cb_cpac_thumbnail_size() {
     return 'admin-columns';
 };
@@ -219 +219 @@
     $my_post_type  = 'demo';
     $my_field_name = 'city';
-    
+
     // make sure we have the correct posttype and fieldname
     if ( $my_post_type == $type && $my_field_name == $custom_field ) {
-        
+
         if ( '33' == $value )
             $value = 'Amsterdam';
-        
+
         elseif ( '34' == $value )
-            $value = 'New York';    
+            $value = 'New York';
     }
-    return $value;  
+    return $value;
 }
 add_filter( 'cpac_get_column_value_custom_field', 'my_custom_field_value', 10, 5 );
@@ -246 +246 @@
 
 == Changelog ==
+
+= 1.4.9
+* fixed bug: thirdparty columns that were previous loaded through load-edit.php will now use do_action( 'cpac-get-default-columns-{$type}' )
 
 = 1.4.8 =