github-migration
/
comicpress-2.8
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:johnbintz/comicpress-2.8

This commit is contained in:
Philip M. Hofer (Frumph) 2009-12-15 21:55:34 -08:00
parent 02c200c782 cb83eeb049
commit 39c678fbc2
7 changed files with 406 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
classes/ComicPressPostMediaHandlingMetabox.inc
View File

@ -1,34 +1,27 @@
<?php <?php
class ComicPressPostMediaHandlingMetabox { class ComicPressPostMediaHandlingMetabox {
// @codeCoverageIgnoreStart
function __comicpress_init() {
add_action('admin_menu', array('ComicPressPostMediaHandlingMetabox', 'admin_menu'));
}
function handle_update() {}
// @codeCoverageIgnoreEnd
function _get_valid_types() { function _get_valid_types() {
return array_keys(ComicPressMediaHandling::_bundle_global_variables()); return array_keys(ComicPressMediaHandling::_bundle_global_variables());
} }
function handle_post_media_update($info) { function _verify_nonce() { return __comicpress_verify_nonce(); }
if (isset($info['post_id'])) {
if (is_numeric($info['post_id'])) { function save_post($post_id) {
$result = array(); if ($this->_verify_nonce() == 'post-media-update') {
if (isset($info['urls'])) { $info = $_REQUEST['cp'];
if (is_array($info['urls'])) { $result = array();
$valid_types = ComicPressPostMediaHandlingMetabox::_get_valid_types(); if (isset($info['urls'])) {
foreach ($info['urls'] as $field => $value) { if (is_array($info['urls'])) {
if (in_array($field, $valid_types)) { $valid_types = ComicPressPostMediaHandlingMetabox::_get_valid_types();
$result[$field] = strip_tags($value); 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'); include('partials/post-media-handling/metabox.inc');
} }
} }
add_action('admin_menu', array('ComicPressPostMediaHandlingMetabox', 'admin_menu'));
add_action('save_post', array('ComicPressPostMediaHandlingMetabox', 'save_post'));

41
functions.php
View File

@ -42,23 +42,20 @@ function __comicpress_init() {
do_action('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 (isset($_REQUEST['cp'])) {
if (is_array($_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 (isset($_REQUEST['cp']['_nonce'])) {
if (wp_verify_nonce($_REQUEST['cp']['_nonce'], 'comicpress')) { if (wp_verify_nonce($_REQUEST['cp']['_nonce'], 'comicpress')) {
if (isset($_REQUEST['cp']['action'])) { if (isset($_REQUEST['cp']['action'])) {
if (isset($_REQUEST['cp']['_action_nonce'])) { if (isset($_REQUEST['cp']['_action_nonce'])) {
if (wp_verify_nonce($_REQUEST['cp']['_action_nonce'], 'comicpress-' . $_REQUEST['cp']['action'])) { if (wp_verify_nonce($_REQUEST['cp']['_action_nonce'], 'comicpress-' . $_REQUEST['cp']['action'])) {
$method_name = 'handle_' . str_replace('-', '_', $_REQUEST['cp']['action']); return $_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']);
}
}
} }
} }
} }
@ -66,6 +63,7 @@ function __comicpress_init() {
} }
} }
} }
return false;
} }
add_action('widgets_init', '__comicpress_widgets_init'); add_action('widgets_init', '__comicpress_widgets_init');
@ -841,26 +839,3 @@ function comicpress_gnav_display_css() {
} }
if (comicpress_check_child_file('childfunctions') == false) {} 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());
}

48
functions/widget-template-tags.php Normal file
View File

@ -0,0 +1,48 @@
<?php
/**
* 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());
}
/**
* 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'));
}

26
test/ComicPressPostMediaHandlingMetaboxTest.php
View File

@ -7,29 +7,31 @@ require_once(dirname(__FILE__) . '/../classes/ComicPressPostMediaHandlingMetabox
class ComicPressPostMediaHandlingMetaboxTest extends PHPUnit_Framework_TestCase { class ComicPressPostMediaHandlingMetaboxTest extends PHPUnit_Framework_TestCase {
function setUp() { function setUp() {
_reset_wp(); _reset_wp();
$_REQUEST = array();
$this->pmh = new ComicPressPostMediaHandlingMetabox(); $this->pmh = new ComicPressPostMediaHandlingMetabox();
} }
function providerTestPostMediaUpdate() { function providerTestSavePost() {
return array( return array(
array(array(), ''), array(array(), array()),
array(array('post_id' => 'test'), ''), array(array('urls' => false), array()),
array(array('post_id' => 1), array()), array(array('urls' => array()), array()),
array(array('post_id' => 1, 'urls' => false), array()), array(array('urls' => array('test' => 'test')), array()),
array(array('post_id' => 1, 'urls' => array()), array()), array(array('urls' => array('comic' => 'test')), array('comic' => 'test')),
array(array('post_id' => 1, 'urls' => array('test' => 'test')), array()),
array(array('post_id' => 1, 'urls' => array('comic' => 'test')), array('comic' => 'test')),
); );
} }
/** /**
* @dataProvider providerTestPostMediaUpdate * @dataProvider providerTestSavePost
*/ */
function testPostMediaUpdate($input, $expected_post_metadata) { function testSavePost($input, $expected_post_metadata) {
$pmh = $this->getMock('ComicPressPostMediaHandlingMetabox', array('_get_valid_types')); $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'))); $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)); $this->assertEquals($expected_post_metadata, get_post_meta(1, 'backend_url_images', true));
} }
} }

117
test/widgets/ArchiveDropdownWidgetTest.php Normal file
View File

@ -0,0 +1,117 @@
<?php
require_once('PHPUnit/Framework.php');
require_once('MockPress/mockpress.php');
require_once(dirname(__FILE__) . '/../../widgets/ArchiveDropdownWidget.inc');
class ArchiveDropdownWidgetTest extends PHPUnit_Framework_TestCase {
function setUp() {
_reset_wp();
$this->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'),
'<option value="test">Test</option><option value="test2">Test2</option>'
) 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' => '<b>test</b>'),
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()));
}
}

203
widgets/ArchiveDropdownWidget.inc Normal file
View File

@ -0,0 +1,203 @@
<?php
/*
Widget Name: comicpress archive dropdown
Widget URI: http://comicpress.org/
Description:
Author: Philip M. Hofer (Frumph) & John Bintz
Version: 1.1
Author URI: http://frumph.net/
*/
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'),
'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(); ?>
<div class="archive-dropdown-wrap" id="<?php echo esc_attr($id) ?>">
<form action="" method="get">
<input type="hidden" name="cp[_nonce]" value="<?php echo esc_attr($nonce) ?>" />
<input type="hidden" name="cp[action]" value="follow-archive-dropdown" />
<input type="hidden" name="cp[_action_nonce]" value="<?php echo esc_attr($action_nonce) ?>" />
<select name="cp[urls]">
<option value=""><?php echo esc_html(apply_filters('comicpress_archive_dropdown_default_entry', __('Archives...', 'comicpress'))) ?></option>
<?php
if (is_string($entries)) {
echo $entries;
} else {
foreach ($entries as $url => $value) { ?>
<option value="<?php echo esc_attr($url) ?>"><?php echo esc_html($value) ?></option>
<?php }
}
?>
</select>
<input id="<?php echo esc_attr($button_id) ?>" type="submit" value="<?php echo esc_attr(apply_filters('comicpress_archive_dropdown_submit_button', __('Go', 'comicpress'))) ?>" />
</form>
</div>
<script type="text/javascript">
document.getElementById('<?php echo esc_js($button_id) ?>').style.display = 'none';
document.getElementById('<?php echo esc_js($id) ?>').onchange = function(e) {
document.location.href = e.target.options[e.target.selectedIndex].value;
};
</script>
<?php return ob_get_clean();
}
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'));
}
function _new_comicpressstoryline() { return new ComicPressStoryline(); }
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();
$query = $this->_new_wp_query();
$query->query(array(
'showposts' => -1,
'category__in' => $storyline->build_from_restrictions()
));
$results = array();
while($query->have_posts()) {
$post = $query->next_post();
$results[get_permalink($post)] = get_the_title($post);
}
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('&nbsp;', ($info['level'] - 1) * 3) . $category->name;
}
}
}
return $this->build_dropdown($results);
}
/**
* Render the widget.
*/
function widget($args, $instance) {
extract($args, EXTR_SKIP);
echo $before_widget;
$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
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;
}
/**
* Update widget parameters.
*/
function update($new_instance, $old_instance) {
$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;
}
/**
* 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));
foreach (array(
'title' => __('Title:', 'comicpress'),
'mode' => __('Show in widget:', 'comicpress')
) as $field => $label) { ?>
<p>
<?php switch ($field) {
case 'mode': ?>
<?php echo $label ?><br />
<?php foreach ($this->modes as $mode => $label) { ?>
<label><input type="radio" name="<?php echo $this->get_field_name($field); ?>" value="<?php echo $mode ?>" <?php echo ($mode == $instance['mode']) ? 'checked="checked"' : '' ?> /> <?php echo $label ?></label><br />
<?php }
break;
default: ?>
<label for="<?php echo $this->get_field_id($field); ?>"><?php echo $label ?>
<input class="widefat" id="<?php echo $this->get_field_id($field); ?>" name="<?php echo $this->get_field_name($field); ?>" type="text" value="<?php echo esc_attr($instance[$field]) ?>" />
</label>
<br />
<?php break;
} ?>
</p>
<?php }
}
}
add_action('template_redirect', array('ArchiveDropdownWidget', 'template_redirect'));

102
widgets/archive-dropdown.php
View File

@ -1,102 +0,0 @@
<?php
/*
Widget Name: comicpress archive dropdown
Widget URI: http://comicpress.org/
Description:
Author: Philip M. Hofer (Frumph)
Version: 1.04
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() { ?>
<div class="archive-dropdown-wrap">
<select name="archive-dropdown" class="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
<option value=""><?php echo attribute_escape(__('Archives...','comicpress')); ?></option>
<?php wp_get_archives('type=monthly&format=option&show_post_count=-1'); ?>
</select>
</div>
<?php }
function comicpress_archive_dropdown_comics() {
global $post, $wp_query;
$temp_post = $post;
$temp_query = $wp_query;
?>
<div class="archive-dropdown-wrap">
<select name="archive-dropdown" class="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
<option value=""><?php echo attribute_escape(__('Archives...','comicpress')); ?></option>
<?php $comicArchive = new WP_Query(); $comicArchive->query('showposts=-1&cat='.get_all_comic_categories_as_cat_string());
while ($comicArchive->have_posts()) : $comicArchive->the_post() ?>
<option value="<?php echo get_permalink($post->ID) ?>"><?php the_title() ?></option>
<?php endwhile; ?>
</select>
</div>
<?php
$post = $temp_post; $temp_post = null;
$wp_query = $temp_query; $temp_query = null;
}
class widget_comicpress_archive_dropdown extends WP_Widget {
function widget_comicpress_archive_dropdown() {
$widget_ops = array('classname' => 'widget_comicpress_archive_dropdown', 'description' => __('Display a dropdown list of your archives, styled.','comicpress') );
$this->WP_Widget('archive_dropdown', __('ComicPress Archive Dropdown','comicpress'), $widget_ops);
}
function widget($args, $instance) {
extract($args, EXTR_SKIP);
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();
}
echo $after_widget;
}
function update($new_instance, $old_instance) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
$instance['showcomicposts'] = $new_instance['showcomicposts'];
return $instance;
}
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';
?>
<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
<p><label for="<?php echo $this->get_field_id('showcomicposts'); ?>"><strong><?php _e('Show individual comic posts?','comicpress'); ?></strong><br />
<input id="<?php echo $this->get_field_id('showcomicposts'); ?>" name="<?php echo $this->get_field_name('showcomicposts'); ?>" type="radio" value="on"<?php if ( $showcomicposts == "on") { echo " checked"; } ?> />On</label>&nbsp;<input id="<?php echo $this->get_field_id('showcomicposts'); ?>" name="<?php echo $this->get_field_name('showcomicposts'); ?>" type="radio" value="off"<?php if ( $showcomicposts == "off") { echo " checked"; } ?> />Off</label></p>
<?php
}
}
register_widget('widget_comicpress_archive_dropdown');
function widget_comicpress_archive_dropdown_init() {
new widget_comicpress_archive_dropdown();
}
add_action('widgets_init', 'widget_comicpress_archive_dropdown_init');
?>