From b12cf93083c541e64e206c328c42ed7889aa7fc5 Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Sun, 29 Nov 2009 22:48:02 -0700 Subject: [PATCH 01/86] Comments styling and CSS minimizing. --- functions/comment-functions.php | 65 ++++++----- options/postoptions.php | 2 +- style.css | 156 +++++++++++++------------- widgets/GraphicalNavigationWidget.inc | 12 +- 4 files changed, 120 insertions(+), 115 deletions(-) diff --git a/functions/comment-functions.php b/functions/comment-functions.php index 472357a..09abd52 100644 --- a/functions/comment-functions.php +++ b/functions/comment-functions.php @@ -38,7 +38,7 @@ function comicpress_avatar() { $id_or_email = get_comment_author_email(); if (empty($id_or_email)) $id_or_email = get_comment_author(); if(function_exists('comicpress_get_avatar') && $comment_type != 'pingback' && $comment_type != 'trackback' ) { - echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 72)); + echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 80)); } else { if ($comment_type == 'pingback' || $comment_type == 'trackback') { echo ''; @@ -128,46 +128,51 @@ function comicpress_comments_callback($comment, $args, $depth) {
+ +
+ +
- -
-
-
- + - + - | - + | + + + __('Reply','comicpress'), - 'login_text' => __('Log in to reply.','comicpress'), + 'login_text' => __('Login to Reply','comicpress'), 'depth' => $depth, 'max_depth' => $max_depth, - 'before' => '| ', + 'before' => '| ', 'after' => '' - )); - endif; - ?> - '.__('Edit','comicpress').'',' | ',''); ?> - - comment_approved == '0') : ?> -
- - -
- - -
- + )); + endif; ?> + + '.__('Edit','comicpress').'',' | ',''); ?> + + comment_approved == '0') : ?> +
+ +
- -
+ + +
+ +
+ +
+ +
+ - + /> diff --git a/style.css b/style.css index 5148486..3e8922c 100644 --- a/style.css +++ b/style.css @@ -48,7 +48,7 @@ img { } small { - font-size: 10px; + font-size: 11px; } hr { @@ -68,12 +68,11 @@ blockquote { border-color: #000; } -cite { +blockquote cite { margin: 5px 0 0; display: block; font-weight: bold; font-family: 'Arial', sans-serif; - font-style: normal; font-size: 12px; } @@ -472,7 +471,7 @@ h3, h3 a { .post-info, .post-comic-info { padding-bottom: 5px; - font-size: 10px; + font-size: 11px; } .post-text, .post-comic-text { @@ -594,90 +593,92 @@ h3, h3 a { /* COMMENTS */ -#comment-wrapper { - margin-top: 5px; +.comment { + display: block; + margin-top: 20px; } - .comment { - padding: 2px; - clear: both; - } .comment .comment { - margin-left: 30px; + margin: 10px 0 0 90px; } - .comment .avatar { - margin: 0; - padding: 0; - float: left; + .comment .comment .comment { + margin-left: 45px; } - .comment .comment .avatar { - width: 48px; - height: 48px; - } - - .comment .trackping { - float: left; - } - - #comment-wrapper #respond { - padding: 5px; - } - - .comment-note { - width: 400px; - display: block; - font-size: 11px; - } - - .comment-text { - font-size: 13px; - padding: 10px 5px 5px; - float: left; - } - - .comment-author { - padding-left: 5px; - display: inline; - } - - .comment-author cite { - padding: 0; - margin: 0; - font-size: 16px; - display: inline; - } - - .comment .comment .comment-author cite { - font-size: 14px; - } - - .comment-time { - padding-left: 5px; - } - - .comment-moderated em { - color: #f00; - padding-left: 5px; - } - - li.comment { - margin-top: 10px; - } - -.comment-meta-data { +.comment-avatar { + width: 80px; + height: 80px; + float: left; + overflow: hidden; } + .comment .comment .comment-avatar { + width: 40px; + height: 40px; + } + + .comment .comment .avatar { + width: 40px; + height: 40px; + } + +.comment-author cite { + font-weight: bold; + font-style: normal; + font-size: 16px; +} + + .comment .comment .comment-author cite { + font-size: 14px; + } + + .comment .comment .comment-author { + display: inline; + } + +.comment-meta-data { + font-size: 11px; +} + + .comment .comment .comment-meta-data { + display: inline; + } + + .comment .comment .comment-permalink { + display: none; + } + +.comment-moderated { + font-style: italic; + font-size: 15px; +} + +.comment-content { + margin-left: 90px; +} + + .comment .comment .comment-content { + margin-left: 45px; + } + +.comment-text p { + padding: 5px 0 0 0; + margin: 0; + font-size: 12px; +} + +.comment-note { + width: 400px; + display: block; + font-size: 11px; +} + .comment-meta { display: inline; border-left: 1px solid #000; } -.says { - display: none; -} - .commentsrsslink { float: right; font-size: 11px; @@ -704,7 +705,6 @@ h3, h3 a { ol.commentlist { margin: 0; padding: 10px 0 30px 0; - font-size: 11px; list-style: none; } @@ -863,7 +863,7 @@ ul.children { } #wp-calendar th { - font-size: 10px; + font-size: 11px; font-weight: normal; text-align: center; } @@ -1201,7 +1201,7 @@ li.pingback div p, li.trackback div p { display: block; float: left; text-align: center; - font-size: 10px; + font-size: 11px; line-height: 13px; } @@ -1212,7 +1212,7 @@ li.pingback div p, li.trackback div p { display: block; float: left; text-align: center; - font-size: 10px; + font-size: 11px; line-height: 13px; border: 1px solid #999; } diff --git a/widgets/GraphicalNavigationWidget.inc b/widgets/GraphicalNavigationWidget.inc index 8316407..3835838 100644 --- a/widgets/GraphicalNavigationWidget.inc +++ b/widgets/GraphicalNavigationWidget.inc @@ -356,17 +356,17 @@ class GraphicalNavigationWidget extends WP_Widget { ); $title_defaults = array( - 'first_title' => __('‹‹ First', 'comicpress'), + 'first_title' => __('First', 'comicpress'), 'story_prev_title' => __('Chapter', 'comicpress'), 'story_next_title' => __('Chapter', 'comicpress'), - 'story_prev_in_title' => __('In Chapter', 'comicpress'), - 'story_next_in_title' => __('In Chapter', 'comicpress'), - 'previous_title' => __('‹ Previous', 'comicpress'), + 'story_prev_in_title' => __('In Chapter', 'comicpress'), + 'story_next_in_title' => __('In Chapter', 'comicpress'), + 'previous_title' => __('Previous', 'comicpress'), 'random_title' => __('Random', 'comicpress'), 'archives_title' => __('Archives', 'comicpress'), 'comments_title' => __('Comments', 'comicpress'), - 'next_title' => __('Next ›', 'comicpress'), - 'last_title' => __('Last ››', 'comicpress'), + 'next_title' => __('Next', 'comicpress'), + 'last_title' => __('Last', 'comicpress'), 'buyprint_title' => __('Buy Print', 'comicpress') ); From c32fae115aa05d41757a4eb0c4465dba4e4d79ce Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Mon, 30 Nov 2009 10:40:08 -0700 Subject: [PATCH 02/86] Wasn't displaying comments when comments were closed. With the new WordPress option to expire commenting on old posts (to keep discussion current) its still nice to read the old discussions. --- single.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/single.php b/single.php index eff8de6..fdd1067 100644 --- a/single.php +++ b/single.php @@ -116,9 +116,9 @@ $post = $temppost; $wp_query = $temp_query; $temppost = null; $temp_query = null; } } - if ('open' == $post->comment_status) { - comments_template('', true); - } + + comments_template('', true); + ?> From bf67bcb0826c40922eeb2c4a540ac2b1a8df3af0 Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Mon, 30 Nov 2009 11:43:32 -0700 Subject: [PATCH 03/86] Adjusted for Trackbacks and Pingbacks styling. --- style.css | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/style.css b/style.css index 3e8922c..148738b 100644 --- a/style.css +++ b/style.css @@ -605,7 +605,7 @@ h3, h3 a { .comment .comment .comment { margin-left: 45px; } - + .comment-avatar { width: 80px; height: 80px; @@ -622,7 +622,23 @@ h3, h3 a { width: 40px; height: 40px; } + +.comment-content { + margin-left: 90px; +} + + .comment .comment .comment-content { + margin-left: 45px; + } + + .pingback .comment-content { + margin-left: 0; + } + .trackback .comment-content { + margin-left: 0; + } + .comment-author cite { font-weight: bold; font-style: normal; @@ -654,14 +670,6 @@ h3, h3 a { font-size: 15px; } -.comment-content { - margin-left: 90px; -} - - .comment .comment .comment-content { - margin-left: 45px; - } - .comment-text p { padding: 5px 0 0 0; margin: 0; From 3227c4874245b649f6a1c4a3814f25cd10a6a6f7 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Mon, 30 Nov 2009 13:28:11 -0800 Subject: [PATCH 04/86] Comment Functions CHange removing static images for the pingback and trackback Signed-off-by: Philip M. Hofer (Frumph) --- functions/comment-functions.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/functions/comment-functions.php b/functions/comment-functions.php index 09abd52..72a95c5 100644 --- a/functions/comment-functions.php +++ b/functions/comment-functions.php @@ -21,13 +21,7 @@ function comicpress_avatar() { $comment_type = get_comment_type(); - if($comment_type == 'trackback') : - $avatar = '/images/trackback.png'; - - elseif($comment_type == 'pingback') : - $avatar = '/images/pingback.png'; - - elseif(get_settings('avatar_default')): + if(get_settings('avatar_default')): $avatar = get_settings('avatar_default'); endif; @@ -41,7 +35,8 @@ function comicpress_avatar() { echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 80)); } else { if ($comment_type == 'pingback' || $comment_type == 'trackback') { - echo ''; + if ($comment_type == 'pingback') echo '
'; + if ($comment_type == 'trackback') echo '
'; } else { echo ''; } From 6518224239b7f8af13cf8e2af38906cca3636746 Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Mon, 30 Nov 2009 14:43:41 -0700 Subject: [PATCH 05/86] Comment adjustments, back to 64px avatar. ;) --- functions/comment-functions.php | 2 +- sidebar-right.php | 2 -- style.css | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/functions/comment-functions.php b/functions/comment-functions.php index 09abd52..eec4877 100644 --- a/functions/comment-functions.php +++ b/functions/comment-functions.php @@ -38,7 +38,7 @@ function comicpress_avatar() { $id_or_email = get_comment_author_email(); if (empty($id_or_email)) $id_or_email = get_comment_author(); if(function_exists('comicpress_get_avatar') && $comment_type != 'pingback' && $comment_type != 'trackback' ) { - echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 80)); + echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 64)); } else { if ($comment_type == 'pingback' || $comment_type == 'trackback') { echo ''; diff --git a/sidebar-right.php b/sidebar-right.php index f12d23b..61bcac6 100644 --- a/sidebar-right.php +++ b/sidebar-right.php @@ -4,8 +4,6 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
- -
diff --git a/style.css b/style.css index 148738b..c8c1729 100644 --- a/style.css +++ b/style.css @@ -599,16 +599,16 @@ h3, h3 a { } .comment .comment { - margin: 10px 0 0 90px; + margin: 10px 0 0 70px; } .comment .comment .comment { - margin-left: 45px; + margin-left: 20px; } .comment-avatar { - width: 80px; - height: 80px; + width: 64px; + height: 64px; float: left; overflow: hidden; } @@ -624,7 +624,7 @@ h3, h3 a { } .comment-content { - margin-left: 90px; + margin-left: 70px; } .comment .comment .comment-content { From 31ef527a0e8b083e78f7951bedbe79f435255e94 Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Mon, 30 Nov 2009 14:56:19 -0700 Subject: [PATCH 06/86] Comment replies author back to its own line (not inline with date). --- style.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/style.css b/style.css index c8c1729..5caa431 100644 --- a/style.css +++ b/style.css @@ -649,18 +649,10 @@ h3, h3 a { font-size: 14px; } - .comment .comment .comment-author { - display: inline; - } - .comment-meta-data { font-size: 11px; } - .comment .comment .comment-meta-data { - display: inline; - } - .comment .comment .comment-permalink { display: none; } From 68e849717dad37217a7b17b5a57ad27b09cebe49 Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Mon, 30 Nov 2009 15:31:44 -0700 Subject: [PATCH 07/86] Adjusting comments reply avatar size... --- style.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/style.css b/style.css index 5caa431..362157d 100644 --- a/style.css +++ b/style.css @@ -614,13 +614,13 @@ h3, h3 a { } .comment .comment .comment-avatar { - width: 40px; - height: 40px; + width: 48px; + height: 48px; } .comment .comment .avatar { - width: 40px; - height: 40px; + width: 48px; + height: 48px; } .comment-content { @@ -628,7 +628,7 @@ h3, h3 a { } .comment .comment .comment-content { - margin-left: 45px; + margin-left: 52px; } .pingback .comment-content { @@ -663,8 +663,7 @@ h3, h3 a { } .comment-text p { - padding: 5px 0 0 0; - margin: 0; + margin: 5px 0 0 0; font-size: 12px; } From f0179bea8eeb6a643a5e487e6d5d887775435e52 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Sat, 28 Nov 2009 16:46:45 -0500 Subject: [PATCH 08/86] bookmark widget cleanup --- js/bookmark.js | 54 ++++++++++++++++++++------------------ sidebar-right.php | 3 +++ widgets/BookmarkWidget.inc | 2 -- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/js/bookmark.js b/js/bookmark.js index eea3119..5fd5c2e 100644 --- a/js/bookmark.js +++ b/js/bookmark.js @@ -36,35 +36,37 @@ Event.observe(window, 'load', function() { var bookmark_info = new BookmarkInfo(); var info = bookmark_info.read(); - var hrefs = {}; - $$('#comic-bookmark-holder a').each(function(a) { - var name = $w(a.className).shift(); - hrefs[name] = a; - }); + if ($('comic-bookmark-holder')) { + var hrefs = {}; + $$('#comic-bookmark-holder a').each(function(a) { + var name = $w(a.className).shift(); + hrefs[name] = a; + }); - var set_goto_tag = function(i) { - hrefs['goto-tag'].href = (i.permalink ? i.permalink : "#"); - [ 'goto-tag','clear-tag' ].each(function(which) { - hrefs[which].select('img')[0].src = image_root + button_images[which][i.permalink ? "on" : "off"]; - }); - }; + var set_goto_tag = function(i) { + hrefs['goto-tag'].href = (i.permalink ? i.permalink : "#"); + [ 'goto-tag','clear-tag' ].each(function(which) { + hrefs[which].select('img')[0].src = image_root + button_images[which][i.permalink ? "on" : "off"]; + }); + }; - bookmark_info.onWrite = function(i) { set_goto_tag(i); } - set_goto_tag(info); + bookmark_info.onWrite = function(i) { set_goto_tag(i); } + set_goto_tag(info); - Event.observe(hrefs['tag-page'], 'click', function(e) { - Event.stop(e); - info.permalink = permalink; - bookmark_info.write(info); - }); + Event.observe(hrefs['tag-page'], 'click', function(e) { + Event.stop(e); + info.permalink = permalink; + bookmark_info.write(info); + }); - Event.observe(hrefs['clear-tag'], 'click', function(e) { - Event.stop(e); - info.permalink = false; - bookmark_info.write(info); - }); + Event.observe(hrefs['clear-tag'], 'click', function(e) { + Event.stop(e); + info.permalink = false; + bookmark_info.write(info); + }); - Event.observe(hrefs['goto-tag'], 'click', function(e) { - if (hrefs['goto-tag'].href == "#") { Event.stop(e); } - }); + Event.observe(hrefs['goto-tag'], 'click', function(e) { + if (hrefs['goto-tag'].href == "#") { Event.stop(e); } + }); + } }); diff --git a/sidebar-right.php b/sidebar-right.php index 61bcac6..67a96d3 100644 --- a/sidebar-right.php +++ b/sidebar-right.php @@ -4,6 +4,9 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
+
diff --git a/widgets/BookmarkWidget.inc b/widgets/BookmarkWidget.inc index f0b745b..b2e4648 100644 --- a/widgets/BookmarkWidget.inc +++ b/widgets/BookmarkWidget.inc @@ -32,5 +32,3 @@ class BookmarkWidget extends WP_Widget { From ecaeec2b8d16182ec1eb2feeffa4a42ff5424290 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 30 Nov 2009 21:05:28 -0500 Subject: [PATCH 09/86] fix js error --- js/bookmark.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/bookmark.js b/js/bookmark.js index 5fd5c2e..e6b444c 100644 --- a/js/bookmark.js +++ b/js/bookmark.js @@ -8,7 +8,7 @@ var button_images = { }; var BookmarkInfo = Class.create({ - 'default': { + 'def': { 'permalink': false }, 'initialize': function() { @@ -21,7 +21,7 @@ var BookmarkInfo = Class.create({ var bookmark_info = this.jar.get('bookmark-info'); if ((typeof(bookmark_info) != 'object') || (bookmark_info == null)) { - bookmark_info = this.default; + bookmark_info = this.def; } return bookmark_info; From 8a8e50ba68b273cb1350555731213054cd7bdb63 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Tue, 1 Dec 2009 13:02:03 -0800 Subject: [PATCH 10/86] changed function names for the embed's of the .inc's Signed-off-by: Philip M. Hofer (Frumph) --- functions.php | 4 ++-- sidebar-left.php | 2 +- sidebar-right.php | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/functions.php b/functions.php index 7bcfc2d..1f43826 100644 --- a/functions.php +++ b/functions.php @@ -883,7 +883,7 @@ if (comicpress_check_child_file('childfunctions') == false) {} /** * Render the ComicPress calendar widget. */ -function comicpress_calendar() { +function comicpress_calendar_embed() { $calendar = new CalendarWidget(); $instance = array(); @@ -897,7 +897,7 @@ function comicpress_calendar() { /** * Render the ComicPress bookmark widget. */ -function comicpress_comic_bookmark() { +function comicpress_comic_bookmark_embed() { $bookmark = new BookmarkWidget(); $bookmark->init(); $bookmark->widget(array(), array()); diff --git a/sidebar-left.php b/sidebar-left.php index e210e2e..8779f97 100644 --- a/sidebar-left.php +++ b/sidebar-left.php @@ -6,7 +6,7 @@
- +
diff --git a/sidebar-right.php b/sidebar-right.php index 61bcac6..da18fbc 100644 --- a/sidebar-right.php +++ b/sidebar-right.php @@ -4,9 +4,12 @@ if (!$comicpress_options['disable_lrsidebars_frontpage']) { ?>
+
+ +
- +
From 83195c457f227cc19859b85084671c61632221b4 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Tue, 1 Dec 2009 13:34:06 -0800 Subject: [PATCH 11/86] Depreciating Files for backwards over-write installation Signed-off-by: Philip M. Hofer (Frumph) --- comicpress-options-config.php | 3 + functions/checkbrowser.php | 3 + functions/rawformatting.php | 3 + functions/syndication.php | 59 ++++++ functions/userpages.php | 3 + widgets/bookmark.php | 3 + widgets/buythisprint.php | 3 + widgets/calendar.php | 3 + widgets/graphical-navigation-orig.php | 284 +------------------------ widgets/graphical-navigation.php | 285 ++++++++++++++++++++++++++ wpmu-functions.php | 3 + 11 files changed, 369 insertions(+), 283 deletions(-) create mode 100644 comicpress-options-config.php create mode 100644 functions/checkbrowser.php create mode 100644 functions/rawformatting.php create mode 100644 functions/syndication.php create mode 100644 functions/userpages.php create mode 100644 widgets/bookmark.php create mode 100644 widgets/buythisprint.php create mode 100644 widgets/calendar.php create mode 100644 widgets/graphical-navigation.php create mode 100644 wpmu-functions.php diff --git a/comicpress-options-config.php b/comicpress-options-config.php new file mode 100644 index 0000000..7ac7fd1 --- /dev/null +++ b/comicpress-options-config.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/functions/checkbrowser.php b/functions/checkbrowser.php new file mode 100644 index 0000000..7ac7fd1 --- /dev/null +++ b/functions/checkbrowser.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/functions/rawformatting.php b/functions/rawformatting.php new file mode 100644 index 0000000..7ac7fd1 --- /dev/null +++ b/functions/rawformatting.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/functions/syndication.php b/functions/syndication.php new file mode 100644 index 0000000..2e3cba3 --- /dev/null +++ b/functions/syndication.php @@ -0,0 +1,59 @@ + \ No newline at end of file diff --git a/functions/userpages.php b/functions/userpages.php new file mode 100644 index 0000000..7ac7fd1 --- /dev/null +++ b/functions/userpages.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/widgets/bookmark.php b/widgets/bookmark.php new file mode 100644 index 0000000..c266e1e --- /dev/null +++ b/widgets/bookmark.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/widgets/buythisprint.php b/widgets/buythisprint.php new file mode 100644 index 0000000..7ac7fd1 --- /dev/null +++ b/widgets/buythisprint.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/widgets/calendar.php b/widgets/calendar.php new file mode 100644 index 0000000..7ac7fd1 --- /dev/null +++ b/widgets/calendar.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/widgets/graphical-navigation-orig.php b/widgets/graphical-navigation-orig.php index 94499df..7ac7fd1 100644 --- a/widgets/graphical-navigation-orig.php +++ b/widgets/graphical-navigation-orig.php @@ -1,285 +1,3 @@ 'widget_comicpress_graphical_navigation', 'description' => __('Displays Graphical Navigation Buttons. (used in comic sidebars)','comicpress') ); - $this->WP_Widget('graphicalnavigation', __('Comic Navigation (orig)','comicpress'), $widget_ops); - } - - function widget($args, $instance) { - global $wp_query, $post; - - if (is_home() || is_single()) { - - $this_permalink = get_permalink(); - - $temp_query = $wp_query->is_single; - $wp_query->is_single = true; - $prev_comic = get_previous_comic_permalink(); - $next_comic = get_next_comic_permalink(); - $wp_query->is_single = $temp_query; - $temp_query = null; - - $first_comic = get_first_comic_permalink(); - $last_comic = get_last_comic_permalink(); - - $prev_story = get_previous_storyline_start_permalink(); - $next_story = get_next_storyline_start_permalink(); - - $latest_comic = get_permalink( get_terminal_post_in_category(get_all_comic_categories_as_cat_string(), false) ); - ?> -
- - -
- - - -
- - - -
- - - -
- - - - - -
""
- - - -
- - -
- - - - - - -
- - - -
- - - - - - -
- -
-
- - 'on', - 'last' => 'on', - 'story_prev' => 'off', - 'story_next' => 'off', - 'previous' => 'on', - 'random' => 'off', - 'archives' => 'off', - 'comments' => 'off', - 'next' => 'on', - 'archive_path' => '', - 'buyprint' => 'off', - 'first_title' => 'First', - 'last_title' => 'Latest', - 'story_prev_title' => 'Chapter', - 'story_next_title' => 'Chapter', - 'previous_title' => 'Previous', - 'random_title' => 'Random', - 'archives_title' => 'Archives', - 'comments_title' => 'Comments', - 'next_title' => 'Next', - 'buyprint_title' => 'Buy Print', - 'comictitle' => 'off', - 'lastgohome' => 'off', - ) ); - $first = $instance['first']; if (empty($first)) $first = 'on'; - $last = $instance['last']; if (empty($last)) $last = 'on'; - $story_prev = $instance['story_prev']; if (empty($story_prev)) $story_prev = 'off'; - $story_next = $instance['story_next']; if (empty($story_next)) $story_next = 'off'; - $previous = $instance['previous']; if (empty($previous)) $previous = 'on'; - $random = $instance['random']; if (empty($random)) $random = 'off'; - $archives = $instance['archives']; if (empty($archives)) $archives = 'off'; - $comments = $instance['comments']; if (empty($comments)) $comments = 'off'; - $archive_path = $instance['archive_path']; - $next = $instance['next']; if (empty($next)) $next = 'on'; - $buyprint = $instance['buyprint']; if (empty($buyprint)) $buyprint = 'off'; - $comictitle = $instance['comictitle']; if (empty($comictitle)) $comictitle = 'off'; - $lastgohome = $instance['lastgohome']; if (empty($lastgohome)) $lastgohome = 'off'; - - - $first_title = $instance['first_title']; - $last_title = $instance['last_title']; - $story_prev_title = $instance['story_prev_title']; - $story_next_title = $instance['story_next_title']; - $previous_title = $instance['previous_title']; - $random_title = $instance['random_title']; - $archives_title = $instance['archives_title']; - $comments_title = $instance['comments_title']; - $next_title = $instance['next_title']; - $buyprint_title = $instance['buyprint_title']; - - - - - ?> - -   />Off
- Title:
-
- -
-   />Off
- Title:
-
- -
-   />Off
- Title:
-
- -
-   />Off
- Title:
-
- -
-   />Off
- Title:
-
- -
-   />Off
- Title:
-
- -
-   />Off
- -
-   />Off
- Title:
-
- Archive URL:
-
- -
-   />Off
- Title:
-
- -
-   />Off
- Title:
-
- -
-   />Off
- Title:
-
-
-
- />On  />Off
- - \ No newline at end of file diff --git a/widgets/graphical-navigation.php b/widgets/graphical-navigation.php new file mode 100644 index 0000000..94499df --- /dev/null +++ b/widgets/graphical-navigation.php @@ -0,0 +1,285 @@ + 'widget_comicpress_graphical_navigation', 'description' => __('Displays Graphical Navigation Buttons. (used in comic sidebars)','comicpress') ); + $this->WP_Widget('graphicalnavigation', __('Comic Navigation (orig)','comicpress'), $widget_ops); + } + + function widget($args, $instance) { + global $wp_query, $post; + + if (is_home() || is_single()) { + + $this_permalink = get_permalink(); + + $temp_query = $wp_query->is_single; + $wp_query->is_single = true; + $prev_comic = get_previous_comic_permalink(); + $next_comic = get_next_comic_permalink(); + $wp_query->is_single = $temp_query; + $temp_query = null; + + $first_comic = get_first_comic_permalink(); + $last_comic = get_last_comic_permalink(); + + $prev_story = get_previous_storyline_start_permalink(); + $next_story = get_next_storyline_start_permalink(); + + $latest_comic = get_permalink( get_terminal_post_in_category(get_all_comic_categories_as_cat_string(), false) ); + ?> +
+ + +
+ + + +
+ + + +
+ + + +
+ + + + + +
""
+ + + +
+ + +
+ + + + + + +
+ + + +
+ + + + + + +
+ +
+
+ + 'on', + 'last' => 'on', + 'story_prev' => 'off', + 'story_next' => 'off', + 'previous' => 'on', + 'random' => 'off', + 'archives' => 'off', + 'comments' => 'off', + 'next' => 'on', + 'archive_path' => '', + 'buyprint' => 'off', + 'first_title' => 'First', + 'last_title' => 'Latest', + 'story_prev_title' => 'Chapter', + 'story_next_title' => 'Chapter', + 'previous_title' => 'Previous', + 'random_title' => 'Random', + 'archives_title' => 'Archives', + 'comments_title' => 'Comments', + 'next_title' => 'Next', + 'buyprint_title' => 'Buy Print', + 'comictitle' => 'off', + 'lastgohome' => 'off', + ) ); + $first = $instance['first']; if (empty($first)) $first = 'on'; + $last = $instance['last']; if (empty($last)) $last = 'on'; + $story_prev = $instance['story_prev']; if (empty($story_prev)) $story_prev = 'off'; + $story_next = $instance['story_next']; if (empty($story_next)) $story_next = 'off'; + $previous = $instance['previous']; if (empty($previous)) $previous = 'on'; + $random = $instance['random']; if (empty($random)) $random = 'off'; + $archives = $instance['archives']; if (empty($archives)) $archives = 'off'; + $comments = $instance['comments']; if (empty($comments)) $comments = 'off'; + $archive_path = $instance['archive_path']; + $next = $instance['next']; if (empty($next)) $next = 'on'; + $buyprint = $instance['buyprint']; if (empty($buyprint)) $buyprint = 'off'; + $comictitle = $instance['comictitle']; if (empty($comictitle)) $comictitle = 'off'; + $lastgohome = $instance['lastgohome']; if (empty($lastgohome)) $lastgohome = 'off'; + + + $first_title = $instance['first_title']; + $last_title = $instance['last_title']; + $story_prev_title = $instance['story_prev_title']; + $story_next_title = $instance['story_next_title']; + $previous_title = $instance['previous_title']; + $random_title = $instance['random_title']; + $archives_title = $instance['archives_title']; + $comments_title = $instance['comments_title']; + $next_title = $instance['next_title']; + $buyprint_title = $instance['buyprint_title']; + + + + + ?> + +   />Off
+ Title:
+
+ +
+   />Off
+ Title:
+
+ +
+   />Off
+ Title:
+
+ +
+   />Off
+ Title:
+
+ +
+   />Off
+ Title:
+
+ +
+   />Off
+ Title:
+
+ +
+   />Off
+ +
+   />Off
+ Title:
+
+ Archive URL:
+
+ +
+   />Off
+ Title:
+
+ +
+   />Off
+ Title:
+
+ +
+   />Off
+ Title:
+
+
+
+ />On  />Off
+ + \ No newline at end of file diff --git a/wpmu-functions.php b/wpmu-functions.php new file mode 100644 index 0000000..7ac7fd1 --- /dev/null +++ b/wpmu-functions.php @@ -0,0 +1,3 @@ + \ No newline at end of file From 04d9989829721eb67fbf3354ef205ee4aa30cfaf Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Tue, 1 Dec 2009 13:37:30 -0800 Subject: [PATCH 12/86] Pushing 2.9.0.4 Signed-off-by: Philip M. Hofer (Frumph) --- functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index 1f43826..46ca363 100644 --- a/functions.php +++ b/functions.php @@ -75,7 +75,7 @@ function comicpress_load_options() { global $comicpress_options; $comicpress_options = get_option('comicpress_options'); if (empty($comicpress_options)) { - $comicpress_options['comicpress_version'] = '2.9.0.3'; + $comicpress_options['comicpress_version'] = '2.9.0.4'; foreach (array( 'disable_comic_frontpage' => false, @@ -153,7 +153,7 @@ function comicpress_load_options() { add_option('comicpress_options', $comicpress_options, '', 'yes'); // update_option('comicpress_options', $comicpress_options); } - $comicpress_options['comicpress_version'] = '2.9.0.3'; + $comicpress_options['comicpress_version'] = '2.9.0.4'; update_option('comicpress_options', $comicpress_options); return $comicpress_options; } From 459fe347138278a46e04e3b4d0064b8f54881a2b Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Tue, 1 Dec 2009 13:37:30 -0800 Subject: [PATCH 13/86] Pushing 2.9.0.4 Signed-off-by: Philip M. Hofer (Frumph) --- functions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index 46ca363..8e59428 100644 --- a/functions.php +++ b/functions.php @@ -75,8 +75,9 @@ function comicpress_load_options() { global $comicpress_options; $comicpress_options = get_option('comicpress_options'); if (empty($comicpress_options)) { - $comicpress_options['comicpress_version'] = '2.9.0.4'; - +<<<<<<< .mine $comicpress_options['comicpress_version'] = '2.9.0.4'; +======= $comicpress_options['comicpress_version'] = '2.9.0.4'; +>>>>>>> .theirs foreach (array( 'disable_comic_frontpage' => false, 'disable_comic_blog_frontpage' => false, From aa9eaa02929b2349abea9139db03680e5f320d4f Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Tue, 1 Dec 2009 13:57:06 -0800 Subject: [PATCH 14/86] 2.9.0.4 tagged ? Signed-off-by: Philip M. Hofer (Frumph) --- functions.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/functions.php b/functions.php index 8e59428..b63a322 100644 --- a/functions.php +++ b/functions.php @@ -75,9 +75,7 @@ function comicpress_load_options() { global $comicpress_options; $comicpress_options = get_option('comicpress_options'); if (empty($comicpress_options)) { -<<<<<<< .mine $comicpress_options['comicpress_version'] = '2.9.0.4'; -======= $comicpress_options['comicpress_version'] = '2.9.0.4'; ->>>>>>> .theirs + $comicpress_options['comicpress_version'] = '2.9.0.4'; foreach (array( 'disable_comic_frontpage' => false, 'disable_comic_blog_frontpage' => false, From 3be56dac2c51e91f415ab6fc97d890b344de70f9 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Tue, 1 Dec 2009 14:37:31 -0800 Subject: [PATCH 15/86] get_stylesheet_directory changed to get_template_directory in the get_comic_path function Signed-off-by: Philip M. Hofer (Frumph) --- functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.php b/functions.php index b63a322..6f0f669 100644 --- a/functions.php +++ b/functions.php @@ -453,7 +453,7 @@ function get_comic_path($folder = 'comic', $override_post = null, $filter = 'def $filter_with_date = str_replace('{date}', $post_date, $filter_to_use); - $cwd = get_stylesheet_directory(); + $cwd = get_template_directory(); if ($cwd !== false) { // Strip the wp-admin part and just get to the root. $root_path = preg_replace('#[\\/]wp-(admin|content).*#', '', $cwd); From 07c3a9e9f2d07850d5178c43e417d96bd7a23eec Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Tue, 1 Dec 2009 16:12:59 -0700 Subject: [PATCH 16/86] Comments/pingbacks styling and adjustments... --- functions/comment-functions.php | 29 +++++++++++++---------------- style.css | 19 ++++++++++++------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/functions/comment-functions.php b/functions/comment-functions.php index 0a2577e..d6f228f 100644 --- a/functions/comment-functions.php +++ b/functions/comment-functions.php @@ -27,23 +27,22 @@ function comicpress_avatar() { endif; // $avatar = apply_filters('comicpress_avatar', $avatar); - if($url == true && $url != 'http://') - echo ''; - $id_or_email = get_comment_author_email(); - if (empty($id_or_email)) $id_or_email = get_comment_author(); - if(function_exists('comicpress_get_avatar') && $comment_type != 'pingback' && $comment_type != 'trackback' ) { - echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 64)); - } else { - if ($comment_type == 'pingback' || $comment_type == 'trackback') { - if ($comment_type == 'pingback') echo '
'; - if ($comment_type == 'trackback') echo '
'; + if ($comment_type != 'pingback' && $comment_type != 'trackback') { + echo '
'; + if($url == true && $url != 'http://') + echo ''; + $id_or_email = get_comment_author_email(); + if (empty($id_or_email)) $id_or_email = get_comment_author(); + if(function_exists('comicpress_get_avatar') && $comment_type != 'pingback' && $comment_type != 'trackback' ) { + echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 64)); } else { echo ''; } + if($url == true && $url != 'http://') + echo ''; + echo '
'; } - if($url == true && $url != 'http://') - echo ''; } /** @@ -118,9 +117,7 @@ function comicpress_comments_callback($comment, $args, $depth) {
  • > -
    - -
    +
    @@ -131,7 +128,7 @@ function comicpress_comments_callback($comment, $args, $depth) {
    - + diff --git a/style.css b/style.css index 362157d..242b95f 100644 --- a/style.css +++ b/style.css @@ -614,13 +614,13 @@ h3, h3 a { } .comment .comment .comment-avatar { - width: 48px; - height: 48px; + width: 40px; + height: 40px; } .comment .comment .avatar { - width: 48px; - height: 48px; + width: 40px; + height: 40px; } .comment-content { @@ -628,7 +628,7 @@ h3, h3 a { } .comment .comment .comment-content { - margin-left: 52px; + margin-left: 45px; } .pingback .comment-content { @@ -662,11 +662,16 @@ h3, h3 a { font-size: 15px; } -.comment-text p { - margin: 5px 0 0 0; +.comment-text { + padding: 5px; font-size: 12px; } + .comment-text p { + padding: 5px 5px; + margin: 0; + } + .comment-note { width: 400px; display: block; From d9b46aa63e29a3cd07e5760bdcd4a21cc8bb1c9d Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 21:07:10 -0500 Subject: [PATCH 17/86] start media handling --- classes/ComicPressMediaHandling.inc | 20 +++++++++++++++++++ test/ComicPressMediaHandlingTest.php | 29 ++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 classes/ComicPressMediaHandling.inc create mode 100644 test/ComicPressMediaHandlingTest.php diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc new file mode 100644 index 0000000..b01b4a5 --- /dev/null +++ b/classes/ComicPressMediaHandling.inc @@ -0,0 +1,20 @@ +cpmh = new ComicPressMediaHandling(); + } + + function testBundleGlobalVariables() { + global $comic_folder, $archive_comic_folder, $rss_comic_folder, $mini_comic_folder; + + $comic_folder = 'comic'; + $archive_comic_folder = 'archive'; + $rss_comic_folder = 'rss'; + $mini_comic_folder = 'mini'; + + $this->assertEquals(array( + 'comic' => 'comic', + 'archive' => 'archive', + 'rss' => 'rss', + 'mini' => 'mini' + ), $this->cpmh->_bundle_global_variables()); + } +} From 220322318d8500e020ca11194685e5d558e73c74 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 21:14:54 -0500 Subject: [PATCH 18/86] get filter --- classes/ComicPressMediaHandling.inc | 20 +++++++++++++++++++ test/ComicPressMediaHandlingTest.php | 20 +++++++++++++++++++ .../widgets/GraphicalNavigationWidgetTest.php | 5 ----- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index b01b4a5..57e95d7 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -1,6 +1,8 @@ default_filter; + } + + function get_comic_path($source = 'comic', $override_post = null, $filter = 'default', $multi = false) { + + } } diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 7b841ce..603f53e 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -26,4 +26,24 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { 'mini' => 'mini' ), $this->cpmh->_bundle_global_variables()); } + + function providerTestGetFilter() { + return array( + array(null, '%wordpress%/%type-folder%/%date-Y-m-d%*.*'), + array('fail', '%wordpress%/%type-folder%/%date-Y-m-d%*.*'), + array(array(), '%wordpress%/%type-folder%/%date-Y-m-d%*.*'), + array('test', 'test') + ); + } + + /** + * @dataProvider providerTestGetFilter + */ + function testGetFilter($filter_to_use, $expected_result) { + global $comic_filename_filters; + + $comic_filename_filters['test'] = 'test'; + + $this->assertEquals($expected_result, $this->cpmh->_get_filter($filter_to_use)); + } } diff --git a/test/widgets/GraphicalNavigationWidgetTest.php b/test/widgets/GraphicalNavigationWidgetTest.php index cab99c2..709acf4 100644 --- a/test/widgets/GraphicalNavigationWidgetTest.php +++ b/test/widgets/GraphicalNavigationWidgetTest.php @@ -10,9 +10,6 @@ class GraphicalNavigationWidgetTest extends PHPUnit_Framework_TestCase { $this->w = new GraphicalNavigationWidget(); } - /** - * @covers WidgetComicPressGraphicalStorylineNavigation::update - */ function testUpdateWidget() { $result = $this->w->update(array( "next" => "test", @@ -41,7 +38,6 @@ class GraphicalNavigationWidgetTest extends PHPUnit_Framework_TestCase { /** * @dataProvider providerTestIsNavLinkVisible - * @covers WidgetComicPressGraphicalStorylineNavigation::_will_display_nav_link */ function testIsNavLinkVisible($which, $current_id, $target_id, $expected_result) { $current = (object)array('ID' => $current_id); @@ -76,7 +72,6 @@ class GraphicalNavigationWidgetTest extends PHPUnit_Framework_TestCase { /** * @dataProvider providerTestGroupNavigationButtons - * @covers WidgetComicPressGraphicalStorylineNavigation::_group_navigation_buttons */ function testGroupNavigationButtons($buttons, $expected_grouping) { _set_filter_expectation('comicpress_navigation_grouping_details', array(array( From 1f428c786a8bca4e4d2f11b670871166ca6785b8 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 21:37:28 -0500 Subject: [PATCH 19/86] filtering --- classes/ComicPressMediaHandling.inc | 50 ++++++++++++++++++++++- test/ComicPressMediaHandlingTest.php | 59 ++++++++++++++++++++++++++-- 2 files changed, 103 insertions(+), 6 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 57e95d7..1071585 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -1,6 +1,7 @@ _convert_to_percent_filter($comic_filename_filters[$filter_to_use]); } } } @@ -34,7 +35,52 @@ class ComicPressMediaHandling { return $this->default_filter; } - function get_comic_path($source = 'comic', $override_post = null, $filter = 'default', $multi = false) { + function _convert_to_percent_filter($old) { + if (strpos(strtolower($old), '%wordpress%') !== 0) { + $old = str_replace('{date}', '%date-Y-m-d%', $old); + return $this->root_filter . $old; + } + return $old; + } + function _expand_filter($filter, $type_filter, $override_post = null) { + global $post; + $this->post_to_use = !is_null($override_post) ? $override_post : $post; + $this->type_filter = $type_filter; + + $result = preg_replace_callback('#%([a-z0-9-]+)%#i', array(&$this, '_expand_filter_callback'), $filter); + $result = str_replace('.', '\.', $result); + $result = str_replace('*', '.*', $result); + + unset($this->post_to_use); + unset($this->type_filter); + + return $result; + } + + function _abspath() { return ABSPATH; } + + function _expand_filter_callback($matches) { + $value = ''; + switch (strtolower($matches[1])) { + case 'wordpress': + $value = $this->_abspath(); + break; + case 'type-folder': + $value = $this->type_filter; + break; + default: + if (preg_match('#^date-(.*)$#', $matches[1], $date_matches) > 0) { + $value = date($date_matches[1], strtotime($this->post_to_use->post_date)); + break; + } + $value = $matches[0]; + break; + } + return $value; + } + + function get_comic_path($type = 'comic', $override_post = null, $filter = 'default', $multi = false) { + $filter = $this->get_filter($filter); } } diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 603f53e..358c1c5 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -9,6 +9,10 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { function setUp() { _reset_wp(); $this->cpmh = new ComicPressMediaHandling(); + $this->default_filter = $this->cpmh->default_filter; + + vfsStreamWrapper::register(); + vfsStreamWrapper::setRoot(new vfsStreamDirectory('root')); } function testBundleGlobalVariables() { @@ -28,10 +32,12 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { } function providerTestGetFilter() { + $cpmh = new ComicPressMediaHandling(); + return array( - array(null, '%wordpress%/%type-folder%/%date-Y-m-d%*.*'), - array('fail', '%wordpress%/%type-folder%/%date-Y-m-d%*.*'), - array(array(), '%wordpress%/%type-folder%/%date-Y-m-d%*.*'), + array(null, $cpmh->default_filter), + array('fail', $cpmh->default_filter), + array(array(), $cpmh->default_filter), array('test', 'test') ); } @@ -44,6 +50,51 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $comic_filename_filters['test'] = 'test'; - $this->assertEquals($expected_result, $this->cpmh->_get_filter($filter_to_use)); + $cpmh = $this->getMock('ComicPressMediaHandling', array('_convert_to_percent_filter')); + if ($expected_result !== $cpmh->default_filter) { + $cpmh->expects($this->once())->method('_convert_to_percent_filter')->with($expected_result)->will($this->returnValue($expected_result)); + } else { + $cpmh->expects($this->never())->method('_convert_to_percent_filter'); + } + + $this->assertEquals($expected_result, $cpmh->_get_filter($filter_to_use)); + } + + function providerTestConvertToPercentFilter() { + return array( + array('', '%wordpress%/%type-folder%/'), + array('{date}', '%wordpress%/%type-folder%/%date-Y-m-d%'), + array('%wordpress%/%type-folder%/{date}', '%wordpress%/%type-folder%/{date}'), + ); + } + + /** + * @dataProvider providerTestConvertToPercentFilter + */ + function testConvertToPercentFilter($old_filter, $new_filter) { + $this->assertEquals($new_filter, $this->cpmh->_convert_to_percent_filter($old_filter)); + } + + function providerTestExpandFilter() { + return array( + array('', ''), + array('%test%', '%test%'), + array('%wordpress%', vfsStream::url('root')), + array('%wordpress%%wordpress%', vfsStream::url('root') . vfsStream::url('root')), + array('%test test%', '%test test%'), + array('%wordpress%/%type-folder%', vfsStream::url('root') . '/comic'), + array('%date-Y%', '2009'), + array('%wordpress%/%type-folder%/%date-Y-m-d%*.*', vfsStream::url('root') . '/comic/2009-01-01.*\..*'), + ); + } + + /** + * @dataProvider providerTestExpandFilter + */ + function testExpandFilter($filter, $expected_result) { + $cpmh = $this->getMock('ComicPressMediaHandling', array('_abspath')); + $cpmh->expects($this->any())->method('_abspath')->will($this->returnValue(vfsStream::url('root'))); + + $this->assertEquals($expected_result, $cpmh->_expand_filter($filter, 'comic', (object)array('ID' => 1, 'post_date' => '2009-01-01 15:00:00'))); } } From 6aea00a8d047820b19f2acd8949077495c04b422 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 21:40:40 -0500 Subject: [PATCH 20/86] wpmu handling --- classes/ComicPressMediaHandling.inc | 10 ++++++++-- test/ComicPressMediaHandlingTest.php | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 1071585..d3892b1 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -58,13 +58,19 @@ class ComicPressMediaHandling { return $result; } - function _abspath() { return ABSPATH; } + function _abspath() { + return ABSPATH; + } function _expand_filter_callback($matches) { $value = ''; switch (strtolower($matches[1])) { case 'wordpress': - $value = $this->_abspath(); + if ($path = get_option('upload_path')) { + $value = $path; + } else { + $value = $this->_abspath(); + } break; case 'type-folder': $value = $this->type_filter; diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 358c1c5..4a88e9e 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -85,16 +85,21 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { array('%wordpress%/%type-folder%', vfsStream::url('root') . '/comic'), array('%date-Y%', '2009'), array('%wordpress%/%type-folder%/%date-Y-m-d%*.*', vfsStream::url('root') . '/comic/2009-01-01.*\..*'), + array('%wordpress%/%type-folder%/%date-Y-m-d%*.*', '/wpmupath/comic/2009-01-01.*\..*', '/wpmupath'), ); } /** * @dataProvider providerTestExpandFilter */ - function testExpandFilter($filter, $expected_result) { + function testExpandFilter($filter, $expected_result, $use_option_path = false) { $cpmh = $this->getMock('ComicPressMediaHandling', array('_abspath')); $cpmh->expects($this->any())->method('_abspath')->will($this->returnValue(vfsStream::url('root'))); + if ($use_option_path !== false) { + update_option('upload_path', $use_option_path); + } + $this->assertEquals($expected_result, $cpmh->_expand_filter($filter, 'comic', (object)array('ID' => 1, 'post_date' => '2009-01-01 15:00:00'))); } } From 3d514a3544a0822c77bb36f33c3e4b6fa93140c3 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 21:53:46 -0500 Subject: [PATCH 21/86] directory reading and more cleanup --- classes/ComicPressMediaHandling.inc | 38 ++++++++++++++++++++++++---- test/ComicPressMediaHandlingTest.php | 23 +++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index d3892b1..926d827 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -43,17 +43,17 @@ class ComicPressMediaHandling { return $old; } - function _expand_filter($filter, $type_filter, $override_post = null) { + function _expand_filter($filter, $type_folder, $override_post = null) { global $post; $this->post_to_use = !is_null($override_post) ? $override_post : $post; - $this->type_filter = $type_filter; + $this->type_folder = $type_folder; $result = preg_replace_callback('#%([a-z0-9-]+)%#i', array(&$this, '_expand_filter_callback'), $filter); $result = str_replace('.', '\.', $result); $result = str_replace('*', '.*', $result); unset($this->post_to_use); - unset($this->type_filter); + unset($this->type_folder); return $result; } @@ -73,7 +73,7 @@ class ComicPressMediaHandling { } break; case 'type-folder': - $value = $this->type_filter; + $value = $this->type_folder; break; default: if (preg_match('#^date-(.*)$#', $matches[1], $date_matches) > 0) { @@ -83,10 +83,38 @@ class ComicPressMediaHandling { $value = $matches[0]; break; } - return $value; + return apply_filters('comicpress_expand_filter_callback', $value, $matches); + } + + function _read_directory($pattern) { + $dirname = dirname($pattern); + $results = false; + if (is_dir($dirname)) { + $results = array(); + if (($dh = opendir($dirname)) !== false) { + $filename_pattern = str_replace('#', '\#', basename($pattern)); + while (($file = readdir($dh)) !== false) { + $target = $dirname . '/' . $file; + if (is_file($target)) { + if (preg_match("#${filename_pattern}#", $file) > 0) { + $results[] = $target; + } + } + } + } + } + return $results; } function get_comic_path($type = 'comic', $override_post = null, $filter = 'default', $multi = false) { + global $post; + $post_to_use = !is_null($override_post) ? $override_post : $post; + $filter = $this->get_filter($filter); + $globals = $this->_bundle_global_variables(); + + if (isset($globals[$type])) { + $filter = $this->_expand_filter($filter, $globals[$type], $post_to_use); + } } } diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 4a88e9e..2e30ae4 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -102,4 +102,27 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $this->assertEquals($expected_result, $cpmh->_expand_filter($filter, 'comic', (object)array('ID' => 1, 'post_date' => '2009-01-01 15:00:00'))); } + + function providerTestReadDirectory() { + return array( + array(vfsStream::url('root2/.*'), false), + array(vfsStream::url('root/.*'), array('2009-01-01.jpg', '2009-01-02.jpg', '2009-02-02-two.jpg', '2008-01-01.jpg')), + array(vfsStream::url('root/2009.*'), array('2009-01-01.jpg', '2009-01-02.jpg', '2009-02-02-two.jpg')), + array(vfsStream::url('root/2009-01.*'), array('2009-01-01.jpg', '2009-01-02.jpg')), + array(vfsStream::url('root/2009-01-01.*'), array('2009-01-01.jpg')), + ); + } + + /** + * @dataProvider providerTestReadDirectory + */ + function testReadDirectory($pattern, $expected_results) { + foreach (array('2009-01-01.jpg', '2009-01-02.jpg', '2009-02-02-two.jpg', '2008-01-01.jpg') as $file) { + file_put_contents(vfsStream::url("root/${file}"), 'file'); + } + if (is_array($expected_results)) { + foreach ($expected_results as &$result) { $result = vfsStream::url("root/${result}"); } + } + $this->assertEquals($expected_results, $this->cpmh->_read_directory($pattern)); + } } From 3b0b3a1471151cf6d3ff6c17009155a225c7d37a Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 22:13:21 -0500 Subject: [PATCH 22/86] wpmu-specific stuff --- classes/ComicPressMediaHandling.inc | 14 ++++++--- test/ComicPressMediaHandlingTest.php | 46 +++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 926d827..3665d09 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -58,19 +58,17 @@ class ComicPressMediaHandling { return $result; } + // @codeCoverageIgnoreStart function _abspath() { return ABSPATH; } + // @codeCoverageIgnoreEnd function _expand_filter_callback($matches) { $value = ''; switch (strtolower($matches[1])) { case 'wordpress': - if ($path = get_option('upload_path')) { - $value = $path; - } else { - $value = $this->_abspath(); - } + $value = $this->_abspath(); break; case 'type-folder': $value = $this->type_folder; @@ -115,6 +113,12 @@ class ComicPressMediaHandling { if (isset($globals[$type])) { $filter = $this->_expand_filter($filter, $globals[$type], $post_to_use); + + if (is_array($results = $this->_read_directory($filter))) { + if (($pre_handle = apply_filters('comicpress_pre_handle_comic_path_results', false, $results, $type, $post_to_use)) !== false) { + return $pre_handle; + } + } } } } diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 2e30ae4..e03c591 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -4,6 +4,7 @@ require_once('PHPUnit/Framework.php'); require_once('MockPress/mockpress.php'); require_once('vfsStream/vfsStream.php'); require_once(dirname(__FILE__) . '/../classes/ComicPressMediaHandling.inc'); +require_once(dirname(__FILE__) . '/../functions/wpmu.php'); class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { function setUp() { @@ -84,25 +85,35 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { array('%test test%', '%test test%'), array('%wordpress%/%type-folder%', vfsStream::url('root') . '/comic'), array('%date-Y%', '2009'), - array('%wordpress%/%type-folder%/%date-Y-m-d%*.*', vfsStream::url('root') . '/comic/2009-01-01.*\..*'), - array('%wordpress%/%type-folder%/%date-Y-m-d%*.*', '/wpmupath/comic/2009-01-01.*\..*', '/wpmupath'), + array('%wordpress%/%type-folder%/%date-Y-m-d%*.*', vfsStream::url('root') . '/comic/2009-01-01.*\..*') ); } /** * @dataProvider providerTestExpandFilter */ - function testExpandFilter($filter, $expected_result, $use_option_path = false) { + function testExpandFilter($filter, $expected_result) { $cpmh = $this->getMock('ComicPressMediaHandling', array('_abspath')); $cpmh->expects($this->any())->method('_abspath')->will($this->returnValue(vfsStream::url('root'))); - if ($use_option_path !== false) { - update_option('upload_path', $use_option_path); - } - $this->assertEquals($expected_result, $cpmh->_expand_filter($filter, 'comic', (object)array('ID' => 1, 'post_date' => '2009-01-01 15:00:00'))); } + function providerTestExpandFilterWPMUCallback() { + return array( + array('', 'original'), + array('new', 'new') + ); + } + + /** + * @dataProvider providerTestExpandFilterWPMUCallback + */ + function testExpandFilterWPMUCallback($option_value, $expected_result) { + update_option('upload_path', $option_value); + $this->assertEquals($expected_result, _comicpress_expand_filter_callback('original', array())); + } + function providerTestReadDirectory() { return array( array(vfsStream::url('root2/.*'), false), @@ -125,4 +136,25 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { } $this->assertEquals($expected_results, $this->cpmh->_read_directory($pattern)); } + + function providerTestPreHandleComicPathResults() { + return array( + array('', '', false), + array('1', '', 'comic/one'), + array('1', 'comic', 'files/one'), + ); + } + + /** + * @dataProvider providerTestPreHandleComicPathResults + */ + function testPreHandleComicPathResults($_wpmu_version, $upload_path, $expected_result) { + global $wpmu_version, $comic_folder; + $wpmu_version = $_wpmu_version; + $comic_folder = 'comic'; + + update_option('upload_path', $upload_path); + + $this->assertEquals($expected_result, _comicpress_pre_handle_comic_path_results(false, array('one/one', 'two/two', 'three/three'), 'comic', (object)array('ID' => 1))); + } } From 91436b4b5133f906ab3f23597d6bfae172dc9bfd Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 22:27:54 -0500 Subject: [PATCH 23/86] finalize get comic path changeover --- classes/ComicPressMediaHandling.inc | 27 +++++++++-- functions.php | 68 +++------------------------- functions/wpmu.php | 33 ++++++++++++++ test/ComicPressMediaHandlingTest.php | 12 +++-- 4 files changed, 71 insertions(+), 69 deletions(-) create mode 100644 functions/wpmu.php diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 3665d09..11ac09b 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -60,7 +60,7 @@ class ComicPressMediaHandling { // @codeCoverageIgnoreStart function _abspath() { - return ABSPATH; + return realpath(ABSPATH); } // @codeCoverageIgnoreEnd @@ -94,21 +94,30 @@ class ComicPressMediaHandling { while (($file = readdir($dh)) !== false) { $target = $dirname . '/' . $file; if (is_file($target)) { - if (preg_match("#${filename_pattern}#", $file) > 0) { + if (preg_match("#^${filename_pattern}$#", $file) > 0) { $results[] = $target; } } } + closedir($dh); } } return $results; } + /** + * Get the comic path. + * @param string $type The type to retrieve. + * @param object $override_post The post to use in place of the Loop post. + * @param string $filter The filter to use. + * @param boolean $multi If true, return all matching files. + * @return string|array|boolean A single comic URI relative to the WordPress base, multiple comic URIs, or false if an error occurred. + */ function get_comic_path($type = 'comic', $override_post = null, $filter = 'default', $multi = false) { global $post; $post_to_use = !is_null($override_post) ? $override_post : $post; - $filter = $this->get_filter($filter); + $filter = $this->_get_filter($filter); $globals = $this->_bundle_global_variables(); if (isset($globals[$type])) { @@ -118,7 +127,19 @@ class ComicPressMediaHandling { if (($pre_handle = apply_filters('comicpress_pre_handle_comic_path_results', false, $results, $type, $post_to_use)) !== false) { return $pre_handle; } + + $new_results = array(); + foreach ($results as $result) { + $new_results[] = str_replace($this->_abspath(), '', $result); + } + + if ($multi) { + return $new_results; + } else { + return reset($new_results); + } } } + return false; } } diff --git a/functions.php b/functions.php index 6f0f669..8f63e5c 100644 --- a/functions.php +++ b/functions.php @@ -75,7 +75,7 @@ function comicpress_load_options() { global $comicpress_options; $comicpress_options = get_option('comicpress_options'); if (empty($comicpress_options)) { - $comicpress_options['comicpress_version'] = '2.9.0.4'; + $comicpress_options['comicpress_version'] = '2.9.0.4'; foreach (array( 'disable_comic_frontpage' => false, 'disable_comic_blog_frontpage' => false, @@ -181,11 +181,9 @@ if ($comicpress_options['remove_wptexturize']) { // WIDGETS WP 2.8 compatible ONLY, no backwards compatibility here. $dirs_to_search = array_unique(array(get_template_directory(),get_stylesheet_directory())); foreach ($dirs_to_search as $dir) { - // Widgets - foreach (glob($dir . '/widgets/*.php') as $__file) { require_once($__file); } - - // FUNCTIONS & Extra's - foreach (glob($dir . '/functions/*.php') as $__file) { require_once($__file); } + foreach (array('widgets' => 'php', 'functions' => 'php', 'classes' => 'inc') as $folder => $extension) { + foreach (glob($dir . "/${folder}/*.${extension}") as $__file) { require_once($__file); } + } } // Dashboard Menu Comicpress Options and ComicPress CSS @@ -217,7 +215,6 @@ if (defined("CPM_DATE_FORMAT")) { // Note that it's quite possible to slurp up the wrong file if your expressions are too broad. $comic_filename_filters = array(); -$comic_filename_filters['default'] = "{date}*.*"; // load all of the comic & non-comic category information add_action('init', 'get_all_comic_categories'); @@ -427,61 +424,8 @@ function get_adjacent_storyline_category_id($next = false) { */ function get_comic_path($folder = 'comic', $override_post = null, $filter = 'default', $multi = null) { - global $post, $comic_filename_filters, $comic_folder, $archive_comic_folder, $rss_comic_folder, $mini_comic_folder, $comic_pathfinding_errors, $wpmu_version; - - if (isset($comic_filename_filters[$filter])) { - $filter_to_use = $comic_filename_filters[$filter]; - } else { - $filter_to_use = '{date}*.*'; - } - - switch ($folder) { - case "rss": $folder_to_use = $rss_comic_folder; break; - case "archive": $folder_to_use = $archive_comic_folder; break; - case "mini": $folder_to_use = $mini_comic_folder; break; - case "comic": default: $folder_to_use = $comic_folder; break; - } - - if (!empty($wpmu_version)) { - if (($wpmu_path = get_option('upload_path')) !== false) { - $folder_to_use = $wpmu_path . '/' . $folder_to_use; - } - } - - $post_to_use = (is_object($override_post)) ? $override_post : $post; - $post_date = mysql2date(CP_DATE_FORMAT, $post_to_use->post_date); - - $filter_with_date = str_replace('{date}', $post_date, $filter_to_use); - - $cwd = get_template_directory(); - if ($cwd !== false) { - // Strip the wp-admin part and just get to the root. - $root_path = preg_replace('#[\\/]wp-(admin|content).*#', '', $cwd); - } - - $results = array(); - /* have to use root_path to get subdirectory installation directories */ - if (count($results = glob("${root_path}/${folder_to_use}/${filter_with_date}")) > 0) { - - if (!empty($wpmu_version)) { - $comic = reset($results); - $comic = $folder_to_use . '/'. basename($comic); - if ($wpmu_path !== false) { $comic = str_replace($wpmu_path, "files", $comic); } - return $comic; - } - - if (!empty($multi)) { - return $results; - } else { - /* clear the root path */ - $comic = reset($results); - $comic = $folder_to_use .'/'. basename($comic); - return $comic; - } - } - - $comic_pathfinding_errors[] = sprintf(__("Unable to find the file in the %s folder that matched the pattern %s. Check your WordPress and ComicPress settings.", 'comicpress'), $folder_to_use, $filter_with_date); - return false; + $mh = new ComicPressMediaHandling(); + return $mh->get_comic_path($folder, $override_post, $filter, $multi); } diff --git a/functions/wpmu.php b/functions/wpmu.php new file mode 100644 index 0000000..f2651dd --- /dev/null +++ b/functions/wpmu.php @@ -0,0 +1,33 @@ +assertEquals($expected_result, _comicpress_expand_filter_callback('original', array())); + $this->assertEquals($expected_result, _comicpress_expand_filter_callback('original', array('all', 'wordpress'))); } function providerTestReadDirectory() { From cf53f4e0e040e18087867a6ff2a4fc3b5cb91e10 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Wed, 2 Dec 2009 15:33:52 -0800 Subject: [PATCH 24/86] Fix for the static_blog function to disable commenting for comic blog posts completely. Signed-off-by: Philip M. Hofer (Frumph) --- functions/displaycomicpost.php | 2 +- options/postoptions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php index de461b1..6cd7495 100644 --- a/functions/displaycomicpost.php +++ b/functions/displaycomicpost.php @@ -66,7 +66,7 @@ function display_comic_post() {
    comment_status) { + if ('open' == $post->comment_status && !$comicpress_options['static_blog']) { if (comicpress_check_child_file('partials/commentlink') == false) { ?>
      '.__('Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
    /> - + From 23742b8fe2c698d070c852500a345eae01050449 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Wed, 2 Dec 2009 22:40:08 -0500 Subject: [PATCH 25/86] fix issue with periods in directory names --- classes/ComicPressMediaHandling.inc | 7 ++++++- test/ComicPressMediaHandlingTest.php | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 11ac09b..887c1aa 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -58,6 +58,11 @@ class ComicPressMediaHandling { return $result; } + function _resolve_regex_path($input) { + $input = str_replace('\.', '.', $input); + return $input; + } + // @codeCoverageIgnoreStart function _abspath() { return realpath(ABSPATH); @@ -85,7 +90,7 @@ class ComicPressMediaHandling { } function _read_directory($pattern) { - $dirname = dirname($pattern); + $dirname = $this->_resolve_regex_path(dirname($pattern)); $results = false; if (is_dir($dirname)) { $results = array(); diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index d41b15b..03ab451 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -141,6 +141,20 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $this->assertEquals($expected_results, $this->cpmh->_read_directory($pattern)); } + function providerTestResolveRegexPath() { + return array( + array('test', 'test'), + array('te\.st', 'te.st') + ); + } + + /** + * @dataProvider providerTestResolveRegexPath + */ + function testResolveRegexPath($input, $expected_output) { + $this->assertEquals($expected_output, $this->cpmh->_resolve_regex_path($input)); + } + function providerTestPreHandleComicPathResults() { return array( array('', '', false), From 0ed54a4008d2823d54d76550d8de3ea114d2016e Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 07:06:35 -0500 Subject: [PATCH 26/86] remove core classes from coverage --- phpunit.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/phpunit.xml b/phpunit.xml index b448d08..b9d6b4a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -2,4 +2,11 @@ + + + classes/ComicPressDBInterface.inc + classes/ComicPressNavigation.inc + classes/ComicPressStoryline.inc + + From d1690186e865be5ef6c4e0e93d011f124f771806 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Sat, 28 Nov 2009 11:29:05 -0500 Subject: [PATCH 27/86] makefile --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8ee6751 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +.PHONY : test-coverage + +test-coverage : + phpunit --syntax-check --coverage-html coverage test From 66f5083e3b110d373a9750c0a126f6b65ac9f5f9 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 3 Dec 2009 07:12:14 -0500 Subject: [PATCH 28/86] basic metadata support --- classes/ComicPressMediaHandling.inc | 60 +++++++++++++++++++++++++++- test/ComicPressMediaHandlingTest.php | 43 ++++++++++++++++++++ 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 887c1aa..31f7e7d 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -80,8 +80,10 @@ class ComicPressMediaHandling { break; default: if (preg_match('#^date-(.*)$#', $matches[1], $date_matches) > 0) { - $value = date($date_matches[1], strtotime($this->post_to_use->post_date)); - break; + if (isset($this->post_to_use)) { + $value = date($date_matches[1], strtotime($this->post_to_use->post_date)); + break; + } } $value = $matches[0]; break; @@ -110,6 +112,54 @@ class ComicPressMediaHandling { return $results; } + function _check_post_meta_data($post_to_use, $type) { + if ($result = get_post_meta($post_to_use->ID, "backend_url_${type}", true)) { + if (is_string($result)) { + return $result; + } + } + + if ($result = get_post_meta($post_to_use->ID, "backend_url_images", true)) { + if (is_string($result)) { + parse_str($result, $types); + if (isset($types[$type])) { + return $types[$type]; + } + } + } + + if ($result = get_post_meta($post_to_use->ID, "backend_url", true)) { + if (is_string($result)) { + return $result; + } + } + return false; + } + + function _ensure_valid_uri($uri, $type) { + if (!empty($uri)) { + if (substr($uri, 0, 1) == '/') { + return $uri; + } else { + if (preg_match('#^[a-z]+://#', $uri) > 0) { + return $uri; + } else { + $bundle = $this->_bundle_global_variables(); + if (isset($bundle[$type])) { + $this->type_folder = $bundle[$type]; + } else { + $this->type_folder = ''; + } + + $uri = preg_replace_callback('#%([a-z0-9-]+)%#i', array(&$this, '_expand_filter_callback'), $uri); + + return trailingslashit(get_bloginfo('url')) . $uri; + } + } + } + return false; + } + /** * Get the comic path. * @param string $type The type to retrieve. @@ -122,6 +172,12 @@ class ComicPressMediaHandling { global $post; $post_to_use = !is_null($override_post) ? $override_post : $post; + if ($uri = $this->_check_post_meta($post_to_use, $type)) { + if ($result = $this->_ensure_valid_url($uri, $type)) { + return $result; + } + } + $filter = $this->_get_filter($filter); $globals = $this->_bundle_global_variables(); diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 03ab451..d36181e 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -175,4 +175,47 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $this->assertEquals($expected_result, _comicpress_pre_handle_comic_path_results(false, array('one/one', 'two/two', 'three/three'), 'comic', (object)array('ID' => 1))); } + + function providerTestCheckPostMetaData() { + return array( + array('comic', array(), false), + array('comic', array('backend_url_comic' => '/test'), '/test'), + array('comic', array('backend_url_images' => 'test=/test'), false), + array('comic', array('backend_url_images' => 'comic=/test'), '/test'), + array('comic', array('backend_url' => '/test'), '/test'), + ); + } + + /** + * @dataProvider providerTestCheckPostMetaData + */ + function testCheckPostMetaData($type, $metadata, $expected_result) { + foreach ($metadata as $key => $value) { + update_post_meta(1, $key, $value); + } + + $this->assertEquals($expected_result, $this->cpmh->_check_post_meta_data((object)array('ID' => 1), $type)); + } + + function providerTestEnsureValidURI() { + return array( + array('', false), + array('test', 'wordpress/test'), + array('%type-folder%/test', 'wordpress/comic-dir/test'), + array('/test', '/test'), + array('http://file', 'http://file'), + ); + } + + /** + * @dataProvider providerTestEnsureValidURI + */ + function testEnsureValidURI($uri, $expected_result) { + _set_bloginfo('url', 'wordpress'); + + $cpmh = $this->getMock('ComicPressMediaHandling', array('_bundle_global_variables')); + $cpmh->expects($this->any())->method('_bundle_global_variables')->will($this->returnValue(array('comic' => 'comic-dir'))); + + $this->assertEquals($expected_result, $cpmh->_ensure_valid_uri($uri, 'comic')); + } } From ab3af9244a49d98d5673d458c83e2e0f94da06ac Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 3 Dec 2009 18:40:21 -0500 Subject: [PATCH 29/86] translate backslashes into forward slashes, fixes dirname() issue on windows --- classes/ComicPressMediaHandling.inc | 1 + test/ComicPressMediaHandlingTest.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 31f7e7d..e38edeb 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -60,6 +60,7 @@ class ComicPressMediaHandling { function _resolve_regex_path($input) { $input = str_replace('\.', '.', $input); + $input = str_replace('\\', '/', $input); return $input; } diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index d36181e..c519fc4 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -144,7 +144,8 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { function providerTestResolveRegexPath() { return array( array('test', 'test'), - array('te\.st', 'te.st') + array('te\.st', 'te.st'), + array('te\st', 'te/st'), ); } From ddefc8897f6504b35849cee609b751f827378c61 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 3 Dec 2009 18:40:21 -0500 Subject: [PATCH 30/86] translate backslashes into forward slashes, fixes dirname() issue on windows --- classes/ComicPressMediaHandling.inc | 1 + test/ComicPressMediaHandlingTest.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 887c1aa..18b02d1 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -60,6 +60,7 @@ class ComicPressMediaHandling { function _resolve_regex_path($input) { $input = str_replace('\.', '.', $input); + $input = str_replace('\\', '/', $input); return $input; } diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 03ab451..f701f50 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -144,7 +144,8 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { function providerTestResolveRegexPath() { return array( array('test', 'test'), - array('te\.st', 'te.st') + array('te\.st', 'te.st'), + array('te\st', 'te/st'), ); } From cae60abc4fb68838655f02905a33f198aee89485 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 3 Dec 2009 18:43:07 -0500 Subject: [PATCH 31/86] support for arrays in backend_url_image in prep for meta box --- classes/ComicPressMediaHandling.inc | 6 ++++++ test/ComicPressMediaHandlingTest.php | 1 + 2 files changed, 7 insertions(+) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index e38edeb..1f4b3c8 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -121,8 +121,14 @@ class ComicPressMediaHandling { } if ($result = get_post_meta($post_to_use->ID, "backend_url_images", true)) { + $types = false; if (is_string($result)) { parse_str($result, $types); + } + if (is_array($result)) { + $types = $result; + } + if (is_array($types)) { if (isset($types[$type])) { return $types[$type]; } diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index c519fc4..b716f8b 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -183,6 +183,7 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { array('comic', array('backend_url_comic' => '/test'), '/test'), array('comic', array('backend_url_images' => 'test=/test'), false), array('comic', array('backend_url_images' => 'comic=/test'), '/test'), + array('comic', array('backend_url_images' => array('comic' => '/test')), '/test'), array('comic', array('backend_url' => '/test'), '/test'), ); } From 509c9a09e4664177aafd3ef6bbc8b0777655001c Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 1 Dec 2009 07:06:35 -0500 Subject: [PATCH 32/86] remove core classes from coverage --- phpunit.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/phpunit.xml b/phpunit.xml index b448d08..b9d6b4a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -2,4 +2,11 @@ + + + classes/ComicPressDBInterface.inc + classes/ComicPressNavigation.inc + classes/ComicPressStoryline.inc + + From 8ba8561ac5b31a2cdd2bbb3ef0f162382c9ace3a Mon Sep 17 00:00:00 2001 From: John Bintz Date: Sat, 28 Nov 2009 11:29:05 -0500 Subject: [PATCH 33/86] makefile --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8ee6751 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +.PHONY : test-coverage + +test-coverage : + phpunit --syntax-check --coverage-html coverage test From f311986e5e2be1b6e78fd78a4fd0ccf479f09d2d Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 3 Dec 2009 18:52:26 -0500 Subject: [PATCH 34/86] code coverage --- test/ComicPressMediaHandlingTest.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index b716f8b..8e8f3fe 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -99,6 +99,10 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $this->assertEquals($expected_result, $cpmh->_expand_filter($filter, 'comic', (object)array('ID' => 1, 'post_date' => '2009-01-01 15:00:00'))); } + function testExpandFilterNoPostDateRequested() { + $this->assertEquals('%date-Y%', $this->cpmh->_expand_filter('%date-Y%', 'comic', null)); + } + function providerTestExpandFilterWPMUCallback() { return array( array('', '', 'original'), @@ -181,10 +185,12 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { return array( array('comic', array(), false), array('comic', array('backend_url_comic' => '/test'), '/test'), + array('comic', array('backend_url_comic' => array('test')), false), array('comic', array('backend_url_images' => 'test=/test'), false), array('comic', array('backend_url_images' => 'comic=/test'), '/test'), array('comic', array('backend_url_images' => array('comic' => '/test')), '/test'), array('comic', array('backend_url' => '/test'), '/test'), + array('comic', array('backend_url' => array('test')), false), ); } @@ -220,4 +226,13 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $this->assertEquals($expected_result, $cpmh->_ensure_valid_uri($uri, 'comic')); } + + function testEnsureValidURIInvalidType() { + _set_bloginfo('url', 'wordpress'); + + $cpmh = $this->getMock('ComicPressMediaHandling', array('_bundle_global_variables')); + $cpmh->expects($this->any())->method('_bundle_global_variables')->will($this->returnValue(array('comic' => 'comic-dir'))); + + $this->assertEquals('wordpress/', $cpmh->_ensure_valid_uri('%type-folder%', 'test')); + } } From 94487ac423f0f53eea92a9259f31beba366912b4 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 3 Dec 2009 19:12:34 -0500 Subject: [PATCH 35/86] fix integration bug --- classes/ComicPressMediaHandling.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 1f4b3c8..28dbe4c 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -179,7 +179,7 @@ class ComicPressMediaHandling { global $post; $post_to_use = !is_null($override_post) ? $override_post : $post; - if ($uri = $this->_check_post_meta($post_to_use, $type)) { + if ($uri = $this->_check_post_meta_data($post_to_use, $type)) { if ($result = $this->_ensure_valid_url($uri, $type)) { return $result; } From e72cb6ae9d48fc46132ce039b0eae0aa2c5953f7 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 3 Dec 2009 19:13:10 -0500 Subject: [PATCH 36/86] starting on meta box for post meta data management --- .../ComicPressPostMediaHandlingMetabox.inc | 30 +++++++++++++++++++ functions.php | 29 ++++++++++++++++-- ...ComicPressPostMediaHandlingMetaboxTest.php | 20 +++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 classes/ComicPressPostMediaHandlingMetabox.inc create mode 100644 test/ComicPressPostMediaHandlingMetaboxTest.php diff --git a/classes/ComicPressPostMediaHandlingMetabox.inc b/classes/ComicPressPostMediaHandlingMetabox.inc new file mode 100644 index 0000000..7c85320 --- /dev/null +++ b/classes/ComicPressPostMediaHandlingMetabox.inc @@ -0,0 +1,30 @@ +{$method_name}($_REQUEST['cp']); + } + } + } + } + } + } + } + } + } + + function handle_update($info) { + + } +} diff --git a/functions.php b/functions.php index 8f63e5c..4549e9a 100644 --- a/functions.php +++ b/functions.php @@ -18,6 +18,18 @@ function __comicpress_widgets_init() { } closedir($dh); } + + if (isset($_REQUEST['cp'])) { + if (is_array($_REQUEST['cp'])) { + if (isset($_REQUEST['cp']['post_id'])) { + if (($_REQUEST['cp']['post_id'] <= 0) && ($_POST['post_ID'] > 0)) { + $_REQUEST['cp']['post_id'] = $_POST['post_ID']; + } + } + } + } + + do_action('comicpress_init'); } function __comicpress_init() { @@ -39,6 +51,11 @@ function __comicpress_init() { if (function_exists('id_get_comment_number')) { remove_filter('comments_number','id_get_comment_number'); } + + if (($_REQUEST['cp']['post_id'] <= 0) && ($_POST['post_ID'] > 0)) { + $_REQUEST['cp']['post_id'] = $_POST['post_ID']; + } + } add_action('widgets_init', '__comicpress_widgets_init'); @@ -179,10 +196,18 @@ if ($comicpress_options['remove_wptexturize']) { } // WIDGETS WP 2.8 compatible ONLY, no backwards compatibility here. -$dirs_to_search = array_unique(array(get_template_directory(),get_stylesheet_directory())); +$dirs_to_search = array_unique(array(get_template_directory(), get_stylesheet_directory())); foreach ($dirs_to_search as $dir) { foreach (array('widgets' => 'php', 'functions' => 'php', 'classes' => 'inc') as $folder => $extension) { - foreach (glob($dir . "/${folder}/*.${extension}") as $__file) { require_once($__file); } + foreach (glob($dir . "/${folder}/*.${extension}") as $__file) { + require_once($__file); + $__class_name = preg_replace('#\..*$#', '', basename($__file)); + if (class_exists($__class_name)) { + if (method_exists($__class_name, '__comicpress_init')) { + add_action('comicpress_init', array($__class_name, '__comicpress_init')); + } + } + } } } diff --git a/test/ComicPressPostMediaHandlingMetaboxTest.php b/test/ComicPressPostMediaHandlingMetaboxTest.php new file mode 100644 index 0000000..cdf0bce --- /dev/null +++ b/test/ComicPressPostMediaHandlingMetaboxTest.php @@ -0,0 +1,20 @@ + Date: Fri, 4 Dec 2009 08:35:08 -0800 Subject: [PATCH 37/86] Fixes for IIS / windows for ComicPressMediaHandling.inc Signed-off-by: Philip M. Hofer (Frumph) --- classes/ComicPressMediaHandling.inc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 28dbe4c..4aba691 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -66,7 +66,7 @@ class ComicPressMediaHandling { // @codeCoverageIgnoreStart function _abspath() { - return realpath(ABSPATH); + return trailingslashit($this->_resolve_regex_path(realpath(ABSPATH))); } // @codeCoverageIgnoreEnd @@ -74,7 +74,7 @@ class ComicPressMediaHandling { $value = ''; switch (strtolower($matches[1])) { case 'wordpress': - $value = $this->_abspath(); + $value = untrailingslashit($this->_abspath()); break; case 'type-folder': $value = $this->type_folder; @@ -93,14 +93,16 @@ class ComicPressMediaHandling { } function _read_directory($pattern) { - $dirname = $this->_resolve_regex_path(dirname($pattern)); + $resolved_pattern = $this->_resolve_regex_path($pattern); + $dirname = dirname($resolved_pattern); $results = false; if (is_dir($dirname)) { $results = array(); if (($dh = opendir($dirname)) !== false) { - $filename_pattern = str_replace('#', '\#', basename($pattern)); + $filename_pattern = str_replace('#', '\#', basename($resolved_pattern)); while (($file = readdir($dh)) !== false) { $target = $dirname . '/' . $file; +// echo "
    TARGET:
    "; var_dump($target); echo "

    "; if (is_file($target)) { if (preg_match("#^${filename_pattern}$#", $file) > 0) { $results[] = $target; @@ -167,6 +169,7 @@ class ComicPressMediaHandling { return false; } + /** * Get the comic path. * @param string $type The type to retrieve. @@ -190,17 +193,18 @@ class ComicPressMediaHandling { if (isset($globals[$type])) { $filter = $this->_expand_filter($filter, $globals[$type], $post_to_use); - +// var_dump($filter); if (is_array($results = $this->_read_directory($filter))) { if (($pre_handle = apply_filters('comicpress_pre_handle_comic_path_results', false, $results, $type, $post_to_use)) !== false) { return $pre_handle; } - +// echo "
    RESULTS:
    ";var_dump($results); echo "

    "; $new_results = array(); +// echo "
    ABSPATH:
    "; var_dump($this->_abspath()); echo "

    "; foreach ($results as $result) { $new_results[] = str_replace($this->_abspath(), '', $result); } - +// echo "
    NEW RESULTS:
    ";var_dump($new_results); echo "

    "; if ($multi) { return $new_results; } else { From 25096759b024868934fb4a6c605ff10efe33a6a8 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Fri, 4 Dec 2009 08:36:36 -0800 Subject: [PATCH 38/86] // TODO fix pattern excaping in _read_directory() Signed-off-by: Philip M. Hofer (Frumph) --- classes/ComicPressMediaHandling.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 4aba691..9d6ebec 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -92,6 +92,7 @@ class ComicPressMediaHandling { return apply_filters('comicpress_expand_filter_callback', $value, $matches); } + // TODO: Fix Pattern Escaping function _read_directory($pattern) { $resolved_pattern = $this->_resolve_regex_path($pattern); $dirname = dirname($resolved_pattern); From 1970d387c391f2060c65d1ea8f63d8e7f9d3cc79 Mon Sep 17 00:00:00 2001 From: mindfaucet Date: Fri, 4 Dec 2009 10:38:19 -0700 Subject: [PATCH 39/86] At some point the comments link started showing up on the single pages, doubled up with the actual comments and discussion count. Not sure what the original code was here but I added is_single() exclusions. --- functions/displayblogpost.php | 2 +- functions/displaycomicpost.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php index 47f6cc6..d228122 100644 --- a/functions/displayblogpost.php +++ b/functions/displayblogpost.php @@ -64,7 +64,7 @@ function display_blog_post() { comment_status) { - if (comicpress_check_child_file('partials/commentlink') == false) { ?> + if (comicpress_check_child_file('partials/commentlink') == false && !(is_single())) { ?>
      '.__('Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
    comment_status && !$comicpress_options['static_blog']) { + if ('open' == $post->comment_status && !$comicpress_options['static_blog'] && !(is_single())) { if (comicpress_check_child_file('partials/commentlink') == false) { ?>
      '.__('Comments ','comicpress'), '1 '.__('Comment ','comicpress'), '% '.__('Comments ','comicpress')); ?>
    Date: Fri, 4 Dec 2009 11:32:16 -0700 Subject: [PATCH 40/86] Final comments.php organization and styling. Pings and Trackbacks set with id's and wrap to make it easy to make it expandable with a simple JS or jquery action in custom themes. --- comments.php | 70 +++++++++++++++++++++++++++------------------------- style.css | 35 ++++++++++++++------------ 2 files changed, 55 insertions(+), 50 deletions(-) diff --git a/comments.php b/comments.php index 97b0daf..dbbd88c 100644 --- a/comments.php +++ b/comments.php @@ -16,24 +16,45 @@ if ( post_password_required() ) { ?> -
    [ ]
    +

    - +
    [ ]
      - 'comment', - 'reply_text' => __('Reply to %s¬','comicpress'), - 'callback' => 'comicpress_comments_callback', - 'end-callback' => 'comicpress_comments_end_callback', - 'avatar_size'=>64 - ) - ); - } else { - wp_list_comments(array('type' => 'comment', 'avatar_size'=>64)); + 'comment', + 'reply_text' => __('Reply to %s¬','comicpress'), + 'callback' => 'comicpress_comments_callback', + 'end-callback' => 'comicpress_comments_end_callback', + 'avatar_size'=>64 + ) + ); + } else { + wp_list_comments(array('type' => 'comment', 'avatar_size'=>64)); }?>
    + + +
    +

    +
      +
        + 'pings', + 'callback' => 'comicpress_comments_callback', + 'end-callback' => 'comicpress_comments_end_callback', + 'avatar_size'=>32 + ) + ); + } else { + wp_list_comments(array('type' => 'pings', 'avatar_size'=>64)); + }?> +
      +
    +
    + + @@ -110,26 +131,7 @@ if ( post_password_required() ) { ?> - - -

    -
      -
        - 'pings', - 'callback' => 'comicpress_comments_callback', - 'end-callback' => 'comicpress_comments_end_callback', - 'avatar_size'=>32 - ) - ); - } else { - wp_list_comments(array('type' => 'pings', 'avatar_size'=>64)); - }?> -
      -
    - +
    \ No newline at end of file diff --git a/style.css b/style.css index 242b95f..617fdb0 100644 --- a/style.css +++ b/style.css @@ -631,13 +631,6 @@ h3, h3 a { margin-left: 45px; } - .pingback .comment-content { - margin-left: 0; - } - - .trackback .comment-content { - margin-left: 0; - } .comment-author cite { font-weight: bold; @@ -684,7 +677,6 @@ h3, h3 a { } .commentsrsslink { - float: right; font-size: 11px; } @@ -722,11 +714,27 @@ ul.children { list-style: none; } -.reply { - padding: 10px 0 0 0; - text-align: right; +#respond { + padding: 20px 0 0 0; } +/* Pingbacks and Trackbacks */ + +#pingtrackback { + font-size: 16px; +} + +.pingback .comment-content, .trackback .comment-content { + margin-left: 0; +} + +.trackback .comment-author cite, .pingback .comment-author cite { + font-weight: bold; + font-style: normal; + font-size: 13px; +} + + /* ARCHIVE */ /* For the built-in WordPress archive pages (by month or category) as well as search result pages */ @@ -1096,11 +1104,6 @@ ul.children { overflow: hidden; } -/* Pingbacks and Trackbacks */ - -li.pingback div p, li.trackback div p { - margin-left: 0; -} /* STORYLINES */ From aca6d4712bc285acb1b52203d5c7d21d95e168fa Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 20:36:39 -0500 Subject: [PATCH 41/86] remove commented-out debug options --- classes/ComicPressMediaHandling.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 9d6ebec..1ebfd9f 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -103,7 +103,6 @@ class ComicPressMediaHandling { $filename_pattern = str_replace('#', '\#', basename($resolved_pattern)); while (($file = readdir($dh)) !== false) { $target = $dirname . '/' . $file; -// echo "
    TARGET:
    "; var_dump($target); echo "

    "; if (is_file($target)) { if (preg_match("#^${filename_pattern}$#", $file) > 0) { $results[] = $target; @@ -194,18 +193,14 @@ class ComicPressMediaHandling { if (isset($globals[$type])) { $filter = $this->_expand_filter($filter, $globals[$type], $post_to_use); -// var_dump($filter); if (is_array($results = $this->_read_directory($filter))) { if (($pre_handle = apply_filters('comicpress_pre_handle_comic_path_results', false, $results, $type, $post_to_use)) !== false) { return $pre_handle; } -// echo "
    RESULTS:
    ";var_dump($results); echo "

    "; $new_results = array(); -// echo "
    ABSPATH:
    "; var_dump($this->_abspath()); echo "

    "; foreach ($results as $result) { $new_results[] = str_replace($this->_abspath(), '', $result); } -// echo "
    NEW RESULTS:
    ";var_dump($new_results); echo "

    "; if ($multi) { return $new_results; } else { @@ -216,3 +211,4 @@ class ComicPressMediaHandling { return false; } } + From 090cc455763fc71dc943893d0e2ca49d9a574be6 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:03:09 -0500 Subject: [PATCH 42/86] improve pattern manipulation --- classes/ComicPressMediaHandling.inc | 15 ++++++++++---- test/ComicPressMediaHandlingTest.php | 29 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 1ebfd9f..8d9e2ad 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -58,6 +58,15 @@ class ComicPressMediaHandling { return $result; } + function _get_regex_dirname($input) { + return dirname($this->_resolve_regex_path($input)); + } + + function _get_regex_filename($input) { + $input = preg_replace('#\\\(?![.])#', '/', $input); + return basename($input); + } + function _resolve_regex_path($input) { $input = str_replace('\.', '.', $input); $input = str_replace('\\', '/', $input); @@ -92,15 +101,13 @@ class ComicPressMediaHandling { return apply_filters('comicpress_expand_filter_callback', $value, $matches); } - // TODO: Fix Pattern Escaping function _read_directory($pattern) { - $resolved_pattern = $this->_resolve_regex_path($pattern); - $dirname = dirname($resolved_pattern); + $dirname = $this->_get_regex_dirname($pattern); $results = false; if (is_dir($dirname)) { $results = array(); if (($dh = opendir($dirname)) !== false) { - $filename_pattern = str_replace('#', '\#', basename($resolved_pattern)); + $filename_pattern = str_replace('#', '\#', $this->_get_regex_filename($pattern)); while (($file = readdir($dh)) !== false) { $target = $dirname . '/' . $file; if (is_file($target)) { diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 8e8f3fe..528a5e8 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -160,6 +160,35 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $this->assertEquals($expected_output, $this->cpmh->_resolve_regex_path($input)); } + function providerTestGetRegexDirname() { + return array( + array('/test/test2', '/test') + ); + } + + /** + * @dataProvider providerTestGetRegexDirname + */ + function testGetRegexDirname($input, $expected_output) { + $this->assertEquals($expected_output, $this->cpmh->_get_regex_dirname($input)); + } + + function providerTestGetRegexFilename() { + return array( + array('/test/test2', 'test2'), + array('c:\test\test2', 'test2'), + array('/test/test2\.cat', 'test2\.cat'), + array('c:\test\test2\.cat', 'test2\.cat'), + ); + } + + /** + * @dataProvider providerTestGetRegexFilename + */ + function testGetRegexFilename($input, $expected_output) { + $this->assertEquals($expected_output, $this->cpmh->_get_regex_filename($input)); + } + function providerTestPreHandleComicPathResults() { return array( array('', '', false), From 9ee3abb553a59473fd5587d7b7ccf711f9acd323 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:25:30 -0500 Subject: [PATCH 43/86] fix GH#20 --- classes/ComicPressMediaHandling.inc | 12 ++++++++++-- test/ComicPressMediaHandlingTest.php | 18 ++++++++++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 8d9e2ad..367905d 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -2,7 +2,8 @@ class ComicPressMediaHandling { var $root_filter = '%wordpress%/%type-folder%/'; - var $default_filter = '%wordpress%/%type-folder%/%date-Y-m-d%*.*'; + var $default_filter = '%wordpress%/%type-folder%/{date}*.*'; + var $default_filename_filter = '%date-Y-m-d%'; function _bundle_global_variables() { global $comic_folder, $archive_comic_folder, $rss_comic_folder, $mini_comic_folder; @@ -32,7 +33,14 @@ class ComicPressMediaHandling { } } - return $this->default_filter; + $filter = $this->default_filter; + if ($result = get_option('comicpress-manager-cpm-date-format')) { + $filter = str_replace('{date}', "%date-${result}%", $filter); + } else { + $filter = str_replace('{date}', $this->default_filename_filter, $filter); + } + + return $filter; } function _convert_to_percent_filter($old) { diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 528a5e8..6d09695 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -35,10 +35,12 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { function providerTestGetFilter() { $cpmh = new ComicPressMediaHandling(); + $default = str_replace('{date}', $cpmh->default_filename_filter, $cpmh->default_filter); + return array( - array(null, $cpmh->default_filter), - array('fail', $cpmh->default_filter), - array(array(), $cpmh->default_filter), + array(null, $default), + array('fail', $default), + array(array(), $default), array('test', 'test') ); } @@ -51,8 +53,10 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $comic_filename_filters['test'] = 'test'; + $default = str_replace('{date}', $this->cpmh->default_filename_filter, $this->cpmh->default_filter); + $cpmh = $this->getMock('ComicPressMediaHandling', array('_convert_to_percent_filter')); - if ($expected_result !== $cpmh->default_filter) { + if ($expected_result !== $default) { $cpmh->expects($this->once())->method('_convert_to_percent_filter')->with($expected_result)->will($this->returnValue($expected_result)); } else { $cpmh->expects($this->never())->method('_convert_to_percent_filter'); @@ -61,6 +65,12 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $this->assertEquals($expected_result, $cpmh->_get_filter($filter_to_use)); } + function testGetFilterCPMOption() { + update_option('comicpress-manager-cpm-date-format', 'test'); + + $this->assertEquals(str_replace('{date}', '%date-test%', $this->cpmh->default_filter), $this->cpmh->_get_filter()); + } + function providerTestConvertToPercentFilter() { return array( array('', '%wordpress%/%type-folder%/'), From 28e967e804e1d3da4c8302c26026a7d1abf2ece9 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:35:23 -0500 Subject: [PATCH 44/86] start framework for classes that can receive updates --- .../ComicPressPostMediaHandlingMetabox.inc | 23 +------------ functions.php | 33 ++++++++++++++++--- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/classes/ComicPressPostMediaHandlingMetabox.inc b/classes/ComicPressPostMediaHandlingMetabox.inc index 7c85320..9bf1afa 100644 --- a/classes/ComicPressPostMediaHandlingMetabox.inc +++ b/classes/ComicPressPostMediaHandlingMetabox.inc @@ -3,28 +3,7 @@ class ComicPressPostMediaHandlingMetabox { function __comicpress_init() { $n = new ComicPressPostMediaHandlingMetabox(); - - if (isset($_REQUEST['cp'])) { - if (is_array($_REQUEST['cp'])) { - if (isset($_REQUEST['cp']['_nonce'])) { - if (wp_verify_nonce('comicpress', $_REQUEST['cp']['_nonce'])) { - if (isset($_REQUEST['cp']['action'])) { - if (isset($_REQUEST['cp']['_action_nonce'])) { - if (wp_verify_nonce('comicpress-' . $_REQUEST['cp']['action'], $_REQUEST['cp']['_action_nonce'])) { - $method_name = str_replace('-', '_', $_REQUEST['cp']['_action_nonce']); - if (method_exists($n, $method_name)) { - $n->{$method_name}($_REQUEST['cp']); - } - } - } - } - } - } - } - } } - function handle_update($info) { - - } + function handle_update() {} } diff --git a/functions.php b/functions.php index 4549e9a..9de1cc2 100644 --- a/functions.php +++ b/functions.php @@ -33,7 +33,7 @@ function __comicpress_widgets_init() { } function __comicpress_init() { - global $comicpress_options; + global $comicpress_options, $__comicpress_handlable_classes; // Check if the $comicpress_options exist, if not set defaults $comicpress_options = comicpress_load_options(); // xili-language plugin check @@ -52,10 +52,30 @@ function __comicpress_init() { remove_filter('comments_number','id_get_comment_number'); } - if (($_REQUEST['cp']['post_id'] <= 0) && ($_POST['post_ID'] > 0)) { - $_REQUEST['cp']['post_id'] = $_POST['post_ID']; - } + 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('comicpress', $_REQUEST['cp']['_nonce'])) { + if (isset($_REQUEST['cp']['action'])) { + if (isset($_REQUEST['cp']['_action_nonce'])) { + if (wp_verify_nonce('comicpress-' . $_REQUEST['cp']['action'], $_REQUEST['cp']['_action_nonce'])) { + $method_name = 'handle_' . str_replace('-', '_', $_REQUEST['cp']['_action_nonce']); + foreach ($__comicpress_handlable_classes as $class_name) { + if (method_exists($class_name, $method_name)) { + $class_name->{$method_name}($_REQUEST['cp']); + } + } + } + } + } + } + } + } + } } add_action('widgets_init', '__comicpress_widgets_init'); @@ -197,6 +217,7 @@ if ($comicpress_options['remove_wptexturize']) { // WIDGETS WP 2.8 compatible ONLY, no backwards compatibility here. $dirs_to_search = array_unique(array(get_template_directory(), get_stylesheet_directory())); +$__comicpress_handlable_classes = array(); foreach ($dirs_to_search as $dir) { foreach (array('widgets' => 'php', 'functions' => 'php', 'classes' => 'inc') as $folder => $extension) { foreach (glob($dir . "/${folder}/*.${extension}") as $__file) { @@ -206,6 +227,10 @@ foreach ($dirs_to_search as $dir) { if (method_exists($__class_name, '__comicpress_init')) { add_action('comicpress_init', array($__class_name, '__comicpress_init')); } + + if (method_exists($__class_name, 'handle_update')) { + $__comicpress_handlable_classes[] = $__class_name; + } } } } From b03bcd1c33a0c7feeabb18ef6e3782d07eed4cb2 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:35:42 -0500 Subject: [PATCH 45/86] remove unnecessary comments --- functions.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/functions.php b/functions.php index 9de1cc2..2bb2a2f 100644 --- a/functions.php +++ b/functions.php @@ -208,11 +208,7 @@ function is_cp_theme_layout($choices) { if ($comicpress_options['remove_wptexturize']) { // Remove the wptexturizer from changing the quotes and squotes. - // remove_filter('the_content', 'wpautop'); - // remove_filter('the_title', 'wptexturize'); remove_filter('the_content', 'wptexturize'); - // remove_filter('the_excerpt', 'wptexturize'); - // remove_filter('comment_text', 'wptexturize'); } // WIDGETS WP 2.8 compatible ONLY, no backwards compatibility here. From 71011e0e360dec734bc4a5aaa1ddfb7574dc8f1d Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:36:26 -0500 Subject: [PATCH 46/86] remove unnecessary variable --- functions.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/functions.php b/functions.php index 2bb2a2f..0e6647c 100644 --- a/functions.php +++ b/functions.php @@ -235,9 +235,6 @@ foreach ($dirs_to_search as $dir) { // Dashboard Menu Comicpress Options and ComicPress CSS require_once(get_template_directory() . '/comicpress-options.php'); -// If any errors occur while searching for a comic file, the error messages will be pushed into here. -$comic_pathfinding_errors = array(); - // If ComicPress Manager is installed, use the date format defined there. If not, default to // Y-m-d.. It's best to use CPM's date definition for improved operability between theme and plugin. From 04b2500fcc1bd7d374ebea9c56a9e9e8368ced01 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:37:02 -0500 Subject: [PATCH 47/86] remove unnecessary defines --- functions.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/functions.php b/functions.php index 0e6647c..daec032 100644 --- a/functions.php +++ b/functions.php @@ -235,15 +235,6 @@ foreach ($dirs_to_search as $dir) { // Dashboard Menu Comicpress Options and ComicPress CSS require_once(get_template_directory() . '/comicpress-options.php'); -// If ComicPress Manager is installed, use the date format defined there. If not, default to -// Y-m-d.. It's best to use CPM's date definition for improved operability between theme and plugin. - -if (defined("CPM_DATE_FORMAT")) { - define("CP_DATE_FORMAT", CPM_DATE_FORMAT); -} else { - define("CP_DATE_FORMAT", "Y-m-d"); -} - // If you want to run multiple comics on a single day, define your additional filters here. // Example: you want to run an additional comic with the filename 2008-01-01-a-my-new-years-comic.jpg. // Define an additional filter in the list below: From e5dabc6cf7029da90c286ac3def582c2c4ff9daa Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:37:53 -0500 Subject: [PATCH 48/86] remove deprecated functions --- functions.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/functions.php b/functions.php index daec032..9f5e962 100644 --- a/functions.php +++ b/functions.php @@ -615,22 +615,10 @@ function in_comic_category() { // ComicPress Template Functions function the_comic_filename($filter = 'default') { return get_comic_filename('comic',null, $filter); } - function the_comic($filter = 'default') { echo get_comic_url('comic', null, $filter); } - //The following is deprecated... - function comic_display($filter = 'default') { echo get_comic_url('comic', null, $filter); } - function the_comic_archive($filter = 'default') { echo get_comic_url('archive', null, $filter); } - //The following is deprecated... - function comic_archive($filter = 'default') { echo get_comic_url('archive', null, $filter); } - function the_comic_rss($filter = 'default') { echo get_comic_url('rss', null, $filter); } - //The following is deprecated... - function comic_rss($filter = 'default') { echo get_comic_url('rss', null, $filter); } - function the_comic_mini($filter = 'default') { echo get_comic_url('mini', null, $filter); } - //The following is deprecated... - function comic_mini($filter = 'default') { echo get_comic_url('mini', null, $filter); } /** * Display the list of Storyline categories. From db1fe2821e6314bde523658d917ac025523868c3 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:38:14 -0500 Subject: [PATCH 49/86] remove code coverage directory via gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ab423c8..a938aaa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .project .settings/ .DS_Store +coverage/ From 1cb662d6e68b680bbdfeafc99b09a19e8ba15424 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 21:53:38 -0500 Subject: [PATCH 50/86] starting metabox --- .../ComicPressPostMediaHandlingMetabox.inc | 18 +++++++++++++ .../partials/post-media-handling/metabox.inc | 25 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 classes/partials/post-media-handling/metabox.inc diff --git a/classes/ComicPressPostMediaHandlingMetabox.inc b/classes/ComicPressPostMediaHandlingMetabox.inc index 9bf1afa..6302321 100644 --- a/classes/ComicPressPostMediaHandlingMetabox.inc +++ b/classes/ComicPressPostMediaHandlingMetabox.inc @@ -3,7 +3,25 @@ class ComicPressPostMediaHandlingMetabox { function __comicpress_init() { $n = new ComicPressPostMediaHandlingMetabox(); + add_action('admin_menu', array(&$n, 'admin_menu')); } function handle_update() {} + + function admin_menu() { + add_meta_box('comicpress-post-media-handling', __('ComicPress Post Media', 'comicpress'), array(&$this, 'metabox'), 'post', 'normal', 'low'); + } + + function metabox() { + global $post; + $media_info = get_post_meta($post->ID, 'backend_url_images', true); + if (!is_array($media_info)) { + $media_info = array(); + } + + $nonce = wp_create_nonce('comicpress'); + $action_nonce = wp_create_nonce('comicpress-post-media-update'); + + include('partials/post-media-handling/metabox.inc'); + } } diff --git a/classes/partials/post-media-handling/metabox.inc b/classes/partials/post-media-handling/metabox.inc new file mode 100644 index 0000000..04e5c77 --- /dev/null +++ b/classes/partials/post-media-handling/metabox.inc @@ -0,0 +1,25 @@ + + + +

    + Enter in relative or absolute URLs to the images you want to use for this post. This will override file system searches. +

    + + __('Comic', 'comicpress'), + 'rss' => __('RSS', 'comicpress'), + 'archive' => __('Archive', 'comicpress'), + 'mini' => __('Mini', 'comicpress') + ) as $field => $label) { + $value = isset($media_info[$field]) ? $media_info[$field] : ''; + ?> + + + + + +
    URL + +
    From 06a765ad55c5ee4428c840ceea3b09eb5a249b5d Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 22:35:49 -0500 Subject: [PATCH 51/86] clean up functions.php --- functions.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/functions.php b/functions.php index 9f5e962..f5b0793 100644 --- a/functions.php +++ b/functions.php @@ -18,18 +18,6 @@ function __comicpress_widgets_init() { } closedir($dh); } - - if (isset($_REQUEST['cp'])) { - if (is_array($_REQUEST['cp'])) { - if (isset($_REQUEST['cp']['post_id'])) { - if (($_REQUEST['cp']['post_id'] <= 0) && ($_POST['post_ID'] > 0)) { - $_REQUEST['cp']['post_id'] = $_POST['post_ID']; - } - } - } - } - - do_action('comicpress_init'); } function __comicpress_init() { @@ -52,6 +40,8 @@ function __comicpress_init() { remove_filter('comments_number','id_get_comment_number'); } + do_action('comicpress_init'); + if (isset($_REQUEST['cp'])) { if (is_array($_REQUEST['cp'])) { if (($_REQUEST['cp']['post_id'] <= 0) && ($_POST['post_ID'] > 0)) { From 5a717b627fed53eec050a71d294c6f09f3bef4ad Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 22:36:00 -0500 Subject: [PATCH 52/86] handle post media update --- .../ComicPressPostMediaHandlingMetabox.inc | 28 +++++++++++++++++-- .../partials/post-media-handling/metabox.inc | 1 + ...ComicPressPostMediaHandlingMetaboxTest.php | 23 ++++++++++++--- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/classes/ComicPressPostMediaHandlingMetabox.inc b/classes/ComicPressPostMediaHandlingMetabox.inc index 6302321..5ee030b 100644 --- a/classes/ComicPressPostMediaHandlingMetabox.inc +++ b/classes/ComicPressPostMediaHandlingMetabox.inc @@ -2,14 +2,36 @@ class ComicPressPostMediaHandlingMetabox { function __comicpress_init() { - $n = new ComicPressPostMediaHandlingMetabox(); - add_action('admin_menu', array(&$n, 'admin_menu')); + add_action('admin_menu', array('ComicPressPostMediaHandlingMetabox', 'admin_menu')); } function handle_update() {} + function _get_valid_types() { + return array_keys(ComicPressMediaHandling::_bundle_global_variables()); + } + + function handle_post_media_update($info) { + if (isset($info['post_id'])) { + if (is_numeric($info['post_id'])) { + $result = array(); + if (isset($info['urls'])) { + if (is_array($info['urls'])) { + $valid_types = $this->_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); + } + } + } + function admin_menu() { - add_meta_box('comicpress-post-media-handling', __('ComicPress Post Media', 'comicpress'), array(&$this, 'metabox'), 'post', 'normal', 'low'); + add_meta_box('comicpress-post-media-handling', __('ComicPress Post Media', 'comicpress'), array('ComicPressPostMediaHandlingMetabox', 'metabox'), 'post', 'normal', 'low'); } function metabox() { diff --git a/classes/partials/post-media-handling/metabox.inc b/classes/partials/post-media-handling/metabox.inc index 04e5c77..43f5a45 100644 --- a/classes/partials/post-media-handling/metabox.inc +++ b/classes/partials/post-media-handling/metabox.inc @@ -1,5 +1,6 @@ +

    Enter in relative or absolute URLs to the images you want to use for this post. This will override file system searches. diff --git a/test/ComicPressPostMediaHandlingMetaboxTest.php b/test/ComicPressPostMediaHandlingMetaboxTest.php index cdf0bce..39c6039 100644 --- a/test/ComicPressPostMediaHandlingMetaboxTest.php +++ b/test/ComicPressPostMediaHandlingMetaboxTest.php @@ -5,16 +5,31 @@ require_once('MockPress/mockpress.php'); require_once(dirname(__FILE__) . '/../classes/ComicPressPostMediaHandlingMetabox.inc'); class ComicPressPostMediaHandlingMetaboxTest extends PHPUnit_Framework_TestCase { - function providerTestUpdate() { + function setUp() { + _reset_wp(); + $this->pmh = new ComicPressPostMediaHandlingMetabox(); + } + + function providerTestPostMediaUpdate() { return array( - array(array(), 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')), ); } /** - * @dataProvider providerTestUpdate + * @dataProvider providerTestPostMediaUpdate */ - function testUpdate($input, $expected_post_metadata) { + function testPostMediaUpdate($input, $expected_post_metadata) { + $pmh = $this->getMock('ComicPressPostMediaHandlingMetabox', array('_get_valid_types')); + $pmh->expects($this->any())->method('_get_valid_types')->will($this->returnValue(array('comic'))); + $this->pmh->handle_post_media_update($input); + $this->assertEquals($expected_post_metadata, get_post_meta(1, 'backend_url_images', true)); } } From 9737569e9585e657e7178d283dcba85e489fada9 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 22:59:08 -0500 Subject: [PATCH 53/86] clean up setting meta box info --- classes/ComicPressMediaHandling.inc | 6 +++--- .../ComicPressPostMediaHandlingMetabox.inc | 2 +- comicpress-config.php | 6 ++---- functions.php | 21 ++++++++----------- test/ComicPressMediaHandlingTest.php | 6 +++--- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 367905d..0f657f8 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -177,7 +177,7 @@ class ComicPressMediaHandling { $uri = preg_replace_callback('#%([a-z0-9-]+)%#i', array(&$this, '_expand_filter_callback'), $uri); - return trailingslashit(get_bloginfo('url')) . $uri; + return $uri; } } } @@ -198,8 +198,8 @@ class ComicPressMediaHandling { $post_to_use = !is_null($override_post) ? $override_post : $post; if ($uri = $this->_check_post_meta_data($post_to_use, $type)) { - if ($result = $this->_ensure_valid_url($uri, $type)) { - return $result; + if ($result = $this->_ensure_valid_uri($uri, $type)) { + return preg_replace('#^/#', '', $result); } } diff --git a/classes/ComicPressPostMediaHandlingMetabox.inc b/classes/ComicPressPostMediaHandlingMetabox.inc index 5ee030b..b4794c8 100644 --- a/classes/ComicPressPostMediaHandlingMetabox.inc +++ b/classes/ComicPressPostMediaHandlingMetabox.inc @@ -17,7 +17,7 @@ class ComicPressPostMediaHandlingMetabox { $result = array(); if (isset($info['urls'])) { if (is_array($info['urls'])) { - $valid_types = $this->_get_valid_types(); + $valid_types = ComicPressPostMediaHandlingMetabox::_get_valid_types(); foreach ($info['urls'] as $field => $value) { if (in_array($field, $valid_types)) { $result[$field] = strip_tags($value); diff --git a/comicpress-config.php b/comicpress-config.php index e21900b..6e1978b 100644 --- a/comicpress-config.php +++ b/comicpress-config.php @@ -1,10 +1,10 @@ \ No newline at end of file diff --git a/functions.php b/functions.php index f5b0793..4ccf03c 100644 --- a/functions.php +++ b/functions.php @@ -49,14 +49,14 @@ function __comicpress_init() { } if (isset($_REQUEST['cp']['_nonce'])) { - if (wp_verify_nonce('comicpress', $_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('comicpress-' . $_REQUEST['cp']['action'], $_REQUEST['cp']['_action_nonce'])) { - $method_name = 'handle_' . str_replace('-', '_', $_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)) { - $class_name->{$method_name}($_REQUEST['cp']); + call_user_func(array($class_name, $method_name), $_REQUEST['cp']); } } } @@ -460,16 +460,13 @@ function get_comic_path($folder = 'comic', $override_post = null, $filter = 'def * @param string $filter The $comic_filename_filters to use. * @return string The absolute URL to the comic file, or false if not found. */ -function get_comic_url($folder = 'comic', $override_post = null, $filter = 'default') { - if (($result = get_comic_path($folder, $override_post, $filter)) !== false) { - return get_bloginfo('wpurl') . '/' . $result; - } else { - if (($result = get_comic_path('comic', $override_post, $filter)) !== false) { - $basecomic = basename($result); - return get_bloginfo('wpurl') . '/' . $result; +function get_comic_url($type = 'comic', $override_post = null, $filter = 'default') { + foreach (array_unique(array($type, 'comic')) as $which_type) { + if (($result = get_comic_path($which_type, $override_post, $filter)) !== false) { + return trailingslashit(get_bloginfo('url')) . $result; } } - return $result; + return false; } /** diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index 6d09695..f0354bd 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -247,8 +247,8 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { function providerTestEnsureValidURI() { return array( array('', false), - array('test', 'wordpress/test'), - array('%type-folder%/test', 'wordpress/comic-dir/test'), + array('test', 'test'), + array('%type-folder%/test', 'comic-dir/test'), array('/test', '/test'), array('http://file', 'http://file'), ); @@ -272,6 +272,6 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { $cpmh = $this->getMock('ComicPressMediaHandling', array('_bundle_global_variables')); $cpmh->expects($this->any())->method('_bundle_global_variables')->will($this->returnValue(array('comic' => 'comic-dir'))); - $this->assertEquals('wordpress/', $cpmh->_ensure_valid_uri('%type-folder%', 'test')); + $this->assertEquals('', $cpmh->_ensure_valid_uri('%type-folder%', 'test')); } } From 51b185076554a0b76f86b1474164a240e3b1f594 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 Dec 2009 23:00:29 -0500 Subject: [PATCH 54/86] remove some things from coverage --- classes/ComicPressPostMediaHandlingMetabox.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/ComicPressPostMediaHandlingMetabox.inc b/classes/ComicPressPostMediaHandlingMetabox.inc index b4794c8..fab0b76 100644 --- a/classes/ComicPressPostMediaHandlingMetabox.inc +++ b/classes/ComicPressPostMediaHandlingMetabox.inc @@ -1,11 +1,13 @@ Date: Fri, 4 Dec 2009 23:14:33 -0500 Subject: [PATCH 55/86] comicpress-config.php change --- comicpress-config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/comicpress-config.php b/comicpress-config.php index 6e1978b..972c717 100644 --- a/comicpress-config.php +++ b/comicpress-config.php @@ -1,10 +1,10 @@ Date: Fri, 4 Dec 2009 23:16:34 -0500 Subject: [PATCH 56/86] comicpress-config.php as a tracked file is too annoying. copy comicpress-config.php.dist to comicpress-config.php for releases or for updates --- .gitignore | 2 ++ comicpress-config.php => comicpress-config.php.dist | 0 2 files changed, 2 insertions(+) rename comicpress-config.php => comicpress-config.php.dist (100%) diff --git a/.gitignore b/.gitignore index a938aaa..4456ace 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ .settings/ .DS_Store coverage/ +comicpress-config.php + diff --git a/comicpress-config.php b/comicpress-config.php.dist similarity index 100% rename from comicpress-config.php rename to comicpress-config.php.dist From 10130125b572c3f9ea859739e5ccdf3f0e4d664d Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Sat, 5 Dec 2009 10:50:36 -0800 Subject: [PATCH 57/86] Re Added the commented out remove_filter code Signed-off-by: Philip M. Hofer (Frumph) --- functions.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/functions.php b/functions.php index 4ccf03c..3a75281 100644 --- a/functions.php +++ b/functions.php @@ -199,6 +199,11 @@ function is_cp_theme_layout($choices) { if ($comicpress_options['remove_wptexturize']) { // Remove the wptexturizer from changing the quotes and squotes. remove_filter('the_content', 'wptexturize'); + // These are left here so they dont have to be looked up every single time. + // remove_filter('the_content', 'wpautop'); + // remove_filter('the_title', 'wptexturize'); + // remove_filter('the_excerpt', 'wptexturize'); + // remove_filter('comment_text', 'wptexturize'); } // WIDGETS WP 2.8 compatible ONLY, no backwards compatibility here. From d9f0d00240d5db3a3fd8afa4e9759eeaed5c29f8 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Sat, 5 Dec 2009 11:19:18 -0800 Subject: [PATCH 58/86] Wp texturize removal text Signed-off-by: Philip M. Hofer (Frumph) --- functions.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index 3a75281..6df5d2d 100644 --- a/functions.php +++ b/functions.php @@ -196,10 +196,14 @@ function is_cp_theme_layout($choices) { return false; } +/** + * Remove of wordpress auto-texturizer. + * Dependant on the need remove the commented out areas of this code. + * Ex. Russian Language users will need to uncomment all of these to handle the character set dependant on + * if they utilize the language translation pack. + **/ if ($comicpress_options['remove_wptexturize']) { - // Remove the wptexturizer from changing the quotes and squotes. remove_filter('the_content', 'wptexturize'); - // These are left here so they dont have to be looked up every single time. // remove_filter('the_content', 'wpautop'); // remove_filter('the_title', 'wptexturize'); // remove_filter('the_excerpt', 'wptexturize'); From 3fb1081afc8ff54204f9230697956f3f7e03c814 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Sat, 5 Dec 2009 15:00:34 -0500 Subject: [PATCH 59/86] additional windows fix for path handling --- classes/ComicPressMediaHandling.inc | 2 +- test/ComicPressMediaHandlingTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc index 0f657f8..e5fbb41 100644 --- a/classes/ComicPressMediaHandling.inc +++ b/classes/ComicPressMediaHandling.inc @@ -72,7 +72,7 @@ class ComicPressMediaHandling { function _get_regex_filename($input) { $input = preg_replace('#\\\(?![.])#', '/', $input); - return basename($input); + return preg_replace('#^.*\/([^\/]+)$#', '$1', $input); } function _resolve_regex_path($input) { diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php index f0354bd..899d550 100644 --- a/test/ComicPressMediaHandlingTest.php +++ b/test/ComicPressMediaHandlingTest.php @@ -189,6 +189,7 @@ class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase { array('c:\test\test2', 'test2'), array('/test/test2\.cat', 'test2\.cat'), array('c:\test\test2\.cat', 'test2\.cat'), + array('C:/inetpub/a\.windows\.directory/comics/2009-11-24.*\..*', '2009-11-24.*\..*') ); } From d1b03c4903843bf932f060a2578a3adb4c4e4ae5 Mon Sep 17 00:00:00 2001 From: "Philip M. Hofer (Frumph)" Date: Sat, 5 Dec 2009 14:53:55 -0800 Subject: [PATCH 60/86] Buy Print URL fix Signed-off-by: Philip M. Hofer (Frumph) --- widgets/BuyThisPrintWidget.inc | 6 +++--- widgets/GraphicalNavigationWidget.inc | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/widgets/BuyThisPrintWidget.inc b/widgets/BuyThisPrintWidget.inc index 39906a7..319b00c 100644 --- a/widgets/BuyThisPrintWidget.inc +++ b/widgets/BuyThisPrintWidget.inc @@ -21,7 +21,7 @@ class BuyThisPrintWidget extends WP_Widget { function widget($args, $instance) { extract($args, EXTR_SKIP); - + echo $before_widget; $title = apply_filters('widget_title', $instance['title']); if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; @@ -34,8 +34,8 @@ class BuyThisPrintWidget extends WP_Widget { } function buy_print_structure($content = '') { - global $buy_print_url; ?> -

    + $comicpress_options = comicpress_load_options(); ?> +
    diff --git a/widgets/GraphicalNavigationWidget.inc b/widgets/GraphicalNavigationWidget.inc index 3835838..d489bf0 100644 --- a/widgets/GraphicalNavigationWidget.inc +++ b/widgets/GraphicalNavigationWidget.inc @@ -135,9 +135,10 @@ class GraphicalNavigationWidget extends WP_Widget { $id = $temp_id; break; case 'buyprint': + $comicpress_options = comicpress_load_options(); ?>