Changeset 587972

Timestamp:

08/20/2012 08:57:26 PM (13 years ago)

Author:

jascott

Message:

Elements bug fixes

Location:

kickpress/trunk

Files:

• elements/class-checkbox.php (modified) (1 diff)
• includes/js/kickpress-ajax.js (modified) (1 diff)
• kickpress-api.php (modified) (3 diffs)
• kickpress-form-elements.php (modified) (3 diffs)
• kickpress-functions.php (modified) (1 diff)
• kickpress-post-types.php (modified) (1 diff)
• kickpress-relationships.php (modified) (3 diffs)
• kickpress-workflows.php (modified) (1 diff)

kickpress/trunk/elements/class-checkbox.php

@@ -45 +45 @@
         extract( $params, EXTR_SKIP );
         
-        return self::_html_input( 'checkbox', $name, 1, array(
+        return self::_html_input( 'checkbox', $name, 'enable', array(
             'id'      => $id,
             'class'   => $class,
-            'checked' => 'enable' == $value
+            'checked' => kickpress_boolean( $value )
         ) );
+    }
+    
+    public function validate_input( $data ) {
+        return kickpress_boolean( $data ) ? 'enable' : 'disable';
     }
 }

kickpress/trunk/includes/js/kickpress-ajax.js

@@ -1 +1 @@
 jQuery(document).ready( function($) {
-    $('a.ajax-reload').live('click', function(e) {
+    $('a.ajax-reload').on('click', function(e) {
         var wrapper = $('div#' + this.rel);
         

kickpress/trunk/kickpress-api.php

@@ -639 +639 @@
         );
         
+        $post_type = $this->params['post_type'];
+        
+        $filter_array = apply_filters( "kickpress_filter_array", $filter_array );
+        $filter_array = apply_filters( "kickpress_filter_array_{$post_type}", $filter_array );
+        
         return $filter_array;
     }
@@ -1719 +1724 @@
                     if ( !isset( $this->params['id'] ) )
                         $this->params['id'] = $post_id;
-    
+                    
+                    // this returns custom fields from the original API,
+                    // not the current post type
                     $fields = $this->get_custom_fields( true );
                     
@@ -2748 +2755 @@
         }
 
-        $custom_fields = $this->get_custom_fields( $this->params['merge_base_fields'] == 'true' );
+        $custom_fields = $this->get_custom_fields( $this->params['merge_base_fields'] == 'enable' );
 
         foreach ( $custom_fields as $key => $field ) {

kickpress/trunk/kickpress-form-elements.php

@@ -66 +66 @@
     
         if ( ! isset( $value ) ) $value = null;
-        $attr = isset( $properties ) ? $properties : array();
-        
-        $attr['id']    = $id;
-        $attr['class'] = $class;
+        
+        $attr = $this->get_attributes( $params );
         
         return self::_html_input( 'text', $name, $value, $attr );
@@ -87 +85 @@
     }
 
+    protected function get_attributes( $params ) {
+        extract( $params, EXTR_SKIP );
+        
+        $attr = isset( $properties ) ? $properties : array();
+        $attr['id']    = $id;
+        $attr['class'] = $class;
+        
+        return $attr;
+    }
+
     /**
      * This method SHOULD be over-ridden in child classes
      */
-    public function validate_input( $data ) {
-        return $data;
+    public function validate_input( $value ) {
+        return $value;
     }
     
@@ -136 +144 @@
         
         return self::_html_select( $name, $value, $options, $attr );
+    }
+    
+    /**
+     * 
+     */
+    public static function filter_alpha( $value ) {
+        return preg_replace( '/[^a-z]/i', '', $value );
+    }
+    
+    /**
+     * 
+     */
+    public static function filter_alnum( $value ) {
+        return preg_replace( '/[^0-9a-z]/i', '', $value );
+    }
+    
+    /**
+     * 
+     */
+    public static function filter_digit( $value ) {
+        return preg_replace( '/[^0-9]/', '', $value );
+    }
+    
+    /**
+     * 
+     */
+    public static function filter_xdigit( $value ) {
+        return preg_replace( '/[^0-9a-f]/i', '', $value );
     }
     

kickpress/trunk/kickpress-functions.php

@@ -696 +696 @@
  * if one is provided, or FALSE otherwise.
  */
-function kickpress_boolean( $param = null, $default = false ) {
+function kickpress_boolean( $value = null, $default = false ) {
     // ensure that the default is a boolean value
     if ( ! is_bool( $default ) )
         $default = kickpress_boolean( $default );
     
-    if ( is_null( $param ) )
+    if ( is_null( $value ) ) {
         return $default;
-    elseif ( 'enable' == strtolower( $param ) )
-        return true;
-    elseif ( 'disable' == strtolower( $param ) )
-        return false;
-    elseif ( 'false' == strtolower( $param ) )
-        return false;
-    elseif ( is_string( $param ) )
-        return (bool) trim( $param );
-    elseif ( is_scalar( $param ) )
-        return (bool) $param;
+    } elseif ( is_string( $value ) ) {
+        $true_strings  = array( 'true',  'enable' );
+        $false_strings = array( 'false', 'disable' );
+        
+        $lower_value = strtolower( $value );
+        
+        if ( in_array( $lower_value, $true_strings ) )
+            return true;
+        elseif ( in_array( $lower_value, $false_strings ) )
+            return false;
+        
+        return (bool) trim( $value );
+    } elseif ( is_scalar( $value ) ) {
+        return (bool) $value;
+    }
     
     return $default;

kickpress/trunk/kickpress-post-types.php

@@ -25 +25 @@
     $show_in_menu = current_user_can( 'manage_options' );
 
-    register_taxonomy($cat_slug, 'custom-post-types', array(
+    register_taxonomy( $cat_slug, 'custom-post-types', array(
             'public'             => false,
             'publicly_queryable' => false,

kickpress/trunk/kickpress-relationships.php

@@ -399 +399 @@
             var slug = form.attr('id').substr(16);
             
-            var label = $('<label/>').text($(this).text());
+            var input_id = 'rel_posts-' + slug + '-' + post_id;
+            
+            var label = $('<label/>', {
+                'for': input_id
+            }).text(' ' + $(this).text());
+            
             var input = $('<input/>', {
-                'type':  'hidden',
+                'id': input_id,
+                'type':  'checkbox',
                 'name':  'rel_posts[' + slug + '][]',
-                'value': post_id
+                'value': post_id,
+                'checked': 'checked'
             });
             
@@ -411 +418 @@
             list.append($('<div/>', {
                 'class': 'related-post'
-            }).append($('<a/>', {
-                'href':  '#',
-                'title': 'Remove Related Post',
-                'class': 'remove-post'
-            }).text('Remove Related Post')).append(label).append(input));
+            }).append(input).append(label));
             
             form.hide('blind', null, 'fast');
@@ -488 +491 @@
     <div id="related-posts-<?php echo $slug; ?>" class="related-posts">
         <?php if ( ! empty( $rel_posts ) ) : ?>
-        <?php if ( 'many' == $rel->object_qty ) : foreach ( $rel_posts as $rel_post ) : ?>
+        <?php if ( 'many' == $rel->object_qty ) : foreach ( $rel_posts as $rel_post ) :
+            $input_id = "rel_posts-{$slug}-{$rel_post->ID}"; ?>
         <div class="related-post">
-            <a href="#" title="Remove Related Post" class="remove-post">Remove Related Post</a>
-            <label><?php echo $rel_post->post_title; ?></label>
-            <input type="hidden" name="rel_posts[<?php echo $slug; ?>][]" value="<?php echo $rel_post->ID; ?>">
+            <input id="<?php esc_attr_e( $input_id ); ?>"
+                type="checkbox" checked="checked"
+                name="rel_posts[<?php echo $slug; ?>][]"
+                value="<?php echo $rel_post->ID; ?>">
+            <label for="<?php esc_attr_e( $input_id ); ?>">
+                <?php echo $rel_post->post_title; ?>
+            </label>
         </div>
         <?php endforeach; elseif ( 'one' == $rel->object_qty ) : ?>

kickpress/trunk/kickpress-workflows.php

@@ -291 +291 @@
     
     foreach ( $kickpress_post_types as $type ) {
-        if ( 'false' == $type['api']->params['builtin'] ) {
+        if ( kickpress_boolean( $type['api']->params['builtin'] ) ) {
             $slug = $type['post_type'] . '-workflow';