rearrange a bunch of things, eliminate the idea of addons

This commit is contained in:
John Bintz 2009-11-05 07:00:29 -05:00
parent f536c6eb29
commit 49ce41fdc9
143 changed files with 141 additions and 190 deletions

View File

@ -1,27 +1,6 @@
<?php <?php
class ComicPressAddon { class ComicPressAddon {
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 '<div class="updated fade cp-' . $type . '">';
foreach ($messages as $message) {
echo '<p>' . $message . '</p>';
}
echo '</div>';
}
}
}
} }
?> ?>

View File

@ -1,10 +1,6 @@
<?php <?php
class ComicPressAddonCore extends ComicPressAddon { class ComicPressAdmin {
var $is_addon_manager = true;
var $cannot_be_disabled = true;
var $name = "ComicPress Core";
/** /**
* Initialize the addon. * Initialize the addon.
* @param ComicPress $comicpress The master ComicPress object. * @param ComicPress $comicpress The master ComicPress object.
@ -14,14 +10,6 @@ class ComicPressAddonCore extends ComicPressAddon {
add_action('admin_menu', array(&$this, 'admin_menu')); 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);
add_action('show_comic', array(&$this, 'show_comic'), 1, 1);
add_action('show_archive', array(&$this, 'show_archive'), 1, 1);
add_action('show_rss', array(&$this, 'show_rss'), 1, 1);
add_filter('the_content', array(&$this, 'insert_comic_feed'));
if (isset($_GET['randomcomic'])) {
add_action('template_redirect', array(&$this, 'go_to_random_comic'));
}
if (current_user_can('edit_posts') && isset($comicpress->comicpress_options['helpers']['show_inline_comic_ordering'])) { 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_attached_image', array(&$this, 'comicpress_attached_image'), 10, 3);
@ -34,6 +22,12 @@ class ComicPressAddonCore extends ComicPressAddon {
'rss' => __('RSS', 'comicpress'), 'rss' => __('RSS', 'comicpress'),
'archive' => __('Archive', 'comicpress') 'archive' => __('Archive', 'comicpress')
); );
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) { function comicpress_attached_image($content, $attachment_id, $index) {
@ -66,40 +60,6 @@ class ComicPressAddonCore extends ComicPressAddon {
return $content; return $content;
} }
/**
* Callback to send the reader to a random comic.
*/
function go_to_random_comic() {
$random_comic_query = new WP_Query();
$random_comic_query->query('showposts=1&orderby=rand&cat=' . $this->comicpress->get_all_comic_categories_as_cat_string());
while ($random_comic_query->have_posts()) {
$random_comic_query->the_post();
$random_comic_id = get_the_ID();
break;
}
if (!empty($random_comic_id)) {
wp_redirect(get_permalink( $random_comic_id ));
}
}
/**
* Markup to insert a comic into the comic feed.
*/
function comic_feed() { ?>
<p><a href="<?php the_permalink() ?>"><?php do_action('show_rss') ?></a></p><?php
}
/**
* Filter to insert the comic into the RSS feed.
*/
function insert_comic_feed($content) {
if (is_feed() && in_comic_category()) {
return $this->comic_feed() . $content;
} else {
return $content;
}
}
/** /**
* Set up the admin interface and meta boxes. * Set up the admin interface and meta boxes.
*/ */
@ -135,50 +95,6 @@ class ComicPressAddonCore extends ComicPressAddon {
</script> </script>
<?php } <?php }
/**
* Show comic media.
* @param object $override_post If not nul;, the post to use instead of the current Loop post.
* @param string $method The method to call on the comic post.
*/
function show_media($override_post, $method, $format) {
global $post;
$post_to_use = $post;
switch ($this->comicpress->comicpress_options['comic_space']) {
case "comic_only":
$comic_post = new ComicPressComicPost($post_to_use, &$this->comicpress);
$comic_post->{$method}($format);
break;
case "post_content":
$t = $post;
$post = $post_to_use;
include_partial('index-blog-post');
$post = $t;
break;
}
}
/**
* Show a comic.
*/
function show_comic($override_post = null, $format = "%s<br />") {
$this->show_media($override_post, "display_comics", $format);
}
/**
* Show an archive comic.
*/
function show_archive($override_post = null, $format = "%s<br />") {
$this->show_media($override_post, "display_archive", $format);
}
/**
* Show an RSS comic.
*/
function show_rss($override_post = null, $format = "%s<br />") {
$this->show_media($override_post, "display_rss", $format);
}
/** /**
* Modify the Media Gallery for ComicPress use. * Modify the Media Gallery for ComicPress use.
*/ */
@ -491,18 +407,22 @@ class ComicPressAddonCore extends ComicPressAddon {
/** /**
* Handle an update. * Handle an update.
*/ */
function handle_update($info) { function handle_update() {
if (is_array($_REQUEST['cp'])) {
if (isset($_REQUEST['cp']['_nonce'])) {
if (wp_verify_nonce($_REQUEST['cp']['_nonce'], 'comicpress')) {
if (isset($_POST['attachments'])) { if (isset($_POST['attachments'])) {
//coming from media editor //coming from media editor
$this->handle_update_attachments(); $this->handle_update_attachments();
} else if (isset($info['action'])) { } else if (isset($_REQUEST['cp']['action'])) {
$method = 'handle_update_' . strtolower(str_replace('-', '_', $info['action'])); $method = 'handle_update_' . strtolower(str_replace('-', '_', $_REQUEST['cp']['action']));
if (method_exists($this, $method)) { if (method_exists($this, $method)) {
$this->{$method}($info); $this->{$method}($_REQUEST['cp']);
} }
} else { } else {
//coming from us //coming from us
$this->handle_update_comicpress_options($info); // clean this up O_o
$this->handle_update_comicpress_options($_REQUEST['cp']);
$this->comicpress->save(); $this->comicpress->save();
@ -510,6 +430,11 @@ class ComicPressAddonCore extends ComicPressAddon {
$this->comicpress->init(); $this->comicpress->init();
} }
$this->comicpress->load();
}
}
}
} }
/** /**
@ -522,6 +447,28 @@ class ComicPressAddonCore extends ComicPressAddon {
} }
return implode("\n", $output); return implode("\n", $output);
} }
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 '<div class="updated fade cp-' . $type . '">';
foreach ($messages as $message) {
echo '<p>' . $message . '</p>';
}
echo '</div>';
}
}
}
} }
?> ?>

View File

@ -1,17 +1,83 @@
<?php <?php
class ComicPressFilters { class ComicPressFilters {
function init() {
$this->comicpress =& ComicPress::get_instance();
foreach (array(
'comicpress_display_attached_images' => 3,
'the_content' => 1,
'show_media' => 3
) as $filter => $param_count) {
add_filter($filter, array(&$__comicpress_filters, $filter), 10, $param_count);
}
}
function comicpress_display_attached_images($images, $post_id, $content) { function comicpress_display_attached_images($images, $post_id, $content) {
return array($images, $post_id, implode("\n", $images)); return array($images, $post_id, implode("\n", $images));
} }
}
$__comicpress_filters = new ComicPressFilters(); /**
* Callback to send the reader to a random comic.
*/
function template_redirect() {
global $post;
if (get_query_var(apply_filters('comicpress_random_comic_string', 'randomcomic'))) {
$random_comic_query = new WP_Query();
$random_comic_query->query('showposts=1&orderby=rand&cat=' . $this->comicpress->get_all_comic_categories_as_cat_string());
while ($random_comic_query->have_posts()) {
$random_comic_query->the_post();
break;
}
if (!empty($post)) {
wp_redirect(get_permalink($post->ID));
} else {
wp_redirect(get_bloginfo('url'));
}
}
}
foreach (array( /**
'comicpress_display_attached_images' => 3 * Markup to insert a comic into the comic feed.
) as $filter => $param_count) { */
add_filter($filter, array(&$__comicpress_filters, $filter), 10, $param_count); function comic_feed() { ?>
<p><a href="<?php the_permalink() ?>"><?php echo end(apply_filters('show_media', 'rss')) ?></a></p><?php
}
/**
* Filter to insert the comic into the RSS feed.
*/
function the_content($content) {
if (is_feed() && in_comic_category()) {
return $this->comic_feed() . $content;
} else {
return $content;
}
}
/**
* Show comic media.
* @param object $override_post If not null, the post to use instead of the current Loop post.
* @param string $method The method to call on the comic post.
*/
function show_media($override_post, $method, $format) {
global $post;
$post_to_use = !empty($override_post) ? $override_post : $post;
switch ($this->comicpress->comicpress_options['comic_space']) {
case "comic_only":
$comic_post = new ComicPressComicPost($post_to_use, &$this->comicpress);
$comic_post->{$method}($format);
break;
case "post_content":
$t = $post;
$post = $post_to_use;
include_partial('index-blog-post');
$post = $t;
break;
}
}
} }
?> ?>

View File

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

View File

Before

Width:  |  Height:  |  Size: 102 B

After

Width:  |  Height:  |  Size: 102 B

View File

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 198 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 295 B

View File

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 256 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 257 B

View File

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

View File

Before

Width:  |  Height:  |  Size: 147 B

After

Width:  |  Height:  |  Size: 147 B

View File

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 825 B

View File

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 169 B

View File

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 168 B

View File

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 285 B

View File

Before

Width:  |  Height:  |  Size: 191 B

After

Width:  |  Height:  |  Size: 191 B

View File

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

View File

Before

Width:  |  Height:  |  Size: 43 B

After

Width:  |  Height:  |  Size: 43 B

View File

Before

Width:  |  Height:  |  Size: 79 B

After

Width:  |  Height:  |  Size: 79 B

View File

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

View File

Before

Width:  |  Height:  |  Size: 951 B

After

Width:  |  Height:  |  Size: 951 B

View File

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 245 B

View File

Before

Width:  |  Height:  |  Size: 87 B

After

Width:  |  Height:  |  Size: 87 B

Some files were not shown because too many files have changed in this diff Show More