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

Merge branch 'nav'

This commit is contained in:
John Bintz 2009-11-09 21:27:34 -05:00
parent 4759f5183b 38c26c61d3
commit 1ec4d79ed0
4 changed files with 578 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,2 +1,5 @@
*~ *~
.buildpath
.project
.settings/

69
classes/ComicPressNavigation.inc
View File

@ -11,34 +11,57 @@ class ComicPressNavigation {
function get_post_nav($post) { function get_post_nav($post) {
$nav = array(); $nav = array();
if (is_object($post)) {
if (isset($post->ID)) {
$cache_key = 'navigation-' . $post->ID;
// global previous/next if (($result = wp_cache_get($cache_key, 'comicpress')) !== false) {
foreach (array('previous', 'next') as $field) { foreach ($result as $key => $post_id) {
$nav[$field] = $this->_dbi->{"get_${field}_comic"}(null, $post); $nev[$key] = get_post($post_id);
} }
}
// global first/last // global previous/next
if ($root_category = $this->_storyline->root_category) { foreach (array('previous', 'next') as $field) {
foreach (array('first', 'last') as $field) { $nav[$field] = $this->_dbi->{"get_${field}_comic"}(null, $post);
$nav[$field] = $this->_dbi->{"get_${field}_comic"}($root_category); }
}
}
if ($category = $this->_storyline->get_valid_post_category($post->ID)) { // global first/last
// storyline previous/next foreach (array('first', 'last') as $field) {
foreach (array('previous', 'next') as $field) { $nav[$field] = $this->_dbi->{"get_${field}_comic"}(null);
$nav["storyline-${field}"] = $this->_dbi->{"get_${field}_comic"}($category, $post); }
}
// adjacent storyline nodes if ($category = $this->_storyline->get_valid_post_category($post->ID)) {
if (is_array($valid = $this->_storyline->valid($category))) { // storyline previous/next
foreach ($valid as $field) { foreach (array('previous', 'next') as $field) {
$nav["storyline-chapter-${field}"] = $this->_dbi->get_first_comic($this->_storyline->{$field}($category)); $nav["storyline-${field}"] = $this->_dbi->{"get_${field}_comic"}($category, $post);
} }
}
}
return $nav; // adjacent storyline nodes
if (is_array($valid = $this->_storyline->valid($category))) {
foreach ($valid as $field) {
$all_adjacents = $this->_storyline->all_adjacent($category, $field);
foreach ($all_adjacents as $adjacent_category) {
$result = $this->_dbi->get_first_comic($adjacent_category);
if (!empty($result)) {
$nav["storyline-chapter-${field}"] = $result; break;
}
}
}
}
}
$cache_data = array();
foreach ($nav as $key => $output_post) {
if (!empty($output_post)) { $cache_data[$key] = $output_post->ID; }
if ($output_post->ID == $post->ID) { $nav[$key] = false; }
}
wp_cache_set($cache_key, $cache_data, 'comicpress');
return $nav;
}
}
} }
} }

570
classes/ComicPressStoryline.inc
View File

@ -3,70 +3,129 @@
require_once('ComicPressDBInterface.inc'); require_once('ComicPressDBInterface.inc');
class ComicPressStoryline { class ComicPressStoryline {
var $_structure, $root_category; var $_structure;
var $_category_search;
function &read_from_options() {
$this->create_structure($this->get_flattened_storyline());
return $this;
}
/**
* Get the flattened storyline from options.
*/
function get_flattened_storyline() {
$comicpress = &ComicPress::get_instance();
return $comicpress->comicpress_options['storyline_order'];
}
/**
* Set the global storyline as a flattened storyline.
*/
function set_flattened_storyline($storyline) {
$comicpress = &ComicPress::get_instance();
$comicpress->comicpress_options['storyline_order'] = $storyline;
$comicpress->save();
}
/**
* Set the order from a flattened storyline.
*/
function set_order_via_flattened_storyline($order) {
$nodes = explode(',', $order);
$original_nodes = explode(',', $this->get_flattened_storyline());
$missing_good_nodes = array_diff($original_nodes, $nodes);
$any_bad_nodes = array_diff($nodes, $original_nodes);
if (empty($missing_good_nodes) && empty($any_bad_nodes)) {
$this->set_flattened_storyline($order);
return true;
} else {
return false;
}
}
/** /**
* Create a searchable structure from a node list. * Create a searchable structure from a node list.
* @param array $structure The structure to process. * @param array $structure The structure to process.
* @return boolean True if the structure was valid. * @return boolean True if the structure was valid.
*/ */
function create_structure($structure) { function create_structure($structure) {
$new_structure = array(); $key = null;
$parent = null; if (is_string($structure)) {
$all_leaves = array(); $key = $structure;
$this->root_category = false; $structure = explode(',', $structure);
} else {
$adjacents_by_parent = array(); if (is_array($structure)) {
$fixed_structure = array();
if (is_string($structure)) { foreach ($structure as $s) {
$structure = explode(',', $structure); if (!is_array($s)) { $fixed_structure[] = $s; }
} }
$key = implode(',', $fixed_structure);
if (is_array($structure)) {
$is_valid = true;
foreach ($structure as $branch) {
if (is_string($branch)) {
$parts = explode('/', $branch);
$valid = false;
if (count($parts) > 1) {
if ($parts[0] == '0') { $valid = true; }
}
if (!$valid) {
$is_valid = false; break;
} else {
$data = array();
$leaf = end($parts);
$all_leaves[] = $leaf;
if (count($parts) > 2) {
$parent = $parts[count($parts) - 2];
if (!isset($adjacents_by_parent[$parent])) {
$adjacents_by_parent[$parent] = array();
}
$adjacents_by_parent[$parent][] = $leaf;
$data['parent'] = $parent;
} else {
$this->root_category = $leaf;
}
$new_structure[$leaf] = $data;
}
} else {
$is_valid = false; break;
}
} }
if ($is_valid) { }
for ($i = 0; $i < count($all_leaves); ++$i) {
foreach (array('previous' => -1, 'next' => 1) as $type => $dir) { if (!is_null($key)) {
if (isset($all_leaves[$i + $dir])) { $key = "storyline-structure-${key}";
$new_structure[$all_leaves[$i]][$type] = $all_leaves[$i + $dir];
if (($result = wp_cache_get($key, 'comicpress')) !== false) {
$this->_structure = $result;
} else {
$new_structure = array();
$parent = null;
$all_leaves = array();
$adjacents_by_parent = array();
if (is_array($structure)) {
$is_valid = true;
foreach ($structure as $branch) {
if (is_string($branch)) {
$parts = explode('/', $branch);
$valid = false;
if (count($parts) > 1) {
if ($parts[0] == '0') { $valid = true; }
}
if (!$valid) {
$is_valid = false; break;
} else {
$data = array();
$leaf = end($parts);
$all_leaves[] = $leaf;
$data['level'] = count($parts) - 1;
if (count($parts) > 2) {
$parent = $parts[count($parts) - 2];
if (!isset($adjacents_by_parent[$parent])) {
$adjacents_by_parent[$parent] = array();
}
$adjacents_by_parent[$parent][] = $leaf;
$data['parent'] = $parent;
}
$new_structure[$leaf] = $data;
}
} else {
$is_valid = false; break;
} }
} }
} if ($is_valid) {
for ($i = 0; $i < count($all_leaves); ++$i) {
foreach (array('previous' => -1, 'next' => 1) as $type => $dir) {
if (isset($all_leaves[$i + $dir])) {
$new_structure[$all_leaves[$i]][$type] = $all_leaves[$i + $dir];
}
}
}
$this->_structure = $new_structure; $this->_structure = $new_structure;
}
}
wp_cache_set($key, $this->_structure, 'comicpress');
} }
} }
return is_array($this->_structure); return is_array($this->_structure);
@ -82,7 +141,7 @@ class ComicPressStoryline {
} }
return false; return false;
} }
function parent($id) { return $this->_get_field('parent', $id); } function parent($id) { return $this->_get_field('parent', $id); }
function previous($id) { return $this->_get_field('previous', $id); } function previous($id) { return $this->_get_field('previous', $id); }
function next($id) { return $this->_get_field('next', $id); } function next($id) { return $this->_get_field('next', $id); }
@ -93,6 +152,20 @@ class ComicPressStoryline {
return false; return false;
} }
function all_adjacent($id, $direction) {
if (isset($this->_structure[$id])) {
$all_adjacent = array();
do {
if ($has_adjacent = isset($this->_structure[$id][$direction])) {
$all_adjacent[] = $this->_structure[$id][$direction];
$id = $this->_structure[$id][$direction];
}
} while ($has_adjacent);
return $all_adjacent;
}
return false;
}
/** /**
* Get the valid navigation directions for a particular post. * Get the valid navigation directions for a particular post.
*/ */
@ -108,7 +181,7 @@ class ComicPressStoryline {
*/ */
function get_valid_post_category($post_id) { function get_valid_post_category($post_id) {
$result = false; $result = false;
foreach (wp_get_post_categories($post_id) as $category) { foreach (wp_get_post_categories($post_id) as $category) {
if ($this->valid($category)) { if ($this->valid($category)) {
if ($result) { return false; } if ($result) { return false; }
@ -119,9 +192,394 @@ class ComicPressStoryline {
return $result; return $result;
} }
/**
* Get all comic categories.
* @deprecated
*/
function get_comic_categories() { function get_comic_categories() {
return array_keys($this->_structure); return array_keys($this->_structure);
} }
/**
* Get a simple storyline.
*/
function get_simple_storyline() {
$simple_storyline = array('0' => array());
foreach ($this->_structure as $category_id => $adjacents) {
$parent = 0;
if (isset($adjacents['parent'])) { $parent = $adjacents['parent']; }
if (!isset($simple_storyline[$parent])) {
$simple_storyline[$parent] = array();
}
$simple_storyline[$parent][$category_id] = true;
}
return $this->_merge_simple_storyline($simple_storyline);
}
/**
* Get a simple structure.
*/
function get_category_simple_structure($parent = null) {
$structure = array();
foreach (get_all_category_ids() as $category_id) {
$category = get_category($category_id);
if (!isset($structure[$category->parent])) {
$structure[$category->parent] = array();
}
$structure[$category->parent][$category_id] = true;
}
$structure = $this->_merge_simple_storyline($structure);
if (!empty($parent)) {
if (isset($structure[0])) {
foreach ($structure[0] as $key => $children) {
if ($key != $parent) { unset($structure[0][$key]); }
}
}
}
return $structure;
}
/**
* Get a flattened category node list.
*/
function get_category_flattened($parent = null) {
return $this->flatten_simple_storyline($this->get_category_simple_structure($parent));
}
/**
* Merge a flat simple storyline into a tree.
*/
function _merge_simple_storyline($simple_storyline) {
while (count($simple_storyline) > 0) {
$merge_found = false;
foreach ($simple_storyline as $parent => $children) {
$has_no_descendents = true;
foreach (array_keys($children) as $child) {
if (is_numeric($child)) {
if (isset($simple_storyline[$child])) {
$has_no_descendents = false;
break;
}
}
}
if ($has_no_descendents) {
$merge_found = $parent; break;
}
}
if ($merge_found !== false) {
foreach ($simple_storyline as $parent => $children) {
if (isset($children[$merge_found])) {
$simple_storyline[$parent][$merge_found] = $simple_storyline[$merge_found];
unset($simple_storyline[$merge_found]);
break;
}
}
}
if (!$merge_found) { break; }
}
return $simple_storyline;
}
/**
* Integrates a bunch of other things.
*/
function normalize($flattened_storyline = null, $set = true) {
$comicpress = ComicPress::get_instance();
if (is_null($flattened_storyline)) {
$flattened_storyline = $this->get_flattened_storyline();
}
$all_categories_flattened = $this->get_category_flattened();
$result = $this->normalize_flattened_storyline($flattened_storyline, $all_categories_flattened);
if ($set) {
$this->set_flattened_storyline($result);
}
return $result;
}
/**
* Sort nodes by node count.
*/
function _length_sort($parts) {
$new = array();
foreach ($parts as $part) {
$p = explode('/', $part);
if (!isset($new[count($p)])) {
$new[count($p)] = array();
}
$new[count($p)][] = $part;
}
ksort($new);
$output = array();
foreach (array_values($new) as $values) {
$output = array_merge($output, $values);
}
return $output;
}
/**
* Normalize a flattened storyline, inserting and removing categories from the list is necessary.
*/
function normalize_flattened_storyline($storyline, $comic_categories) {
$storyline_nodes = explode(",", $storyline);
$category_nodes = explode(",", $comic_categories);
$missing_from_storyline = array_diff($category_nodes, $storyline_nodes);
$extra_in_storyline = array_diff($storyline_nodes, $category_nodes);
if (!empty($missing_from_storyline)) {
$missing_from_storyline = $this->_length_sort($missing_from_storyline);
foreach ($missing_from_storyline as $node) {
$parent_pattern = implode('/', array_slice(explode('/', $node), 0, -1));
$last = null;
for ($i = 0, $il = count($storyline_nodes); $i < $il; ++$i) {
if (strpos($storyline_nodes[$i], $parent_pattern) === 0) {
$last = $i;
}
}
if (!is_null($last)) {
array_splice($storyline_nodes, $last + 1, 0, array($node));
} else {
$storyline_nodes[] = $node;
}
}
}
if (!empty($extra_in_storyline)) {
$new = array();
foreach ($storyline_nodes as $node) {
if (!in_array($node, $extra_in_storyline)) {
$new[] = $node;
}
}
$storyline_nodes = $new;
}
return implode(',', $storyline_nodes);
}
/**
* Flatten a simple storyline.
*/
function flatten_simple_storyline($storyline) {
return implode(',', $this->_follow_simple_storyline($storyline));
}
/**
* Follow the nodes of a simple storyline, creating a node list.
*/
function _follow_simple_storyline($storyline, $parent = null) {
$output = array();
foreach ($storyline as $key => $children) {
if (is_null($parent)) {
$new_parent = $key;
} else {
$new_parent = $parent . '/' . $key;
$output[] = $new_parent;
}
if (is_array($children)) {
$output = array_merge($output, $this->_follow_simple_storyline($children, $new_parent));
}
}
return $output;
}
function &include_all() {
$this->_category_search = array_keys($this->_structure);
return $this;
}
function &exclude_all() {
$this->_category_search = array();
return $this;
}
function _find_children($parent) {
if (!is_numeric($parent)) {
foreach (get_all_category_ids() as $id) {
$category = get_category($id);
if ($category->slug == $parent) {
$parent = $id; break;
}
}
}
if (is_numeric($parent)) {
$children = array($parent);
do {
$found_children = false;
foreach ($this->_structure as $category_id => $info) {
if (!in_array($category_id, $children)) {
if (isset($info['parent'])) {
if (in_array($info['parent'], $children)) {
$children[] = $category_id;
$found_children = true;
}
}
}
}
} while ($found_children);
return $children;
}
return false;
}
function &_include() {
$args = func_get_args();
$method = array_shift($args);
$this->_category_search = array_unique(array_merge($this->_category_search, call_user_func_array(array($this, $method), $args)));
sort($this->_category_search);
return $this;
}
function &_exclude() {
$args = func_get_args();
$method = array_shift($args);
$this->_category_search = array_diff($this->_category_search, call_user_func_array(array($this, $method), $args));
sort($this->_category_search);
return $this;
}
function _find_level_or_above($level = null) {
$found = array();
foreach ($this->_structure as $category_id => $info) {
if ($info['level'] <= $level) { $found[] = $category_id; }
}
return $found;
}
function _find_only($id = null) {
if (isset($this->_structure[$id])) {
return array($id);
}
return array();
}
function _find_level($level = null) {
$found = array();
foreach ($this->_structure as $category_id => $info) {
if ($info['level'] == $level) { $found[] = $category_id; }
}
return $found;
}
function _ensure_post_id($thing) {
$id = null;
if (is_object($thing)) {
if (isset($thing->ID)) { $id = $thing->ID; }
} else {
if (is_numeric($thing)) { $id = $thing; }
}
return $id;
}
function _find_post_category($post = null) {
$found = array();
$id = $this->_ensure_post_id($post);
if (!is_null($id)) {
if (count($categories = wp_get_post_categories($id)) == 1) {
$found = $categories;
}
}
return $found;
}
function _find_adjacent($category = null, $next = false) {
$found = array();
if (!is_null($category)) {
if (isset($this->_structure[$category])) {
$field = $next ? 'next' : 'previous';
if (isset($this->_structure[$category][$field])) {
$found = array($this->_structure[$category][$field]);
}
}
}
return $found;
}
function _find_post_root($post = null) {
$found = array();
$id = $this->_ensure_post_id($post);
if (!is_null($id)) {
if (count($categories = wp_get_post_categories($id)) == 1) {
$comic_post = new ComicPressComicPost(get_post($id));
$parents = $comic_post->find_parents();
if (!empty($parents)) {
$parents = array_keys($parents); $found = $this->_find_children(end($parents));
}
}
}
return $found;
}
function end_search() {
$result = $this->_category_search;
$this->_category_search = array();
return $result;
}
function build_from_restrictions($restrictions = null) {
global $post;
$this->read_from_options()->exclude_all();
$include_all = true;
if (is_array($restrictions)) {
if (!empty($restrictions)) {
$include_all = false;
}
}
if (!$include_all) {
foreach ($restrictions as $type => $list) {
if (substr($type, 0, 1) == "!") {
$method_root = 'exclude';
$method_type = substr($type, 1);
} else {
$method_root = 'include';
$method_type = $type;
}
if (!is_array($list)) { $list = array($list); }
foreach ($list as $restriction) {
$method = '';
$args = array($restriction);
switch ($method_type) {
case 'child_of': $method = 'children'; break;
case 'root_of': $method = 'post_root'; break;
case 'from_post': $method = 'post_category'; break;
case 'previous':
$method = 'adjacent';
$args[] = false;
break;
case 'next':
$method = 'adjacent';
$args[] = true;
break;
default:
$method = $method_type; break;
}
if (!empty($method)) {
array_unshift($args, "_find_${method}");
call_user_func_array(array($this, "_${method_root}"), $args);
}
}
}
} else {
$this->include_all();
}
return $this->end_search();
}
} }
?> ?>

24
widgets/graphical-navigation.php
View File

@ -57,7 +57,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
'previous' => 'prev', 'previous' => 'prev',
'story_next' => 'nextchap' 'story_next' => 'nextchap'
); );
$ok = true; $ok = true;
switch ($which) { switch ($which) {
case 'first': case 'first':
@ -87,11 +87,15 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
case 'story_next': case 'story_next':
case 'story_prev_in': case 'story_prev_in':
case 'story_next_in': case 'story_next_in':
$navi_class_names = array("navi-${which}"); $ok = false;
if (isset($css_name_mapping[$which])) { $navi_class_names[] = "navi-{$css_name_mapping[$which]}"; } $navi_class_names = array("navi-${which}");
if (is_object($target)) {
$link = get_permalink($target->ID); $ok = true;
if (($which == 'last') && ($instance['lastgohome'] == 'on')) { $link = get_bloginfo('url'); } if (isset($css_name_mapping[$which])) { $navi_class_names[] = "navi-{$css_name_mapping[$which]}"; }
$link = get_permalink($target->ID);
if (($which == 'last') && ($instance['lastgohome'] == 'on')) { $link = get_bloginfo('url'); }
}
if ($ok) { if ($ok) {
?><a href="<?php echo $link; ?>" ?><a href="<?php echo $link; ?>"
class="navi <?php echo implode(" ", $navi_class_names); ?>" class="navi <?php echo implode(" ", $navi_class_names); ?>"
@ -243,7 +247,9 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
$post_nav = $navigation->get_post_nav($post); $post_nav = $navigation->get_post_nav($post);
if ($instance['story_prev_acts_as_prev_in']) { if ($instance['story_prev_acts_as_prev_in']) {
$post_nav['storyline-chapter-previous'] = $post_nav['storyline-previous']; if ($post_nav['storyline-previous'] !== false) {
$post_nav['storyline-chapter-previous'] = $post_nav['storyline-previous'];
}
} }
$storyline_to_nav_mapping = array( $storyline_to_nav_mapping = array(
@ -279,7 +285,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
$all_fields = array( $all_fields = array(
'first', 'story_prev', 'story_next', 'story_prev_in', 'first', 'story_prev', 'story_next', 'story_prev_in',
'story_next_in', 'previous', 'random', 'archives', 'story_next_in', 'previous', 'random', 'archives',
'comments', 'next', 'last', 'buyprint', 'comictitle', 'lastgohome', 'comments', 'next', 'last', 'buyprint', 'comictitle', 'lastgohome',
'story_prev_acts_as_prev_in' 'story_prev_acts_as_prev_in'
); );
@ -414,7 +420,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
} }
} }
}; };
jQuery('.comicpress-field-holder').each(function(fh) { jQuery('.comicpress-field-holder').each(function(fh) {
jQuery('.comicpress-field[type=checkbox]', this).bind('click', _get_comicpress_show_hide_text(this, false)); jQuery('.comicpress-field[type=checkbox]', this).bind('click', _get_comicpress_show_hide_text(this, false));
_get_comicpress_show_hide_text(this, true)(); _get_comicpress_show_hide_text(this, true)();