From 120933638839f0d7acf7fd96ea85379517a19820 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 16 Nov 2009 20:24:19 -0500 Subject: [PATCH] working on action nonces --- classes/ComicPressAdmin.inc | 646 +++++++++++---------- classes/partials/_comic-image-ordering.inc | 5 +- classes/partials/edit-partials.inc | 89 --- classes/partials/layout-editor.inc | 8 - classes/partials/options-admin.inc | 4 +- test/ComicPressAdminTest.php | 39 -- 6 files changed, 331 insertions(+), 460 deletions(-) delete mode 100644 classes/partials/edit-partials.inc delete mode 100644 classes/partials/layout-editor.inc diff --git a/classes/ComicPressAdmin.inc b/classes/ComicPressAdmin.inc index 8e41bd0..5a7dc73 100644 --- a/classes/ComicPressAdmin.inc +++ b/classes/ComicPressAdmin.inc @@ -1,85 +1,85 @@ comicpress = &ComicPress::get_instance(); add_action('admin_menu', array(&$this, 'admin_menu')); - add_filter('attachment_fields_to_edit', array(&$this, 'setup_comic_metadata_buttons'), 10, 2); + add_filter('attachment_fields_to_edit', array(&$this, 'setup_comic_metadata_buttons'), 10, 2); - if (current_user_can('edit_posts') && isset($comicpress->comicpress_options['helpers']['show_inline_comic_ordering'])) { - add_filter('comicpress_attached_image', array(&$this, 'comicpress_attached_image'), 10, 3); - add_filter('comicpress_display_attached_images', array(&$this, 'comicpress_display_attached_images'), 10, 2); - } + if (current_user_can('edit_posts') && isset($comicpress->comicpress_options['helpers']['show_inline_comic_ordering'])) { + add_filter('comicpress_attached_image', array(&$this, 'comicpress_attached_image'), 10, 3); + add_filter('comicpress_display_attached_images', array(&$this, 'comicpress_display_attached_images'), 10, 2); + } - $this->comic_image_types = array( - 'none' => __('Not a comic', 'comicpress'), - 'comic' => __('Comic', 'comicpress'), - 'rss' => __('RSS', 'comicpress'), - 'archive' => __('Archive', 'comicpress') - ); + $this->comic_image_types = array( + 'none' => __('Not a comic', 'comicpress'), + 'comic' => __('Comic', 'comicpress'), + 'rss' => __('RSS', 'comicpress'), + 'archive' => __('Archive', 'comicpress') + ); - if (is_admin()) { - add_action('admin_notices', array(&$this, 'display_messages')); - } else { - add_action('wp_head', array(&$this, 'display_messages')); - } - } + if (is_admin()) { + add_action('admin_notices', array(&$this, 'display_messages')); + } else { + add_action('wp_head', array(&$this, 'display_messages')); + } + } - function comicpress_attached_image($content, $attachment_id, $index) { - $content .= ''; + function comicpress_attached_image($content, $attachment_id, $index) { + $content .= ''; - return $content; - } + return $content; + } - function comicpress_display_attached_images($content, $post_id) { - $content = '
' - . '' - . '' - . $content - . '' - . '
'; + function comicpress_display_attached_images($content, $post_id) { + $content = '
' + . '' + . '' + . $content + . '' + . '
'; - return $content; - } + return $content; + } - /** - * Set up the admin interface and meta boxes. - */ - function admin_menu() { + /** + * Set up the admin interface and meta boxes. + */ + function admin_menu() { global $plugin_page, $pagenow, $post; - add_theme_page(__("ComicPress", 'comicpress'), __('ComicPress', 'comicpress'), 'edit_themes', 'comicpress/render_admin', array(&$this, 'render_admin')); + add_theme_page(__("ComicPress", 'comicpress'), __('ComicPress', 'comicpress'), 'edit_themes', 'comicpress/render_admin', array(&$this, 'render_admin')); - if (strpos($pagenow, "post") === 0) { - add_meta_box("comic-image-ordering", __("Comic Image Ordering", 'comicpress'), array(&$this, 'render_comic_image_ordering'), "post", "normal", "low"); - wp_enqueue_script('cp-ordering', get_template_directory_uri() . '/js/ComicImageOrdering.js', array('scriptaculous', 'scriptaculous-slider')); - wp_enqueue_style('cp-admin', get_template_directory_uri() . '/css/cp-admin.css'); - add_action('admin_footer', array(&$this, 'admin_footer')); - } + if (strpos($pagenow, "post") === 0) { + add_meta_box("comic-image-ordering", __("Comic Image Ordering", 'comicpress'), array(&$this, 'render_comic_image_ordering'), "post", "normal", "low"); + wp_enqueue_script('cp-ordering', get_template_directory_uri() . '/js/ComicImageOrdering.js', array('scriptaculous', 'scriptaculous-slider')); + wp_enqueue_style('cp-admin', get_template_directory_uri() . '/css/cp-admin.css'); + add_action('admin_footer', array(&$this, 'admin_footer')); + } if ($plugin_page == 'comicpress/render_admin') { wp_enqueue_style('cp-admin', get_template_directory_uri() . '/css/cp-admin.css'); wp_enqueue_script('cp-admin', get_template_directory_uri() . '/js/Storyline.js', array('prototype', 'scriptaculous')); - add_action('admin_footer', array(&$this, 'admin_footer')); + add_action('admin_footer', array(&$this, 'admin_footer')); } if (strpos($pagenow, "-upload") !== false) { @@ -87,57 +87,58 @@ class ComicPressAdmin { } } - function admin_footer() { - $nonce = wp_create_nonce('comicpress'); - ?> - + ID, 'comicpress', true); - $is_managed = false; - if (isset($comicpress_info['managed'])) { - $is_managed = $comicpress_info['managed']; - } + $comicpress_info = get_post_meta($post->ID, 'comicpress', true); + $is_managed = false; + if (isset($comicpress_info['managed'])) { + $is_managed = $comicpress_info['managed']; + } - if ($pagenow !== "media.php") { - $form_fields['auto_attach'] = array( - 'label' => __("Let ComicPress Manage?", 'comicpress'), - 'input' => 'html', - 'html' => '' - . '' - . '' - ); - } + if ($pagenow !== "media.php") { + $form_fields['auto_attach'] = array( + 'label' => __("Let ComicPress Manage?", 'comicpress'), + 'input' => 'html', + 'html' => '' + . '' + . '' + ); + } - return $form_fields; - } + return $form_fields; + } - /** - * Render the admin interface. - */ - function render_admin() { - $nonce = wp_create_nonce('comicpress'); + /** + * Render the admin interface. + */ + function render_admin() { + $nonce = wp_create_nonce('comicpress'); + $action_nonce = wp_create_nonce('comicpress-comicpress-options'); $storyline = new ComicPressStoryline(); $storyline->normalize(); $storyline->read_from_options(); - include(dirname(__FILE__) . '/partials/options-admin.inc'); - } + include(dirname(__FILE__) . '/partials/options-admin.inc'); + } function _render_admin_storyline_tree($node, $parent_id = "0") { - foreach ($node as $category_id => $children) { + foreach ($node as $category_id => $children) { $category = get_category($category_id); echo '
'; echo '' . $category->name . ''; @@ -150,37 +151,38 @@ class ComicPressAdmin { } } - /** - * Render the comic image ordering interface. - */ - function render_comic_image_ordering($is_ajax = false, $override_post = null) { - global $post_ID, $temp_ID; + /** + * Render the comic image ordering interface. + */ + function render_comic_image_ordering($is_ajax = false, $override_post = null) { + global $post_ID, $temp_ID; - $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID); - if (is_numeric($override_post)) { $uploading_iframe_ID = $override_post; } + $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID); + if (is_numeric($override_post)) { $uploading_iframe_ID = $override_post; } - $comic_post = new ComicPressComicPost(get_post($uploading_iframe_ID)); - $ordering = $comic_post->normalize_ordering(); + $comic_post = new ComicPressComicPost(get_post($uploading_iframe_ID)); + $ordering = $comic_post->normalize_ordering(); - $nonce = wp_create_nonce('comicpress'); - $zoom_level = 40; - $current_user = wp_get_current_user(); - if (!empty($current_user)) { - $comicpress_meta = get_usermeta($current_user->ID, 'comicpress-settings'); - if (is_array($comicpress_meta)) { - if (isset($comicpress_meta['zoom_level'])) { - $zoom_level = floor($comicpress_meta['zoom_level']); - } - } - } + $nonce = wp_create_nonce('comicpress'); + $action_nonce = wp_create_nonce('comicpress-comic-ordering'); + $zoom_level = 40; + $current_user = wp_get_current_user(); + if (!empty($current_user)) { + $comicpress_meta = get_usermeta($current_user->ID, 'comicpress-settings'); + if (is_array($comicpress_meta)) { + if (isset($comicpress_meta['zoom_level'])) { + $zoom_level = floor($comicpress_meta['zoom_level']); + } + } + } - // from wp-admin/includes/media.php O_o - $media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID"; - $image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&type=image&TB_iframe=true"); + // from wp-admin/includes/media.php O_o + $media_upload_iframe_src = "media-upload.php?post_id=$uploading_iframe_ID"; + $image_upload_iframe_src = apply_filters('image_upload_iframe_src', "$media_upload_iframe_src&type=image&TB_iframe=true"); - $comicpress = ComicPress::get_instance(); + $comicpress = ComicPress::get_instance(); - $available_attachments = array(); + $available_attachments = array(); foreach ($this->get_editable_attachment_list($ordering) as $id => $info) { $result = ComicPressBackend::generate_from_id($id); if (!empty($result)) { @@ -190,86 +192,86 @@ class ComicPressAdmin { } } - if ($is_ajax === true) { - include(dirname(__FILE__) . '/partials/_comic-image-ordering-sorters.inc'); - } else { - include(dirname(__FILE__) . '/partials/_comic-image-ordering.inc'); - } - } - // @codeCoverageIgnoreEnd + if ($is_ajax === true) { + include(dirname(__FILE__) . '/partials/_comic-image-ordering-sorters.inc'); + } else { + include(dirname(__FILE__) . '/partials/_comic-image-ordering.inc'); + } + } + // @codeCoverageIgnoreEnd - function get_editable_attachment_list($ordering) { - foreach ($ordering as $id => $info) { - if (isset($info['children'])) { - foreach (array_values($info['children']) as $new_id) { - $ordering[$new_id] = array('enabled' => true); - } - } - } + function get_editable_attachment_list($ordering) { + foreach ($ordering as $id => $info) { + if (isset($info['children'])) { + foreach (array_values($info['children']) as $new_id) { + $ordering[$new_id] = array('enabled' => true); + } + } + } - return $ordering; - } + return $ordering; + } - /** - * Create a dimension selector. - * @param string $root The field name root. - * @param $dimension The dimension to pre-fill into the fields. - * @return string The dimension selector as HTML. - */ - function create_dimension_selector($root, $dimension) { - $output = array(); + /** + * Create a dimension selector. + * @param string $root The field name root. + * @param $dimension The dimension to pre-fill into the fields. + * @return string The dimension selector as HTML. + */ + function create_dimension_selector($root, $dimension) { + $output = array(); - $parts = explode("x", $dimension); - foreach (array( - 'width' => __('Width', 'comicpress'), - 'height' => __('Height', 'comicpress') - ) as $id => $name) { - $dim = array_shift($parts); - if (!empty($dim) && !is_numeric($dim)) { $dim = ""; } - $output[] = '
'; - } - return implode("\n", $output); - } + $parts = explode("x", $dimension); + foreach (array( + 'width' => __('Width', 'comicpress'), + 'height' => __('Height', 'comicpress') + ) as $id => $name) { + $dim = array_shift($parts); + if (!empty($dim) && !is_numeric($dim)) { $dim = ""; } + $output[] = '
'; + } + return implode("\n", $output); + } - // @codeCoverageIgnoreStart - /** - * Update attachment information. - */ - function handle_update_refresh_ordering($info) { - $this->render_comic_image_ordering(true, $info['post_id']); - exit(0); - } - // @codeCoverageIgnoreEnd + // @codeCoverageIgnoreStart + /** + * Update attachment information. + */ + function handle_update_refresh_ordering($info) { + $this->render_comic_image_ordering(true, $info['post_id']); + exit(0); + } + // @codeCoverageIgnoreEnd - /** - * Update attachment information. - */ - function handle_update_attachments() { - foreach ($_POST['attachments'] as $post_id => $settings) { - if (isset($settings['comicpress_management'])) { - $media_post = get_post($post_id); - if (isset($media_post->post_parent)) { - $media_post->post_parent = $settings['post_parent']; - wp_update_post($media_post); - } - } - update_post_meta($post_id, 'comicpress', array( - 'managed' => isset($settings['comicpress_management']) - )); - } - } + /** + * Update attachment information. + */ + function handle_update_attachments() { + foreach ($_POST['attachments'] as $post_id => $settings) { + if (isset($settings['comicpress_management'])) { + $media_post = get_post($post_id); + if (isset($media_post->post_parent)) { + $media_post->post_parent = $settings['post_parent']; + wp_update_post($media_post); + } + } + update_post_meta($post_id, 'comicpress', array( + 'managed' => isset($settings['comicpress_management']) + )); + } + } - /** - * Update ComicPress options. - */ - function handle_update_comicpress_options($info) { - foreach ($this->comicpress->comicpress_options as $option => $value) { - if (isset($info[$option])) { - switch ($option) { - case 'image_types': + /** + * Update ComicPress options. + */ + function handle_update_comicpress_options($info) { + foreach ($this->comicpress->comicpress_options as $option => $value) { + if (isset($info[$option])) { + switch ($option) { + case 'image_types': if (is_array($info['image_types'])) { - $this->comicpress->comicpress_options['image_types'] = array(); - $defined_default = null; + $this->comicpress->comicpress_options['image_types'] = array(); + $defined_default = null; foreach ($info['image_types'] as $type => $image_info) { if (is_array($image_info)) { $new_value = array(); @@ -289,7 +291,7 @@ class ComicPressAdmin { } } if ($type != $new_type) { - unset($this->comicpress->comicpress_options['image_types'][$new_type]); + unset($this->comicpress->comicpress_options['image_types'][$new_type]); } $this->comicpress->comicpress_options['image_types'][$new_type] = $new_value; } @@ -305,146 +307,146 @@ class ComicPressAdmin { $this->comicpress->comicpress_options['image_types'][$defined_default]['default'] = true; } } - break; - // @codeCoverageIgnoreStart + break; + // @codeCoverageIgnoreStart case 'storyline_order': $storyline = new ComicPressStoryline(); $storyline->normalize($info[$option]); break; - // @codeCoverageIgnoreEnd - } - } - } - } + // @codeCoverageIgnoreEnd + } + } + } - // @codeCoverageIgnoreStart - function _json_decode($string) { - if (function_exists('json_decode')) { - return json_decode($string); - } else { - require_once(ABSPATH."/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/JSON.php"); - $j = new Moxiecode_JSON(); - return $j->decode($string); - } - } + $this->comicpress->save(); + + $this->info(__("ComicPress configuration updated.", 'comicpress')); + + $this->comicpress->init(); + } + + // @codeCoverageIgnoreStart + function _json_decode($string) { + if (function_exists('json_decode')) { + return json_decode($string); + } else { + require_once(ABSPATH."/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/JSON.php"); + $j = new Moxiecode_JSON(); + return $j->decode($string); + } + } function _json_encode($data) { - if (function_exists('json_encode')) { - return json_encode($data); - } else { - require_once(ABSPATH."/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/JSON.php"); - $j = new Moxiecode_JSON(); - return $j->encode($data); - } - } + if (function_exists('json_encode')) { + return json_encode($data); + } else { + require_once(ABSPATH."/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/JSON.php"); + $j = new Moxiecode_JSON(); + return $j->encode($data); + } + } - function handle_update_comic_ordering() { - if (isset($_POST['post_ID'])) { - if (is_numeric($_POST['post_ID'])) { - if ($post = get_post($_POST['post_ID'])) { - $comic_post = new ComicPressComicPost($post); - $comic_post->update_post_media_data($this->_json_decode(stripslashes($_POST['cp']['comic_order']))); - } - } - } - } + function handle_update_comic_ordering() { + if (isset($_POST['post_ID'])) { + if (is_numeric($_POST['post_ID'])) { + if ($post = get_post($_POST['post_ID'])) { + $comic_post = new ComicPressComicPost($post); + $comic_post->update_post_media_data($this->_json_decode(stripslashes($_POST['cp']['comic_order']))); + } + } + } + } - function handle_update_get_new_image_type_editor($info) { - $type = substr(md5(rand()), 0, 6); - $info = array( - 'dimensions' => '100x100', - 'default' => false, - 'name' => 'New Type' - ); + function handle_update_get_new_image_type_editor($info) { + $type = substr(md5(rand()), 0, 6); + $info = array( + 'dimensions' => '100x100', + 'default' => false, + 'name' => 'New Type' + ); - require_once('partials/_image-type-editor.inc'); - exit(0); - } + require_once('partials/_image-type-editor.inc'); + exit(0); + } - /** - * Update the zoom slider info. - * @param $info The browser input. - */ - function handle_update_zoom_slider($info) { - $this->is_ajax = true; + /** + * Update the zoom slider info. + * @param $info The browser input. + */ + function handle_update_zoom_slider($info) { + $this->is_ajax = true; - $current_user = wp_get_current_user(); - if (!empty($current_user)) { - $this->_update_zoom_slider_meta($current_user->ID, $info['zoom_level']); - exit(0); - } - header('HTTP/1.1 500 Internal Server Error'); - exit(0); - } - // @codeCoverageIgnoreEnd + $current_user = wp_get_current_user(); + if (!empty($current_user)) { + $this->_update_zoom_slider_meta($current_user->ID, $info['zoom_level']); + exit(0); + } + header('HTTP/1.1 500 Internal Server Error'); + exit(0); + } + // @codeCoverageIgnoreEnd - /** - * Update the user's zoom slider metadata. - */ - function _update_zoom_slider_meta($user_id, $level) { - $comicpress_meta = get_usermeta($user_id, 'comicpress-settings'); - if (!is_array($comicpress_meta)) { $comicpress_meta = array(); } - $comicpress_meta['zoom_level'] = $level; - update_usermeta($user_id, 'comicpress-settings', $comicpress_meta); - } + /** + * Update the user's zoom slider metadata. + */ + function _update_zoom_slider_meta($user_id, $level) { + $comicpress_meta = get_usermeta($user_id, 'comicpress-settings'); + if (!is_array($comicpress_meta)) { $comicpress_meta = array(); } + $comicpress_meta['zoom_level'] = $level; + update_usermeta($user_id, 'comicpress-settings', $comicpress_meta); + } - /** - * Handle an update. - */ - function handle_update() { - if (isset($_REQUEST['cp'])) { - if (is_array($_REQUEST['cp'])) { - if (isset($_REQUEST['cp']['_nonce'])) { - if (wp_verify_nonce($_REQUEST['cp']['_nonce'], 'comicpress')) { - if (isset($_POST['attachments'])) { - //coming from media editor - $this->handle_update_attachments(); - } else if (isset($_REQUEST['cp']['action'])) { - $method = 'handle_update_' . strtolower(str_replace('-', '_', $_REQUEST['cp']['action'])); - if (method_exists($this, $method)) { - $this->{$method}($_REQUEST['cp']); - } - } else { - //coming from us - $this->handle_update_comicpress_options($_REQUEST['cp']); + /** + * Handle an update. + */ + function handle_update() { + if (isset($_REQUEST['cp'])) { + if (is_array($_REQUEST['cp'])) { + if (isset($_REQUEST['cp']['_nonce'])) { + if (wp_verify_nonce($_REQUEST['cp']['_nonce'], 'comicpress')) { + if (isset($_POST['attachments'])) { + //coming from media editor + $this->handle_update_attachments(); + } else if (isset($_REQUEST['cp']['action'])) { + $action = $_REQUEST['cp']['action']; + if (isset($_REQUEST['cp']['_action_nonce'])) { + if (wp_verify_nonce($_REQUEST['cp']['_action_nonce'], "comicpress-${action}")) { + $method = 'handle_update_' . strtolower(str_replace('-', '_', $action)); + if (method_exists($this, $method)) { + $this->{$method}($_REQUEST['cp']); + } + } + } + } + } + } + } + } + } - $this->comicpress->save(); + // @codeCoverageIgnoreStart + var $messages = array( + 'info' => array(), + 'warn' => array(), + 'error' => array() + ); - $this->info(__("ComicPress configuration updated.", 'comicpress')); + function info($message) { $this->messages['info'][] = $message; } + function warn($message) { $this->messages['warn'][] = $message; } + function error($message) { $this->messages['error'][] = $message; } - $this->comicpress->init(); - } - - $this->comicpress->load(); - } - } - } - } - } - - // @codeCoverageIgnoreStart - var $messages = array( - 'info' => array(), - 'warn' => array(), - 'error' => array() - ); - - function info($message) { $this->messages['info'][] = $message; } - function warn($message) { $this->messages['warn'][] = $message; } - function error($message) { $this->messages['error'][] = $message; } - - function display_messages() { - foreach ($this->messages as $type => $messages) { - if (!empty($messages)) { - echo '
'; - foreach ($messages as $message) { - echo '

' . $message . '

'; - } - echo '
'; - } - } - } - // @codeCoverageIgnoreEnd + function display_messages() { + foreach ($this->messages as $type => $messages) { + if (!empty($messages)) { + echo '
'; + foreach ($messages as $message) { + echo '

' . $message . '

'; + } + echo '
'; + } + } + } + // @codeCoverageIgnoreEnd } ?> diff --git a/classes/partials/_comic-image-ordering.inc b/classes/partials/_comic-image-ordering.inc index a90cdc6..59bf430 100644 --- a/classes/partials/_comic-image-ordering.inc +++ b/classes/partials/_comic-image-ordering.inc @@ -1,6 +1,7 @@
+
@@ -17,12 +18,14 @@ (function() { $('ordering-refresh').observe('click', function(e) { Event.stop(e); + new Ajax.Updater('comic-ordering-holder', ComicPressAdmin.ajax_uri, { method: 'post', parameters: { 'cp[_nonce]': ComicPressAdmin.nonce, + 'cp[_action_nonce]': '', 'cp[action]': 'refresh-ordering', - 'cp[post_id]': + 'cp[post_id]': }, evalScripts: true, onSuccess: function() { diff --git a/classes/partials/edit-partials.inc b/classes/partials/edit-partials.inc deleted file mode 100644 index 79eb5e6..0000000 --- a/classes/partials/edit-partials.inc +++ /dev/null @@ -1,89 +0,0 @@ -
-

Edit partials

- -
- 0) { - $valid_partials[] = $matches[1]; - } - } - - $selected = reset($valid_partials); - if (isset($_REQUEST['cp']['partial'])) { - if (in_array($_REQUEST['cp']['partial'], $valid_partials)) { - $selected = $_REQUEST['cp']['partial']; - } - } - - echo '
    '; - foreach ($valid_partials as $partial_name) { - echo '
  • '; - if ($partial_name == $selected) { echo ''; } - echo '' . $partial_name . ''; - if ($partial_name == $selected) { echo ''; } - if (isset($this->comicpress->comicpress_options['override_partials'][$partial_name])) { - echo "(@)"; - } - echo '
    • '; - } - echo '
'; - - $is_original = false; - if ($_REQUEST['cp']['action'] == __('Delete override partial', 'comicpress')) { - unset($_REQUEST['cp']['code']); - } - - if (isset($_REQUEST['cp']['code'])) { - $partial_code = htmlentities($_REQUEST['cp']['code']); - } else { - if (isset($this->comicpress->comicpress_options['override_partials'][$selected])) { - $partial_code = htmlentities($this->comicpress->comicpress_options['override_partials'][$selected]); - } else { - $is_original = true; - $partial_code = htmlentities(file_get_contents(get_template_directory() . DIRECTORY_SEPARATOR . $selected . '.inc')); - } - } - - ?> -
-
-

- -

()

- -
- - - - - -
-
- -
-
diff --git a/classes/partials/layout-editor.inc b/classes/partials/layout-editor.inc deleted file mode 100644 index ccfa44c..0000000 --- a/classes/partials/layout-editor.inc +++ /dev/null @@ -1,8 +0,0 @@ -
-
- -
-
- \ No newline at end of file diff --git a/classes/partials/options-admin.inc b/classes/partials/options-admin.inc index 809e018..dd5c5d3 100644 --- a/classes/partials/options-admin.inc +++ b/classes/partials/options-admin.inc @@ -2,6 +2,8 @@

+ +

@@ -33,7 +35,7 @@
- +
diff --git a/test/ComicPressAdminTest.php b/test/ComicPressAdminTest.php index d6d06d5..a23c049 100644 --- a/test/ComicPressAdminTest.php +++ b/test/ComicPressAdminTest.php @@ -251,45 +251,6 @@ class ComicPressAdminTest extends PHPUnit_Framework_TestCase { ), get_usermeta(1, 'comicpress-settings')); } - function providerTestHandleUpdate() { - return array( - array(array()), - array(array('cp' => true), false), - array(array('cp' => array()), false), - array(array('cp' => array()), true, true, true), - array(array('cp' => array(), 'attachments' => array()), true, true, false), - array(array('cp' => array('action' => 'test')), true, true, false), - array(array('cp' => array('action' => 'comic_ordering')), true, true, false), - ); - } - - /** - * @dataProvider providerTestHandleUpdate - * @covers ComicPressAdmin::handle_update - */ - function testHandleUpdate($input, $add_nonce = false, $comicpress_load = false, $comicpress_save = false) { - $this->admin->comicpress = $this->getMock('ComicPress', array('save', 'init', 'load')); - if ($comicpress_load) { - $this->admin->comicpress->expects($this->once())->method('load'); - } - if ($comicpress_save) { - $this->admin->comicpress->expects($this->once())->method('save'); - $this->admin->comicpress->expects($this->once())->method('init'); - } - - if ($add_nonce) { - if (isset($input['cp'])) { - if (is_array($input['cp'])) { - $input['cp']['_nonce'] = wp_create_nonce('comicpress'); - } - } - } - - $_POST = $_REQUEST = $input; - - $this->admin->handle_update(); - } - function providerTestGetEditableAttachmentList() { return array( array(