From 690aa46ba1f27edf844526375bbed4271147758a Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 10 Dec 2009 07:46:59 -0500 Subject: [PATCH 1/8] work on archive dropdown, currently broken --- widgets/ArchiveDropdownWidget.inc | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/widgets/ArchiveDropdownWidget.inc b/widgets/ArchiveDropdownWidget.inc index 91057a8..dff7cd9 100644 --- a/widgets/ArchiveDropdownWidget.inc +++ b/widgets/ArchiveDropdownWidget.inc @@ -3,8 +3,8 @@ Widget Name: comicpress archive dropdown Widget URI: http://comicpress.org/ Description: -Author: Philip M. Hofer (Frumph) -Version: 1.04 +Author: Philip M. Hofer (Frumph) & John Bintz +Version: 1.1 Author URI: http://frumph.net/ */ @@ -24,7 +24,7 @@ function comicpress_archive_dropdown() { ?>
- + build_dropdown(wp_get_archives('type=monthly&format=option&show_post_count=-1&echo=0')); + } + + function _new_comicpressstoryline() { return new ComicPressStoryline(); } + function _new_comicpressdbinterface() { return new ComicPressDBInterface(); } + + function build_comic_archive_dropdown() { + $storyline = $this->_new_comicpressstoryline(); + $storyline->read_from_options(); + + + } + function widget($args, $instance) { extract($args, EXTR_SKIP); From b6f7d9601953caa0538d115df460826d8f3a00c1 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 10 Dec 2009 23:24:45 -0500 Subject: [PATCH 2/8] comic archive dropdown --- test/widgets/ArchiveDropdownWidgetTest.php | 28 ++++++++++++++++++++++ widgets/ArchiveDropdownWidget.inc | 22 ++++++++++------- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/test/widgets/ArchiveDropdownWidgetTest.php b/test/widgets/ArchiveDropdownWidgetTest.php index 2eb1eaa..d9c554f 100644 --- a/test/widgets/ArchiveDropdownWidgetTest.php +++ b/test/widgets/ArchiveDropdownWidgetTest.php @@ -58,4 +58,32 @@ class ArchiveDropdownWidgetTest extends PHPUnit_Framework_TestCase { $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', 'has_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('has_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('has_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(); + } } \ No newline at end of file diff --git a/widgets/ArchiveDropdownWidget.inc b/widgets/ArchiveDropdownWidget.inc index dff7cd9..55bb6ae 100644 --- a/widgets/ArchiveDropdownWidget.inc +++ b/widgets/ArchiveDropdownWidget.inc @@ -20,15 +20,6 @@ function comicpress_archive_dropdown_storyline() { } */ -function comicpress_archive_dropdown() { ?> -
- -
-_new_comicpressstoryline(); $storyline->read_from_options(); + $query = $this->_new_wp_query(); + $query->query(array( + 'showposts' => -1, + 'category__in' => $storyline->build_from_restrictions() + )); + $results = array(); + while($query->has_posts()) { + $post = $query->next_post(); + $results[get_permalink($post)] = get_the_title($post); + } + + return $this->build_dropdown($results); } function widget($args, $instance) { From 0edca9e64a4e57442e371b27dd708235387196d5 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 14 Dec 2009 21:19:21 -0500 Subject: [PATCH 3/8] update --- test/widgets/ArchiveDropdownWidgetTest.php | 28 ++++++++++++++++++++++ widgets/ArchiveDropdownWidget.inc | 27 ++++++++++++++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/test/widgets/ArchiveDropdownWidgetTest.php b/test/widgets/ArchiveDropdownWidgetTest.php index d9c554f..6608524 100644 --- a/test/widgets/ArchiveDropdownWidgetTest.php +++ b/test/widgets/ArchiveDropdownWidgetTest.php @@ -86,4 +86,32 @@ class ArchiveDropdownWidgetTest extends PHPUnit_Framework_TestCase { $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 index 55bb6ae..5d0cc41 100644 --- a/widgets/ArchiveDropdownWidget.inc +++ b/widgets/ArchiveDropdownWidget.inc @@ -40,9 +40,16 @@ function comicpress_archive_dropdown_comics() { } class ArchiveDropdownWidget extends WP_Widget { + var $modes; + function ArchiveDropdownWidget() { $widget_ops = array('classname' => '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') + ); } function _verify_nonce() { return __comicpress_verify_nonce(); } @@ -136,9 +143,23 @@ class ArchiveDropdownWidget extends WP_Widget { } function update($new_instance, $old_instance) { - $instance = $old_instance; - $instance['title'] = strip_tags($new_instance['title']); - $instance['showcomicposts'] = $new_instance['showcomicposts']; + $instance = array(); + + foreach (array('title', 'mode') as $field) { + if (isset($new_instance[$field])) { + switch ($field) { + case 'mode': + if (isset($this->modes[$new_instance[$field]])) { + $instance[$field] = $new_instance[$field]; + } + break; + default: + $instance[$field] = strip_tags($new_instance[$field]); + break; + } + } + } + return $instance; } From 61436fb243be5012108804f49e2a3c179699e66e Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 14 Dec 2009 21:30:52 -0500 Subject: [PATCH 4/8] editor form --- widgets/ArchiveDropdownWidget.inc | 32 +++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/widgets/ArchiveDropdownWidget.inc b/widgets/ArchiveDropdownWidget.inc index 5d0cc41..60fe0e0 100644 --- a/widgets/ArchiveDropdownWidget.inc +++ b/widgets/ArchiveDropdownWidget.inc @@ -164,13 +164,29 @@ class ArchiveDropdownWidget extends WP_Widget { } function form($instance) { - $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'showcomicposts' => 'off' ) ); - $title = strip_tags($instance['title']); - $showcomicposts = $instance['showcomicposts']; if (empty($showcomicposts)) $showcomicposts = 'off'; - ?> -

-

  />Off

- modes)); + $instance = wp_parse_args((array)$instance, array('title' => '', 'mode' => $valid_mode)); + + foreach (array( + 'title' => __('Title:', 'comicpress'), + 'mode' => __('Show in widget:', 'comicpress') + ) as $field => $label) { ?> +

+ +
+ modes as $mode => $label) { ?> +
+ + +
+ +

+ Date: Mon, 14 Dec 2009 21:31:03 -0500 Subject: [PATCH 5/8] remove template tags --- widgets/ArchiveDropdownWidget.inc | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/widgets/ArchiveDropdownWidget.inc b/widgets/ArchiveDropdownWidget.inc index 60fe0e0..57121bf 100644 --- a/widgets/ArchiveDropdownWidget.inc +++ b/widgets/ArchiveDropdownWidget.inc @@ -9,36 +9,6 @@ Author URI: http://frumph.net/ */ -/* -function comicpress_archive_dropdown_storyline() { - $storyline = new ComicPressStoryline(); - $storyline->create_structure(get_option('comicpress-storyline-category-order')); - $categories = array_keys($storyline->_structure); - foreach ($categories as $id) { - $post = ComicPressDBInterface::get_instance()->get_first_comic($id); - } -} -*/ - -function comicpress_archive_dropdown_comics() { - global $post, $wp_query; - $temp_post = $post; - $temp_query = $wp_query; -?> -
- -
- Date: Mon, 14 Dec 2009 21:34:41 -0500 Subject: [PATCH 6/8] widget display and integration bug --- test/widgets/ArchiveDropdownWidgetTest.php | 6 +++--- widgets/ArchiveDropdownWidget.inc | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/widgets/ArchiveDropdownWidgetTest.php b/test/widgets/ArchiveDropdownWidgetTest.php index 6608524..6a4d6e4 100644 --- a/test/widgets/ArchiveDropdownWidgetTest.php +++ b/test/widgets/ArchiveDropdownWidgetTest.php @@ -68,7 +68,7 @@ class ArchiveDropdownWidgetTest extends PHPUnit_Framework_TestCase { $w->expects($this->once())->method('_new_comicpressstoryline')->will($this->returnValue($storyline)); - $query = $this->getMock('WP_Query', array('query', 'has_posts', 'next_post')); + $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) @@ -76,9 +76,9 @@ class ArchiveDropdownWidgetTest extends PHPUnit_Framework_TestCase { wp_insert_post((object)array('ID' => 1, 'guid' => 'guid', 'post_title' => 'title')); - $query->expects($this->at(1))->method('has_posts')->will($this->returnValue(true)); + $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('has_posts')->will($this->returnValue(false)); + $query->expects($this->at(3))->method('have_posts')->will($this->returnValue(false)); $w->expects($this->once())->method('_new_wp_query')->will($this->returnValue($query)); diff --git a/widgets/ArchiveDropdownWidget.inc b/widgets/ArchiveDropdownWidget.inc index 57121bf..eef9b84 100644 --- a/widgets/ArchiveDropdownWidget.inc +++ b/widgets/ArchiveDropdownWidget.inc @@ -90,7 +90,7 @@ class ArchiveDropdownWidget extends WP_Widget { )); $results = array(); - while($query->has_posts()) { + while($query->have_posts()) { $post = $query->next_post(); $results[get_permalink($post)] = get_the_title($post); } @@ -103,12 +103,12 @@ class ArchiveDropdownWidget extends WP_Widget { echo $before_widget; $title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']); - if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; - if ($instance['showcomicposts'] == 'on') { - comicpress_archive_dropdown_comics(); - } else { - comicpress_archive_dropdown(); + if (!empty($title)) { echo $before_title . $title . $after_title; }; + + if (method_exists($this, "build_{$instance['mode']}_dropdown")) { + echo $this->{"build_{$instance['mode']}_dropdown"}(); } + echo $after_widget; } From 200a89bd934599fa00d6310952f74f40d6ebc8d3 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 14 Dec 2009 21:41:40 -0500 Subject: [PATCH 7/8] storyline order --- widgets/ArchiveDropdownWidget.inc | 41 ++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/widgets/ArchiveDropdownWidget.inc b/widgets/ArchiveDropdownWidget.inc index eef9b84..de4e7e8 100644 --- a/widgets/ArchiveDropdownWidget.inc +++ b/widgets/ArchiveDropdownWidget.inc @@ -18,7 +18,8 @@ class ArchiveDropdownWidget extends WP_Widget { $this->modes = array( 'monthly_archive' => __('Monthly archive', 'comicpress'), - 'comic_archive' => __('Comic archive', 'comicpress') + 'comic_archive' => __('Comic archive', 'comicpress'), + 'storyline_order' => __('Storyline order', 'comicpress'), ); } @@ -30,6 +31,9 @@ class ArchiveDropdownWidget extends WP_Widget { } } + /** + * 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()); @@ -71,6 +75,9 @@ class ArchiveDropdownWidget extends WP_Widget { return ''; } + /** + * Build the monthly archive dropdown. + */ function build_monthly_archive_dropdown() { return $this->build_dropdown(wp_get_archives('type=monthly&format=option&show_post_count=-1&echo=0')); } @@ -79,6 +86,9 @@ class ArchiveDropdownWidget extends WP_Widget { function _new_comicpressdbinterface() { return new ComicPressDBInterface(); } function _new_wp_query() { return new WP_Query(); } + /** + * Build the comic archive dropdown. + */ function build_comic_archive_dropdown() { $storyline = $this->_new_comicpressstoryline(); $storyline->read_from_options(); @@ -98,6 +108,29 @@ class ArchiveDropdownWidget extends WP_Widget { return $this->build_dropdown($results); } + /** + * Build dropdown based on storyline order. + */ + function build_storyline_order_dropdown() { + $storyline = $this->_new_comicpressstoryline(); + $storyline->read_from_options(); + + $results = array(); + if (!empty($storyline->_structure)) { + foreach ($storyline->_structure as $id => $info) { + $category = get_category($id); + if (!empty($category)) { + $results[get_category_link($id)] = str_repeat(' ', ($info['level'] - 1) * 3) . $category->name; + } + } + } + + return $this->build_dropdown($results); + } + + /** + * Render the widget. + */ function widget($args, $instance) { extract($args, EXTR_SKIP); @@ -112,6 +145,9 @@ class ArchiveDropdownWidget extends WP_Widget { echo $after_widget; } + /** + * Update widget parameters. + */ function update($new_instance, $old_instance) { $instance = array(); @@ -133,6 +169,9 @@ class ArchiveDropdownWidget extends WP_Widget { return $instance; } + /** + * Show the widget editor. + */ function form($instance) { $valid_mode = array_shift(array_keys($this->modes)); $instance = wp_parse_args((array)$instance, array('title' => '', 'mode' => $valid_mode)); From cc516694ef1eb893791efba183b763793dc18504 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 14 Dec 2009 21:44:45 -0500 Subject: [PATCH 8/8] non-javascript redirection --- widgets/ArchiveDropdownWidget.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/widgets/ArchiveDropdownWidget.inc b/widgets/ArchiveDropdownWidget.inc index de4e7e8..da2f39a 100644 --- a/widgets/ArchiveDropdownWidget.inc +++ b/widgets/ArchiveDropdownWidget.inc @@ -26,8 +26,8 @@ class ArchiveDropdownWidget extends WP_Widget { function _verify_nonce() { return __comicpress_verify_nonce(); } function template_redirect() { - if ($this->_verify_nonce() == 'follow-archive-dropdown') { - + if (ArchiveDropdownWidget::_verify_nonce() == 'follow-archive-dropdown') { + wp_redirect($_GET['cp']['urls']); } } @@ -199,3 +199,5 @@ class ArchiveDropdownWidget extends WP_Widget {