diff --git a/classes/ComicPressPostMediaHandlingMetabox.inc b/classes/ComicPressPostMediaHandlingMetabox.inc index fab0b76..7a6cabb 100644 --- a/classes/ComicPressPostMediaHandlingMetabox.inc +++ b/classes/ComicPressPostMediaHandlingMetabox.inc @@ -1,34 +1,27 @@ $value) { - if (in_array($field, $valid_types)) { - $result[$field] = strip_tags($value); - } + function _verify_nonce() { return __comicpress_verify_nonce(); } + + function save_post($post_id) { + if ($this->_verify_nonce() == 'post-media-update') { + $info = $_REQUEST['cp']; + $result = array(); + if (isset($info['urls'])) { + if (is_array($info['urls'])) { + $valid_types = ComicPressPostMediaHandlingMetabox::_get_valid_types(); + foreach ($info['urls'] as $field => $value) { + if (in_array($field, $valid_types)) { + $result[$field] = strip_tags($value); } } } - update_post_meta($info['post_id'], 'backend_url_images', $result); } + update_post_meta($post_id, 'backend_url_images', $result); } } @@ -51,3 +44,6 @@ class ComicPressPostMediaHandlingMetabox { include('partials/post-media-handling/metabox.inc'); } } + +add_action('admin_menu', array('ComicPressPostMediaHandlingMetabox', 'admin_menu')); +add_action('save_post', array('ComicPressPostMediaHandlingMetabox', 'save_post')); \ No newline at end of file diff --git a/functions.php b/functions.php index 9e5865a..0a02516 100644 --- a/functions.php +++ b/functions.php @@ -42,23 +42,20 @@ function __comicpress_init() { do_action('comicpress_init'); + if ($verified_nonce = __comicpress_verify_nonce()) { + do_action("comicpress_init-${verified_nonce}"); + } +} + +function __comicpress_verify_nonce() { if (isset($_REQUEST['cp'])) { if (is_array($_REQUEST['cp'])) { - if (($_REQUEST['cp']['post_id'] <= 0) && ($_POST['post_ID'] > 0)) { - $_REQUEST['cp']['post_id'] = $_POST['post_ID']; - } - if (isset($_REQUEST['cp']['_nonce'])) { if (wp_verify_nonce($_REQUEST['cp']['_nonce'], 'comicpress')) { if (isset($_REQUEST['cp']['action'])) { if (isset($_REQUEST['cp']['_action_nonce'])) { if (wp_verify_nonce($_REQUEST['cp']['_action_nonce'], 'comicpress-' . $_REQUEST['cp']['action'])) { - $method_name = 'handle_' . str_replace('-', '_', $_REQUEST['cp']['action']); - foreach ($__comicpress_handlable_classes as $class_name) { - if (method_exists($class_name, $method_name)) { - call_user_func(array($class_name, $method_name), $_REQUEST['cp']); - } - } + return $_REQUEST['cp']['action']; } } } @@ -66,6 +63,7 @@ function __comicpress_init() { } } } + return false; } add_action('widgets_init', '__comicpress_widgets_init'); @@ -841,26 +839,3 @@ function comicpress_gnav_display_css() { } if (comicpress_check_child_file('childfunctions') == false) {} - -/** - * Render the ComicPress calendar widget. - */ -function comicpress_calendar_embed() { - $calendar = new CalendarWidget(); - - $instance = array(); - foreach (array('before_widget', 'after_widget', 'thumbnail', 'link', 'small', 'medium', 'large') as $field) { - $instance[$field] = ''; - } - - $calendar->widget($instance, array()); -} - -/** - * Render the ComicPress bookmark widget. - */ -function comicpress_comic_bookmark_embed() { - $bookmark = new BookmarkWidget(); - $bookmark->init(); - $bookmark->widget(array(), array()); -} diff --git a/functions/widget-template-tags.php b/functions/widget-template-tags.php new file mode 100644 index 0000000..8b617b7 --- /dev/null +++ b/functions/widget-template-tags.php @@ -0,0 +1,48 @@ +widget($instance, array()); +} + +/** + * Render the ComicPress bookmark widget. + */ +function comicpress_comic_bookmark_embed() { + $bookmark = new BookmarkWidget(); + $bookmark->init(); + $bookmark->widget(array(), array()); +} + +/** + * Render the monthly archive dropdown widget + */ +function comicpress_archive_dropdown() { + $archive = new ArchiveDropdownWidget(); + $archive->widget(array(), array('mode' => 'monthly_archive')); +} + +/** + * Render the comic archive dropdown widget + */ +function comicpress_archive_dropdown_comics() { + $archive = new ArchiveDropdownWidget(); + $archive->widget(array(), array('mode' => 'comic_archive')); +} + +/** + * Render the storyline order dropdown widget + */ +function comicpress_archive_dropdown_storyline() { + $archive = new ArchiveDropdownWidget(); + $archive->widget(array(), array('mode' => 'storyline_order')); +} diff --git a/test/ComicPressPostMediaHandlingMetaboxTest.php b/test/ComicPressPostMediaHandlingMetaboxTest.php index 39c6039..0711ea9 100644 --- a/test/ComicPressPostMediaHandlingMetaboxTest.php +++ b/test/ComicPressPostMediaHandlingMetaboxTest.php @@ -7,29 +7,31 @@ require_once(dirname(__FILE__) . '/../classes/ComicPressPostMediaHandlingMetabox class ComicPressPostMediaHandlingMetaboxTest extends PHPUnit_Framework_TestCase { function setUp() { _reset_wp(); + $_REQUEST = array(); $this->pmh = new ComicPressPostMediaHandlingMetabox(); } - function providerTestPostMediaUpdate() { + function providerTestSavePost() { return array( - array(array(), ''), - array(array('post_id' => 'test'), ''), - array(array('post_id' => 1), array()), - array(array('post_id' => 1, 'urls' => false), array()), - array(array('post_id' => 1, 'urls' => array()), array()), - array(array('post_id' => 1, 'urls' => array('test' => 'test')), array()), - array(array('post_id' => 1, 'urls' => array('comic' => 'test')), array('comic' => 'test')), + array(array(), array()), + array(array('urls' => false), array()), + array(array('urls' => array()), array()), + array(array('urls' => array('test' => 'test')), array()), + array(array('urls' => array('comic' => 'test')), array('comic' => 'test')), ); } /** - * @dataProvider providerTestPostMediaUpdate + * @dataProvider providerTestSavePost */ - function testPostMediaUpdate($input, $expected_post_metadata) { - $pmh = $this->getMock('ComicPressPostMediaHandlingMetabox', array('_get_valid_types')); + function testSavePost($input, $expected_post_metadata) { + $pmh = $this->getMock('ComicPressPostMediaHandlingMetabox', array('_get_valid_types', '_verify_nonce')); + $pmh->expects($this->once())->method('_verify_nonce')->will($this->returnValue(true)); $pmh->expects($this->any())->method('_get_valid_types')->will($this->returnValue(array('comic'))); - $this->pmh->handle_post_media_update($input); + $_REQUEST = array('cp' => $input); + + $pmh->save_post(1); $this->assertEquals($expected_post_metadata, get_post_meta(1, 'backend_url_images', true)); } } diff --git a/test/widgets/ArchiveDropdownWidgetTest.php b/test/widgets/ArchiveDropdownWidgetTest.php new file mode 100644 index 0000000..6a4d6e4 --- /dev/null +++ b/test/widgets/ArchiveDropdownWidgetTest.php @@ -0,0 +1,117 @@ +w = new ArchiveDropdownWidget(); + } + + function providerTestBuildDropdown() { + return array( + array(null, 'Archives...', null, 'Go'), + array('Test', 'Test', 'Test2', 'Test2'), + ); + } + + /** + * @dataProvider providerTestBuildDropdown + */ + function testBuildDropdown($default_value, $expected_default, $button_value, $expected_button) { + if (!is_null($default_value)) { + _set_filter_expectation('comicpress_archive_dropdown_default_entry', $default_value); + } + + if (!is_null($button_value)) { + _set_filter_expectation('comicpress_archive_dropdown_submit_button', $button_value); + } + + foreach (array( + array('test' => 'Test', 'test2' => 'Test2'), + '' + ) as $entries) { + $html = $this->w->build_dropdown($entries); + + foreach (array( + array('tag' => 'div', 'attributes' => array('class' => 'archive-dropdown-wrap')), + array('tag' => 'form', 'attributes' => array('action' => '', 'method' => 'get')), + array('tag' => 'select', 'attributes' => array('name' => 'cp[urls]')), + array('tag' => 'input', 'attributes' => array('name' => 'cp[_nonce]')), + array('tag' => 'input', 'attributes' => array('name' => 'cp[_action_nonce]')), + array('tag' => 'input', 'attributes' => array('name' => 'cp[action]', 'value' => 'follow-archive-dropdown')), + array('tag' => 'option', 'attributes' => array('value' => ''), 'content' => $expected_default), + array('tag' => 'input', 'attributes' => array('type' => 'submit', 'value' => $expected_button)), + array('tag' => 'option', 'attributes' => array('value' => 'test'), 'content' => 'Test'), + array('tag' => 'option', 'attributes' => array('value' => 'test2'), 'content' => 'Test2'), + ) as $matcher) { + $this->assertTag($matcher, $html); + } + } + } + + function testBuildDropdownNotStringOrArray() { + $html = $this->w->build_dropdown(false); + + $this->assertTrue(empty($html)); + } + + function testBuildComicArchiveDropdown() { + $w = $this->getMock('ArchiveDropdownWidget', array('_new_comicpressstoryline', '_new_wp_query', 'build_dropdown')); + + $storyline = $this->getMock('ComicPressStoryline', array('read_from_options', 'build_from_restrictions')); + $storyline->expects($this->once())->method('read_from_options'); + $storyline->expects($this->once())->method('build_from_restrictions')->will($this->returnValue(array(1,2,3))); + + $w->expects($this->once())->method('_new_comicpressstoryline')->will($this->returnValue($storyline)); + + $query = $this->getMock('WP_Query', array('query', 'have_posts', 'next_post')); + $query->expects($this->once())->method('query')->with(array( + 'showposts' => -1, + 'category__in' => array(1,2,3) + )); + + wp_insert_post((object)array('ID' => 1, 'guid' => 'guid', 'post_title' => 'title')); + + $query->expects($this->at(1))->method('have_posts')->will($this->returnValue(true)); + $query->expects($this->at(2))->method('next_post')->will($this->returnValue((object)array('ID' => 1, 'guid' => 'guid', 'post_title' => 'title'))); + $query->expects($this->at(3))->method('have_posts')->will($this->returnValue(false)); + + $w->expects($this->once())->method('_new_wp_query')->will($this->returnValue($query)); + + $w->expects($this->once())->method('build_dropdown')->with(array('guid' => 'title')); + + $w->build_comic_archive_dropdown(); + } + + function providerTestUpdate() { + $w = new ArchiveDropdownWidget(); + $valid_mode = array_shift(array_keys($w->modes)); + + return array( + array(array(), array()), + array( + array('title' => 'test'), + array('title' => 'test'), + ), + array( + array('mode' => 'bad'), + array() + ), + array( + array('mode' => $valid_mode), + array('mode' => $valid_mode) + ) + ); + } + + /** + * @dataProvider providerTestUpdate + */ + function testUpdate($input, $expected_output) { + $this->assertEquals($expected_output, $this->w->update($input, array())); + } +} \ No newline at end of file diff --git a/widgets/ArchiveDropdownWidget.inc b/widgets/ArchiveDropdownWidget.inc new file mode 100644 index 0000000..da2f39a --- /dev/null +++ b/widgets/ArchiveDropdownWidget.inc @@ -0,0 +1,203 @@ + 'ArchiveDropdownWidget', 'description' => __('Display a dropdown list of your archives, styled.','comicpress') ); + $this->WP_Widget('archive_dropdown', __('ComicPress Archive Dropdown','comicpress'), $widget_ops); + + $this->modes = array( + 'monthly_archive' => __('Monthly archive', 'comicpress'), + 'comic_archive' => __('Comic archive', 'comicpress'), + 'storyline_order' => __('Storyline order', 'comicpress'), + ); + } + + function _verify_nonce() { return __comicpress_verify_nonce(); } + + function template_redirect() { + if (ArchiveDropdownWidget::_verify_nonce() == 'follow-archive-dropdown') { + wp_redirect($_GET['cp']['urls']); + } + } + + /** + * Build a dropdown geared toward quick links to posts. + */ + function build_dropdown($entries) { + if (is_string($entries) || is_array($entries)) { + $id = 'archive-dropdown-' . md5(rand()); + $button_id = 'archive-dropdown-submit-' . md5(rand()); + + $nonce = wp_create_nonce('comicpress'); + $action_nonce = wp_create_nonce('comicpress-follow-archive-dropdown'); + + ob_start(); ?> +
+
+
+ modes as $mode => $label) { ?>
+
+
+
+
+
+
/>Off
- - \ No newline at end of file