Fix undefined index: show_names and remove trailing spaces #195

Closed
wants to merge 1 commit into
from
View
@@ -20,7 +20,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -40,7 +40,7 @@
/**
* Validate value of meta fields
- * Define ALL validation methods inside this class and use the names of these
+ * Define ALL validation methods inside this class and use the names of these
* methods in the definition of meta boxes (key 'validate_func' of each field)
*/
class cmb_Meta_Box_Validate {
@@ -77,8 +77,8 @@ function __construct( $meta_box ) {
break;
}
}
-
- global $pagenow;
+
+ global $pagenow;
if ( $upload && in_array( $pagenow, array( 'page.php', 'page-new.php', 'post.php', 'post-new.php' ) ) ) {
add_action( 'admin_head', array( &$this, 'add_post_enctype' ) );
}
@@ -105,55 +105,55 @@ function add() {
$this->_meta_box['context'] = empty($this->_meta_box['context']) ? 'normal' : $this->_meta_box['context'];
$this->_meta_box['priority'] = empty($this->_meta_box['priority']) ? 'high' : $this->_meta_box['priority'];
$this->_meta_box['show_on'] = empty( $this->_meta_box['show_on'] ) ? array('key' => false, 'value' => false) : $this->_meta_box['show_on'];
-
+
foreach ( $this->_meta_box['pages'] as $page ) {
if( apply_filters( 'cmb_show_on', true, $this->_meta_box ) )
add_meta_box( $this->_meta_box['id'], $this->_meta_box['title'], array(&$this, 'show'), $page, $this->_meta_box['context'], $this->_meta_box['priority']) ;
}
}
-
+
/**
* Show On Filters
* Use the 'cmb_show_on' filter to further refine the conditions under which a metabox is displayed.
* Below you can limit it by ID and page template
*/
-
- // Add for ID
+
+ // Add for ID
function add_for_id( $display, $meta_box ) {
if ( 'id' !== $meta_box['show_on']['key'] )
return $display;
- // If we're showing it based on ID, get the current ID
+ // If we're showing it based on ID, get the current ID
if( isset( $_GET['post'] ) ) $post_id = $_GET['post'];
elseif( isset( $_POST['post_ID'] ) ) $post_id = $_POST['post_ID'];
if( !isset( $post_id ) )
return false;
-
- // If value isn't an array, turn it into one
+
+ // If value isn't an array, turn it into one
$meta_box['show_on']['value'] = !is_array( $meta_box['show_on']['value'] ) ? array( $meta_box['show_on']['value'] ) : $meta_box['show_on']['value'];
-
+
// If current page id is in the included array, display the metabox
if ( in_array( $post_id, $meta_box['show_on']['value'] ) )
return true;
else
return false;
}
-
+
// Add for Page Template
function add_for_page_template( $display, $meta_box ) {
if( 'page-template' !== $meta_box['show_on']['key'] )
return $display;
-
+
// Get the current ID
if( isset( $_GET['post'] ) ) $post_id = $_GET['post'];
elseif( isset( $_POST['post_ID'] ) ) $post_id = $_POST['post_ID'];
if( !( isset( $post_id ) || is_page() ) ) return false;
-
+
// Get current template
$current_template = get_post_meta( $post_id, '_wp_page_template', true );
-
- // If value isn't an array, turn it into one
+
+ // If value isn't an array, turn it into one
$meta_box['show_on']['value'] = !is_array( $meta_box['show_on']['value'] ) ? array( $meta_box['show_on']['value'] ) : $meta_box['show_on']['value'];
// See if there's a match
@@ -162,12 +162,14 @@ function add_for_page_template( $display, $meta_box ) {
else
return false;
}
-
+
// Show fields
function show() {
global $post;
+ if ( !isset( $this->_meta_box['show_names'] ) ) $this->_meta_box['show_names'] = false;
+
// Use nonce for verification
echo '<input type="hidden" name="wp_meta_box_nonce" value="', wp_create_nonce( basename(__FILE__) ), '" />';
echo '<table class="form-table cmb_metabox">';
@@ -179,21 +181,21 @@ function show() {
if ( !isset( $field['std'] ) ) $field['std'] = '';
if ( 'file' == $field['type'] && !isset( $field['allow'] ) ) $field['allow'] = array( 'url', 'attachment' );
if ( 'file' == $field['type'] && !isset( $field['save_id'] ) ) $field['save_id'] = false;
- if ( 'multicheck' == $field['type'] ) $field['multiple'] = true;
-
+ if ( 'multicheck' == $field['type'] ) $field['multiple'] = true;
+
$meta = get_post_meta( $post->ID, $field['id'], 'multicheck' != $field['type'] /* If multicheck this can be multiple values */ );
echo '<tr>';
-
+
if ( $field['type'] == "title" ) {
echo '<td colspan="2">';
} else {
if( $this->_meta_box['show_names'] == true ) {
echo '<th style="width:18%"><label for="', $field['id'], '">', $field['name'], '</label></th>';
- }
+ }
echo '<td>';
- }
-
+ }
+
switch ( $field['type'] ) {
case 'text':
@@ -218,7 +220,7 @@ function show() {
break;
case 'text_time':
echo '<input class="cmb_timepicker text_time" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', '' !== $meta ? $meta : $field['std'], '" /><span class="cmb_metabox_description">', $field['desc'], '</span>';
- break;
+ break;
case 'text_money':
echo '$ <input class="cmb_text_money" type="text" name="', $field['id'], '" id="', $field['id'], '" value="', '' !== $meta ? $meta : $field['std'], '" /><span class="cmb_metabox_description">', $field['desc'], '</span>';
break;
@@ -239,7 +241,7 @@ function show() {
break;
case 'textarea_code':
echo '<textarea name="', $field['id'], '" id="', $field['id'], '" cols="60" rows="10" class="cmb_textarea_code">', '' !== $meta ? $meta : $field['std'], '</textarea>','<p class="cmb_metabox_description">', $field['desc'], '</p>';
- break;
+ break;
case 'select':
if( empty( $meta ) && !empty( $field['std'] ) ) $meta = $field['std'];
echo '<select name="', $field['id'], '" id="', $field['id'], '">';
@@ -281,12 +283,12 @@ function show() {
foreach ( $field['options'] as $value => $name ) {
// Append `[]` to the name to get multiple values
// Use in_array() to check whether the current option should be checked
- echo '<li><input type="checkbox" name="', $field['id'], '[]" id="', $field['id'], $i, '" value="', $value, '"', in_array( $value, $meta ) ? ' checked="checked"' : '', ' /><label for="', $field['id'], $i, '">', $name, '</label></li>';
+ echo '<li><input type="checkbox" name="', $field['id'], '[]" id="', $field['id'], $i, '" value="', $value, '"', in_array( $value, $meta ) ? ' checked="checked"' : '', ' /><label for="', $field['id'], $i, '">', $name, '</label></li>';
$i++;
}
echo '</ul>';
- echo '<span class="cmb_metabox_description">', $field['desc'], '</span>';
- break;
+ echo '<span class="cmb_metabox_description">', $field['desc'], '</span>';
+ break;
case 'title':
echo '<h5 class="cmb_metabox_title">', $field['name'], '</h5>';
echo '<p class="cmb_metabox_description">', $field['desc'], '</p>';
@@ -328,7 +330,7 @@ function show() {
$names = wp_get_object_terms( $post->ID, $field['taxonomy'] );
$terms = get_terms( $field['taxonomy'], 'hide_empty=0' );
foreach ($terms as $term) {
- echo '<li><input type="checkbox" name="', $field['id'], '[]" id="', $field['id'], '" value="', $term->name , '"';
+ echo '<li><input type="checkbox" name="', $field['id'], '[]" id="', $field['id'], '" value="', $term->name , '"';
foreach ($names as $name) {
if ( $term->slug == $name->slug ){ echo ' checked="checked" ';};
}
@@ -365,10 +367,10 @@ function show() {
$input_type_url="text";
echo '<input class="cmb_upload_file" type="' . $input_type_url . '" size="45" id="', $field['id'], '" name="', $field['id'], '" value="', $meta, '" />';
echo '<input class="cmb_upload_button button" type="button" value="Upload File" />';
- echo '<input class="cmb_upload_file_id" type="hidden" id="', $field['id'], '_id" name="', $field['id'], '_id" value="', get_post_meta( $post->ID, $field['id'] . "_id",true), '" />';
+ echo '<input class="cmb_upload_file_id" type="hidden" id="', $field['id'], '_id" name="', $field['id'], '_id" value="', get_post_meta( $post->ID, $field['id'] . "_id",true), '" />';
echo '<p class="cmb_metabox_description">', $field['desc'], '</p>';
- echo '<div id="', $field['id'], '_status" class="cmb_upload_status">';
- if ( $meta != '' ) {
+ echo '<div id="', $field['id'], '_status" class="cmb_upload_status">';
+ if ( $meta != '' ) {
$check_image = preg_match( '/(^.*\.jpg|jpeg|png|gif|ico*)/i', $meta );
if ( $check_image ) {
echo '<div class="img_status">';
@@ -379,16 +381,16 @@ function show() {
$parts = explode( '/', $meta );
for( $i = 0; $i < count( $parts ); ++$i ) {
$title = $parts[$i];
- }
+ }
echo 'File: <strong>', $title, '</strong>&nbsp;&nbsp;&nbsp; (<a href="', $meta, '" target="_blank" rel="external">Download</a> / <a href="#" class="cmb_remove_file_button" rel="', $field['id'], '">Remove</a>)';
- }
+ }
}
- echo '</div>';
+ echo '</div>';
break;
default:
do_action('cmb_render_' . $field['type'] , $field, $meta);
}
-
+
echo '</td>','</tr>';
}
echo '</table>';
@@ -417,26 +419,26 @@ function save( $post_id) {
}
foreach ( $this->_meta_box['fields'] as $field ) {
- $name = $field['id'];
+ $name = $field['id'];
if ( ! isset( $field['multiple'] ) )
- $field['multiple'] = ( 'multicheck' == $field['type'] ) ? true : false;
-
+ $field['multiple'] = ( 'multicheck' == $field['type'] ) ? true : false;
+
$old = get_post_meta( $post_id, $name, !$field['multiple'] /* If multicheck this can be multiple values */ );
$new = isset( $_POST[$field['id']] ) ? $_POST[$field['id']] : null;
-
- if ( in_array( $field['type'], array( 'taxonomy_select', 'taxonomy_radio', 'taxonomy_multicheck' ) ) ) {
- $new = wp_set_object_terms( $post_id, $new, $field['taxonomy'] );
+
+ if ( in_array( $field['type'], array( 'taxonomy_select', 'taxonomy_radio', 'taxonomy_multicheck' ) ) ) {
+ $new = wp_set_object_terms( $post_id, $new, $field['taxonomy'] );
}
-
+
if ( ($field['type'] == 'textarea') || ($field['type'] == 'textarea_small') ) {
$new = htmlspecialchars( $new );
}
if ( ($field['type'] == 'textarea_code') ) {
$new = htmlspecialchars_decode( $new );
}
-
+
if ( $field['type'] == 'text_date_timestamp' ) {
$new = strtotime( $new );
}
@@ -445,28 +447,28 @@ function save( $post_id) {
$string = $new['date'] . ' ' . $new['time'];
$new = strtotime( $string );
}
-
- $new = apply_filters('cmb_validate_' . $field['type'], $new, $post_id, $field);
-
+
+ $new = apply_filters('cmb_validate_' . $field['type'], $new, $post_id, $field);
+
// validate meta value
if ( isset( $field['validate_func']) ) {
$ok = call_user_func( array( 'cmb_Meta_Box_Validate', $field['validate_func']), $new );
if ( $ok === false ) { // pass away when meta value is invalid
continue;
}
} elseif ( $field['multiple'] ) {
- delete_post_meta( $post_id, $name );
+ delete_post_meta( $post_id, $name );
if ( !empty( $new ) ) {
foreach ( $new as $add_new ) {
add_post_meta( $post_id, $name, $add_new, false );
}
- }
+ }
} elseif ( '' !== $new && $new != $old ) {
update_post_meta( $post_id, $name, $new );
} elseif ( '' == $new ) {
delete_post_meta( $post_id, $name );
}
-
+
if ( 'file' == $field['type'] ) {
$name = $field['id'] . "_id";
$old = get_post_meta( $post_id, $name, !$field['multiple'] /* If multicheck this can be multiple values */ );
@@ -481,7 +483,7 @@ function save( $post_id) {
} elseif ( '' == $new && $old ) {
delete_post_meta( $post_id, $name, $old );
}
- }
+ }
}
}
}
@@ -503,42 +505,42 @@ function cmb_scripts( $hook ) {
function cmb_editor_footer_scripts() { ?>
<?php
- if ( isset( $_GET['cmb_force_send'] ) && 'true' == $_GET['cmb_force_send'] ) {
- $label = $_GET['cmb_send_label'];
+ if ( isset( $_GET['cmb_force_send'] ) && 'true' == $_GET['cmb_force_send'] ) {
+ $label = $_GET['cmb_send_label'];
if ( empty( $label ) ) $label="Select File";
- ?>
+ ?>
<script type="text/javascript">
jQuery(function($) {
$('td.savesend input').val('<?php echo $label; ?>');
});
</script>
- <?php
+ <?php
}
}
add_action( 'admin_print_footer_scripts', 'cmb_editor_footer_scripts', 99 );
-// Force 'Insert into Post' button from Media Library
+// Force 'Insert into Post' button from Media Library
add_filter( 'get_media_item_args', 'cmb_force_send' );
function cmb_force_send( $args ) {
-
- // if the Gallery tab is opened from a custom meta box field, add Insert Into Post button
+
+ // if the Gallery tab is opened from a custom meta box field, add Insert Into Post button
if ( isset( $_GET['cmb_force_send'] ) && 'true' == $_GET['cmb_force_send'] )
$args['send'] = true;
-
- // if the From Computer tab is opened AT ALL, add Insert Into Post button after an image is uploaded
+
+ // if the From Computer tab is opened AT ALL, add Insert Into Post button after an image is uploaded
if ( isset( $_POST['attachment_id'] ) && '' != $_POST["attachment_id"] ) {
-
- $args['send'] = true;
- // TO DO: Are there any conditions in which we don't want the Insert Into Post
+ $args['send'] = true;
+
+ // TO DO: Are there any conditions in which we don't want the Insert Into Post
// button added? For example, if a post type supports thumbnails, does not support
// the editor, and does not have any cmb file inputs? If so, here's the first
// bits of code needed to check all that.
// $attachment_ancestors = get_post_ancestors( $_POST["attachment_id"] );
// $attachment_parent_post_type = get_post_type( $attachment_ancestors[0] );
// $post_type_object = get_post_type_object( $attachment_parent_post_type );
- }
-
+ }
+
// change the label of the button on the From Computer tab
if ( isset( $_POST['attachment_id'] ) && '' != $_POST["attachment_id"] ) {
@@ -554,7 +556,7 @@ function cmbGetParameterByNameInline(name) {
else
return decodeURIComponent(results[1].replace(/\+/g, " "));
}
-
+
jQuery(function($) {
if (cmbGetParameterByNameInline("cmb_force_send")=="true") {
var cmb_send_label = cmbGetParameterByNameInline("cmb_send_label");
@@ -564,7 +566,7 @@ function cmbGetParameterByNameInline(name) {
</script>
';
}
-
+
return $args;
}