Merge branch 'main' of https://git.kjodle.net/kjodle/portage into main

404.php

@@ -22,7 +22,7 @@ get_header();
 	<!-- Post title info -->
 	<div class="post" >
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
-		<?php _e( '404: We can\'t find that page', 'atticus-finch' ); ?>
+		<?php _e( '404: We can\'t find that page', 'portage' ); ?>
 	</h2>
 
 	<!-- Post content -->
@@ -30,12 +30,12 @@ get_header();
 		<p><img src='<?php echo get_template_directory_uri(); ?>/images/404.jpg' /></p>
 		<p>
 			<?php
-				_e( 'Sorry, that page or post doesn\'t appear to be here. It may have been deleted, moved, or at the other end of an outdated link.', 'atticus-finch' );
+				_e( 'Sorry, that page or post doesn\'t appear to be here. It may have been deleted, moved, or at the other end of an outdated link.', 'portage' );
 			?>
 		</p>
 		<p>
 			<?php
-				_e( 'You can use the menus, categories, or tags to find what you are looking for. You can also use the search form below.', 'atticus-finch' );
+				_e( 'You can use the menus, categories, or tags to find what you are looking for. You can also use the search form below.', 'portage' );
 			?>
 		</p>
 		<p id="404search">

archive.php

@@ -5,7 +5,7 @@
  * Displays generic archives.
  * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 get_header();
@@ -16,15 +16,15 @@ get_header();
 
 <div id="archive-title">
 	<?php if ( is_day() ) : ?>
-		<?php printf( __( 'Daily Archive for %s', 'atticus-finch' ), '<span>' . get_the_date() . '</span>' ); ?>
+		<?php printf( __( 'Daily Archive for %s', 'portage' ), '<span>' . get_the_date() . '</span>' ); ?>
 	<?php elseif ( is_month() ) : ?>
-		<?php printf( __( 'Monthly Archive for %s', 'atticus-finch' ), 
+		<?php printf( __( 'Monthly Archive for %s', 'portage' ), 
 		/* translators: F will be replaced with month, and Y will be replaced with year, so "F Y" in English would be replaced with something like "June 2008". */
-		'<span>' . get_the_date( __( 'F Y', 'atticus-finch' ) ) . '</span>' ); ?>
+		'<span>' . get_the_date( __( 'F Y', 'portage' ) ) . '</span>' ); ?>
 	<?php elseif ( is_year() ) : ?>
-		<?php printf(__( 'Yearly Archive for %s', 'atticus-finch' ), '<span>' . get_the_date( 'Y' ) . '</span>' ); ?>
+		<?php printf(__( 'Yearly Archive for %s', 'portage' ), '<span>' . get_the_date( 'Y' ) . '</span>' ); ?>
 	<?php else : ?>
-		<?php _e( 'Blog Archive', 'atticus-finch' ); ?>
+		<?php _e( 'Blog Archive', 'portage' ); ?>
 	<?php endif; ?>
 </div>
 

category.php

@@ -5,7 +5,7 @@
  * Displays category archives.
  * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 get_header();
@@ -17,7 +17,7 @@ get_header();
 <div id="archive-title">
 	<h2>
 	<?php
-		printf( __( 'Posts contained in the &ldquo;<span>%s</span>&rdquo; category:', 'atticus-finch' ), single_cat_title( '', false ) );
+		printf( __( 'Posts contained in the &ldquo;<span>%s</span>&rdquo; category:', 'portage' ), single_cat_title( '', false ) );
 	?>
 	</h2>
 	<?php

comments.php

@@ -1,6 +1,6 @@
 <div id="comments">
 	<?php if ( have_comments() ) : ?>
-	<?php do_action( 'atticus_finch_before_comments' ); ?>
+	<?php do_action( 'portage_before_comments' ); ?>
 
 <?php
 	if ( post_password_required() ) {
@@ -13,7 +13,7 @@
 		<h3 class="comments-title">
 			<?php
 				$post_comments = count( get_comments(array('type' => 'comment','post_id' => $post->ID)) );
-				printf( _nx( 'One comment on &ldquo;%2$s&rdquo;', '%1$s comments on &ldquo;%2$s&rdquo;', $post_comments, 'comments title', 'atticus-finch' ),
+				printf( _nx( 'One comment on &ldquo;%2$s&rdquo;', '%1$s comments on &ldquo;%2$s&rdquo;', $post_comments, 'comments title', 'portage' ),
 					number_format_i18n( $post_comments ), '<span>' . get_the_title() . '</span>' );
 			?>
 		</h3>
@@ -34,7 +34,7 @@
 			<?php
 				$post_pings = count( get_comments(array( 'type' => 'pings', 'post_id' => $post->ID )) );
 				if ( $post_pings > 0 ) {
-				printf( _nx( 'One pingback/trackback on &ldquo;%2$s&rdquo;', '%1$s pingbacks/trackbacks on &ldquo;%2$s&rdquo;', $post_pings, 'pingbacks title', 'atticus-finch' ),
+				printf( _nx( 'One pingback/trackback on &ldquo;%2$s&rdquo;', '%1$s pingbacks/trackbacks on &ldquo;%2$s&rdquo;', $post_pings, 'pingbacks title', 'portage' ),
 					number_format_i18n( $post_pings ), '<span>' . get_the_title() . '</span>' );
 				}
 			?>
@@ -56,20 +56,20 @@
 			if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
 		?>
 		<nav class="navigation comment-navigation" role="navigation">
-			<h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'atticus-finch' ); ?></h1>
-			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'atticus-finch' ) ); ?></div>
-			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'atticus-finch' ) ); ?></div>
+			<h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'portage' ); ?></h1>
+			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'portage' ) ); ?></div>
+			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'portage' ) ); ?></div>
 		</nav><!-- .comment-navigation -->
 		<?php endif; // Check for comment navigation ?>
 
 		<?php if ( ! comments_open() && get_comments_number() ) : ?>
-		<p class="no-comments"><?php _e( 'Sorry, but comments are closed.' , 'atticus-finch' ); ?></p>
+		<p class="no-comments"><?php _e( 'Sorry, but comments are closed.' , 'portage' ); ?></p>
 		<?php endif; ?>
 
-	<?php do_action( 'atticus_finch_after_comments' ); ?>
+	<?php do_action( 'portage_after_comments' ); ?>
 	<?php endif; // have_comments() ?>
 
-	<?php do_action( 'atticus_finch_before_comment_form' ) ?>
+	<?php do_action( 'portage_before_comment_form' ) ?>
 	<?php comment_form(); ?>
-	<?php do_action( 'atticus_finch_after_comment_form' ) ?>
-</div>
+	<?php do_action( 'portage_after_comment_form' ) ?>
+</div>

footer.php

@@ -4,12 +4,12 @@
  *
  * Contains all content after #container div.
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 ?>
 
-<?php do_action( 'atticus_finch_container_bottom' ); ?>
+<?php do_action( 'portage_container_bottom' ); ?>
 
 <div class="clear"></div>
 
@@ -17,9 +17,9 @@
 
 <footer>
 
-<?php atticus_finch_footer_top_link(); ?>
+<?php portage_footer_top_link(); ?>
 
-	<?php do_action( 'atticus_finch_before_footer_menu' ); ?>
+	<?php do_action( 'portage_before_footer_menu' ); ?>
 
 	<nav id="footer-menu">
 		<?php wp_nav_menu( array(
@@ -35,20 +35,20 @@
 		<div class="clear"></div>
 	</nav>
 
-	<?php do_action( 'atticus_finch_footer_top' ); ?>
+	<?php do_action( 'portage_footer_top' ); ?>
 
 	<?php
-		atticus_finch_display_footer_copyright();
-		atticus_finch_display_footer_credits();
+		portage_display_footer_copyright();
+		portage_display_footer_credits();
 	?>
 
 	<div class="clear"></div>
 
-	<?php do_action( 'atticus_finch_footer_bottom' ); ?>
+	<?php do_action( 'portage_footer_bottom' ); ?>
 
 </footer>
 
-	<?php do_action( 'atticus_finch_after_footer' ); ?>
+	<?php do_action( 'portage_after_footer' ); ?>
 
 <?php wp_footer(); ?>
 

formats/content-aside.php

@@ -1,11 +1,11 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
-<?php if ( get_theme_mod( 'atticus_finch_aside_title') == '1' ) { ?>
+<?php if ( get_theme_mod( 'portage_aside_title') == '1' ) { ?>
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
 			<span class="fa fa-asterisk"></span>

formats/content-audio.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 	<?php

formats/content-chat.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 	<?php

formats/content-gallery.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 	<?php

formats/content-image.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 	<?php

formats/content-link.php

@@ -1,11 +1,11 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
-<?php if ( get_theme_mod( 'atticus_finch_link_title') == '1' ) { ?>
+<?php if ( get_theme_mod( 'portage_link_title') == '1' ) { ?>
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
 			<span class="fa fa-link fa-rotate-90"></span>

formats/content-quote.php

@@ -1,11 +1,11 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
-<?php if ( get_theme_mod( 'atticus_finch_quote_title') == '1' ) { ?>
+<?php if ( get_theme_mod( 'portage_quote_title') == '1' ) { ?>
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
 			<span class="fa fa-quote-left"></span>

formats/content-status.php

@@ -1,11 +1,11 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
-<?php if ( get_theme_mod( 'atticus_finch_status_title') == '1' ) { ?>
+<?php if ( get_theme_mod( 'portage_status_title') == '1' ) { ?>
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
 			<span class="fa fa-at"></span>

formats/content-video.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_title' ); ?>
+	<?php do_action( 'portage_before_post_title' ); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 	<?php

formats/content.php

@@ -2,9 +2,9 @@
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 <!-- closing tag in content-main.php -->
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-<?php do_action( 'atticus_finch_before_post_title' ); ?>
+<?php do_action( 'portage_before_post_title' ); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 	<?php

formats/excerpt-aside.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-<?php if ( get_theme_mod( 'atticus_finch_aside_title') == '1' ) { ?>
+<?php if ( get_theme_mod( 'portage_aside_title') == '1' ) { ?>
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
 			<span class="fa fa-asterisk"></span>
@@ -26,7 +26,7 @@
 	?>
 
 <?php
-	if ( get_theme_mod( 'atticus_finch_aside_excerpt' ) == '1' ) {
+	if ( get_theme_mod( 'portage_aside_excerpt' ) == '1' ) {
 		the_excerpt();
 			} else {
 		the_content();

formats/excerpt-audio.php

@@ -1,7 +1,7 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">

formats/excerpt-chat.php

@@ -1,7 +1,7 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">

formats/excerpt-gallery.php

@@ -1,7 +1,7 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">

formats/excerpt-image.php

@@ -1,7 +1,7 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">

formats/excerpt-link.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-<?php if ( get_theme_mod( 'atticus_finch_link_title') == '1' ) { ?>
+<?php if ( get_theme_mod( 'portage_link_title') == '1' ) { ?>
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
 			<span class="fa fa-link fa-rotate-90"></span>
@@ -26,7 +26,7 @@
 	?>
 
 <?php
-	if ( get_theme_mod( 'atticus_finch_link_excerpt' ) == '1' ) {
+	if ( get_theme_mod( 'portage_link_excerpt' ) == '1' ) {
 		the_excerpt();
 			} else {
 		the_content();

formats/excerpt-quote.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-<?php if ( get_theme_mod( 'atticus_finch_quote_title') == '1' ) { ?>
+<?php if ( get_theme_mod( 'portage_quote_title') == '1' ) { ?>
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
 			<span class="fa fa-quote-left"></span>
@@ -27,7 +27,7 @@
 	?>
 
 <?php
-	if ( get_theme_mod( 'atticus_finch_quote_excerpt' ) == '1' ) {
+	if ( get_theme_mod( 'portage_quote_excerpt' ) == '1' ) {
 		the_excerpt();
 			} else {
 		the_content();

formats/excerpt-status.php

@@ -1,9 +1,9 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-<?php if ( get_theme_mod( 'atticus_finch_status_title') == '1' ) { ?>
+<?php if ( get_theme_mod( 'portage_status_title') == '1' ) { ?>
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
 			<span class="fa fa-at"></span>
@@ -26,7 +26,7 @@
 	?>
 
 <?php
-	if ( get_theme_mod( 'atticus_finch_status_excerpt' ) == '1' ) {
+	if ( get_theme_mod( 'portage_status_excerpt' ) == '1' ) {
 		the_excerpt();
 			} else {
 		the_content();

formats/excerpt-video.php

@@ -1,7 +1,7 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">

formats/excerpt.php

@@ -1,7 +1,7 @@
 <!-- Post title info -->
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
 	<h2 id="post-<?php the_ID(); ?>" class="post-title">
 		<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">

functions.php

@@ -2,10 +2,10 @@
 /**
  * Atticus Finch functions and definitions
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
-if ( ! function_exists( 'atticus_finch_setup' ) ) :
+if ( ! function_exists( 'portage_setup' ) ) :
 /**
  * Sets up theme defaults and registers support for various WordPress features.
  *
@@ -13,14 +13,14 @@ if ( ! function_exists( 'atticus_finch_setup' ) ) :
  * runs before the init hook. The init hook is too late for some features, such
  * as indicating support for post thumbnails.
  */
-function atticus_finch_setup() {
+function portage_setup() {
 	/*
 	 * Make theme available for translation.
 	 * Translations can be filed in the /languages/ directory.
 	 * If you're building a theme based on Atticus Finch, use a find and replace
-	 * to change 'atticus-finch' to the name of your theme in all the template files
+	 * to change 'portage' to the name of your theme in all the template files
 	 */
-	load_theme_textdomain( 'atticus-finch', get_template_directory() . '/lang' );
+	load_theme_textdomain( 'portage', get_template_directory() . '/lang' );
 
 	// Add default posts and comments RSS feed links to head.
 	add_theme_support( 'automatic-feed-links' );
@@ -42,9 +42,9 @@ function atticus_finch_setup() {
 
 	// This theme uses wp_nav_menu() in three locations.
 	register_nav_menus( array(
-		'top-menu'            => esc_html__( 'Top Menu', 'atticus-finch' ),
-		'primary-menu'        => esc_html__( 'Primary Menu', 'atticus-finch' ),
-		'footer-menu'         => esc_html__( 'Footer Menu', 'atticus-finch' ),
+		'top-menu'            => esc_html__( 'Top Menu', 'portage' ),
+		'primary-menu'        => esc_html__( 'Primary Menu', 'portage' ),
+		'footer-menu'         => esc_html__( 'Footer Menu', 'portage' ),
 	) );
 
 	/*
@@ -76,13 +76,13 @@ function atticus_finch_setup() {
 	) );
 
 	// Set up the WordPress core custom background feature.
-	add_theme_support( 'custom-background', apply_filters( 'atticus_finch_custom_background_args', array(
+	add_theme_support( 'custom-background', apply_filters( 'portage_custom_background_args', array(
 		'default-color' => 'ffffff',
 		'default-image' => '',
 	) ) );
 }
-endif; // atticus_finch_setup
-add_action( 'after_setup_theme', 'atticus_finch_setup' );
+endif; // portage_setup
+add_action( 'after_setup_theme', 'portage_setup' );
 
 /**
  * Set the content width in pixels, based on the theme's design and stylesheet.
@@ -91,19 +91,19 @@ add_action( 'after_setup_theme', 'atticus_finch_setup' );
  *
  * @global int $content_width
  */
-function atticus_finch_content_width() {
-	$GLOBALS['content_width'] = apply_filters( 'atticus_finch_content_width', 620 );
+function portage_content_width() {
+	$GLOBALS['content_width'] = apply_filters( 'portage_content_width', 620 );
 }
-add_action( 'after_setup_theme', 'atticus_finch_content_width', 0 );
+add_action( 'after_setup_theme', 'portage_content_width', 0 );
 
 /**
  * Register widget area.
  *
  * @link http://codex.wordpress.org/Function_Reference/register_sidebar
  */
-function atticus_finch_widgets_init() {
+function portage_widgets_init() {
 	register_sidebar( array(
-		'name'          => esc_html__( 'Sidebar', 'atticus-finch' ),
+		'name'          => esc_html__( 'Sidebar', 'portage' ),
 		'id'            => 'sidebar-1',
 		'description'   => '',
 		'before_widget' => '',
@@ -112,58 +112,58 @@ function atticus_finch_widgets_init() {
 		'after_title'   => '</h2>',
 	) );
 }
-add_action( 'widgets_init', 'atticus_finch_widgets_init' );
+add_action( 'widgets_init', 'portage_widgets_init' );
 
 /**
  * Enqueue scripts and styles.
  */
-function atticus_finch_scripts() {
-	wp_enqueue_style( 'atticus-finch-googlefont', 'https://fonts.googleapis.com/css?family=IM+Fell+English:400,400italic', 'atticus-finch-style', wp_get_theme() -> get( 'Version' ), 'all' );
+function portage_scripts() {
+	wp_enqueue_style( 'portage-googlefont', 'https://fonts.googleapis.com/css?family=IM+Fell+English:400,400italic', 'portage-style', wp_get_theme() -> get( 'Version' ), 'all' );
 
 if ( !wp_style_is( 'font-awesome.min.css', 'enqueued' ) ) {
-	wp_enqueue_style( 'atticus-finch-fa', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', 'atticus-finch-style', wp_get_theme() -> get( 'Version' ), 'all' );
+	wp_enqueue_style( 'portage-fa', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', 'portage-style', wp_get_theme() -> get( 'Version' ), 'all' );
 }
 
-	wp_enqueue_style( 'atticus-finch-style', get_stylesheet_uri() );
+	wp_enqueue_style( 'portage-style', get_stylesheet_uri() );
 
-	wp_enqueue_style( 'atticus-finch-menus', get_template_directory_uri() . '/styles/menus.css', array( 'atticus-finch-style' ), wp_get_theme() -> get( 'Version' ) );
+	wp_enqueue_style( 'portage-menus', get_template_directory_uri() . '/styles/menus.css', array( 'portage-style' ), wp_get_theme() -> get( 'Version' ) );
 
-	wp_enqueue_style( 'atticus-finch-mobile', get_template_directory_uri() . '/styles/mobile.css', array( 'atticus-finch-style' ), wp_get_theme() -> get( 'Version' ), 'screen and (max-width: '. get_theme_mod( 'atticus_finch_mobile_breakpoint' ) . 'px)' );
+	wp_enqueue_style( 'portage-mobile', get_template_directory_uri() . '/styles/mobile.css', array( 'portage-style' ), wp_get_theme() -> get( 'Version' ), 'screen and (max-width: '. get_theme_mod( 'portage_mobile_breakpoint' ) . 'px)' );
 
-	wp_enqueue_style( 'atticus-finch-print', get_template_directory_uri() . '/styles/print.css', array( 'atticus-finch-style' ), wp_get_theme() -> get( 'Version' ), 'print' );
+	wp_enqueue_style( 'portage-print', get_template_directory_uri() . '/styles/print.css', array( 'portage-style' ), wp_get_theme() -> get( 'Version' ), 'print' );
 
-	wp_enqueue_script( 'atticus-finch-menumaker', get_template_directory_uri() . '/js/menumaker.js', array( 'jquery' ), wp_get_theme() -> get( 'Version' ), true );
+	wp_enqueue_script( 'portage-menumaker', get_template_directory_uri() . '/js/menumaker.js', array( 'jquery' ), wp_get_theme() -> get( 'Version' ), true );
 
-	wp_enqueue_script( 'atticus-finch-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), wp_get_theme() -> get( 'Version' ), true );
+	wp_enqueue_script( 'portage-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), wp_get_theme() -> get( 'Version' ), true );
 
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
 	}
 }
-add_action( 'wp_enqueue_scripts', 'atticus_finch_scripts' );
+add_action( 'wp_enqueue_scripts', 'portage_scripts' );
 
 /**
  * Enable live changes in the customizer
  */
-function atticus_finch_customizer_script() {
-	wp_enqueue_script( 'atticus-finch-theme-customizer', get_template_directory_uri() . '/js/customizer.js', array(), wp_get_theme() -> get( 'Version' ), true );
+function portage_customizer_script() {
+	wp_enqueue_script( 'portage-theme-customizer', get_template_directory_uri() . '/js/customizer.js', array(), wp_get_theme() -> get( 'Version' ), true );
 }
-add_action( 'customize_preview_init', 'atticus_finch_customizer_script' );
+add_action( 'customize_preview_init', 'portage_customizer_script' );
 
 
 // Change "read more" link on excerpts
 // codex.wordpress.org/Function_Reference/the_excerpt
-function atticus_finch_excerpt_more( $more ) {
-	$text = get_theme_mod( 'atticus_finch_readmore', '&hellip;read more&hellip;' );
+function portage_excerpt_more( $more ) {
+	$text = get_theme_mod( 'portage_readmore', '&hellip;read more&hellip;' );
 	return ' <a class="excerpt-link" href="' . get_permalink( get_the_ID() ) . '">' . $text . '</a>';
 }
-add_filter( 'excerpt_more', 'atticus_finch_excerpt_more' );
+add_filter( 'excerpt_more', 'portage_excerpt_more' );
 
 
 // Add descriptions to main menu
 // http://www.wpbeginner.com/wp-themes/how-to-add-menu-descriptions-in-your-wordpress-themes/
 /*
-class Atticus_Finch_Menu_With_Description extends Walker_Nav_Menu {
+class portage_Menu_With_Description extends Walker_Nav_Menu {
 	function start_el(&$output, $item, $depth=0, $args = array(), $id=0) {
 		global $wp_query;
 		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
@@ -227,7 +227,7 @@ require get_template_directory() . '/functions/mobile-menus.php';
 // Include our update script to update from private repo
 require 'update/puc.php';
 $myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
-	'http://api.kjodle.net/?action=get_metadata&slug=atticus-finch',
+	'http://api.kjodle.net/?action=get_metadata&slug=portage',
 	__FILE__,
-	'atticus-finch'
+	'portage'
 );

functions/custom-header.php

@@ -11,37 +11,37 @@
 	</a>
 	<?php endif; // End header image check. ?>
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 /**
  * Set up the WordPress core custom header feature.
  *
- * @uses atticus_finch_header_style()
- * @uses atticus_finch_admin_header_style()
- * @uses atticus_finch_admin_header_image()
+ * @uses portage_header_style()
+ * @uses portage_admin_header_style()
+ * @uses portage_admin_header_image()
  */
-function atticus_finch_custom_header_setup() {
-	add_theme_support( 'custom-header', apply_filters( 'atticus_finch_custom_header_args', array(
+function portage_custom_header_setup() {
+	add_theme_support( 'custom-header', apply_filters( 'portage_custom_header_args', array(
 		'default-image'          => '',
 		'default-text-color'     => '000000',
 		'width'                  => 1000,
 		'height'                 => 250,
 		'flex-height'            => true,
-		'wp-head-callback'       => 'atticus_finch_header_style',
-		'admin-head-callback'    => 'atticus_finch_admin_header_style',
-		'admin-preview-callback' => 'atticus_finch_admin_header_image',
+		'wp-head-callback'       => 'portage_header_style',
+		'admin-head-callback'    => 'portage_admin_header_style',
+		'admin-preview-callback' => 'portage_admin_header_image',
 	) ) );
 }
-add_action( 'after_setup_theme', 'atticus_finch_custom_header_setup' );
+add_action( 'after_setup_theme', 'portage_custom_header_setup' );
 
-if ( ! function_exists( 'atticus_finch_header_style' ) ) :
+if ( ! function_exists( 'portage_header_style' ) ) :
 /**
  * Styles the header image and text displayed on the blog
  *
- * @see atticus_finch_custom_header_setup().
+ * @see portage_custom_header_setup().
  */
-function atticus_finch_header_style() {
+function portage_header_style() {
 	$header_text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail
@@ -74,15 +74,15 @@ function atticus_finch_header_style() {
 	</style>
 	<?php
 }
-endif; // atticus_finch_header_style
+endif; // portage_header_style
 
-if ( ! function_exists( 'atticus_finch_admin_header_style' ) ) :
+if ( ! function_exists( 'portage_admin_header_style' ) ) :
 /**
  * Styles the header image displayed on the Appearance > Header admin panel.
  *
- * @see atticus_finch_custom_header_setup().
+ * @see portage_custom_header_setup().
  */
-function atticus_finch_admin_header_style() {
+function portage_admin_header_style() {
 ?>
 	<style type="text/css">
 		.appearance_page_custom-header #headimg {
@@ -102,15 +102,15 @@ function atticus_finch_admin_header_style() {
 	</style>
 <?php
 }
-endif; // atticus_finch_admin_header_style
+endif; // portage_admin_header_style
 
-if ( ! function_exists( 'atticus_finch_admin_header_image' ) ) :
+if ( ! function_exists( 'portage_admin_header_image' ) ) :
 /**
  * Custom header image markup displayed on the Appearance > Header admin panel.
  *
- * @see atticus_finch_custom_header_setup().
+ * @see portage_custom_header_setup().
  */
-function atticus_finch_admin_header_image() {
+function portage_admin_header_image() {
 ?>
 	<div id="headimg">
 		<h1 class="displaying-header-text">
@@ -123,4 +123,4 @@ function atticus_finch_admin_header_image() {
 	</div>
 <?php
 }
-endif; // atticus_finch_admin_header_image
+endif; // portage_admin_header_image

functions/jetpack.php

@@ -3,28 +3,28 @@
  * Jetpack Compatibility File
  * See: https://jetpack.me/
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 /**
  * Add theme support for Infinite Scroll.
  * See: https://jetpack.me/support/infinite-scroll/
  */
-function atticus_finch_jetpack_setup() {
+function portage_jetpack_setup() {
 	add_theme_support( 'infinite-scroll', array(
 		'container' => 'main',
-		'render'    => 'atticus_finch_infinite_scroll_render',
+		'render'    => 'portage_infinite_scroll_render',
 		'footer'    => 'page',
 	) );
-} // end function atticus_finch_jetpack_setup
-add_action( 'after_setup_theme', 'atticus_finch_jetpack_setup' );
+} // end function portage_jetpack_setup
+add_action( 'after_setup_theme', 'portage_jetpack_setup' );
 
 /**
  * Custom render function for Infinite Scroll.
  */
-function atticus_finch_infinite_scroll_render() {
+function portage_infinite_scroll_render() {
 	while ( have_posts() ) {
 		the_post();
 		get_template_part( 'template-parts/content', get_post_format() );
 	}
-} // end function atticus_finch_infinite_scroll_render
+} // end function portage_infinite_scroll_render

functions/mobile-menus.php

@@ -1,26 +1,26 @@
 <?php
 
-function atticus_finch_mobile_menus(){
+function portage_mobile_menus(){
 	echo '
 <script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery("#aboveheadermenu").menumaker({
-		title: "' . get_theme_mod( 'atticus_finch_top_menu_name' ) . '",
-		breakpoint: ' . get_theme_mod( 'atticus_finch_top_menu_breakpoint' ) . ',
-		format: "' . get_theme_mod( 'atticus_finch_top_menu_type' ) . '"
+		title: "' . get_theme_mod( 'portage_top_menu_name' ) . '",
+		breakpoint: ' . get_theme_mod( 'portage_top_menu_breakpoint' ) . ',
+		format: "' . get_theme_mod( 'portage_top_menu_type' ) . '"
 	});
 	jQuery("#belowheadermenu").menumaker({
-		title: "' . get_theme_mod( 'atticus_finch_main_menu_name' ) . '",
-		breakpoint: ' . get_theme_mod( 'atticus_finch_main_menu_breakpoint' ) . ',
-		format: "' . get_theme_mod( 'atticus_finch_main_menu_type' ) . '"
+		title: "' . get_theme_mod( 'portage_main_menu_name' ) . '",
+		breakpoint: ' . get_theme_mod( 'portage_main_menu_breakpoint' ) . ',
+		format: "' . get_theme_mod( 'portage_main_menu_type' ) . '"
 	});
 	jQuery("#footermenu").menumaker({
-		title: "' . get_theme_mod( 'atticus_finch_footer_menu_name' ) . '",
-		breakpoint: ' . get_theme_mod( 'atticus_finch_footer_menu_breakpoint' ) . ',
-		format: "' . get_theme_mod( 'atticus_finch_footer_menu_type' ) . '"
+		title: "' . get_theme_mod( 'portage_footer_menu_name' ) . '",
+		breakpoint: ' . get_theme_mod( 'portage_footer_menu_breakpoint' ) . ',
+		format: "' . get_theme_mod( 'portage_footer_menu_type' ) . '"
 	});
 });
 </script>
 ';
 }
-add_action( 'wp_footer', 'atticus_finch_mobile_menus' );
+add_action( 'wp_footer', 'portage_mobile_menus' );

functions/template-tags.php

@@ -4,15 +4,15 @@
  *
  * Eventually, some of the functionality here could be replaced by core features.
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 
-if ( ! function_exists( 'atticus_finch_posted_on' ) ) :
+if ( ! function_exists( 'portage_posted_on' ) ) :
 /**
  * Prints HTML with meta information for the current post-date/time and author.
  */
-function atticus_finch_posted_on() {
+function portage_posted_on() {
 
 	$date = get_the_date();
 	$modd = get_the_modified_date();
@@ -53,8 +53,8 @@ endif;
  *
  * @return bool
  */
-function atticus_finch_categorized_blog() {
-	if ( false === ( $all_the_cool_cats = get_transient( 'atticus_finch_categories' ) ) ) {
+function portage_categorized_blog() {
+	if ( false === ( $all_the_cool_cats = get_transient( 'portage_categories' ) ) ) {
 		// Create an array of all the categories that are attached to posts.
 		$all_the_cool_cats = get_categories( array(
 			'fields'     => 'ids',
@@ -67,30 +67,30 @@ function atticus_finch_categorized_blog() {
 		// Count the number of categories that are attached to the posts.
 		$all_the_cool_cats = count( $all_the_cool_cats );
 
-		set_transient( 'atticus_finch_categories', $all_the_cool_cats );
+		set_transient( 'portage_categories', $all_the_cool_cats );
 	}
 
 	if ( $all_the_cool_cats > 1 ) {
-		// This blog has more than 1 category so atticus_finch_categorized_blog should return true.
+		// This blog has more than 1 category so portage_categorized_blog should return true.
 		return true;
 	} else {
-		// This blog has only 1 category so atticus_finch_categorized_blog should return false.
+		// This blog has only 1 category so portage_categorized_blog should return false.
 		return false;
 	}
 }
 
 /**
- * Flush out the transients used in atticus_finch_categorized_blog.
+ * Flush out the transients used in portage_categorized_blog.
  */
-function atticus_finch_category_transient_flusher() {
+function portage_category_transient_flusher() {
 	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 		return;
 	}
 	// Like, beat it. Dig?
-	delete_transient( 'atticus_finch_categories' );
+	delete_transient( 'portage_categories' );
 }
-add_action( 'edit_category', 'atticus_finch_category_transient_flusher' );
-add_action( 'save_post',     'atticus_finch_category_transient_flusher' );
+add_action( 'edit_category', 'portage_category_transient_flusher' );
+add_action( 'save_post',     'portage_category_transient_flusher' );
 
 
 /* My Stuff */
@@ -99,17 +99,17 @@ add_action( 'save_post',     'atticus_finch_category_transient_flusher' );
 // Determine whether or not to show page navigation at bottom of index/archive
 // Necessary because page navigation is in a styled <div> and should not appear
 // on non-paginated pages
-function atticus_finch_display_nav() {
-	$atticus_finch_num_posts = wp_count_posts()->publish;
-	$atticus_finch_posts_per_page = get_option('posts_per_page ');
-	if ( $atticus_finch_num_posts > $atticus_finch_posts_per_page) { 
+function portage_display_nav() {
+	$portage_num_posts = wp_count_posts()->publish;
+	$portage_posts_per_page = get_option('posts_per_page ');
+	if ( $portage_num_posts > $portage_posts_per_page) { 
 		echo '<div id="posts-nav">' . get_posts_nav_link(' &bull; ','&laquo; Newer Posts','Older Posts;') . '</div>';
 	}
 }
 
 
 // Determine whether to display the comments box
-function atticus_finch_comment_display() {
+function portage_comment_display() {
 	$var = get_comments_number();
 	if ( comments_open() || $var > 0 ) {
 		comments_template();
@@ -125,30 +125,30 @@ function atticus_finch_comment_display() {
 
 // Display the time
 // Included here if we need to change it later
-function atticus_finch_date() {
+function portage_date() {
 	return get_the_time(get_option('date_format'));
 }
 
 
 // Display publication info as a translatable string in 'content-entry-meta.php'
-function atticus_finch_pub() {
-	$atticus_finch_author_link = get_author_posts_url( get_the_author_meta( 'ID' ) );
-	$atticus_finch_author_href = '<a href="' . $atticus_finch_author_link . '">' . get_the_author() . '</a>';
+function portage_pub() {
+	$portage_author_link = get_author_posts_url( get_the_author_meta( 'ID' ) );
+	$portage_author_href = '<a href="' . $portage_author_link . '">' . get_the_author() . '</a>';
 	echo '<a href="' . get_permalink() . '">';
-	printf( __( 'Published on: %1$s by %2$s', 'atticus-finch' ), atticus_finch_date(), $atticus_finch_author_href );
+	printf( __( 'Published on: %1$s by %2$s', 'atticus-finch' ), portage_date(), $portage_author_href );
 	echo '</a>';
 }
 
 
 // Display category info as a translatable string in 'content-entry-meta.php'
-function atticus_finch_cat() {
+function portage_cat() {
 	$gbcat = get_the_category_list( ', ' );
 	printf( __( 'Categorized under: %s', 'atticus-finch'), $gbcat );
 }
 
 
 // Display tags info as a translatable string in 'content-entry-meta.php'
-function atticus_finch_tags() {
+function portage_tags() {
 	$tags_array = has_tag();
 	if (!empty($tags_array)) { 
 		printf( __( 'Tagged with: %s', 'atticus-finch'), get_the_tag_list('', ', ', '' ) );
@@ -159,9 +159,9 @@ function atticus_finch_tags() {
 
 
 // Display next post link only if a newer post exists
-function atticus_finch_next_post_link() {
-	$atticus_finch_npl = get_next_post_link();
-	if ( empty ( $atticus_finch_npl ) ) {
+function portage_next_post_link() {
+	$portage_npl = get_next_post_link();
+	if ( empty ( $portage_npl ) ) {
 		echo '<p>' . __( 'You are reading the newest post.', 'atticus-finch' ) . '</p>';
 	} else {
 		echo '<p>' . __( 'Read a newer post:', 'atticus-finch' ) . '</p>';
@@ -171,9 +171,9 @@ function atticus_finch_next_post_link() {
 
 
 // Display previous post link only if an older post exists
-function atticus_finch_prev_post_link() {
-	$atticus_finch_ppl = get_previous_post_link();
-	if ( empty ( $atticus_finch_ppl ) ) {
+function portage_prev_post_link() {
+	$portage_ppl = get_previous_post_link();
+	if ( empty ( $portage_ppl ) ) {
 		echo '<p>>' . __( 'You are reading the oldest post.', 'atticus-finch' ) . '</p>';
 	} else {
 		echo '<p>' . __( 'Read an older post:', 'atticus-finch' ) . '</p>';
@@ -183,7 +183,7 @@ function atticus_finch_prev_post_link() {
 
 
 // Add the URL information when printing
-function atticus_finch_print_url() {
+function portage_print_url() {
 	echo '<p class="printonly printurl">';
 	printf(__( 'Link for this article:', 'atticus-finch' ) );
 	echo '<br /><span class="printurl-url">' . get_the_permalink() . '<span></p>';
@@ -191,7 +191,7 @@ function atticus_finch_print_url() {
 
 
 // Add a "Read More" box on excerpts
-function atticus_finch_read_more() {
+function portage_read_more() {
 	echo '<p class="read-more"><a href="' . get_the_permalink() . '">';
 	printf(__( 'Read the complete article&hellip;', 'atticus-finch' ) );
 	echo '</a></p>';
@@ -199,7 +199,7 @@ function atticus_finch_read_more() {
 
 
 // Take care of wp_link_pages
-function atticus_finch_link_pages() {
+function portage_link_pages() {
 	$defaults = array(
 		'before'           => '<div id="link-pages">' . __( 'This post has multiple pages:', 'atticus-finch' ),
 		'after'            => '</div>',
@@ -217,13 +217,13 @@ function atticus_finch_link_pages() {
 
 
 // Print options
-function atticus_finch_print_options() {
-	if ( get_theme_mod( 'atticus_finch_print_copyright' ) == '1' ) {
+function portage_print_options() {
+	if ( get_theme_mod( 'portage_print_copyright' ) == '1' ) {
 		echo '<span class="printonly printcopyright">' . 
-		get_theme_mod( 'atticus_finch_copyright', '<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" id="cc-button" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.' ) . 
+		get_theme_mod( 'portage_copyright', '<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" id="cc-button" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.' ) . 
 		'</span>';
 	}
-	if ( get_theme_mod( 'atticus_finch_print_url' ) == '1' ) {
+	if ( get_theme_mod( 'portage_print_url' ) == '1' ) {
 		echo '<span class="printonly printurl">';
 		printf(__( 'Permalink for this article:', 'atticus-finch' ) );
 		echo '<br /><span class="printurl-url">' . get_the_permalink() . '<span></span>';
@@ -232,8 +232,8 @@ function atticus_finch_print_options() {
 
 
 // Edit post link, if user is logged in
-function atticus_finch_edit_post() {
-	if ( get_theme_mod( 'atticus_finch_edit_post_link' ) == '1' && is_user_logged_in() ) : {
+function portage_edit_post() {
+	if ( get_theme_mod( 'portage_edit_post_link' ) == '1' && is_user_logged_in() ) : {
 		edit_post_link('Edit this post', '<p class="edit-post">', '</p>');
 		}
 	endif;
@@ -241,19 +241,19 @@ function atticus_finch_edit_post() {
 
 
 // Footer options
-function atticus_finch_display_footer_copyright() {
-	if ( get_theme_mod( 'atticus_finch_display_copyright' ) == '1' ) : {
+function portage_display_footer_copyright() {
+	if ( get_theme_mod( 'portage_display_copyright' ) == '1' ) : {
 		echo '<div id="copyright">' . 
-		get_theme_mod( 'atticus_finch_copyright', '<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" id="cc-button" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.' ) . 
+		get_theme_mod( 'portage_copyright', '<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" id="cc-button" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.' ) . 
 		'</div>';
 	}
 	endif;
 }
 
-function atticus_finch_display_footer_credits() {
-	if ( get_theme_mod( 'atticus_finch_display_credits') == '1' ) : {
+function portage_display_footer_credits() {
+	if ( get_theme_mod( 'portage_display_credits') == '1' ) : {
 		$afwp = '<a href="http://wordpress.org/">WordPress</a>';
-		$afaf = '<a href="http://d12webdesign.com/">Atticus Finch Theme</a>';
+		$afaf = '<a href="http://d12webdesign.com/">Portage Theme</a>';
 		echo '<div id="credits">';
 		printf(__( 'Powered by %1$s and the %2$s.', 'atticus-finch' ), $afwp, $afaf );
 		echo '</div>';
@@ -263,61 +263,61 @@ function atticus_finch_display_footer_credits() {
 
 
 // Custom CSS Option
-function atticus_finch_custom_css_head() {
-	$afcss = get_theme_mod( 'atticus_finch_ccss' );
+function portage_custom_css_head() {
+	$afcss = get_theme_mod( 'portage_ccss' );
 	if ( !empty( $afcss ) ) {
-	echo '<style type="text/css">/* Atticus Finch Custom CSS */' . "\n" . get_theme_mod( 'atticus_finch_ccss' ) . "\n" . '</style>';
+	echo '<style type="text/css">/* Portage Custom CSS */' . "\n" . get_theme_mod( 'portage_ccss' ) . "\n" . '</style>';
 	}
 }
 
 
 // Social Media
-function atticus_finch_social_media_display() {
-	if ( get_theme_mod( 'atticus_finch_rss' ) == '1' ) {
+function portage_social_media_display() {
+	if ( get_theme_mod( 'portage_rss' ) == '1' ) {
 		echo '<a href="' . site_url() . '/feed" class="sm-rss"><span class="fa fa-rss-square"></span></a>';
 	}
 
-	$aftw = get_theme_mod( 'atticus_finch_twitter' );
+	$aftw = get_theme_mod( 'portage_twitter' );
 	if ( !empty( $aftw ) ) {
-		echo '<a href="' . get_theme_mod( 'atticus_finch_twitter' ) . '" target="_blank" class="sm-twitter"><span class="fa fa-twitter-square"></span></a>';
+		echo '<a href="' . get_theme_mod( 'portage_twitter' ) . '" target="_blank" class="sm-twitter"><span class="fa fa-twitter-square"></span></a>';
 	}
 
-	$aft2 = get_theme_mod( 'atticus_finch_twitter2' );
+	$aft2 = get_theme_mod( 'portage_twitter2' );
 	if ( !empty( $aft2 ) ) {
-		echo '<a href="' . get_theme_mod( 'atticus_finch_twitter2' ) . '" target="_blank" class="sm-twitter"><span class="fa fa-twitter-square"></span></a>';
+		echo '<a href="' . get_theme_mod( 'portage_twitter2' ) . '" target="_blank" class="sm-twitter"><span class="fa fa-twitter-square"></span></a>';
 	}
 
-	$affb = get_theme_mod( 'atticus_finch_facebook' );
+	$affb = get_theme_mod( 'portage_facebook' );
 	if ( !empty( $affb ) ) {
-		echo '<a href="' . get_theme_mod( 'atticus_finch_facebook' ) . '" target="_blank" class="sm-facebook"><span class="fa fa-facebook-square"></span></a>';
+		echo '<a href="' . get_theme_mod( 'portage_facebook' ) . '" target="_blank" class="sm-facebook"><span class="fa fa-facebook-square"></span></a>';
 	}
 
-	$afig = get_theme_mod( 'atticus_finch_instagram' );
+	$afig = get_theme_mod( 'portage_instagram' );
 	if ( !empty( $afig ) ) {
-		echo '<a href="' . get_theme_mod( 'atticus_finch_instagram' ) . '" target="_blank" class="sm-instagram"><span class="fa fa-instagram"></span></a>';
+		echo '<a href="' . get_theme_mod( 'portage_instagram' ) . '" target="_blank" class="sm-instagram"><span class="fa fa-instagram"></span></a>';
 	}
 
-	$afyt = get_theme_mod( 'atticus_finch_youtube' );
+	$afyt = get_theme_mod( 'portage_youtube' );
 	if ( !empty( $afyt ) ) {
-		echo '<a href="' . get_theme_mod( 'atticus_finch_youtube' ) . '" target="_blank" class="sm-youtube"><span class="fa fa-youtube-square"></span></a>';
+		echo '<a href="' . get_theme_mod( 'portage_youtube' ) . '" target="_blank" class="sm-youtube"><span class="fa fa-youtube-square"></span></a>';
 	}
 
-	$afyt = get_theme_mod( 'atticus_finch_pinterest' );
+	$afyt = get_theme_mod( 'portage_pinterest' );
 	if ( !empty( $afyt ) ) {
-		echo '<a href="' . get_theme_mod( 'atticus_finch_pinterest' ) . '" target="_blank" class="sm-pinterest"><span class="fa fa-pinterest-square"></span></a>';
+		echo '<a href="' . get_theme_mod( 'portage_pinterest' ) . '" target="_blank" class="sm-pinterest"><span class="fa fa-pinterest-square"></span></a>';
 	}
 
-	$afam = get_theme_mod( 'atticus_finch_amazon' );
+	$afam = get_theme_mod( 'portage_amazon' );
 	if ( !empty( $afam ) ) {
-		echo '<a href="' . get_theme_mod( 'atticus_finch_amazon' ) . '" target="_blank" class="sm-amazon"><span class="fa fa-amazon"></span></a>';
+		echo '<a href="' . get_theme_mod( 'portage_amazon' ) . '" target="_blank" class="sm-amazon"><span class="fa fa-amazon"></span></a>';
 	}
 
 }
 
 
 // Mobile Top Link Options
-function atticus_finch_footer_top_link() {
-	if ( get_theme_mod( 'atticus_finch_footer_top_link' ) == 1 ) {
+function portage_footer_top_link() {
+	if ( get_theme_mod( 'portage_footer_top_link' ) == 1 ) {
 		echo '<a href="#" class="top-button">';
 		_e( 'Return to Top', 'atticus-finch' );
 		echo '</a>';
@@ -326,12 +326,12 @@ function atticus_finch_footer_top_link() {
 	}
 }
 
-function atticus_finch_post_top_link() {
-	if ( get_theme_mod( 'atticus_finch_post_top_link' ) == 1 ) {
+function portage_post_top_link() {
+	if ( get_theme_mod( 'portage_post_top_link' ) == 1 ) {
 		echo '<a href="#" class="top-button">';
 		_e( 'Return to Top', 'atticus-finch' );
 		echo '</a>';
 	} else {
 		return;
 	}
-}
+}

functions/widget-areas.php

@@ -4,56 +4,56 @@
 
 // header.php action hooks
 
-if ( get_theme_mod( 'atticus_finch_before_header') == '1' ) :
-add_action('atticus_finch_before_header', 'atticus_finch_before_header_fc' );
-function atticus_finch_before_header_fc(){
-	if ( is_active_sidebar( 'atticus_finch_before_header' ) ) {
-	echo '<div id="atticus_finch_before_header" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_before_header' );
+if ( get_theme_mod( 'portage_before_header') == '1' ) :
+add_action('portage_before_header', 'portage_before_header_fc' );
+function portage_before_header_fc(){
+	if ( is_active_sidebar( 'portage_before_header' ) ) {
+	echo '<div id="portage_before_header" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_before_header' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_top_menu') == '1' ) :
-add_action('atticus_finch_after_top_menu', 'atticus_finch_after_top_menu_FC' );
-function atticus_finch_after_top_menu_FC(){
-	if ( is_active_sidebar( 'atticus_finch_after_top_menu' ) ) {
-	echo '<div id="atticus_finch_after_top_menu" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_after_top_menu' );
+if ( get_theme_mod( 'portage_after_top_menu') == '1' ) :
+add_action('portage_after_top_menu', 'portage_after_top_menu_FC' );
+function portage_after_top_menu_FC(){
+	if ( is_active_sidebar( 'portage_after_top_menu' ) ) {
+	echo '<div id="portage_after_top_menu" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_after_top_menu' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_social_media') == '1' ) :
-add_action('atticus_finch_before_social_media', 'atticus_finch_before_social_media_fc' );
-function atticus_finch_before_social_media_fc(){
-	if ( is_active_sidebar( 'atticus_finch_before_social_media' ) ) {
-	echo '<div id="atticus_finch_before_social_media" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_before_social_media' );
+if ( get_theme_mod( 'portage_before_social_media') == '1' ) :
+add_action('portage_before_social_media', 'portage_before_social_media_fc' );
+function portage_before_social_media_fc(){
+	if ( is_active_sidebar( 'portage_before_social_media' ) ) {
+	echo '<div id="portage_before_social_media" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_before_social_media' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_primary_menu') == '1' ) :
-add_action('atticus_finch_before_primary_menu', 'atticus_finch_before_primary_menu_fc' );
-function atticus_finch_before_primary_menu_fc(){
-	if ( is_active_sidebar( 'atticus_finch_before_primary_menu' ) ) {
-	echo '<div id="atticus_finch_before_primary_menu" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_before_primary_menu' );
+if ( get_theme_mod( 'portage_before_primary_menu') == '1' ) :
+add_action('portage_before_primary_menu', 'portage_before_primary_menu_fc' );
+function portage_before_primary_menu_fc(){
+	if ( is_active_sidebar( 'portage_before_primary_menu' ) ) {
+	echo '<div id="portage_before_primary_menu" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_before_primary_menu' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_header') == '1' ) :
-add_action('atticus_finch_after_header', 'atticus_finch_after_header_fc' );
-function atticus_finch_after_header_fc(){
-	if ( is_active_sidebar( 'atticus_finch_after_header' ) ) {
-	echo '<div id="atticus_finch_after_header" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_after_header' );
+if ( get_theme_mod( 'portage_after_header') == '1' ) :
+add_action('portage_after_header', 'portage_after_header_fc' );
+function portage_after_header_fc(){
+	if ( is_active_sidebar( 'portage_after_header' ) ) {
+	echo '<div id="portage_after_header" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_after_header' );
 	echo '</div>';
 	}
 }
@@ -61,12 +61,12 @@ endif;
 
 // index.php action hooks
 
-if ( get_theme_mod( 'atticus_finch_container_top') == '1' ) :
-add_action('atticus_finch_container_top', 'atticus_finch_container_top_fc' );
-function atticus_finch_container_top_fc(){
-	if ( is_active_sidebar( 'atticus_finch_container_top' ) ) {
-	echo '<div id="atticus_finch_container_top" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_container_top' );
+if ( get_theme_mod( 'portage_container_top') == '1' ) :
+add_action('portage_container_top', 'portage_container_top_fc' );
+function portage_container_top_fc(){
+	if ( is_active_sidebar( 'portage_container_top' ) ) {
+	echo '<div id="portage_container_top" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_container_top' );
 	echo '</div><div class="clear"></div>';
 	}
 }
@@ -74,78 +74,78 @@ endif;
 
 // content.php action hooks
 
-if ( get_theme_mod( 'atticus_finch_before_post_title') == '1' ) :
-add_action('atticus_finch_before_post_title', 'atticus_finch_before_post_title_fc' );
-function atticus_finch_before_post_title_fc(){
-	if ( is_active_sidebar( 'atticus_finch_before_post_title' ) ) {
-	echo '<div id="atticus_finch_before_post_title" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_before_post_title' );
+if ( get_theme_mod( 'portage_before_post_title') == '1' ) :
+add_action('portage_before_post_title', 'portage_before_post_title_fc' );
+function portage_before_post_title_fc(){
+	if ( is_active_sidebar( 'portage_before_post_title' ) ) {
+	echo '<div id="portage_before_post_title" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_before_post_title' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_post_content') == '1' ) :
-add_action('atticus_finch_before_post_content', 'atticus_finch_before_post_content_fc' );
-function atticus_finch_before_post_content_fc(){
-	if ( is_active_sidebar( 'atticus_finch_before_post_content' ) ) {
-	echo '<div id="atticus_finch_before_post_content" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_before_post_content' );
+if ( get_theme_mod( 'portage_before_post_content') == '1' ) :
+add_action('portage_before_post_content', 'portage_before_post_content_fc' );
+function portage_before_post_content_fc(){
+	if ( is_active_sidebar( 'portage_before_post_content' ) ) {
+	echo '<div id="portage_before_post_content" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_before_post_content' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_post_top') == '1' ) :
-add_action('atticus_finch_post_top', 'atticus_finch_post_top_fc' );
-function atticus_finch_post_top_fc(){
-	if ( is_active_sidebar( 'atticus_finch_post_top' ) ) {
-	echo '<div id="atticus_finch_post_top" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_post_top' );
+if ( get_theme_mod( 'portage_post_top') == '1' ) :
+add_action('portage_post_top', 'portage_post_top_fc' );
+function portage_post_top_fc(){
+	if ( is_active_sidebar( 'portage_post_top' ) ) {
+	echo '<div id="portage_post_top" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_post_top' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_post_bottom') == '1' ) :
-add_action('atticus_finch_post_bottom', 'atticus_finch_post_bottom_fc' );
-function atticus_finch_post_bottom_fc(){
-	if ( is_active_sidebar( 'atticus_finch_post_bottom' ) ) {
-	echo '<div id="atticus_finch_post_bottom" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_post_bottom' );
+if ( get_theme_mod( 'portage_post_bottom') == '1' ) :
+add_action('portage_post_bottom', 'portage_post_bottom_fc' );
+function portage_post_bottom_fc(){
+	if ( is_active_sidebar( 'portage_post_bottom' ) ) {
+	echo '<div id="portage_post_bottom" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_post_bottom' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_post_content') == '1' ) :
-add_action('atticus_finch_after_post_content', 'atticus_finch_after_post_content_fc' );
-function atticus_finch_after_post_content_fc(){
-	if ( is_active_sidebar( 'atticus_finch_after_post_content' ) ) {
-	echo '<div id="atticus_finch_after_post_content" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_after_post_content' );
+if ( get_theme_mod( 'portage_after_post_content') == '1' ) :
+add_action('portage_after_post_content', 'portage_after_post_content_fc' );
+function portage_after_post_content_fc(){
+	if ( is_active_sidebar( 'portage_after_post_content' ) ) {
+	echo '<div id="portage_after_post_content" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_after_post_content' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_post_meta') == '1' ) :
-add_action('atticus_finch_before_post_meta', 'atticus_finch_before_post_meta_fc' );
-function atticus_finch_before_post_meta_fc(){
-	if ( is_active_sidebar( 'atticus_finch_before_post_meta' ) ) {
-	echo '<div id="atticus_finch_before_post_meta" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_before_post_meta' );
+if ( get_theme_mod( 'portage_before_post_meta') == '1' ) :
+add_action('portage_before_post_meta', 'portage_before_post_meta_fc' );
+function portage_before_post_meta_fc(){
+	if ( is_active_sidebar( 'portage_before_post_meta' ) ) {
+	echo '<div id="portage_before_post_meta" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_before_post_meta' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_post_meta') == '1' ) :
-add_action('atticus_finch_after_post_meta', 'atticus_finch_after_post_meta_fc' );
-function atticus_finch_after_post_meta_fc(){
-	if ( is_active_sidebar( 'atticus_finch_after_post_meta' ) ) {
-	echo '<div id="atticus_finch_after_post_meta" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_after_post_meta' );
+if ( get_theme_mod( 'portage_after_post_meta') == '1' ) :
+add_action('portage_after_post_meta', 'portage_after_post_meta_fc' );
+function portage_after_post_meta_fc(){
+	if ( is_active_sidebar( 'portage_after_post_meta' ) ) {
+	echo '<div id="portage_after_post_meta" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_after_post_meta' );
 	echo '</div>';
 	}
 }
@@ -153,35 +153,35 @@ endif;
 
 // comments.php action hooks
 
-if ( get_theme_mod( 'atticus_finch_before_comments') == '1' ) :
-add_action('atticus_finch_before_comments', 'atticus_finch_before_comments_fc' );
-function atticus_finch_before_comments_fc(){
-	if ( is_active_sidebar( 'atticus_finch_before_comments' ) ) {
-	echo '<div id="atticus_finch_before_comments" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_before_comments' );
+if ( get_theme_mod( 'portage_before_comments') == '1' ) :
+add_action('portage_before_comments', 'portage_before_comments_fc' );
+function portage_before_comments_fc(){
+	if ( is_active_sidebar( 'portage_before_comments' ) ) {
+	echo '<div id="portage_before_comments" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_before_comments' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_comments') == '1' ) :
-add_action('atticus_finch_after_comments', 'atticus_finch_after_comments_fc' );
-function atticus_finch_after_comments_fc(){
-	if ( is_active_sidebar( 'atticus_finch_after_comments' ) ) {
-	echo '<div id="atticus_finch_after_comments" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_after_comments' );
+if ( get_theme_mod( 'portage_after_comments') == '1' ) :
+add_action('portage_after_comments', 'portage_after_comments_fc' );
+function portage_after_comments_fc(){
+	if ( is_active_sidebar( 'portage_after_comments' ) ) {
+	echo '<div id="portage_after_comments" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_after_comments' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_comment_form') == '1' ) :
-add_action('atticus_finch_before_comment_form', 'atticus_finch_before_comment_form_fc' );
-function atticus_finch_before_comment_form_fc(){
+if ( get_theme_mod( 'portage_before_comment_form') == '1' ) :
+add_action('portage_before_comment_form', 'portage_before_comment_form_fc' );
+function portage_before_comment_form_fc(){
 	if ( comments_open() ) : {
-		if ( is_active_sidebar( 'atticus_finch_before_comment_form' ) ) {
-		echo '<div id="atticus_finch_before_comment_form" class="atticus-finch-action-hook">';
-		dynamic_sidebar( 'atticus_finch_before_comment_form' );
+		if ( is_active_sidebar( 'portage_before_comment_form' ) ) {
+		echo '<div id="portage_before_comment_form" class="atticus-finch-action-hook">';
+		dynamic_sidebar( 'portage_before_comment_form' );
 		echo '</div>';
 		}
 	}
@@ -189,13 +189,13 @@ function atticus_finch_before_comment_form_fc(){
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_comment_form') == '1' ) :
-add_action('atticus_finch_after_comment_form', 'atticus_finch_after_comment_form_fc' );
-function atticus_finch_after_comment_form_fc(){
+if ( get_theme_mod( 'portage_after_comment_form') == '1' ) :
+add_action('portage_after_comment_form', 'portage_after_comment_form_fc' );
+function portage_after_comment_form_fc(){
 	if (comments_open() ) : {
-		if ( is_active_sidebar( 'atticus_finch_after_comment_form' ) ) {
-		echo '<div id="atticus_finch_after_comment_form" class="atticus-finch-action-hook">';
-		dynamic_sidebar( 'atticus_finch_after_comment_form' );
+		if ( is_active_sidebar( 'portage_after_comment_form' ) ) {
+		echo '<div id="portage_after_comment_form" class="atticus-finch-action-hook">';
+		dynamic_sidebar( 'portage_after_comment_form' );
 		echo '</div>';
 		}
 	}
@@ -205,56 +205,56 @@ endif;
 
 // footer.php action hooks
 
-if ( get_theme_mod( 'atticus_finch_container_bottom') == '1' ) :
-add_action('atticus_finch_container_bottom', 'atticus_finch_container_bottom_fc' );
-function atticus_finch_container_bottom_fc(){
-	if ( is_active_sidebar( 'atticus_finch_container_bottom' ) ) {
-	echo '<div class="clear"></div><div id="atticus_finch_container_bottom" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_container_bottom' );
+if ( get_theme_mod( 'portage_container_bottom') == '1' ) :
+add_action('portage_container_bottom', 'portage_container_bottom_fc' );
+function portage_container_bottom_fc(){
+	if ( is_active_sidebar( 'portage_container_bottom' ) ) {
+	echo '<div class="clear"></div><div id="portage_container_bottom" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_container_bottom' );
 	echo '</div><div class="clear"></div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_footer_menu') == '1' ) :
-add_action('atticus_finch_before_footer_menu', 'atticus_finch_before_footer_menu_fc' );
-function atticus_finch_before_footer_menu_fc(){
-	if ( is_active_sidebar( 'atticus_finch_before_footer_menu' ) ) {
-	echo '<div id="atticus_finch_before_footer_menu" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_before_footer_menu' );
+if ( get_theme_mod( 'portage_before_footer_menu') == '1' ) :
+add_action('portage_before_footer_menu', 'portage_before_footer_menu_fc' );
+function portage_before_footer_menu_fc(){
+	if ( is_active_sidebar( 'portage_before_footer_menu' ) ) {
+	echo '<div id="portage_before_footer_menu" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_before_footer_menu' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_footer_top') == '1' ) :
-add_action('atticus_finch_footer_top', 'atticus_finch_footer_top_fc' );
-function atticus_finch_footer_top_fc(){
-	if ( is_active_sidebar( 'atticus_finch_footer_top' ) ) {
-	echo '<div id="atticus_finch_footer_top" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_footer_top' );
+if ( get_theme_mod( 'portage_footer_top') == '1' ) :
+add_action('portage_footer_top', 'portage_footer_top_fc' );
+function portage_footer_top_fc(){
+	if ( is_active_sidebar( 'portage_footer_top' ) ) {
+	echo '<div id="portage_footer_top" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_footer_top' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_footer_bottom') == '1' ) :
-add_action('atticus_finch_footer_bottom', 'atticus_finch_footer_bottom_fc' );
-function atticus_finch_footer_bottom_fc(){
-	if ( is_active_sidebar( 'atticus_finch_footer_bottom' ) ) {
-	echo '<div id="atticus_finch_footer_bottom" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_footer_bottom' );
+if ( get_theme_mod( 'portage_footer_bottom') == '1' ) :
+add_action('portage_footer_bottom', 'portage_footer_bottom_fc' );
+function portage_footer_bottom_fc(){
+	if ( is_active_sidebar( 'portage_footer_bottom' ) ) {
+	echo '<div id="portage_footer_bottom" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_footer_bottom' );
 	echo '</div>';
 	}
 }
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_footer') == '1' ) :
-add_action('atticus_finch_after_footer', 'atticus_finch_after_footer_fc' );
-function atticus_finch_after_footer_fc(){
-	if ( is_active_sidebar( 'atticus_finch_after_footer' ) ) {
-	echo '<div id="atticus_finch_after_footer" class="atticus-finch-action-hook">';
-	dynamic_sidebar( 'atticus_finch_after_footer' );
+if ( get_theme_mod( 'portage_after_footer') == '1' ) :
+add_action('portage_after_footer', 'portage_after_footer_fc' );
+function portage_after_footer_fc(){
+	if ( is_active_sidebar( 'portage_after_footer' ) ) {
+	echo '<div id="portage_after_footer" class="atticus-finch-action-hook">';
+	dynamic_sidebar( 'portage_after_footer' );
 	echo '</div>';
 	}
 }
@@ -266,10 +266,10 @@ function greybox_action_hook_widgets() {
 
 // Header widgets
 
-if ( get_theme_mod( 'atticus_finch_before_header') == '1' ) :
+if ( get_theme_mod( 'portage_before_header') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Header',
-		'id'            => 'atticus_finch_before_header',
+		'id'            => 'portage_before_header',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages just above the header and the "above header menu" (if you are using one).', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-header-widget">',
 		'after_widget'  => '</div>',
@@ -278,10 +278,10 @@ if ( get_theme_mod( 'atticus_finch_before_header') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_top_menu') == '1' ) :
+if ( get_theme_mod( 'portage_after_top_menu') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'After Top Menu',
-		'id'            => 'atticus_finch_after_top_menu',
+		'id'            => 'portage_after_top_menu',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages below the top menu and above the site name.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-after-top-menu-widget">',
 		'after_widget'  => '</div>',
@@ -290,10 +290,10 @@ if ( get_theme_mod( 'atticus_finch_after_top_menu') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_social_media') == '1' ) :
+if ( get_theme_mod( 'portage_before_social_media') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Social Media',
-		'id'            => 'atticus_finch_before_social_media',
+		'id'            => 'portage_before_social_media',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages to the left of the title and to the right of the social media menu.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-social-media-widget">',
 		'after_widget'  => '</div>',
@@ -302,10 +302,10 @@ if ( get_theme_mod( 'atticus_finch_before_social_media') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_primary_menu') == '1' ) :
+if ( get_theme_mod( 'portage_before_primary_menu') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Primary Menu',
-		'id'            => 'atticus_finch_before_primary_menu',
+		'id'            => 'portage_before_primary_menu',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages above the primary menu.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-primary-menu-widget">',
 		'after_widget'  => '</div>',
@@ -314,10 +314,10 @@ if ( get_theme_mod( 'atticus_finch_before_primary_menu') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_header') == '1' ) :
+if ( get_theme_mod( 'portage_after_header') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'After Header',
-		'id'            => 'atticus_finch_after_header',
+		'id'            => 'portage_after_header',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages after the header and before the main content and sidebar.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-after-header-widget">',
 		'after_widget'  => '</div>',
@@ -328,10 +328,10 @@ endif;
 
 // Index widgets
 
-if ( get_theme_mod( 'atticus_finch_container_top') == '1' ) :
+if ( get_theme_mod( 'portage_container_top') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Top of Container',
-		'id'            => 'atticus_finch_container_top',
+		'id'            => 'portage_container_top',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages above the sidebar and content.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-container-top-widget">',
 		'after_widget'  => '</div>',
@@ -342,10 +342,10 @@ endif;
 
 // Content widgets
 
-if ( get_theme_mod( 'atticus_finch_before_post_title') == '1' ) :
+if ( get_theme_mod( 'portage_before_post_title') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Post Title',
-		'id'            => 'atticus_finch_before_post_title',
+		'id'            => 'portage_before_post_title',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages before the post title.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-post-title-widget">',
 		'after_widget'  => '</div>',
@@ -354,10 +354,10 @@ if ( get_theme_mod( 'atticus_finch_before_post_title') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_post_content') == '1' ) :
+if ( get_theme_mod( 'portage_before_post_content') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Post Content',
-		'id'            => 'atticus_finch_before_post_content',
+		'id'            => 'portage_before_post_content',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages after the title and before the post content.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-post-content-widget">',
 		'after_widget'  => '</div>',
@@ -366,10 +366,10 @@ if ( get_theme_mod( 'atticus_finch_before_post_content') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_post_top') == '1' ) :
+if ( get_theme_mod( 'portage_post_top') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Top of Post',
-		'id'            => 'atticus_finch_post_top',
+		'id'            => 'portage_post_top',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages at the top of the post.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-post-top-widget">',
 		'after_widget'  => '</div>',
@@ -378,10 +378,10 @@ if ( get_theme_mod( 'atticus_finch_post_top') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_post_bottom') == '1' ) :
+if ( get_theme_mod( 'portage_post_bottom') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Bottom of Post',
-		'id'            => 'atticus_finch_post_bottom',
+		'id'            => 'portage_post_bottom',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages at the bottom of the post.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-post-bottom-widget">',
 		'after_widget'  => '</div>',
@@ -390,10 +390,10 @@ if ( get_theme_mod( 'atticus_finch_post_bottom') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_post_content') == '1' ) :
+if ( get_theme_mod( 'portage_after_post_content') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'After Post Content',
-		'id'            => 'atticus_finch_after_post_content',
+		'id'            => 'portage_after_post_content',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages after the post content.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-after-post-content-widget">',
 		'after_widget'  => '</div>',
@@ -402,10 +402,10 @@ if ( get_theme_mod( 'atticus_finch_after_post_content') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_post_meta') == '1' ) :
+if ( get_theme_mod( 'portage_before_post_meta') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Post Meta',
-		'id'            => 'atticus_finch_before_post_meta',
+		'id'            => 'portage_before_post_meta',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages before the post meta.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-post-meta-widget">',
 		'after_widget'  => '</div>',
@@ -414,10 +414,10 @@ if ( get_theme_mod( 'atticus_finch_before_post_meta') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_post_meta') == '1' ) :
+if ( get_theme_mod( 'portage_after_post_meta') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'After Post Meta',
-		'id'            => 'atticus_finch_after_post_meta',
+		'id'            => 'portage_after_post_meta',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages after the post meta.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-after-post-meta-widget">',
 		'after_widget'  => '</div>',
@@ -428,10 +428,10 @@ endif;
 
 // Comments widgets
 
-if ( get_theme_mod( 'atticus_finch_before_comments') == '1' ) :
+if ( get_theme_mod( 'portage_before_comments') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Comments',
-		'id'            => 'atticus_finch_before_comments',
+		'id'            => 'portage_before_comments',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages before the comments.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-comments-widget">',
 		'after_widget'  => '</div>',
@@ -440,10 +440,10 @@ if ( get_theme_mod( 'atticus_finch_before_comments') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_comments') == '1' ) :
+if ( get_theme_mod( 'portage_after_comments') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'After Comments',
-		'id'            => 'atticus_finch_after_comments',
+		'id'            => 'portage_after_comments',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages after the comments.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-after-comments-widget">',
 		'after_widget'  => '</div>',
@@ -452,10 +452,10 @@ if ( get_theme_mod( 'atticus_finch_after_comments') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_comment_form') == '1' ) :
+if ( get_theme_mod( 'portage_before_comment_form') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Comment Form',
-		'id'            => 'atticus_finch_before_comment_form',
+		'id'            => 'portage_before_comment_form',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages before the comment form.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-comment-form-widget">',
 		'after_widget'  => '</div>',
@@ -464,10 +464,10 @@ if ( get_theme_mod( 'atticus_finch_before_comment_form') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_comment_form') == '1' ) :
+if ( get_theme_mod( 'portage_after_comment_form') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'After Comment Form',
-		'id'            => 'atticus_finch_after_comment_form',
+		'id'            => 'portage_after_comment_form',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages after the comment form.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-after-comment-form-widget">',
 		'after_widget'  => '</div>',
@@ -478,10 +478,10 @@ endif;
 
 // Footer widgets
 
-if ( get_theme_mod( 'atticus_finch_container_bottom') == '1' ) :
+if ( get_theme_mod( 'portage_container_bottom') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Bottom of Container',
-		'id'            => 'atticus_finch_container_bottom',
+		'id'            => 'portage_container_bottom',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages before the footer.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-container-bottom-widget">',
 		'after_widget'  => '</div>',
@@ -490,10 +490,10 @@ if ( get_theme_mod( 'atticus_finch_container_bottom') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_before_footer_menu') == '1' ) :
+if ( get_theme_mod( 'portage_before_footer_menu') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Before Footer Menu',
-		'id'            => 'atticus_finch_before_footer_menu',
+		'id'            => 'portage_before_footer_menu',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages before the footer menu.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-before-footer-menu-widget">',
 		'after_widget'  => '</div>',
@@ -502,10 +502,10 @@ if ( get_theme_mod( 'atticus_finch_before_footer_menu') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_footer_top') == '1' ) :
+if ( get_theme_mod( 'portage_footer_top') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Footer Top',
-		'id'            => 'atticus_finch_footer_top',
+		'id'            => 'portage_footer_top',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages at the top of the footer.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-footer-top-widget">',
 		'after_widget'  => '</div>',
@@ -514,10 +514,10 @@ if ( get_theme_mod( 'atticus_finch_footer_top') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_footer_bottom') == '1' ) :
+if ( get_theme_mod( 'portage_footer_bottom') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'Footer Bottom',
-		'id'            => 'atticus_finch_footer_bottom',
+		'id'            => 'portage_footer_bottom',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages at the bottom of the footer.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-footer-bottom-widget">',
 		'after_widget'  => '</div>',
@@ -526,10 +526,10 @@ if ( get_theme_mod( 'atticus_finch_footer_bottom') == '1' ) :
 	) );
 endif;
 
-if ( get_theme_mod( 'atticus_finch_after_footer') == '1' ) :
+if ( get_theme_mod( 'portage_after_footer') == '1' ) :
 	register_sidebar( array(
 		'name'          => 'After Footer',
-		'id'            => 'atticus_finch_after_footer',
+		'id'            => 'portage_after_footer',
 		'description'   => __( 'Widgets in this area will be shown on all posts and pages after the footer.', 'atticus-finch' ),
 		'before_widget' => '<div class="atticus-finch-after-footer-widget">',
 		'after_widget'  => '</div>',

header.php

@@ -4,7 +4,7 @@
  *
  * Displays all of the <head> section and everything up till <div id="container">
  *
- * @package Atticus Finch
+ * @package Portage
  */
 ?>
 <!DOCTYPE html>
@@ -16,14 +16,14 @@
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
 
 <!-- Commented out on 2021.06.27 -->
-<?php // atticus_finch_custom_css_head(); ?>
+<?php // portage_custom_css_head(); ?>
 
 <?php wp_head(); ?>
 </head>
 
 <body <?php body_class(); ?>>
 
-<?php do_action( 'atticus_finch_before_header' ); ?>
+<?php do_action( 'portage_before_header' ); ?>
 
 <header>
 
@@ -41,7 +41,7 @@
 		<div class="clear"></div>
 	</nav>
 
-	<?php do_action( 'atticus_finch_after_top_menu' ); ?>
+	<?php do_action( 'portage_after_top_menu' ); ?>
 
 	<div id="header" style="background-image: url('<?php header_image(); ?>');">
 
@@ -66,10 +66,10 @@
 		<div class="clear"></div>
 		</div><!-- end #site-desc -->
 
-<?php do_action( 'atticus_finch_before_social_media'); ?>
+<?php do_action( 'portage_before_social_media'); ?>
 
 	<div id="social-media-menu" class="social-navigation">
-<?php atticus_finch_social_media_display(); ?>
+<?php portage_social_media_display(); ?>
 	<div class="clear"></div>
 	</div><!-- end #social-media-menu -->
 
@@ -77,14 +77,14 @@
 
 <div class="clear"></div>
 
-<?php do_action( 'atticus_finch_before_primary_menu' ); ?>
+<?php do_action( 'portage_before_primary_menu' ); ?>
 
 <!-- Commented out on 2021.06.27 -->
-<?php // $walker = new Atticus_Finch_Menu_With_Description; ?>
+<?php // $walker = new portage_Menu_With_Description; ?>
 
 	<nav id="primary-menu">
 		<?php
-			if ( get_theme_mod( 'atticus_finch_main_menu_desc' ) == 1 ) {
+			if ( get_theme_mod( 'portage_main_menu_desc' ) == 1 ) {
 				$array = array(
 				'theme_location' => 'primary-menu',
 				'fallback_cb'    => '',
@@ -115,8 +115,8 @@
 
 </header>
 
-<?php do_action( 'atticus_finch_after_header' ); ?>
+<?php do_action( 'portage_after_header' ); ?>
 
 <div id="container"><!-- closing tag is in footer.php -->
 
-<?php do_action( 'atticus_finch_container_top' ); ?>
+<?php do_action( 'portage_container_top' ); ?>

inc/content-entry-meta.php

@@ -1,14 +1,14 @@
 	<div class="clear"></div>
 	<div id="post-meta">
-	<?php do_action( 'atticus_finch_before_post_meta' ); ?>
+	<?php do_action( 'portage_before_post_meta' ); ?>
 		<div class="list-pub">
-			<?php atticus_finch_pub(); ?>
+			<?php portage_pub(); ?>
 		</div>
 		<div class="list-cat">
-			<?php atticus_finch_cat(); ?>
+			<?php portage_cat(); ?>
 		</div>
 		<div class="list-tags">
-			<?php atticus_finch_tags(); ?>
+			<?php portage_tags(); ?>
 		</div>
-	<?php do_action( 'atticus_finch_after_post_meta' ); ?>
+	<?php do_action( 'portage_after_post_meta' ); ?>
 	</div>

inc/content-excerpt.php

@@ -2,29 +2,29 @@
 
 <div class="post-content post-content-<?php echo get_post_format(); ?>">
 
-		<?php do_action( 'atticus_finch_post_top' ); ?>
+		<?php do_action( 'portage_post_top' ); ?>
 
 		<?php the_content(); ?>
 		<div class="clear"></div>
 
-		<?php do_action( 'atticus_finch_post_bottom' ); ?>
+		<?php do_action( 'portage_post_bottom' ); ?>
 
-		<?php atticus_finch_print_options() ?>
+		<?php portage_print_options() ?>
 
 	</div><!-- end post content -->
 
-	<?php do_action( 'atticus_finch_after_post_content' ); ?>
+	<?php do_action( 'portage_after_post_content' ); ?>
 
-	<?php atticus_finch_link_pages(); ?>
+	<?php portage_link_pages(); ?>
 
-	<?php do_action( 'atticus_finch_before_post_meta' ); ?>
+	<?php do_action( 'portage_before_post_meta' ); ?>
 
 	<?php get_template_part( 'inc/content', 'entry-meta' ); ?>
 
-	<?php do_action( 'atticus_finch_after_post_meta' ); ?>
+	<?php do_action( 'portage_after_post_meta' ); ?>
 
 	<?php get_template_part( 'inc/content', 'post-nav' ); ?>
 
-	<?php atticus_finch_comment_display(); ?> 
+	<?php portage_comment_display(); ?> 
 
 </div><!-- end post -->

inc/content-main.php

@@ -4,25 +4,25 @@
 
 	<div class="post-content">
 
-		<?php do_action( 'atticus_finch_post_top' ); ?>
+		<?php do_action( 'portage_post_top' ); ?>
 
 		<?php the_content(); ?>
 		<div class="clear"></div>
 
-		<?php do_action( 'atticus_finch_post_bottom' ); ?>
+		<?php do_action( 'portage_post_bottom' ); ?>
 
-		<?php atticus_finch_print_options() ?>
+		<?php portage_print_options() ?>
 
 	</div><!-- end post content -->
 
-	<?php atticus_finch_post_top_link(); ?>
+	<?php portage_post_top_link(); ?>
 
-	<?php atticus_finch_link_pages(); ?>
+	<?php portage_link_pages(); ?>
 
 	<?php get_template_part( 'inc/content', 'post-nav' ); ?>
 
-	<?php atticus_finch_comment_display(); ?> 
+	<?php portage_comment_display(); ?> 
 
 </div><!-- end post -->
 
-	<?php do_action( 'atticus_finch_after_post_content' ); ?>
+	<?php do_action( 'portage_after_post_content' ); ?>

inc/content-post-nav.php

@@ -1,9 +1,9 @@
 <div id="post-series">
 	<div class="post-next">
-		<?php atticus_finch_next_post_link(); ?>
+		<?php portage_next_post_link(); ?>
 	</div>
 	<div class="post-prev">
-		<?php atticus_finch_prev_post_link(); ?> 
+		<?php portage_prev_post_link(); ?> 
 	</div>
 	<div class="clear"></div>
-</div>
+</div>

inc/excerpt-entry-meta.php

@@ -1,6 +1,6 @@
 	<div class="entry-meta">
-		<p><?php atticus_finch_pub(); ?></p>
-		<p><?php atticus_finch_cat(); ?></p>
-		<p><?php atticus_finch_tags(); ?></p>
+		<p><?php portage_pub(); ?></p>
+		<p><?php portage_cat(); ?></p>
+		<p><?php portage_tags(); ?></p>
 		<div class="clear"></div>
 	</div>

inc/excerpt-short-meta.php

@@ -1,5 +1,5 @@
 	<div class="aside-meta">
 		<?php
-			printf(__( 'Published on %1$s at %2$s', 'atticus-finch'), atticus_finch_date(), get_the_time() );
+			printf(__( 'Published on %1$s at %2$s', 'atticus-finch'), portage_date(), get_the_time() );
 		?>
-	</div>
+	</div>

inc/page-main.php

@@ -2,12 +2,12 @@
 
 	<div class="post-content">
 
-		<?php do_action( 'atticus_finch_post_top' ); ?>
+		<?php do_action( 'portage_post_top' ); ?>
 
 		<?php the_content(); ?>
 		<div class="clear"></div>
 
-		<?php do_action( 'atticus_finch_post_bottom' ); ?>
+		<?php do_action( 'portage_post_bottom' ); ?>
 
 <div id="page-info">
 	<p>
@@ -24,13 +24,13 @@
 	</p>
 </div>
 
-		<?php atticus_finch_print_options() ?>
+		<?php portage_print_options() ?>
 
 	</div><!-- end post content -->
 
 
-	<?php atticus_finch_comment_display(); ?> 
+	<?php portage_comment_display(); ?> 
 
 
-	<?php do_action( 'atticus_finch_after_post_content' ); ?>
+	<?php do_action( 'portage_after_post_content' ); ?>
 

index.php

@@ -8,7 +8,7 @@
  * E.g., it puts together the home page when no home.php file exists.
  * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 get_header();
@@ -27,10 +27,10 @@ get_header();
 <?php endwhile; ?>
 <?php endif; ?>
 
-<?php atticus_finch_display_nav(); ?>
+<?php portage_display_nav(); ?>
 </div> <!-- end Content -->
 
-<?php atticus_finch_post_top_link(); ?>
+<?php portage_post_top_link(); ?>
 
 <?php get_sidebar(); ?>
 

js/customizer.js

@@ -36,7 +36,7 @@
 		} );
 	} );
 	// Social Media Options
-	wp.customize( 'atticus_finch_twitter', function( value ) {
+	wp.customize( 'portage_twitter', function( value ) {
 		value.bind( function( to ) {
 			$( '#social-media-menu' ).text( to );
 		} );

page-no-sidebar.php

@@ -5,7 +5,7 @@
  * Template Name: Full Width Page
  *
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 get_header();
@@ -16,9 +16,9 @@ get_header();
 
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-<?php do_action( 'atticus_finch_before_post_title' ); ?>
+<?php do_action( 'portage_before_post_title' ); ?>
 
 <h1 class="post-title">
 	<span class="dashicons dashicons-admin-page"></span>

page.php

@@ -8,7 +8,7 @@
  * E.g., it puts together the home page when no home.php file exists.
  * Learn more: http://codex.wordpress.org/Template_Hierarchy
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 get_header();
@@ -19,9 +19,9 @@ get_header();
 
 <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-<?php atticus_finch_edit_post(); ?>
+<?php portage_edit_post(); ?>
 
-<?php do_action( 'atticus_finch_before_post_title' ); ?>
+<?php do_action( 'portage_before_post_title' ); ?>
 
 <h1 class="post-title">
 	<span class="dashicons dashicons-admin-page"></span>

sidebar.php

@@ -2,7 +2,7 @@
 /**
  * The sidebar containing the main widget area.
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 if ( ! is_active_sidebar( 'sidebar-1' ) ) {
@@ -12,4 +12,4 @@ if ( ! is_active_sidebar( 'sidebar-1' ) ) {
 
 <div id="sidebar" class="widget-area" role="complementary">
 	<?php dynamic_sidebar( 'sidebar-1' ); ?>
-</div><!-- end #sidebar -->
+</div><!-- end #sidebar -->

single.php

@@ -2,7 +2,7 @@
 /**
  * The template for displaying all single posts and attachments
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 get_header();
@@ -30,4 +30,4 @@ get_header();
 
 <div class="clear"></div>
 
-<?php get_footer(); ?>
+<?php get_footer(); ?>

style.css

@@ -1,6 +1,6 @@
 /*
 Theme Name: Portage
-Theme URI: http://wiki.kjodle.net/Category:Atticus_Finch_Theme
+Theme URI: http://wiki.kjodle.net/Category:portage_Theme
 Author: kjodle
 Author URI: http://d12webdesign.com/
 Description: Description
@@ -9,7 +9,7 @@ License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: two-columns, left-sidebar, custom-menu, featured-images, post-formats, theme-options, threaded-comments, translation-ready
 Text Domain: portage
-Details URI: http://wiki.kjodle.net/Category:Atticus_Finch_Theme
+Details URI: http://wiki.kjodle.net/Category:portage_Theme
 
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
@@ -595,9 +595,9 @@ ul#footermenu-ul {
 /**********************************/
 /* 12. Action Hook Widget Areas   */
 
-#atticus_finch_before_social_media,
-#atticus_finch_after_footer,
-#atticus_finch_footer_bottom {
+#portage_before_social_media,
+#portage_after_footer,
+#portage_footer_bottom {
 	clear: both;
 }
 
@@ -749,7 +749,7 @@ figure {
 	padding: 0;
 }
 
-.atticus-finch-post-top-widget {
+.portage-post-top-widget {
 	text-align: right;
 }
 

styles/mobile.css

@@ -1,4 +1,4 @@
-/* Mobile Style Sheet for Atticus Finch Theme */
+/* Mobile Style Sheet for Portage Theme */
 
 * {
 	box-sizing: border-box;

tag.php

@@ -4,7 +4,7 @@
  *
  * Displays a tag archive
  *
- * @package Atticus Finch
+ * @package Portage
  */
 
 get_header();
@@ -34,7 +34,7 @@ get_header();
 <?php endwhile; ?>
 <?php endif; ?>
 
-<?php atticus_finch_display_nav(); ?>
+<?php portage_display_nav(); ?>
 </div> <!-- end Content -->
 
 <?php get_sidebar(); ?>

update/Puc/v4/Factory.php

@@ -1,271 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4_Factory', false) ):
-
-	/**
-	 * A factory that builds update checker instances.
-	 *
-	 * When multiple versions of the same class have been loaded (e.g. PluginUpdateChecker 4.0
-	 * and 4.1), this factory will always use the latest available minor version. Register class
-	 * versions by calling {@link PucFactory::addVersion()}.
-	 *
-	 * At the moment it can only build instances of the UpdateChecker class. Other classes are
-	 * intended mainly for internal use and refer directly to specific implementations.
-	 */
-	class Puc_v4_Factory {
-		protected static $classVersions = array();
-		protected static $sorted = false;
-
-		protected static $myMajorVersion = '';
-		protected static $latestCompatibleVersion = '';
-
-		/**
-		 * Create a new instance of the update checker.
-		 *
-		 * This method automatically detects if you're using it for a plugin or a theme and chooses
-		 * the appropriate implementation for your update source (JSON file, GitHub, BitBucket, etc).
-		 *
-		 * @see Puc_v4p1_UpdateChecker::__construct
-		 *
-		 * @param string $metadataUrl The URL of the metadata file, a GitHub repository, or another supported update source.
-		 * @param string $fullPath Full path to the main plugin file or to the theme directory.
-		 * @param string $slug Custom slug. Defaults to the name of the main plugin file or the theme directory.
-		 * @param int $checkPeriod How often to check for updates (in hours).
-		 * @param string $optionName Where to store book-keeping info about update checks.
-		 * @param string $muPluginFile The plugin filename relative to the mu-plugins directory.
-		 * @return Puc_v4p1_Plugin_UpdateChecker|Puc_v4p1_Theme_UpdateChecker|Puc_v4p1_Vcs_BaseChecker
-		 */
-		public static function buildUpdateChecker($metadataUrl, $fullPath, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '') {
-			$fullPath = wp_normalize_path($fullPath);
-			$id = null;
-
-			//Plugin or theme?
-			$themeDirectory = self::getThemeDirectoryName($fullPath);
-			if ( self::isPluginFile($fullPath) ) {
-				$type = 'Plugin';
-				$id = $fullPath;
-			} else if ( $themeDirectory !== null ) {
-				$type = 'Theme';
-				$id = $themeDirectory;
-			} else {
-				throw new RuntimeException(sprintf(
-					'The update checker cannot determine if "%s" is a plugin or a theme. ' .
-					'This is a bug. Please contact the PUC developer.',
-					htmlentities($fullPath)
-				));
-			}
-
-			//Which hosting service does the URL point to?
-			$service = self::getVcsService($metadataUrl);
-
-			$apiClass = null;
-			if ( empty($service) ) {
-				//The default is to get update information from a remote JSON file.
-				$checkerClass = $type . '_UpdateChecker';
-			} else {
-				//You can also use a VCS repository like GitHub.
-				$checkerClass = 'Vcs_' . $type . 'UpdateChecker';
-				$apiClass = $service . 'Api';
-			}
-
-			$checkerClass = self::getCompatibleClassVersion($checkerClass);
-			if ( $checkerClass === null ) {
-				trigger_error(
-					sprintf(
-						'PUC %s does not support updates for %ss %s',
-						htmlentities(self::$latestCompatibleVersion),
-						strtolower($type),
-						$service ? ('hosted on ' . htmlentities($service)) : 'using JSON metadata'
-					),
-					E_USER_ERROR
-				);
-				return null;
-			}
-
-			if ( !isset($apiClass) ) {
-				//Plain old update checker.
-				return new $checkerClass($metadataUrl, $id, $slug, $checkPeriod, $optionName, $muPluginFile);
-			} else {
-				//VCS checker + an API client.
-				$apiClass = self::getCompatibleClassVersion($apiClass);
-				if ( $apiClass === null ) {
-					trigger_error(sprintf(
-						'PUC %s does not support %s',
-						htmlentities(self::$latestCompatibleVersion),
-						htmlentities($service)
-					), E_USER_ERROR);
-					return null;
-				}
-
-				return new $checkerClass(
-					new $apiClass($metadataUrl),
-					$id,
-					$slug,
-					$checkPeriod,
-					$optionName,
-					$muPluginFile
-				);
-			}
-		}
-
-		/**
-		 * Check if the path points to a plugin file.
-		 *
-		 * @param string $absolutePath Normalized path.
-		 * @return bool
-		 */
-		protected static function isPluginFile($absolutePath) {
-			//Is the file inside the "plugins" or "mu-plugins" directory?
-			$pluginDir = wp_normalize_path(WP_PLUGIN_DIR);
-			$muPluginDir = wp_normalize_path(WPMU_PLUGIN_DIR);
-			if ( (strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0) ) {
-				return true;
-			}
-
-			//Is it a file at all? Caution: is_file() can fail if the parent dir. doesn't have the +x permission set.
-			if ( !is_file($absolutePath) ) {
-				return false;
-			}
-
-			//Does it have a valid plugin header?
-			//This is a last-ditch check for plugins symlinked from outside the WP root.
-			if ( function_exists('get_file_data') ) {
-				$headers = get_file_data($absolutePath, array('Name' => 'Plugin Name'), 'plugin');
-				return !empty($headers['Name']);
-			}
-
-			return false;
-		}
-
-		/**
-		 * Get the name of the theme's directory from a full path to a file inside that directory.
-		 * E.g. "/abc/public_html/wp-content/themes/foo/whatever.php" => "foo".
-		 *
-		 * Note that subdirectories are currently not supported. For example,
-		 * "/xyz/wp-content/themes/my-theme/includes/whatever.php" => NULL.
-		 *
-		 * @param string $absolutePath Normalized path.
-		 * @return string|null Directory name, or NULL if the path doesn't point to a theme.
-		 */
-		protected static function getThemeDirectoryName($absolutePath) {
-			if ( is_file($absolutePath) ) {
-				$absolutePath = dirname($absolutePath);
-			}
-
-			if ( file_exists($absolutePath . '/style.css') ) {
-				return basename($absolutePath);
-			}
-			return null;
-		}
-
-		/**
-		 * Get the name of the hosting service that the URL points to.
-		 *
-		 * @param string $metadataUrl
-		 * @return string|null
-		 */
-		private static function getVcsService($metadataUrl) {
-			$service = null;
-
-			//Which hosting service does the URL point to?
-			$host = @parse_url($metadataUrl, PHP_URL_HOST);
-			$path = @parse_url($metadataUrl, PHP_URL_PATH);
-			//Check if the path looks like "/user-name/repository".
-			$usernameRepoRegex = '@^/?([^/]+?)/([^/#?&]+?)/?$@';
-			if ( preg_match($usernameRepoRegex, $path) ) {
-				$knownServices = array(
-					'github.com' => 'GitHub',
-					'bitbucket.org' => 'BitBucket',
-					'gitlab.com' => 'GitLab',
-				);
-				if ( isset($knownServices[$host]) ) {
-					$service = $knownServices[$host];
-				}
-			}
-
-			return $service;
-		}
-
-		/**
-		 * Get the latest version of the specified class that has the same major version number
-		 * as this factory class.
-		 *
-		 * @param string $class Partial class name.
-		 * @return string|null Full class name.
-		 */
-		protected static function getCompatibleClassVersion($class) {
-			if ( isset(self::$classVersions[$class][self::$latestCompatibleVersion]) ) {
-				return self::$classVersions[$class][self::$latestCompatibleVersion];
-			}
-			return null;
-		}
-
-		/**
-		 * Get the specific class name for the latest available version of a class.
-		 *
-		 * @param string $class
-		 * @return null|string
-		 */
-		public static function getLatestClassVersion($class) {
-			if ( !self::$sorted ) {
-				self::sortVersions();
-			}
-
-			if ( isset(self::$classVersions[$class]) ) {
-				return reset(self::$classVersions[$class]);
-			} else {
-				return null;
-			}
-		}
-
-		/**
-		 * Sort available class versions in descending order (i.e. newest first).
-		 */
-		protected static function sortVersions() {
-			foreach ( self::$classVersions as $class => $versions ) {
-				uksort($versions, array(__CLASS__, 'compareVersions'));
-				self::$classVersions[$class] = $versions;
-			}
-			self::$sorted = true;
-		}
-
-		protected static function compareVersions($a, $b) {
-			return -version_compare($a, $b);
-		}
-
-		/**
-		 * Register a version of a class.
-		 *
-		 * @access private This method is only for internal use by the library.
-		 *
-		 * @param string $generalClass Class name without version numbers, e.g. 'PluginUpdateChecker'.
-		 * @param string $versionedClass Actual class name, e.g. 'PluginUpdateChecker_1_2'.
-		 * @param string $version Version number, e.g. '1.2'.
-		 */
-		public static function addVersion($generalClass, $versionedClass, $version) {
-			if ( empty(self::$myMajorVersion) ) {
-				$nameParts = explode('_', __CLASS__, 3);
-				self::$myMajorVersion = substr(ltrim($nameParts[1], 'v'), 0, 1);
-			}
-
-			//Store the greatest version number that matches our major version.
-			$components = explode('.', $version);
-			if ( $components[0] === self::$myMajorVersion ) {
-
-				if (
-					empty(self::$latestCompatibleVersion)
-					|| version_compare($version, self::$latestCompatibleVersion, '>')
-				) {
-					self::$latestCompatibleVersion = $version;
-				}
-
-			}
-
-			if ( !isset(self::$classVersions[$generalClass]) ) {
-				self::$classVersions[$generalClass] = array();
-			}
-			self::$classVersions[$generalClass][$version] = $versionedClass;
-			self::$sorted = false;
-		}
-	}
-
-endif;

update/Puc/v4p1/Autoloader.php

@@ -1,49 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_Autoloader', false) ):
-
-	class Puc_v4p1_Autoloader {
-		private $prefix = '';
-		private $rootDir = '';
-		private $libraryDir = '';
-
-		private $staticMap;
-
-		public function __construct() {
-			$this->rootDir = dirname(__FILE__) . '/';
-			$nameParts = explode('_', __CLASS__, 3);
-			$this->prefix = $nameParts[0] . '_' . $nameParts[1] . '_';
-
-			$this->libraryDir = realpath($this->rootDir . '../..') . '/';
-			$this->staticMap = array(
-				'PucReadmeParser' => 'vendor/readme-parser.php',
-				'Parsedown' => 'vendor/ParsedownLegacy.php',
-			);
-			if ( version_compare(PHP_VERSION, '5.3.0', '>=') ) {
-				$this->staticMap['Parsedown'] = 'vendor/Parsedown.php';
-			}
-
-			spl_autoload_register(array($this, 'autoload'));
-		}
-
-		public function autoload($className) {
-			if ( isset($this->staticMap[$className]) && file_exists($this->libraryDir . $this->staticMap[$className]) ) {
-				/** @noinspection PhpIncludeInspection */
-				include ($this->libraryDir . $this->staticMap[$className]);
-				return;
-			}
-
-			if (strpos($className, $this->prefix) === 0) {
-				$path = substr($className, strlen($this->prefix));
-				$path = str_replace('_', '/', $path);
-				$path = $this->rootDir . $path . '.php';
-
-				if (file_exists($path)) {
-					/** @noinspection PhpIncludeInspection */
-					include $path;
-				}
-			}
-		}
-	}
-
-endif;

update/Puc/v4p1/DebugBar/Extension.php

@@ -1,117 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_DebugBar_Extension', false) ):
-
-	class Puc_v4p1_DebugBar_Extension {
-		/** @var Puc_v4p1_UpdateChecker */
-		protected $updateChecker;
-		protected $panelClass = 'Puc_v4p1_DebugBar_Panel';
-
-		public function __construct($updateChecker, $panelClass = null) {
-			$this->updateChecker = $updateChecker;
-			if ( isset($panelClass) ) {
-				$this->panelClass = $panelClass;
-			}
-
-			add_filter('debug_bar_panels', array($this, 'addDebugBarPanel'));
-			add_action('debug_bar_enqueue_scripts', array($this, 'enqueuePanelDependencies'));
-
-			add_action('wp_ajax_puc_v4_debug_check_now', array($this, 'ajaxCheckNow'));
-		}
-
-		/**
-		 * Register the PUC Debug Bar panel.
-		 *
-		 * @param array $panels
-		 * @return array
-		 */
-		public function addDebugBarPanel($panels) {
-			if ( $this->updateChecker->userCanInstallUpdates() ) {
-				$panels[] = new $this->panelClass($this->updateChecker);
-			}
-			return $panels;
-		}
-
-		/**
-		 * Enqueue our Debug Bar scripts and styles.
-		 */
-		public function enqueuePanelDependencies() {
-			wp_enqueue_style(
-				'puc-debug-bar-style-v4',
-				$this->getLibraryUrl("/css/puc-debug-bar.css"),
-				array('debug-bar'),
-				'20161217'
-			);
-
-			wp_enqueue_script(
-				'puc-debug-bar-js-v4',
-				$this->getLibraryUrl("/js/debug-bar.js"),
-				array('jquery'),
-				'20170516'
-			);
-		}
-
-		/**
-		 * Run an update check and output the result. Useful for making sure that
-		 * the update checking process works as expected.
-		 */
-		public function ajaxCheckNow() {
-			if ( $_POST['uid'] !== $this->updateChecker->getUniqueName('uid') ) {
-				return;
-			}
-			$this->preAjaxReqest();
-			$update = $this->updateChecker->checkForUpdates();
-			if ( $update !== null ) {
-				echo "An update is available:";
-				echo '<pre>', htmlentities(print_r($update, true)), '</pre>';
-			} else {
-				echo 'No updates found.';
-			}
-			exit;
-		}
-
-		/**
-		 * Check access permissions and enable error display (for debugging).
-		 */
-		protected function preAjaxReqest() {
-			if ( !$this->updateChecker->userCanInstallUpdates() ) {
-				die('Access denied');
-			}
-			check_ajax_referer('puc-ajax');
-
-			error_reporting(E_ALL);
-			@ini_set('display_errors','On');
-		}
-
-		/**
-		 * @param string $filePath
-		 * @return string
-		 */
-		private function getLibraryUrl($filePath) {
-			$absolutePath = realpath(dirname(__FILE__) . '/../../../' . ltrim($filePath, '/'));
-
-			//Where is the library located inside the WordPress directory structure?
-			$absolutePath = wp_normalize_path($absolutePath);
-
-			$pluginDir = wp_normalize_path(WP_PLUGIN_DIR);
-			$muPluginDir = wp_normalize_path(WPMU_PLUGIN_DIR);
-			$themeDir = wp_normalize_path(get_theme_root());
-
-			if ( (strpos($absolutePath, $pluginDir) === 0) || (strpos($absolutePath, $muPluginDir) === 0) ) {
-				//It's part of a plugin.
-				return plugins_url(basename($absolutePath), $absolutePath);
-			} else if ( strpos($absolutePath, $themeDir) === 0 ) {
-				//It's part of a theme.
-				$relativePath = substr($absolutePath, strlen($themeDir) + 1);
-				$template = substr($relativePath, 0, strpos($relativePath, '/'));
-				$baseUrl = get_theme_root_uri($template);
-
-				if ( !empty($baseUrl) && $relativePath ) {
-					return $baseUrl . '/' . $relativePath;
-				}
-			}
-
-			return '';
-		}
-	}
-
-endif;

update/Puc/v4p1/DebugBar/Panel.php

@@ -1,165 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_DebugBar_Panel', false) && class_exists('Debug_Bar_Panel', false) ):
-
-	class Puc_v4p1_DebugBar_Panel extends Debug_Bar_Panel {
-		/** @var Puc_v4p1_UpdateChecker */
-		protected $updateChecker;
-
-		private $responseBox = '<div class="puc-ajax-response" style="display: none;"></div>';
-
-		public function __construct($updateChecker) {
-			$this->updateChecker = $updateChecker;
-			$title = sprintf(
-				'<span class="puc-debug-menu-link-%s">PUC (%s)</span>',
-				esc_attr($this->updateChecker->getUniqueName('uid')),
-				$this->updateChecker->slug
-			);
-			parent::__construct($title);
-		}
-
-		public function render() {
-			printf(
-				'<div class="puc-debug-bar-panel-v4" id="%1$s" data-slug="%2$s" data-uid="%3$s" data-nonce="%4$s">',
-				esc_attr($this->updateChecker->getUniqueName('debug-bar-panel')),
-				esc_attr($this->updateChecker->slug),
-				esc_attr($this->updateChecker->getUniqueName('uid')),
-				esc_attr(wp_create_nonce('puc-ajax'))
-			);
-
-			$this->displayConfiguration();
-			$this->displayStatus();
-			$this->displayCurrentUpdate();
-
-			echo '</div>';
-		}
-
-		private function displayConfiguration() {
-			echo '<h3>Configuration</h3>';
-			echo '<table class="puc-debug-data">';
-			$this->displayConfigHeader();
-			$this->row('Slug', htmlentities($this->updateChecker->slug));
-			$this->row('DB option', htmlentities($this->updateChecker->optionName));
-
-			$requestInfoButton = $this->getMetadataButton();
-			$this->row('Metadata URL', htmlentities($this->updateChecker->metadataUrl) . ' ' . $requestInfoButton . $this->responseBox);
-
-			$scheduler = $this->updateChecker->scheduler;
-			if ( $scheduler->checkPeriod > 0 ) {
-				$this->row('Automatic checks', 'Every ' . $scheduler->checkPeriod . ' hours');
-			} else {
-				$this->row('Automatic checks', 'Disabled');
-			}
-
-			if ( isset($scheduler->throttleRedundantChecks) ) {
-				if ( $scheduler->throttleRedundantChecks && ($scheduler->checkPeriod > 0) ) {
-					$this->row(
-						'Throttling',
-						sprintf(
-							'Enabled. If an update is already available, check for updates every %1$d hours instead of every %2$d hours.',
-							$scheduler->throttledCheckPeriod,
-							$scheduler->checkPeriod
-						)
-					);
-				} else {
-					$this->row('Throttling', 'Disabled');
-				}
-			}
-
-			$this->updateChecker->onDisplayConfiguration($this);
-
-			echo '</table>';
-		}
-
-		protected function displayConfigHeader() {
-			//Do nothing. This should be implemented in subclasses.
-		}
-
-		protected function getMetadataButton() {
-			return '';
-		}
-
-		private function displayStatus() {
-			echo '<h3>Status</h3>';
-			echo '<table class="puc-debug-data">';
-			$state = $this->updateChecker->getUpdateState();
-			$checkNowButton = '';
-			if ( function_exists('get_submit_button')  ) {
-				$checkNowButton = get_submit_button(
-					'Check Now',
-					'secondary',
-					'puc-check-now-button',
-					false,
-					array('id' => $this->updateChecker->getUniqueName('check-now-button'))
-				);
-			}
-
-			if ( $state->getLastCheck() > 0 ) {
-				$this->row('Last check', $this->formatTimeWithDelta($state->getLastCheck()) . ' ' . $checkNowButton . $this->responseBox);
-			} else {
-				$this->row('Last check', 'Never');
-			}
-
-			$nextCheck = wp_next_scheduled($this->updateChecker->scheduler->getCronHookName());
-			$this->row('Next automatic check', $this->formatTimeWithDelta($nextCheck));
-
-			if ( $state->getCheckedVersion() !== '' ) {
-				$this->row('Checked version', htmlentities($state->getCheckedVersion()));
-				$this->row('Cached update', $state->getUpdate());
-			}
-			$this->row('Update checker class', htmlentities(get_class($this->updateChecker)));
-			echo '</table>';
-		}
-
-		private function displayCurrentUpdate() {
-			$update = $this->updateChecker->getUpdate();
-			if ( $update !== null ) {
-				echo '<h3>An Update Is Available</h3>';
-				echo '<table class="puc-debug-data">';
-				$fields = $this->getUpdateFields();
-				foreach($fields as $field) {
-					if ( property_exists($update, $field) ) {
-						$this->row(ucwords(str_replace('_', ' ', $field)), htmlentities($update->$field));
-					}
-				}
-				echo '</table>';
-			} else {
-				echo '<h3>No updates currently available</h3>';
-			}
-		}
-
-		protected function getUpdateFields() {
-			return array('version', 'download_url', 'slug',);
-		}
-
-		private function formatTimeWithDelta($unixTime) {
-			if ( empty($unixTime) ) {
-				return 'Never';
-			}
-
-			$delta = time() - $unixTime;
-			$result = human_time_diff(time(), $unixTime);
-			if ( $delta < 0 ) {
-				$result = 'after ' . $result;
-			} else {
-				$result = $result . ' ago';
-			}
-			$result .= ' (' . $this->formatTimestamp($unixTime) . ')';
-			return $result;
-		}
-
-		private function formatTimestamp($unixTime) {
-			return gmdate('Y-m-d H:i:s', $unixTime + (get_option('gmt_offset') * 3600));
-		}
-
-		public function row($name, $value) {
-			if ( is_object($value) || is_array($value) ) {
-				$value = '<pre>' . htmlentities(print_r($value, true)) . '</pre>';
-			} else if ($value === null) {
-				$value = '<code>null</code>';
-			}
-			printf('<tr><th scope="row">%1$s</th> <td>%2$s</td></tr>', $name, $value);
-		}
-	}
-
-endif;

update/Puc/v4p1/DebugBar/PluginExtension.php

@@ -1,33 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_DebugBar_PluginExtension', false) ):
-
-	class Puc_v4p1_DebugBar_PluginExtension extends Puc_v4p1_DebugBar_Extension {
-		/** @var Puc_v4p1_Plugin_UpdateChecker */
-		protected $updateChecker;
-
-		public function __construct($updateChecker) {
-			parent::__construct($updateChecker, 'Puc_v4p1_DebugBar_PluginPanel');
-
-			add_action('wp_ajax_puc_v4_debug_request_info', array($this, 'ajaxRequestInfo'));
-		}
-
-		/**
-		 * Request plugin info and output it.
-		 */
-		public function ajaxRequestInfo() {
-			if ( $_POST['uid'] !== $this->updateChecker->getUniqueName('uid') ) {
-				return;
-			}
-			$this->preAjaxReqest();
-			$info = $this->updateChecker->requestInfo();
-			if ( $info !== null ) {
-				echo 'Successfully retrieved plugin info from the metadata URL:';
-				echo '<pre>', htmlentities(print_r($info, true)), '</pre>';
-			} else {
-				echo 'Failed to retrieve plugin info from the metadata URL.';
-			}
-			exit;
-		}
-	}
-
-endif;

update/Puc/v4p1/DebugBar/PluginPanel.php

@@ -1,38 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_DebugBar_PluginPanel', false) ):
-
-	class Puc_v4p1_DebugBar_PluginPanel extends Puc_v4p1_DebugBar_Panel {
-		/**
-		 * @var Puc_v4p1_Plugin_UpdateChecker
-		 */
-		protected $updateChecker;
-
-		protected function displayConfigHeader() {
-			$this->row('Plugin file', htmlentities($this->updateChecker->pluginFile));
-			parent::displayConfigHeader();
-		}
-
-		protected function getMetadataButton() {
-			$requestInfoButton = '';
-			if ( function_exists('get_submit_button') ) {
-				$requestInfoButton = get_submit_button(
-					'Request Info',
-					'secondary',
-					'puc-request-info-button',
-					false,
-					array('id' => $this->updateChecker->getUniqueName('request-info-button'))
-				);
-			}
-			return $requestInfoButton;
-		}
-
-		protected function getUpdateFields() {
-			return array_merge(
-				parent::getUpdateFields(),
-				array('homepage', 'upgrade_notice', 'tested',)
-			);
-		}
-	}
-
-endif;

update/Puc/v4p1/DebugBar/ThemePanel.php

@@ -1,21 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_DebugBar_ThemePanel', false) ):
-
-	class Puc_v4p1_DebugBar_ThemePanel extends Puc_v4p1_DebugBar_Panel {
-		/**
-		 * @var Puc_v4p1_Theme_UpdateChecker
-		 */
-		protected $updateChecker;
-
-		protected function displayConfigHeader() {
-			$this->row('Theme directory', htmlentities($this->updateChecker->directoryName));
-			parent::displayConfigHeader();
-		}
-
-		protected function getUpdateFields() {
-			return array_merge(parent::getUpdateFields(), array('details_url'));
-		}
-	}
-
-endif;

update/Puc/v4p1/Metadata.php

@@ -1,132 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Metadata', false) ):
-
-	/**
-	 * A base container for holding information about updates and plugin metadata.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	abstract class Puc_v4p1_Metadata {
-
-		/**
-		 * Create an instance of this class from a JSON document.
-		 *
-		 * @abstract
-		 * @param string $json
-		 * @return self
-		 */
-		public static function fromJson(/** @noinspection PhpUnusedParameterInspection */ $json) {
-			throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
-		}
-
-		/**
-		 * @param string $json
-		 * @param self $target
-		 * @return bool
-		 */
-		protected static function createFromJson($json, $target) {
-			/** @var StdClass $apiResponse */
-			$apiResponse = json_decode($json);
-			if ( empty($apiResponse) || !is_object($apiResponse) ){
-				trigger_error(
-					"Failed to parse update metadata. Try validating your .json file with http://jsonlint.com/",
-					E_USER_NOTICE
-				);
-				return false;
-			}
-
-			$valid = $target->validateMetadata($apiResponse);
-			if ( is_wp_error($valid) ){
-				trigger_error($valid->get_error_message(), E_USER_NOTICE);
-				return false;
-			}
-
-			foreach(get_object_vars($apiResponse) as $key => $value){
-				$target->$key = $value;
-			}
-
-			return true;
-		}
-
-		/**
-		 * No validation by default! Subclasses should check that the required fields are present.
-		 *
-		 * @param StdClass $apiResponse
-		 * @return bool|WP_Error
-		 */
-		protected function validateMetadata(/** @noinspection PhpUnusedParameterInspection */ $apiResponse) {
-			return true;
-		}
-
-		/**
-		 * Create a new instance by copying the necessary fields from another object.
-		 *
-		 * @abstract
-		 * @param StdClass|self $object The source object.
-		 * @return self The new copy.
-		 */
-		public static function fromObject(/** @noinspection PhpUnusedParameterInspection */ $object) {
-			throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
-		}
-
-		/**
-		 * Create an instance of StdClass that can later be converted back to an
-		 * update or info container. Useful for serialization and caching, as it
-		 * avoids the "incomplete object" problem if the cached value is loaded
-		 * before this class.
-		 *
-		 * @return StdClass
-		 */
-		public function toStdClass() {
-			$object = new stdClass();
-			$this->copyFields($this, $object);
-			return $object;
-		}
-
-		/**
-		 * Transform the metadata into the format used by WordPress core.
-		 *
-		 * @return object
-		 */
-		abstract public function toWpFormat();
-
-		/**
-		 * Copy known fields from one object to another.
-		 *
-		 * @param StdClass|self $from
-		 * @param StdClass|self $to
-		 */
-		protected function copyFields($from, $to) {
-			$fields = $this->getFieldNames();
-
-			if ( property_exists($from, 'slug') && !empty($from->slug) ) {
-				//Let plugins add extra fields without having to create subclasses.
-				$fields = apply_filters($this->getPrefixedFilter('retain_fields') . '-' . $from->slug, $fields);
-			}
-
-			foreach ($fields as $field) {
-				if ( property_exists($from, $field) ) {
-					$to->$field = $from->$field;
-				}
-			}
-		}
-
-		/**
-		 * @return string[]
-		 */
-		protected function getFieldNames() {
-			return array();
-		}
-
-		/**
-		 * @param string $tag
-		 * @return string
-		 */
-		protected function getPrefixedFilter($tag) {
-			return 'puc_' . $tag;
-		}
-	}
-
-endif;

update/Puc/v4p1/OAuthSignature.php

@@ -1,88 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_OAuthSignature', false) ):
-
-	/**
-	 * A basic signature generator for zero-legged OAuth 1.0.
-	 */
-	class Puc_v4p1_OAuthSignature {
-		private $consumerKey = '';
-		private $consumerSecret = '';
-
-		public function __construct($consumerKey, $consumerSecret) {
-			$this->consumerKey = $consumerKey;
-			$this->consumerSecret = $consumerSecret;
-		}
-
-		/**
-		 * Sign a URL using OAuth 1.0.
-		 *
-		 * @param string $url The URL to be signed. It may contain query parameters.
-		 * @param string $method HTTP method such as "GET", "POST" and so on.
-		 * @return string The signed URL.
-		 */
-		public function sign($url, $method = 'GET') {
-			$parameters = array();
-
-			//Parse query parameters.
-			$query = @parse_url($url, PHP_URL_QUERY);
-			if ( !empty($query) ) {
-				parse_str($query, $parsedParams);
-				if ( is_array($parameters) ) {
-					$parameters = $parsedParams;
-				}
-				//Remove the query string from the URL. We'll replace it later.
-				$url = substr($url, 0, strpos($url, '?'));
-			}
-
-			$parameters = array_merge(
-				$parameters,
-				array(
-					'oauth_consumer_key' => $this->consumerKey,
-					'oauth_nonce' => $this->nonce(),
-					'oauth_signature_method' => 'HMAC-SHA1',
-					'oauth_timestamp' => time(),
-					'oauth_version' => '1.0',
-				)
-			);
-			unset($parameters['oauth_signature']);
-
-			//Parameters must be sorted alphabetically before signing.
-			ksort($parameters);
-
-			//The most complicated part of the request - generating the signature.
-			//The string to sign contains the HTTP method, the URL path, and all of
-			//our query parameters. Everything is URL encoded. Then we concatenate
-			//them with ampersands into a single string to hash.
-			$encodedVerb = urlencode($method);
-			$encodedUrl = urlencode($url);
-			$encodedParams = urlencode(http_build_query($parameters, '', '&'));
-
-			$stringToSign = $encodedVerb . '&' . $encodedUrl . '&' . $encodedParams;
-
-			//Since we only have one OAuth token (the consumer secret) we only have
-			//to use it as our HMAC key. However, we still have to append an & to it
-			//as if we were using it with additional tokens.
-			$secret = urlencode($this->consumerSecret) . '&';
-
-			//The signature is a hash of the consumer key and the base string. Note
-			//that we have to get the raw output from hash_hmac and base64 encode
-			//the binary data result.
-			$parameters['oauth_signature'] = base64_encode(hash_hmac('sha1', $stringToSign, $secret, true));
-
-			return ($url . '?' . http_build_query($parameters));
-		}
-
-		/**
-		 * Generate a random nonce.
-		 *
-		 * @return string
-		 */
-		private function nonce() {
-			$mt = microtime();
-			$rand = mt_rand();
-			return md5($mt . '_' . $rand);
-		}
-	}
-
-endif;

update/Puc/v4p1/Plugin/Info.php

@@ -1,127 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Plugin_Info', false) ):
-
-	/**
-	 * A container class for holding and transforming various plugin metadata.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	class Puc_v4p1_Plugin_Info extends Puc_v4p1_Metadata {
-		//Most fields map directly to the contents of the plugin's info.json file.
-		//See the relevant docs for a description of their meaning.
-		public $name;
-		public $slug;
-		public $version;
-		public $homepage;
-		public $sections = array();
-		public $banners;
-		public $translations = array();
-		public $download_url;
-
-		public $author;
-		public $author_homepage;
-
-		public $requires;
-		public $tested;
-		public $upgrade_notice;
-
-		public $rating;
-		public $num_ratings;
-		public $downloaded;
-		public $active_installs;
-		public $last_updated;
-
-		public $id = 0; //The native WP.org API returns numeric plugin IDs, but they're not used for anything.
-
-		public $filename; //Plugin filename relative to the plugins directory.
-
-		/**
-		 * Create a new instance of Plugin Info from JSON-encoded plugin info
-		 * returned by an external update API.
-		 *
-		 * @param string $json Valid JSON string representing plugin info.
-		 * @return self|null New instance of Plugin Info, or NULL on error.
-		 */
-		public static function fromJson($json){
-			$instance = new self();
-
-			if ( !parent::createFromJson($json, $instance) ) {
-				return null;
-			}
-
-			//json_decode decodes assoc. arrays as objects. We want it as an array.
-			$instance->sections = (array)$instance->sections;
-
-			return $instance;
-		}
-
-		/**
-		 * Very, very basic validation.
-		 *
-		 * @param StdClass $apiResponse
-		 * @return bool|WP_Error
-		 */
-		protected function validateMetadata($apiResponse) {
-			if (
-				!isset($apiResponse->name, $apiResponse->version)
-				|| empty($apiResponse->name)
-				|| empty($apiResponse->version)
-			) {
-				return new WP_Error(
-					'puc-invalid-metadata',
-					"The plugin metadata file does not contain the required 'name' and/or 'version' keys."
-				);
-			}
-			return true;
-		}
-
-
-		/**
-		 * Transform plugin info into the format used by the native WordPress.org API
-		 *
-		 * @return object
-		 */
-		public function toWpFormat(){
-			$info = new stdClass;
-
-			//The custom update API is built so that many fields have the same name and format
-			//as those returned by the native WordPress.org API. These can be assigned directly.
-			$sameFormat = array(
-				'name', 'slug', 'version', 'requires', 'tested', 'rating', 'upgrade_notice',
-				'num_ratings', 'downloaded', 'active_installs', 'homepage', 'last_updated',
-			);
-			foreach($sameFormat as $field){
-				if ( isset($this->$field) ) {
-					$info->$field = $this->$field;
-				} else {
-					$info->$field = null;
-				}
-			}
-
-			//Other fields need to be renamed and/or transformed.
-			$info->download_link = $this->download_url;
-			$info->author = $this->getFormattedAuthor();
-			$info->sections = array_merge(array('description' => ''), $this->sections);
-
-			if ( !empty($this->banners) ) {
-				//WP expects an array with two keys: "high" and "low". Both are optional.
-				//Docs: https://wordpress.org/plugins/about/faq/#banners
-				$info->banners = is_object($this->banners) ? get_object_vars($this->banners) : $this->banners;
-				$info->banners = array_intersect_key($info->banners, array('high' => true, 'low' => true));
-			}
-
-			return $info;
-		}
-
-		protected function getFormattedAuthor() {
-			if ( !empty($this->author_homepage) ){
-				/** @noinspection HtmlUnknownTarget */
-				return sprintf('<a href="%s">%s</a>', $this->author_homepage, $this->author);
-			}
-			return $this->author;
-		}
-	}
-
-endif;

update/Puc/v4p1/Plugin/Update.php

@@ -1,91 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Plugin_Update', false) ):
-
-	/**
-	 * A simple container class for holding information about an available update.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	class Puc_v4p1_Plugin_Update extends Puc_v4p1_Update {
-		public $id = 0;
-		public $homepage;
-		public $upgrade_notice;
-		public $tested;
-		public $filename; //Plugin filename relative to the plugins directory.
-
-		protected static $extraFields = array(
-			'id', 'homepage', 'tested', 'upgrade_notice', 'filename',
-		);
-
-		/**
-		 * Create a new instance of PluginUpdate from its JSON-encoded representation.
-		 *
-		 * @param string $json
-		 * @return Puc_v4p1_Plugin_Update|null
-		 */
-		public static function fromJson($json){
-			//Since update-related information is simply a subset of the full plugin info,
-			//we can parse the update JSON as if it was a plugin info string, then copy over
-			//the parts that we care about.
-			$pluginInfo = Puc_v4p1_Plugin_Info::fromJson($json);
-			if ( $pluginInfo != null ) {
-				return self::fromPluginInfo($pluginInfo);
-			} else {
-				return null;
-			}
-		}
-
-		/**
-		 * Create a new instance of PluginUpdate based on an instance of PluginInfo.
-		 * Basically, this just copies a subset of fields from one object to another.
-		 *
-		 * @param Puc_v4p1_Plugin_Info $info
-		 * @return Puc_v4p1_Plugin_Update
-		 */
-		public static function fromPluginInfo($info){
-			return self::fromObject($info);
-		}
-
-		/**
-		 * Create a new instance by copying the necessary fields from another object.
-		 *
-		 * @param StdClass|Puc_v4p1_Plugin_Info|Puc_v4p1_Plugin_Update $object The source object.
-		 * @return Puc_v4p1_Plugin_Update The new copy.
-		 */
-		public static function fromObject($object) {
-			$update = new self();
-			$update->copyFields($object, $update);
-			return $update;
-		}
-
-		/**
-		 * @return string[]
-		 */
-		protected function getFieldNames() {
-			return array_merge(parent::getFieldNames(), self::$extraFields);
-		}
-
-		/**
-		 * Transform the update into the format used by WordPress native plugin API.
-		 *
-		 * @return object
-		 */
-		public function toWpFormat(){
-			$update = parent::toWpFormat();
-
-			$update->id = $this->id;
-			$update->url = $this->homepage;
-			$update->tested = $this->tested;
-			$update->plugin = $this->filename;
-
-			if ( !empty($this->upgrade_notice) ){
-				$update->upgrade_notice = $this->upgrade_notice;
-			}
-
-			return $update;
-		}
-	}
-
-endif;

update/Puc/v4p1/Plugin/UpdateChecker.php

@@ -1,546 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Plugin_UpdateChecker', false) ):
-
-	/**
-	 * A custom plugin update checker.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	class Puc_v4p1_Plugin_UpdateChecker extends Puc_v4p1_UpdateChecker {
-		protected $updateTransient = 'update_plugins';
-		protected $translationType = 'plugin';
-
-		public $pluginAbsolutePath = ''; //Full path of the main plugin file.
-		public $pluginFile = '';  //Plugin filename relative to the plugins directory. Many WP APIs use this to identify plugins.
-		public $muPluginFile = ''; //For MU plugins, the plugin filename relative to the mu-plugins directory.
-
-		private $cachedInstalledVersion = null;
-
-		/**
-		 * Class constructor.
-		 *
-		 * @param string $metadataUrl The URL of the plugin's metadata file.
-		 * @param string $pluginFile Fully qualified path to the main plugin file.
-		 * @param string $slug The plugin's 'slug'. If not specified, the filename part of $pluginFile sans '.php' will be used as the slug.
-		 * @param integer $checkPeriod How often to check for updates (in hours). Defaults to checking every 12 hours. Set to 0 to disable automatic update checks.
-		 * @param string $optionName Where to store book-keeping info about update checks. Defaults to 'external_updates-$slug'.
-		 * @param string $muPluginFile Optional. The plugin filename relative to the mu-plugins directory.
-		 */
-		public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = ''){
-			$this->pluginAbsolutePath = $pluginFile;
-			$this->pluginFile = plugin_basename($this->pluginAbsolutePath);
-			$this->muPluginFile = $muPluginFile;
-
-			//If no slug is specified, use the name of the main plugin file as the slug.
-			//For example, 'my-cool-plugin/cool-plugin.php' becomes 'cool-plugin'.
-			if ( empty($slug) ){
-				$slug = basename($this->pluginFile, '.php');
-			}
-
-			//Plugin slugs must be unique.
-			$slugCheckFilter = 'puc_is_slug_in_use-' . $this->slug;
-			$slugUsedBy = apply_filters($slugCheckFilter, false);
-			if ( $slugUsedBy ) {
-				$this->triggerError(sprintf(
-					'Plugin slug "%s" is already in use by %s. Slugs must be unique.',
-					htmlentities($this->slug),
-					htmlentities($slugUsedBy)
-				), E_USER_ERROR);
-			}
-			add_filter($slugCheckFilter, array($this, 'getAbsolutePath'));
-
-			//Backwards compatibility: If the plugin is a mu-plugin but no $muPluginFile is specified, assume
-			//it's the same as $pluginFile given that it's not in a subdirectory (WP only looks in the base dir).
-			if ( (strpbrk($this->pluginFile, '/\\') === false) && $this->isUnknownMuPlugin() ) {
-				$this->muPluginFile = $this->pluginFile;
-			}
-
-			parent::__construct($metadataUrl, dirname($this->pluginFile), $slug, $checkPeriod, $optionName);
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Puc_v4p1_Scheduler
-		 */
-		protected function createScheduler($checkPeriod) {
-			$scheduler = new Puc_v4p1_Scheduler($this, $checkPeriod, array('load-plugins.php'));
-			register_deactivation_hook($this->pluginFile, array($scheduler, 'removeUpdaterCron'));
-			return $scheduler;
-		}
-
-		/**
-		 * Install the hooks required to run periodic update checks and inject update info
-		 * into WP data structures.
-		 *
-		 * @return void
-		 */
-		protected function installHooks(){
-			//Override requests for plugin information
-			add_filter('plugins_api', array($this, 'injectInfo'), 20, 3);
-
-			add_filter('plugin_row_meta', array($this, 'addCheckForUpdatesLink'), 10, 2);
-			add_action('admin_init', array($this, 'handleManualCheck'));
-			add_action('all_admin_notices', array($this, 'displayManualCheckResult'));
-
-			//Clear the version number cache when something - anything - is upgraded or WP clears the update cache.
-			add_filter('upgrader_post_install', array($this, 'clearCachedVersion'));
-			add_action('delete_site_transient_update_plugins', array($this, 'clearCachedVersion'));
-
-			parent::installHooks();
-		}
-
-		/**
-		 * Retrieve plugin info from the configured API endpoint.
-		 *
-		 * @uses wp_remote_get()
-		 *
-		 * @param array $queryArgs Additional query arguments to append to the request. Optional.
-		 * @return Puc_v4p1_Plugin_Info
-		 */
-		public function requestInfo($queryArgs = array()) {
-			list($pluginInfo, $result) = $this->requestMetadata('Puc_v4p1_Plugin_Info', 'request_info', $queryArgs);
-
-			if ( $pluginInfo !== null ) {
-				/** @var Puc_v4p1_Plugin_Info $pluginInfo */
-				$pluginInfo->filename = $this->pluginFile;
-				$pluginInfo->slug = $this->slug;
-			}
-
-			$pluginInfo = apply_filters($this->getUniqueName('request_info_result'), $pluginInfo, $result);
-			return $pluginInfo;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * @uses PluginUpdateChecker::requestInfo()
-		 *
-		 * @return Puc_v4p1_Update|null An instance of Plugin_Update, or NULL when no updates are available.
-		 */
-		public function requestUpdate() {
-			//For the sake of simplicity, this function just calls requestInfo()
-			//and transforms the result accordingly.
-			$pluginInfo = $this->requestInfo(array('checking_for_updates' => '1'));
-			if ( $pluginInfo == null ){
-				return null;
-			}
-			$update = Puc_v4p1_Plugin_Update::fromPluginInfo($pluginInfo);
-
-			$update = $this->filterUpdateResult($update);
-
-			return $update;
-		}
-
-		/**
-		 * Get the currently installed version of the plugin.
-		 *
-		 * @return string Version number.
-		 */
-		public function getInstalledVersion(){
-			if ( isset($this->cachedInstalledVersion) ) {
-				return $this->cachedInstalledVersion;
-			}
-
-			$pluginHeader = $this->getPluginHeader();
-			if ( isset($pluginHeader['Version']) ) {
-				$this->cachedInstalledVersion = $pluginHeader['Version'];
-				return $pluginHeader['Version'];
-			} else {
-				//This can happen if the filename points to something that is not a plugin.
-				$this->triggerError(
-					sprintf(
-						"Can't to read the Version header for '%s'. The filename is incorrect or is not a plugin.",
-						$this->pluginFile
-					),
-					E_USER_WARNING
-				);
-				return null;
-			}
-		}
-
-		/**
-		 * Get plugin's metadata from its file header.
-		 *
-		 * @return array
-		 */
-		protected function getPluginHeader() {
-			if ( !is_file($this->pluginAbsolutePath) ) {
-				//This can happen if the plugin filename is wrong.
-				$this->triggerError(
-					sprintf(
-						"Can't to read the plugin header for '%s'. The file does not exist.",
-						$this->pluginFile
-					),
-					E_USER_WARNING
-				);
-				return array();
-			}
-
-			if ( !function_exists('get_plugin_data') ){
-				/** @noinspection PhpIncludeInspection */
-				require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
-			}
-			return get_plugin_data($this->pluginAbsolutePath, false, false);
-		}
-
-		/**
-		 * @return array
-		 */
-		protected function getHeaderNames() {
-			return array(
-				'Name' => 'Plugin Name',
-				'PluginURI' => 'Plugin URI',
-				'Version' => 'Version',
-				'Description' => 'Description',
-				'Author' => 'Author',
-				'AuthorURI' => 'Author URI',
-				'TextDomain' => 'Text Domain',
-				'DomainPath' => 'Domain Path',
-				'Network' => 'Network',
-
-				//The newest WordPress version that this plugin requires or has been tested with.
-				//We support several different formats for compatibility with other libraries.
-				'Tested WP' => 'Tested WP',
-				'Requires WP' => 'Requires WP',
-				'Tested up to' => 'Tested up to',
-				'Requires at least' => 'Requires at least',
-			);
-		}
-
-
-		/**
-		 * Intercept plugins_api() calls that request information about our plugin and
-		 * use the configured API endpoint to satisfy them.
-		 *
-		 * @see plugins_api()
-		 *
-		 * @param mixed $result
-		 * @param string $action
-		 * @param array|object $args
-		 * @return mixed
-		 */
-		public function injectInfo($result, $action = null, $args = null){
-			$relevant = ($action == 'plugin_information') && isset($args->slug) && (
-					($args->slug == $this->slug) || ($args->slug == dirname($this->pluginFile))
-				);
-			if ( !$relevant ) {
-				return $result;
-			}
-
-			$pluginInfo = $this->requestInfo();
-			$pluginInfo = apply_filters($this->getUniqueName('pre_inject_info'), $pluginInfo);
-			if ( $pluginInfo ) {
-				return $pluginInfo->toWpFormat();
-			}
-
-			return $result;
-		}
-
-		protected function shouldShowUpdates() {
-			//No update notifications for mu-plugins unless explicitly enabled. The MU plugin file
-			//is usually different from the main plugin file so the update wouldn't show up properly anyway.
-			return !$this->isUnknownMuPlugin();
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @param stdClass $updateToAdd
-		 * @return stdClass
-		 */
-		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( $this->isMuPlugin() ) {
-				//WP does not support automatic update installation for mu-plugins, but we can
-				//still display a notice.
-				$updateToAdd->package = null;
-			}
-			return parent::addUpdateToList($updates, $updateToAdd);
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @return stdClass|null
-		 */
-		protected function removeUpdateFromList($updates) {
-			$updates = parent::removeUpdateFromList($updates);
-			if ( !empty($this->muPluginFile) && isset($updates, $updates->response) ) {
-				unset($updates->response[$this->muPluginFile]);
-			}
-			return $updates;
-		}
-
-		/**
-		 * For plugins, the update array is indexed by the plugin filename relative to the "plugins"
-		 * directory. Example: "plugin-name/plugin.php".
-		 *
-		 * @return string
-		 */
-		protected function getUpdateListKey() {
-			if ( $this->isMuPlugin() ) {
-				return $this->muPluginFile;
-			}
-			return $this->pluginFile;
-		}
-
-		/**
-		 * Alias for isBeingUpgraded().
-		 *
-		 * @deprecated
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		public function isPluginBeingUpgraded($upgrader = null) {
-			return $this->isBeingUpgraded($upgrader);
-		}
-
-		/**
-		 * Is there an update being installed for this plugin, right now?
-		 *
-		 * @param WP_Upgrader|null $upgrader
-		 * @return bool
-		 */
-		public function isBeingUpgraded($upgrader = null) {
-			return $this->upgraderStatus->isPluginBeingUpgraded($this->pluginFile, $upgrader);
-		}
-
-		/**
-		 * Get the details of the currently available update, if any.
-		 *
-		 * If no updates are available, or if the last known update version is below or equal
-		 * to the currently installed version, this method will return NULL.
-		 *
-		 * Uses cached update data. To retrieve update information straight from
-		 * the metadata URL, call requestUpdate() instead.
-		 *
-		 * @return Puc_v4p1_Plugin_Update|null
-		 */
-		public function getUpdate() {
-			$update = parent::getUpdate();
-			if ( isset($update) ) {
-				/** @var Puc_v4p1_Plugin_Update $update */
-				$update->filename = $this->pluginFile;
-			}
-			return $update;
-		}
-
-		/**
-		 * Add a "Check for updates" link to the plugin row in the "Plugins" page. By default,
-		 * the new link will appear after the "Visit plugin site" link.
-		 *
-		 * You can change the link text by using the "puc_manual_check_link-$slug" filter.
-		 * Returning an empty string from the filter will disable the link.
-		 *
-		 * @param array $pluginMeta Array of meta links.
-		 * @param string $pluginFile
-		 * @return array
-		 */
-		public function addCheckForUpdatesLink($pluginMeta, $pluginFile) {
-			$isRelevant = ($pluginFile == $this->pluginFile)
-				|| (!empty($this->muPluginFile) && $pluginFile == $this->muPluginFile);
-
-			if ( $isRelevant && $this->userCanInstallUpdates() ) {
-				$linkUrl = wp_nonce_url(
-					add_query_arg(
-						array(
-							'puc_check_for_updates' => 1,
-							'puc_slug' => $this->slug,
-						),
-						self_admin_url('plugins.php')
-					),
-					'puc_check_for_updates'
-				);
-
-				$linkText = apply_filters(
-					$this->getUniqueName('manual_check_link'),
-					__('Check for updates', 'plugin-update-checker')
-				);
-				if ( !empty($linkText) ) {
-					/** @noinspection HtmlUnknownTarget */
-					$pluginMeta[] = sprintf('<a href="%s">%s</a>', esc_attr($linkUrl), $linkText);
-				}
-			}
-			return $pluginMeta;
-		}
-
-		/**
-		 * Check for updates when the user clicks the "Check for updates" link.
-		 * @see self::addCheckForUpdatesLink()
-		 *
-		 * @return void
-		 */
-		public function handleManualCheck() {
-			$shouldCheck =
-				isset($_GET['puc_check_for_updates'], $_GET['puc_slug'])
-				&& $_GET['puc_slug'] == $this->slug
-				&& $this->userCanInstallUpdates()
-				&& check_admin_referer('puc_check_for_updates');
-
-			if ( $shouldCheck ) {
-				$update = $this->checkForUpdates();
-				$status = ($update === null) ? 'no_update' : 'update_available';
-				wp_redirect(add_query_arg(
-					array(
-						'puc_update_check_result' => $status,
-						'puc_slug' => $this->slug,
-					),
-					self_admin_url('plugins.php')
-				));
-			}
-		}
-
-		/**
-		 * Display the results of a manual update check.
-		 * @see self::handleManualCheck()
-		 *
-		 * You can change the result message by using the "puc_manual_check_message-$slug" filter.
-		 */
-		public function displayManualCheckResult() {
-			if ( isset($_GET['puc_update_check_result'], $_GET['puc_slug']) && ($_GET['puc_slug'] == $this->slug) ) {
-				$status = strval($_GET['puc_update_check_result']);
-				$title  = $this->getPluginTitle();
-				if ( $status == 'no_update' ) {
-					$message = sprintf(_x('The %s plugin is up to date.', 'the plugin title', 'plugin-update-checker'), $title);
-				} else if ( $status == 'update_available' ) {
-					$message = sprintf(_x('A new version of the %s plugin is available.', 'the plugin title', 'plugin-update-checker'), $title);
-				} else {
-					$message = sprintf(__('Unknown update checker status "%s"', 'plugin-update-checker'), htmlentities($status));
-				}
-				printf(
-					'<div class="updated notice is-dismissible"><p>%s</p></div>',
-					apply_filters($this->getUniqueName('manual_check_message'), $message, $status)
-				);
-			}
-		}
-
-		/**
-		 * Get the translated plugin title.
-		 *
-		 * @return string
-		 */
-		protected function getPluginTitle() {
-			$title  = '';
-			$header = $this->getPluginHeader();
-			if ( $header && !empty($header['Name']) && isset($header['TextDomain']) ) {
-				$title = translate($header['Name'], $header['TextDomain']);
-			}
-			return $title;
-		}
-
-		/**
-		 * Check if the current user has the required permissions to install updates.
-		 *
-		 * @return bool
-		 */
-		public function userCanInstallUpdates() {
-			return current_user_can('update_plugins');
-		}
-
-		/**
-		 * Check if the plugin file is inside the mu-plugins directory.
-		 *
-		 * @return bool
-		 */
-		protected function isMuPlugin() {
-			static $cachedResult = null;
-
-			if ( $cachedResult === null ) {
-				//Convert both paths to the canonical form before comparison.
-				$muPluginDir = realpath(WPMU_PLUGIN_DIR);
-				$pluginPath  = realpath($this->pluginAbsolutePath);
-
-				$cachedResult = (strpos($pluginPath, $muPluginDir) === 0);
-			}
-
-			return $cachedResult;
-		}
-
-		/**
-		 * MU plugins are partially supported, but only when we know which file in mu-plugins
-		 * corresponds to this plugin.
-		 *
-		 * @return bool
-		 */
-		protected function isUnknownMuPlugin() {
-			return empty($this->muPluginFile) && $this->isMuPlugin();
-		}
-
-		/**
-		 * Clear the cached plugin version. This method can be set up as a filter (hook) and will
-		 * return the filter argument unmodified.
-		 *
-		 * @param mixed $filterArgument
-		 * @return mixed
-		 */
-		public function clearCachedVersion($filterArgument = null) {
-			$this->cachedInstalledVersion = null;
-			return $filterArgument;
-		}
-
-		/**
-		 * Get absolute path to the main plugin file.
-		 *
-		 * @return string
-		 */
-		public function getAbsolutePath() {
-			return $this->pluginAbsolutePath;
-		}
-
-		/**
-		 * Register a callback for filtering query arguments.
-		 *
-		 * The callback function should take one argument - an associative array of query arguments.
-		 * It should return a modified array of query arguments.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addQueryArgFilter($callback){
-			$this->addFilter('request_info_query_args', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering arguments passed to wp_remote_get().
-		 *
-		 * The callback function should take one argument - an associative array of arguments -
-		 * and return a modified array or arguments. See the WP documentation on wp_remote_get()
-		 * for details on what arguments are available and how they work.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addHttpRequestArgFilter($callback) {
-			$this->addFilter('request_info_options', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering the plugin info retrieved from the external API.
-		 *
-		 * The callback function should take two arguments. If the plugin info was retrieved
-		 * successfully, the first argument passed will be an instance of  PluginInfo. Otherwise,
-		 * it will be NULL. The second argument will be the corresponding return value of
-		 * wp_remote_get (see WP docs for details).
-		 *
-		 * The callback function should return a new or modified instance of PluginInfo or NULL.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addResultFilter($callback) {
-			$this->addFilter('request_info_result', $callback, 10, 2);
-		}
-
-		protected function createDebugBarExtension() {
-			return new Puc_v4p1_DebugBar_PluginExtension($this);
-		}
-	}
-
-endif;

update/Puc/v4p1/Scheduler.php

@@ -1,177 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Scheduler', false) ):
-
-	/**
-	 * The scheduler decides when and how often to check for updates.
-	 * It calls @see Puc_v4p1_UpdateChecker::checkForUpdates() to perform the actual checks.
-	 */
-	class Puc_v4p1_Scheduler {
-		public $checkPeriod = 12; //How often to check for updates (in hours).
-		public $throttleRedundantChecks = false; //Check less often if we already know that an update is available.
-		public $throttledCheckPeriod = 72;
-
-		protected $hourlyCheckHooks = array('load-update.php');
-
-		/**
-		 * @var Puc_v4p1_UpdateChecker
-		 */
-		protected $updateChecker;
-
-		private $cronHook = null;
-
-		/**
-		 * Scheduler constructor.
-		 *
-		 * @param Puc_v4p1_UpdateChecker $updateChecker
-		 * @param int $checkPeriod How often to check for updates (in hours).
-		 * @param array $hourlyHooks
-		 */
-		public function __construct($updateChecker, $checkPeriod, $hourlyHooks = array('load-plugins.php')) {
-			$this->updateChecker = $updateChecker;
-			$this->checkPeriod = $checkPeriod;
-
-			//Set up the periodic update checks
-			$this->cronHook = $this->updateChecker->getUniqueName('cron_check_updates');
-			if ( $this->checkPeriod > 0 ){
-
-				//Trigger the check via Cron.
-				//Try to use one of the default schedules if possible as it's less likely to conflict
-				//with other plugins and their custom schedules.
-				$defaultSchedules = array(
-					1  => 'hourly',
-					12 => 'twicedaily',
-					24 => 'daily',
-				);
-				if ( array_key_exists($this->checkPeriod, $defaultSchedules) ) {
-					$scheduleName = $defaultSchedules[$this->checkPeriod];
-				} else {
-					//Use a custom cron schedule.
-					$scheduleName = 'every' . $this->checkPeriod . 'hours';
-					add_filter('cron_schedules', array($this, '_addCustomSchedule'));
-				}
-
-				if ( !wp_next_scheduled($this->cronHook) && !defined('WP_INSTALLING') ) {
-					wp_schedule_event(time(), $scheduleName, $this->cronHook);
-				}
-				add_action($this->cronHook, array($this, 'maybeCheckForUpdates'));
-
-				//In case Cron is disabled or unreliable, we also manually trigger
-				//the periodic checks while the user is browsing the Dashboard.
-				add_action( 'admin_init', array($this, 'maybeCheckForUpdates') );
-
-				//Like WordPress itself, we check more often on certain pages.
-				/** @see wp_update_plugins */
-				add_action('load-update-core.php', array($this, 'maybeCheckForUpdates'));
-				//"load-update.php" and "load-plugins.php" or "load-themes.php".
-				$this->hourlyCheckHooks = array_merge($this->hourlyCheckHooks, $hourlyHooks);
-				foreach($this->hourlyCheckHooks as $hook) {
-					add_action($hook, array($this, 'maybeCheckForUpdates'));
-				}
-				//This hook fires after a bulk update is complete.
-				add_action('upgrader_process_complete', array($this, 'maybeCheckForUpdates'), 11, 0);
-
-			} else {
-				//Periodic checks are disabled.
-				wp_clear_scheduled_hook($this->cronHook);
-			}
-		}
-
-		/**
-		 * Check for updates if the configured check interval has already elapsed.
-		 * Will use a shorter check interval on certain admin pages like "Dashboard -> Updates" or when doing cron.
-		 *
-		 * You can override the default behaviour by using the "puc_check_now-$slug" filter.
-		 * The filter callback will be passed three parameters:
-		 *     - Current decision. TRUE = check updates now, FALSE = don't check now.
-		 *     - Last check time as a Unix timestamp.
-		 *     - Configured check period in hours.
-		 * Return TRUE to check for updates immediately, or FALSE to cancel.
-		 *
-		 * This method is declared public because it's a hook callback. Calling it directly is not recommended.
-		 */
-		public function maybeCheckForUpdates(){
-			if ( empty($this->checkPeriod) ){
-				return;
-			}
-
-			$state = $this->updateChecker->getUpdateState();
-			$shouldCheck = ($state->timeSinceLastCheck() >= $this->getEffectiveCheckPeriod());
-
-			//Let plugin authors substitute their own algorithm.
-			$shouldCheck = apply_filters(
-				$this->updateChecker->getUniqueName('check_now'),
-				$shouldCheck,
-				$state->getLastCheck(),
-				$this->checkPeriod
-			);
-
-			if ( $shouldCheck ) {
-				$this->updateChecker->checkForUpdates();
-			}
-		}
-
-		/**
-		 * Calculate the actual check period based on the current status and environment.
-		 *
-		 * @return int Check period in seconds.
-		 */
-		protected function getEffectiveCheckPeriod() {
-			$currentFilter = current_filter();
-			if ( in_array($currentFilter, array('load-update-core.php', 'upgrader_process_complete')) ) {
-				//Check more often when the user visits "Dashboard -> Updates" or does a bulk update.
-				$period = 60;
-			} else if ( in_array($currentFilter, $this->hourlyCheckHooks) ) {
-				//Also check more often on /wp-admin/update.php and the "Plugins" or "Themes" page.
-				$period = 3600;
-			} else if ( $this->throttleRedundantChecks && ($this->updateChecker->getUpdate() !== null) ) {
-				//Check less frequently if it's already known that an update is available.
-				$period = $this->throttledCheckPeriod * 3600;
-			} else if ( defined('DOING_CRON') && constant('DOING_CRON') ) {
-				//WordPress cron schedules are not exact, so lets do an update check even
-				//if slightly less than $checkPeriod hours have elapsed since the last check.
-				$cronFuzziness = 20 * 60;
-				$period = $this->checkPeriod * 3600 - $cronFuzziness;
-			} else {
-				$period = $this->checkPeriod * 3600;
-			}
-
-			return $period;
-		}
-
-		/**
-		 * Add our custom schedule to the array of Cron schedules used by WP.
-		 *
-		 * @param array $schedules
-		 * @return array
-		 */
-		public function _addCustomSchedule($schedules){
-			if ( $this->checkPeriod && ($this->checkPeriod > 0) ){
-				$scheduleName = 'every' . $this->checkPeriod . 'hours';
-				$schedules[$scheduleName] = array(
-					'interval' => $this->checkPeriod * 3600,
-					'display' => sprintf('Every %d hours', $this->checkPeriod),
-				);
-			}
-			return $schedules;
-		}
-
-		/**
-		 * Remove the scheduled cron event that the library uses to check for updates.
-		 *
-		 * @return void
-		 */
-		public function removeUpdaterCron(){
-			wp_clear_scheduled_hook($this->cronHook);
-		}
-
-		/**
-		 * Get the name of the update checker's WP-cron hook. Mostly useful for debugging.
-		 *
-		 * @return string
-		 */
-		public function getCronHookName() {
-			return $this->cronHook;
-		}
-	}
-
-endif;

update/Puc/v4p1/StateStore.php

@@ -1,207 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_StateStore', false) ):
-
-	class Puc_v4p1_StateStore {
-		/**
-		 * @var int Last update check timestamp.
-		 */
-		protected $lastCheck = 0;
-
-		/**
-		 * @var string Version number.
-		 */
-		protected $checkedVersion = '';
-
-		/**
-		 * @var Puc_v4p1_Update|null Cached update.
-		 */
-		protected $update = null;
-
-		/**
-		 * @var string Site option name.
-		 */
-		private $optionName = '';
-
-		/**
-		 * @var bool Whether we've already tried to load the state from the database.
-		 */
-		private $isLoaded = false;
-
-		public function __construct($optionName) {
-			$this->optionName = $optionName;
-		}
-
-		/**
-		 * Get time elapsed since the last update check.
-		 *
-		 * If there are no recorded update checks, this method returns a large arbitrary number
-		 * (i.e. time since the Unix epoch).
-		 *
-		 * @return int Elapsed time in seconds.
-		 */
-		public function timeSinceLastCheck() {
-			$this->lazyLoad();
-			return time() - $this->lastCheck;
-		}
-
-		/**
-		 * @return int
-		 */
-		public function getLastCheck() {
-			$this->lazyLoad();
-			return $this->lastCheck;
-		}
-
-		/**
-		 * Set the time of the last update check to the current timestamp.
-		 *
-		 * @return $this
-		 */
-		public function setLastCheckToNow() {
-			$this->lazyLoad();
-			$this->lastCheck = time();
-			return $this;
-		}
-
-		/**
-		 * @return null|Puc_v4p1_Update
-		 */
-		public function getUpdate() {
-			$this->lazyLoad();
-			return $this->update;
-		}
-
-		/**
-		 * @param Puc_v4p1_Update|null $update
-		 * @return $this
-		 */
-		public function setUpdate(Puc_v4p1_Update $update = null) {
-			$this->lazyLoad();
-			$this->update = $update;
-			return $this;
-		}
-
-		/**
-		 * @return string
-		 */
-		public function getCheckedVersion() {
-			$this->lazyLoad();
-			return $this->checkedVersion;
-		}
-
-		/**
-		 * @param string $version
-		 * @return $this
-		 */
-		public function setCheckedVersion($version) {
-			$this->lazyLoad();
-			$this->checkedVersion = strval($version);
-			return $this;
-		}
-
-		/**
-		 * Get translation updates.
-		 *
-		 * @return array
-		 */
-		public function getTranslations() {
-			$this->lazyLoad();
-			if ( isset($this->update, $this->update->translations) ) {
-				return $this->update->translations;
-			}
-			return array();
-		}
-
-		/**
-		 * Set translation updates.
-		 *
-		 * @param array $translationUpdates
-		 */
-		public function setTranslations($translationUpdates) {
-			$this->lazyLoad();
-			if ( isset($this->update) ) {
-				$this->update->translations = $translationUpdates;
-				$this->save();
-			}
-		}
-
-		public function save() {
-			$state = new stdClass();
-
-			$state->lastCheck = $this->lastCheck;
-			$state->checkedVersion = $this->checkedVersion;
-
-			if ( isset($this->update)) {
-				$state->update = $this->update->toStdClass();
-
-				$updateClass = get_class($this->update);
-				$state->updateClass = $updateClass;
-				$prefix = $this->getLibPrefix();
-				if ( Puc_v4p1_Utils::startsWith($updateClass, $prefix) ) {
-					$state->updateBaseClass = substr($updateClass, strlen($prefix));
-				}
-			}
-
-			update_site_option($this->optionName, $state);
-			$this->isLoaded = true;
-		}
-
-		/**
-		 * @return $this
-		 */
-		public function lazyLoad() {
-			if ( !$this->isLoaded ) {
-				$this->load();
-			}
-			return $this;
-		}
-
-		protected function load() {
-			$this->isLoaded = true;
-
-			$state = get_site_option($this->optionName, null);
-
-			if ( !is_object($state) ) {
-				$this->lastCheck = 0;
-				$this->checkedVersion = '';
-				$this->update = null;
-				return;
-			}
-
-			$this->lastCheck = intval(Puc_v4p1_Utils::get($state, 'lastCheck', 0));
-			$this->checkedVersion = Puc_v4p1_Utils::get($state, 'checkedVersion', '');
-			$this->update = null;
-
-			if ( isset($state->update) ) {
-				//This mess is due to the fact that the want the update class from this version
-				//of the library, not the version that saved the update.
-
-				$updateClass = null;
-				if ( isset($state->updateBaseClass) ) {
-					$updateClass = $this->getLibPrefix() . $state->updateBaseClass;
-				} else if ( isset($state->updateClass) && class_exists($state->updateClass) ) {
-					$updateClass = $state->updateClass;
-				}
-
-				if ( $updateClass !== null ) {
-					$this->update = call_user_func(array($updateClass, 'fromObject'), $state->update);
-				}
-			}
-		}
-
-		public function delete() {
-			delete_site_option($this->optionName);
-
-			$this->lastCheck = 0;
-			$this->checkedVersion = '';
-			$this->update = null;
-		}
-
-		private function getLibPrefix() {
-			$parts = explode('_', __CLASS__, 3);
-			return $parts[0] . '_' . $parts[1] . '_';
-		}
-	}
-
-endif;

update/Puc/v4p1/Theme/Update.php

@@ -1,84 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_Theme_Update', false) ):
-
-	class Puc_v4p1_Theme_Update extends Puc_v4p1_Update {
-		public $details_url = '';
-
-		protected static $extraFields = array('details_url');
-
-		/**
-		 * Transform the metadata into the format used by WordPress core.
-		 * Note the inconsistency: WP stores plugin updates as objects and theme updates as arrays.
-		 *
-		 * @return array
-		 */
-		public function toWpFormat() {
-			$update = array(
-				'theme' => $this->slug,
-				'new_version' => $this->version,
-				'url' => $this->details_url,
-			);
-
-			if ( !empty($this->download_url) ) {
-				$update['package'] = $this->download_url;
-			}
-
-			return $update;
-		}
-
-		/**
-		 * Create a new instance of Theme_Update from its JSON-encoded representation.
-		 *
-		 * @param string $json Valid JSON string representing a theme information object.
-		 * @return self New instance of ThemeUpdate, or NULL on error.
-		 */
-		public static function fromJson($json) {
-			$instance = new self();
-			if ( !parent::createFromJson($json, $instance) ) {
-				return null;
-			}
-			return $instance;
-		}
-
-		/**
-		 * Create a new instance by copying the necessary fields from another object.
-		 *
-		 * @param StdClass|Puc_v4p1_Theme_Update $object The source object.
-		 * @return Puc_v4p1_Theme_Update The new copy.
-		 */
-		public static function fromObject($object) {
-			$update = new self();
-			$update->copyFields($object, $update);
-			return $update;
-		}
-
-		/**
-		 * Basic validation.
-		 *
-		 * @param StdClass $apiResponse
-		 * @return bool|WP_Error
-		 */
-		protected function validateMetadata($apiResponse) {
-			$required = array('version', 'details_url');
-			foreach($required as $key) {
-				if ( !isset($apiResponse->$key) || empty($apiResponse->$key) ) {
-					return new WP_Error(
-						'tuc-invalid-metadata',
-						sprintf('The theme metadata is missing the required "%s" key.', $key)
-					);
-				}
-			}
-			return true;
-		}
-
-		protected function getFieldNames() {
-			return array_merge(parent::getFieldNames(), self::$extraFields);
-		}
-
-		protected function getPrefixedFilter($tag) {
-			return parent::getPrefixedFilter($tag) . '_theme';
-		}
-	}
-
-endif;

update/Puc/v4p1/Theme/UpdateChecker.php

@@ -1,167 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_Theme_UpdateChecker', false) ):
-
-	class Puc_v4p1_Theme_UpdateChecker extends Puc_v4p1_UpdateChecker {
-		protected $filterSuffix = 'theme';
-		protected $updateTransient = 'update_themes';
-		protected $translationType = 'theme';
-
-		/**
-		 * @var string Theme directory name.
-		 */
-		protected $stylesheet;
-
-		/**
-		 * @var WP_Theme Theme object.
-		 */
-		protected $theme;
-
-		public function __construct($metadataUrl, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
-			if ( $stylesheet === null ) {
-				$stylesheet = get_stylesheet();
-			}
-			$this->stylesheet = $stylesheet;
-			$this->theme = wp_get_theme($this->stylesheet);
-
-			parent::__construct(
-				$metadataUrl,
-				$stylesheet,
-				$customSlug ? $customSlug : $stylesheet,
-				$checkPeriod,
-				$optionName
-			);
-		}
-
-		/**
-		 * For themes, the update array is indexed by theme directory name.
-		 *
-		 * @return string
-		 */
-		protected function getUpdateListKey() {
-			return $this->directoryName;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * @return Puc_v4p1_Update|null An instance of Update, or NULL when no updates are available.
-		 */
-		public function requestUpdate() {
-			list($themeUpdate, $result) = $this->requestMetadata('Puc_v4p1_Theme_Update', 'request_update');
-
-			if ( $themeUpdate !== null ) {
-				/** @var Puc_v4p1_Theme_Update $themeUpdate */
-				$themeUpdate->slug = $this->slug;
-			}
-
-			$themeUpdate = $this->filterUpdateResult($themeUpdate, $result);
-			return $themeUpdate;
-		}
-
-		public function userCanInstallUpdates() {
-			return current_user_can('update_themes');
-		}
-
-		/**
-		 * Get the currently installed version of the plugin or theme.
-		 *
-		 * @return string Version number.
-		 */
-		public function getInstalledVersion() {
-			return $this->theme->get('Version');
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Puc_v4p1_Scheduler
-		 */
-		protected function createScheduler($checkPeriod) {
-			return new Puc_v4p1_Scheduler($this, $checkPeriod, array('load-themes.php'));
-		}
-
-		/**
-		 * Is there an update being installed right now for this theme?
-		 *
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		public function isBeingUpgraded($upgrader = null) {
-			return $this->upgraderStatus->isThemeBeingUpgraded($this->stylesheet, $upgrader);
-		}
-
-		protected function createDebugBarExtension() {
-			return new Puc_v4p1_DebugBar_Extension($this, 'Puc_v4p1_DebugBar_ThemePanel');
-		}
-
-		/**
-		 * Register a callback for filtering query arguments.
-		 *
-		 * The callback function should take one argument - an associative array of query arguments.
-		 * It should return a modified array of query arguments.
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addQueryArgFilter($callback){
-			$this->addFilter('request_update_query_args', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering arguments passed to wp_remote_get().
-		 *
-		 * The callback function should take one argument - an associative array of arguments -
-		 * and return a modified array or arguments. See the WP documentation on wp_remote_get()
-		 * for details on what arguments are available and how they work.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addHttpRequestArgFilter($callback) {
-			$this->addFilter('request_update_options', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering theme updates retrieved from the external API.
-		 *
-		 * The callback function should take two arguments. If the theme update was retrieved
-		 * successfully, the first argument passed will be an instance of Theme_Update. Otherwise,
-		 * it will be NULL. The second argument will be the corresponding return value of
-		 * wp_remote_get (see WP docs for details).
-		 *
-		 * The callback function should return a new or modified instance of Theme_Update or NULL.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addResultFilter($callback) {
-			$this->addFilter('request_update_result', $callback, 10, 2);
-		}
-
-		/**
-		 * @return array
-		 */
-		protected function getHeaderNames() {
-			return array(
-				'Name'        => 'Theme Name',
-				'ThemeURI'    => 'Theme URI',
-				'Description' => 'Description',
-				'Author'      => 'Author',
-				'AuthorURI'   => 'Author URI',
-				'Version'     => 'Version',
-				'Template'    => 'Template',
-				'Status'      => 'Status',
-				'Tags'        => 'Tags',
-				'TextDomain'  => 'Text Domain',
-				'DomainPath'  => 'Domain Path',
-			);
-		}
-	}
-
-endif;

update/Puc/v4p1/Update.php

@@ -1,34 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Update', false) ):
-
-	/**
-	 * A simple container class for holding information about an available update.
-	 *
-	 * @author Janis Elsts
-	 * @access public
-	 */
-	abstract class Puc_v4p1_Update extends Puc_v4p1_Metadata {
-		public $slug;
-		public $version;
-		public $download_url;
-		public $translations = array();
-
-		/**
-		 * @return string[]
-		 */
-		protected function getFieldNames() {
-			return array('slug', 'version', 'download_url', 'translations');
-		}
-
-		public function toWpFormat() {
-			$update = new stdClass();
-
-			$update->slug = $this->slug;
-			$update->new_version = $this->version;
-			$update->package = $this->download_url;
-
-			return $update;
-		}
-	}
-
-endif;

update/Puc/v4p1/UpdateChecker.php

@@ -1,825 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_UpdateChecker', false) ):
-
-	abstract class Puc_v4p1_UpdateChecker {
-		protected $filterSuffix = '';
-		protected $updateTransient = '';
-		protected $translationType = ''; //"plugin" or "theme".
-
-		/**
-		 * Set to TRUE to enable error reporting. Errors are raised using trigger_error()
-		 * and should be logged to the standard PHP error log.
-		 * @var bool
-		 */
-		public $debugMode = false;
-
-		/**
-		 * @var string Where to store the update info.
-		 */
-		public $optionName = '';
-
-		/**
-		 * @var string The URL of the metadata file.
-		 */
-		public $metadataUrl = '';
-
-		/**
-		 * @var string Plugin or theme directory name.
-		 */
-		public $directoryName = '';
-
-		/**
-		 * @var string The slug that will be used in update checker hooks and remote API requests.
-		 * Usually matches the directory name unless the plugin/theme directory has been renamed.
-		 */
-		public $slug = '';
-
-		/**
-		 * @var Puc_v4p1_Scheduler
-		 */
-		public $scheduler;
-
-		/**
-		 * @var Puc_v4p1_UpgraderStatus
-		 */
-		protected $upgraderStatus;
-
-		/**
-		 * @var Puc_v4p1_StateStore
-		 */
-		protected $updateState;
-
-		public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
-			$this->debugMode = (bool)(constant('WP_DEBUG'));
-			$this->metadataUrl = $metadataUrl;
-			$this->directoryName = $directoryName;
-			$this->slug = !empty($slug) ? $slug : $this->directoryName;
-
-			$this->optionName = $optionName;
-			if ( empty($this->optionName) ) {
-				//BC: Initially the library only supported plugin updates and didn't use type prefixes
-				//in the option name. Lets use the same prefix-less name when possible.
-				if ( $this->filterSuffix === '' ) {
-					$this->optionName = 'external_updates-' . $this->slug;
-				} else {
-					$this->optionName = $this->getUniqueName('external_updates');
-				}
-			}
-
-			$this->scheduler = $this->createScheduler($checkPeriod);
-			$this->upgraderStatus = new Puc_v4p1_UpgraderStatus();
-			$this->updateState = new Puc_v4p1_StateStore($this->optionName);
-
-			if ( did_action('init') ) {
-				$this->loadTextDomain();
-			} else {
-				add_action('init', array($this, 'loadTextDomain'));
-			}
-
-			$this->installHooks();
-		}
-
-		/**
-		 * @internal
-		 */
-		public function loadTextDomain() {
-			//We're not using load_plugin_textdomain() or its siblings because figuring out where
-			//the library is located (plugin, mu-plugin, theme, custom wp-content paths) is messy.
-			$domain = 'plugin-update-checker';
-			$locale = apply_filters(
-				'plugin_locale',
-				(is_admin() && function_exists('get_user_locale')) ? get_user_locale() : get_locale(),
-				$domain
-			);
-
-			$moFile = $domain . '-' . $locale . '.mo';
-			$path = realpath(dirname(__FILE__) . '/../../languages');
-
-			if ($path && file_exists($path)) {
-				load_textdomain($domain, $path . '/' . $moFile);
-			}
-		}
-
-		protected function installHooks() {
-			//Insert our update info into the update array maintained by WP.
-			add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
-
-			//Insert translation updates into the update list.
-			add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
-
-			//Clear translation updates when WP clears the update cache.
-			//This needs to be done directly because the library doesn't actually remove obsolete plugin updates,
-			//it just hides them (see getUpdate()). We can't do that with translations - too much disk I/O.
-			add_action(
-				'delete_site_transient_' . $this->updateTransient,
-				array($this, 'clearCachedTranslationUpdates')
-			);
-
-			//Rename the update directory to be the same as the existing directory.
-			if ( $this->directoryName !== '.' ) {
-				add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
-			}
-
-			//Allow HTTP requests to the metadata URL even if it's on a local host.
-			add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
-
-			//DebugBar integration.
-			if ( did_action('plugins_loaded') ) {
-				$this->maybeInitDebugBar();
-			} else {
-				add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
-			}
-		}
-
-		/**
-		 * Check if the current user has the required permissions to install updates.
-		 *
-		 * @return bool
-		 */
-		abstract public function userCanInstallUpdates();
-
-		/**
-		 * Explicitly allow HTTP requests to the metadata URL.
-		 *
-		 * WordPress has a security feature where the HTTP API will reject all requests that are sent to
-		 * another site hosted on the same server as the current site (IP match), a local host, or a local
-		 * IP, unless the host exactly matches the current site.
-		 *
-		 * This feature is opt-in (at least in WP 4.4). Apparently some people enable it.
-		 *
-		 * That can be a problem when you're developing your plugin and you decide to host the update information
-		 * on the same server as your test site. Update requests will mysteriously fail.
-		 *
-		 * We fix that by adding an exception for the metadata host.
-		 *
-		 * @param bool $allow
-		 * @param string $host
-		 * @return bool
-		 */
-		public function allowMetadataHost($allow, $host) {
-			static $metadataHost = 0; //Using 0 instead of NULL because parse_url can return NULL.
-			if ( $metadataHost === 0 ) {
-				$metadataHost = @parse_url($this->metadataUrl, PHP_URL_HOST);
-			}
-
-			if ( is_string($metadataHost) && (strtolower($host) === strtolower($metadataHost)) ) {
-				return true;
-			}
-			return $allow;
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * This is implemented as a method to make it possible for plugins to subclass the update checker
-		 * and substitute their own scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Puc_v4p1_Scheduler
-		 */
-		abstract protected function createScheduler($checkPeriod);
-
-		/**
-		 * Check for updates. The results are stored in the DB option specified in $optionName.
-		 *
-		 * @return Puc_v4p1_Update|null
-		 */
-		public function checkForUpdates() {
-			$installedVersion = $this->getInstalledVersion();
-			//Fail silently if we can't find the plugin/theme or read its header.
-			if ( $installedVersion === null ) {
-				$this->triggerError(
-					sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
-					E_USER_WARNING
-				);
-				return null;
-			}
-
-			$state = $this->updateState;
-			$state->setLastCheckToNow()
-				->setCheckedVersion($installedVersion)
-				->save(); //Save before checking in case something goes wrong
-
-			$state->setUpdate($this->requestUpdate());
-			$state->save();
-
-			return $this->getUpdate();
-		}
-
-		/**
-		 * Load the update checker state from the DB.
-		 *
-		 * @return Puc_v4p1_StateStore
-		 */
-		public function getUpdateState() {
-			return $this->updateState->lazyLoad();
-		}
-
-		/**
-		 * Reset update checker state - i.e. last check time, cached update data and so on.
-		 *
-		 * Call this when your plugin is being uninstalled, or if you want to
-		 * clear the update cache.
-		 */
-		public function resetUpdateState() {
-			$this->updateState->delete();
-		}
-
-		/**
-		 * Get the details of the currently available update, if any.
-		 *
-		 * If no updates are available, or if the last known update version is below or equal
-		 * to the currently installed version, this method will return NULL.
-		 *
-		 * Uses cached update data. To retrieve update information straight from
-		 * the metadata URL, call requestUpdate() instead.
-		 *
-		 * @return Puc_v4p1_Update|null
-		 */
-		public function getUpdate() {
-			$update = $this->updateState->getUpdate();
-
-			//Is there an update available?
-			if ( isset($update) ) {
-				//Check if the update is actually newer than the currently installed version.
-				$installedVersion = $this->getInstalledVersion();
-				if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
-					return $update;
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * Subclasses should run the update through filterUpdateResult before returning it.
-		 *
-		 * @return Puc_v4p1_Update An instance of Update, or NULL when no updates are available.
-		 */
-		abstract public function requestUpdate();
-
-		/**
-		 * Filter the result of a requestUpdate() call.
-		 *
-		 * @param Puc_v4p1_Update|null $update
-		 * @param array|WP_Error|null $httpResult The value returned by wp_remote_get(), if any.
-		 * @return Puc_v4p1_Update
-		 */
-		protected function filterUpdateResult($update, $httpResult = null) {
-			//Let plugins/themes modify the update.
-			$update = apply_filters($this->getUniqueName('request_update_result'), $update, $httpResult);
-
-			if ( isset($update, $update->translations) ) {
-				//Keep only those translation updates that apply to this site.
-				$update->translations = $this->filterApplicableTranslations($update->translations);
-			}
-
-			return $update;
-		}
-
-		/**
-		 * Get the currently installed version of the plugin or theme.
-		 *
-		 * @return string|null Version number.
-		 */
-		abstract public function getInstalledVersion();
-
-		/**
-		 * Trigger a PHP error, but only when $debugMode is enabled.
-		 *
-		 * @param string $message
-		 * @param int $errorType
-		 */
-		protected function triggerError($message, $errorType) {
-			if ($this->debugMode) {
-				trigger_error($message, $errorType);
-			}
-		}
-
-		/**
-		 * Get the full name of an update checker filter, action or DB entry.
-		 *
-		 * This method adds the "puc_" prefix and the "-$slug" suffix to the filter name.
-		 * For example, "pre_inject_update" becomes "puc_pre_inject_update-plugin-slug".
-		 *
-		 * @param string $baseTag
-		 * @return string
-		 */
-		public function getUniqueName($baseTag) {
-			$name = 'puc_' . $baseTag;
-			if ($this->filterSuffix !== '') {
-				$name .= '_' . $this->filterSuffix;
-			}
-			return $name . '-' . $this->slug;
-		}
-
-		/* -------------------------------------------------------------------
-		 * PUC filters and filter utilities
-		 * -------------------------------------------------------------------
-		 */
-
-		/**
-		 * Register a callback for one of the update checker filters.
-		 *
-		 * Identical to add_filter(), except it automatically adds the "puc_" prefix
-		 * and the "-$slug" suffix to the filter name. For example, "request_info_result"
-		 * becomes "puc_request_info_result-your_plugin_slug".
-		 *
-		 * @param string $tag
-		 * @param callable $callback
-		 * @param int $priority
-		 * @param int $acceptedArgs
-		 */
-		public function addFilter($tag, $callback, $priority = 10, $acceptedArgs = 1) {
-			add_filter($this->getUniqueName($tag), $callback, $priority, $acceptedArgs);
-		}
-
-		/* -------------------------------------------------------------------
-		 * Inject updates
-		 * -------------------------------------------------------------------
-		 */
-
-		/**
-		 * Insert the latest update (if any) into the update list maintained by WP.
-		 *
-		 * @param stdClass $updates Update list.
-		 * @return stdClass Modified update list.
-		 */
-		public function injectUpdate($updates) {
-			//Is there an update to insert?
-			$update = $this->getUpdate();
-
-			if ( !$this->shouldShowUpdates() ) {
-				$update = null;
-			}
-
-			if ( !empty($update) ) {
-				//Let plugins filter the update info before it's passed on to WordPress.
-				$update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
-				$updates = $this->addUpdateToList($updates, $update->toWpFormat());
-			} else {
-				//Clean up any stale update info.
-				$updates = $this->removeUpdateFromList($updates);
-			}
-
-			return $updates;
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @param stdClass|array $updateToAdd
-		 * @return stdClass
-		 */
-		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-				$updates->response = array();
-			}
-
-			$updates->response[$this->getUpdateListKey()] = $updateToAdd;
-			return $updates;
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @return stdClass|null
-		 */
-		protected function removeUpdateFromList($updates) {
-			if ( isset($updates, $updates->response) ) {
-				unset($updates->response[$this->getUpdateListKey()]);
-			}
-			return $updates;
-		}
-
-		/**
-		 * Get the key that will be used when adding updates to the update list that's maintained
-		 * by the WordPress core. The list is always an associative array, but the key is different
-		 * for plugins and themes.
-		 *
-		 * @return string
-		 */
-		abstract protected function getUpdateListKey();
-
-		/**
-		 * Should we show available updates?
-		 *
-		 * Usually the answer is "yes", but there are exceptions. For example, WordPress doesn't
-		 * support automatic updates installation for mu-plugins, so PUC usually won't show update
-		 * notifications in that case. See the plugin-specific subclass for details.
-		 *
-		 * Note: This method only applies to updates that are displayed (or not) in the WordPress
-		 * admin. It doesn't affect APIs like requestUpdate and getUpdate.
-		 *
-		 * @return bool
-		 */
-		protected function shouldShowUpdates() {
-			return true;
-		}
-
-		/* -------------------------------------------------------------------
-		 * JSON-based update API
-		 * -------------------------------------------------------------------
-		 */
-
-		/**
-		 * Retrieve plugin or theme metadata from the JSON document at $this->metadataUrl.
-		 *
-		 * @param string $metaClass Parse the JSON as an instance of this class. It must have a static fromJson method.
-		 * @param string $filterRoot
-		 * @param array $queryArgs Additional query arguments.
-		 * @return array [Puc_v4p1_Metadata|null, array|WP_Error] A metadata instance and the value returned by wp_remote_get().
-		 */
-		protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()) {
-			//Query args to append to the URL. Plugins can add their own by using a filter callback (see addQueryArgFilter()).
-			$queryArgs = array_merge(
-				array(
-					'installed_version' => strval($this->getInstalledVersion()),
-					'php' => phpversion(),
-					'locale' => get_locale(),
-				),
-				$queryArgs
-			);
-			$queryArgs = apply_filters($this->getUniqueName($filterRoot . '_query_args'), $queryArgs);
-
-			//Various options for the wp_remote_get() call. Plugins can filter these, too.
-			$options = array(
-				'timeout' => 10, //seconds
-				'headers' => array(
-					'Accept' => 'application/json',
-				),
-			);
-			$options = apply_filters($this->getUniqueName($filterRoot . '_options'), $options);
-
-			//The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
-			$url = $this->metadataUrl;
-			if ( !empty($queryArgs) ){
-				$url = add_query_arg($queryArgs, $url);
-			}
-
-			$result = wp_remote_get($url, $options);
-
-			//Try to parse the response
-			$status = $this->validateApiResponse($result);
-			$metadata = null;
-			if ( !is_wp_error($status) ){
-				$metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
-			} else {
-				$this->triggerError(
-					sprintf('The URL %s does not point to a valid metadata file. ', $url)
-					. $status->get_error_message(),
-					E_USER_WARNING
-				);
-			}
-
-			return array($metadata, $result);
-		}
-
-		/**
-		 * Check if $result is a successful update API response.
-		 *
-		 * @param array|WP_Error $result
-		 * @return true|WP_Error
-		 */
-		protected function validateApiResponse($result) {
-			if ( is_wp_error($result) ) { /** @var WP_Error $result */
-				return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
-			}
-
-			if ( !isset($result['response']['code']) ) {
-				return new WP_Error(
-					'puc_no_response_code',
-					'wp_remote_get() returned an unexpected result.'
-				);
-			}
-
-			if ( $result['response']['code'] !== 200 ) {
-				return new WP_Error(
-					'puc_unexpected_response_code',
-					'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
-				);
-			}
-
-			if ( empty($result['body']) ) {
-				return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
-			}
-
-			return true;
-		}
-
-		/* -------------------------------------------------------------------
-		 * Language packs / Translation updates
-		 * -------------------------------------------------------------------
-		 */
-
-		/**
-		 * Filter a list of translation updates and return a new list that contains only updates
-		 * that apply to the current site.
-		 *
-		 * @param array $translations
-		 * @return array
-		 */
-		protected function filterApplicableTranslations($translations) {
-			$languages = array_flip(array_values(get_available_languages()));
-			$installedTranslations = $this->getInstalledTranslations();
-
-			$applicableTranslations = array();
-			foreach($translations as $translation) {
-				//Does it match one of the available core languages?
-				$isApplicable = array_key_exists($translation->language, $languages);
-				//Is it more recent than an already-installed translation?
-				if ( isset($installedTranslations[$translation->language]) ) {
-					$updateTimestamp = strtotime($translation->updated);
-					$installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
-					$isApplicable = $updateTimestamp > $installedTimestamp;
-				}
-
-				if ( $isApplicable ) {
-					$applicableTranslations[] = $translation;
-				}
-			}
-
-			return $applicableTranslations;
-		}
-
-		/**
-		 * Get a list of installed translations for this plugin or theme.
-		 *
-		 * @return array
-		 */
-		protected function getInstalledTranslations() {
-			$installedTranslations = wp_get_installed_translations($this->translationType . 's');
-			if ( isset($installedTranslations[$this->directoryName]) ) {
-				$installedTranslations = $installedTranslations[$this->directoryName];
-			} else {
-				$installedTranslations = array();
-			}
-			return $installedTranslations;
-		}
-
-		/**
-		 * Insert translation updates into the list maintained by WordPress.
-		 *
-		 * @param stdClass $updates
-		 * @return stdClass
-		 */
-		public function injectTranslationUpdates($updates) {
-			$translationUpdates = $this->getTranslationUpdates();
-			if ( empty($translationUpdates) ) {
-				return $updates;
-			}
-
-			//Being defensive.
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-			}
-			if ( !isset($updates->translations) ) {
-				$updates->translations = array();
-			}
-
-			//In case there's a name collision with a plugin or theme hosted on wordpress.org,
-			//remove any preexisting updates that match our thing.
-			$updates->translations = array_values(array_filter(
-				$updates->translations,
-				array($this, 'isNotMyTranslation')
-			));
-
-			//Add our updates to the list.
-			foreach($translationUpdates as $update) {
-				$convertedUpdate = array_merge(
-					array(
-						'type' => $this->translationType,
-						'slug' => $this->directoryName,
-						'autoupdate' => 0,
-						//AFAICT, WordPress doesn't actually use the "version" field for anything.
-						//But lets make sure it's there, just in case.
-						'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
-					),
-					(array)$update
-				);
-
-				$updates->translations[] = $convertedUpdate;
-			}
-
-			return $updates;
-		}
-
-		/**
-		 * Get a list of available translation updates.
-		 *
-		 * This method will return an empty array if there are no updates.
-		 * Uses cached update data.
-		 *
-		 * @return array
-		 */
-		public function getTranslationUpdates() {
-			return $this->updateState->getTranslations();
-		}
-
-		/**
-		 * Remove all cached translation updates.
-		 *
-		 * @see wp_clean_update_cache
-		 */
-		public function clearCachedTranslationUpdates() {
-			$this->updateState->setTranslations(array());
-		}
-
-		/**
-		 * Filter callback. Keeps only translations that *don't* match this plugin or theme.
-		 *
-		 * @param array $translation
-		 * @return bool
-		 */
-		protected function isNotMyTranslation($translation) {
-			$isMatch = isset($translation['type'], $translation['slug'])
-				&& ($translation['type'] === $this->translationType)
-				&& ($translation['slug'] === $this->directoryName);
-
-			return !$isMatch;
-		}
-
-		/* -------------------------------------------------------------------
-		 * Fix directory name when installing updates
-		 * -------------------------------------------------------------------
-		 */
-
-		/**
-		 * Rename the update directory to match the existing plugin/theme directory.
-		 *
-		 * When WordPress installs a plugin or theme update, it assumes that the ZIP file will contain
-		 * exactly one directory, and that the directory name will be the same as the directory where
-		 * the plugin or theme is currently installed.
-		 *
-		 * GitHub and other repositories provide ZIP downloads, but they often use directory names like
-		 * "project-branch" or "project-tag-hash". We need to change the name to the actual plugin folder.
-		 *
-		 * This is a hook callback. Don't call it from a plugin.
-		 *
-		 * @access protected
-		 *
-		 * @param string $source The directory to copy to /wp-content/plugins or /wp-content/themes. Usually a subdirectory of $remoteSource.
-		 * @param string $remoteSource WordPress has extracted the update to this directory.
-		 * @param WP_Upgrader $upgrader
-		 * @return string|WP_Error
-		 */
-		public function fixDirectoryName($source, $remoteSource, $upgrader) {
-			global $wp_filesystem;
-			/** @var WP_Filesystem_Base $wp_filesystem */
-
-			//Basic sanity checks.
-			if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
-				return $source;
-			}
-
-			//If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
-			if ( !$this->isBeingUpgraded($upgrader) ) {
-				return $source;
-			}
-
-			//Rename the source to match the existing directory.
-			$correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
-			if ( $source !== $correctedSource ) {
-				//The update archive should contain a single directory that contains the rest of plugin/theme files.
-				//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
-				//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
-				//after update.
-				if ( $this->isBadDirectoryStructure($remoteSource) ) {
-					return new WP_Error(
-						'puc-incorrect-directory-structure',
-						sprintf(
-							'The directory structure of the update is incorrect. All files should be inside ' .
-							'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
-							htmlentities($this->slug)
-						)
-					);
-				}
-
-				/** @var WP_Upgrader_Skin $upgrader ->skin */
-				$upgrader->skin->feedback(sprintf(
-					'Renaming %s to %s&#8230;',
-					'<span class="code">' . basename($source) . '</span>',
-					'<span class="code">' . $this->directoryName . '</span>'
-				));
-
-				if ( $wp_filesystem->move($source, $correctedSource, true) ) {
-					$upgrader->skin->feedback('Directory successfully renamed.');
-					return $correctedSource;
-				} else {
-					return new WP_Error(
-						'puc-rename-failed',
-						'Unable to rename the update to match the existing directory.'
-					);
-				}
-			}
-
-			return $source;
-		}
-
-		/**
-		 * Is there an update being installed right now, for this plugin or theme?
-		 *
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		abstract public function isBeingUpgraded($upgrader = null);
-
-		/**
-		 * Check for incorrect update directory structure. An update must contain a single directory,
-		 * all other files should be inside that directory.
-		 *
-		 * @param string $remoteSource Directory path.
-		 * @return bool
-		 */
-		protected function isBadDirectoryStructure($remoteSource) {
-			global $wp_filesystem;
-			/** @var WP_Filesystem_Base $wp_filesystem */
-
-			$sourceFiles = $wp_filesystem->dirlist($remoteSource);
-			if ( is_array($sourceFiles) ) {
-				$sourceFiles = array_keys($sourceFiles);
-				$firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
-				return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
-			}
-
-			//Assume it's fine.
-			return false;
-		}
-
-		/* -------------------------------------------------------------------
-		 * File header parsing
-		 * -------------------------------------------------------------------
-		 */
-
-		/**
-		 * Parse plugin or theme metadata from the header comment.
-		 *
-		 * This is basically a simplified version of the get_file_data() function from /wp-includes/functions.php.
-		 * It's intended as a utility for subclasses that detect updates by parsing files in a VCS.
-		 *
-		 * @param string|null $content File contents.
-		 * @return string[]
-		 */
-		public function getFileHeader($content) {
-			$content = (string) $content;
-
-			//WordPress only looks at the first 8 KiB of the file, so we do the same.
-			$content = substr($content, 0, 8192);
-			//Normalize line endings.
-			$content = str_replace("\r", "\n", $content);
-
-			$headers = $this->getHeaderNames();
-			$results = array();
-			foreach ($headers as $field => $name) {
-				$success = preg_match('/^[ \t\/*#@]*' . preg_quote($name, '/') . ':(.*)$/mi', $content, $matches);
-
-				if ( ($success === 1) && $matches[1] ) {
-					$value = $matches[1];
-					if ( function_exists('_cleanup_header_comment') ) {
-						$value = _cleanup_header_comment($value);
-					}
-					$results[$field] = $value;
-				} else {
-					$results[$field] = '';
-				}
-			}
-
-			return $results;
-		}
-
-		/**
-		 * @return array Format: ['HeaderKey' => 'Header Name']
-		 */
-		abstract protected function getHeaderNames();
-
-		/* -------------------------------------------------------------------
-		 * DebugBar integration
-		 * -------------------------------------------------------------------
-		 */
-
-		/**
-		 * Initialize the update checker Debug Bar plugin/add-on thingy.
-		 */
-		public function maybeInitDebugBar() {
-			if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__ . '/DebugBar')) ) {
-				$this->createDebugBarExtension();
-			}
-		}
-
-		protected function createDebugBarExtension() {
-			return new Puc_v4p1_DebugBar_Extension($this);
-		}
-
-		/**
-		 * Display additional configuration details in the Debug Bar panel.
-		 *
-		 * @param Puc_v4p1_DebugBar_Panel $panel
-		 */
-		public function onDisplayConfiguration($panel) {
-			//Do nothing. Subclasses can use this to add additional info to the panel.
-		}
-
-	}
-
-endif;

update/Puc/v4p1/UpgraderStatus.php

@@ -1,199 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_UpgraderStatus', false) ):
-
-	/**
-	 * A utility class that helps figure out which plugin or theme WordPress is upgrading.
-	 *
-	 * It may seem strange to have a separate class just for that, but the task is surprisingly complicated.
-	 * Core classes like Plugin_Upgrader don't expose the plugin file name during an in-progress update (AFAICT).
-	 * This class uses a few workarounds and heuristics to get the file name.
-	 */
-	class Puc_v4p1_UpgraderStatus {
-		private $currentType = null; //"plugin" or "theme".
-		private $currentId = null;   //Plugin basename or theme directory name.
-
-		public function __construct() {
-			//Keep track of which plugin/theme WordPress is currently upgrading.
-			add_filter('upgrader_pre_install', array($this, 'setUpgradedThing'), 10, 2);
-			add_filter('upgrader_package_options', array($this, 'setUpgradedPluginFromOptions'), 10, 1);
-			add_filter('upgrader_post_install', array($this, 'clearUpgradedThing'), 10, 1);
-			add_action('upgrader_process_complete', array($this, 'clearUpgradedThing'), 10, 1);
-		}
-
-		/**
-		 * Is there and update being installed RIGHT NOW, for a specific plugin?
-		 *
-		 * Caution: This method is unreliable. WordPress doesn't make it easy to figure out what it is upgrading,
-		 * and upgrader implementations are liable to change without notice.
-		 *
-		 * @param string $pluginFile The plugin to check.
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool True if the plugin identified by $pluginFile is being upgraded.
-		 */
-		public function isPluginBeingUpgraded($pluginFile, $upgrader = null) {
-			return $this->isBeingUpgraded('plugin', $pluginFile, $upgrader);
-		}
-
-		/**
-		 * Is there an update being installed for a specific theme?
-		 *
-		 * @param string $stylesheet Theme directory name.
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		public function isThemeBeingUpgraded($stylesheet, $upgrader = null) {
-			return $this->isBeingUpgraded('theme', $stylesheet, $upgrader);
-		}
-
-		/**
-		 * Check if a specific theme or plugin is being upgraded.
-		 *
-		 * @param string $type
-		 * @param string $id
-		 * @param Plugin_Upgrader|WP_Upgrader|null $upgrader
-		 * @return bool
-		 */
-		protected function isBeingUpgraded($type, $id, $upgrader = null) {
-			if ( isset($upgrader) ) {
-				list($currentType, $currentId) = $this->getThingBeingUpgradedBy($upgrader);
-				if ( $currentType !== null ) {
-					$this->currentType = $currentType;
-					$this->currentId = $currentId;
-				}
-			}
-			return ($this->currentType === $type) && ($this->currentId === $id);
-		}
-
-		/**
-		 * Figure out which theme or plugin is being upgraded by a WP_Upgrader instance.
-		 *
-		 * Returns an array with two items. The first item is the type of the thing that's being
-		 * upgraded: "plugin" or "theme". The second item is either the plugin basename or
-		 * the theme directory name. If we can't determine what the upgrader is doing, both items
-		 * will be NULL.
-		 *
-		 * Examples:
-		 *      ['plugin', 'plugin-dir-name/plugin.php']
-		 *      ['theme', 'theme-dir-name']
-		 *
-		 * @param Plugin_Upgrader|WP_Upgrader $upgrader
-		 * @return array
-		 */
-		private function getThingBeingUpgradedBy($upgrader) {
-			if ( !isset($upgrader, $upgrader->skin) ) {
-				return array(null, null);
-			}
-
-			//Figure out which plugin or theme is being upgraded.
-			$pluginFile = null;
-			$themeDirectoryName = null;
-
-			$skin = $upgrader->skin;
-			if ( isset($skin->theme_info) && ($skin->theme_info instanceof WP_Theme) ) {
-				$themeDirectoryName = $skin->theme_info->get_stylesheet();
-			} elseif ( $skin instanceof Plugin_Upgrader_Skin ) {
-				if ( isset($skin->plugin) && is_string($skin->plugin) && ($skin->plugin !== '') ) {
-					$pluginFile = $skin->plugin;
-				}
-			} elseif ( $skin instanceof Theme_Upgrader_Skin ) {
-				if ( isset($skin->theme) && is_string($skin->theme) && ($skin->theme !== '') ) {
-					$themeDirectoryName = $skin->theme;
-				}
-			} elseif ( isset($skin->plugin_info) && is_array($skin->plugin_info) ) {
-				//This case is tricky because Bulk_Plugin_Upgrader_Skin (etc) doesn't actually store the plugin
-				//filename anywhere. Instead, it has the plugin headers in $plugin_info. So the best we can
-				//do is compare those headers to the headers of installed plugins.
-				$pluginFile = $this->identifyPluginByHeaders($skin->plugin_info);
-			}
-
-			if ( $pluginFile !== null ) {
-				return array('plugin', $pluginFile);
-			} elseif ( $themeDirectoryName !== null ) {
-				return array('theme', $themeDirectoryName);
-			}
-			return array(null, null);
-		}
-
-		/**
-		 * Identify an installed plugin based on its headers.
-		 *
-		 * @param array $searchHeaders The plugin file header to look for.
-		 * @return string|null Plugin basename ("foo/bar.php"), or NULL if we can't identify the plugin.
-		 */
-		private function identifyPluginByHeaders($searchHeaders) {
-			if ( !function_exists('get_plugins') ){
-				/** @noinspection PhpIncludeInspection */
-				require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
-			}
-
-			$installedPlugins = get_plugins();
-			$matches = array();
-			foreach($installedPlugins as $pluginBasename => $headers) {
-				$diff1 = array_diff_assoc($headers, $searchHeaders);
-				$diff2 = array_diff_assoc($searchHeaders, $headers);
-				if ( empty($diff1) && empty($diff2) ) {
-					$matches[] = $pluginBasename;
-				}
-			}
-
-			//It's possible (though very unlikely) that there could be two plugins with identical
-			//headers. In that case, we can't unambiguously identify the plugin that's being upgraded.
-			if ( count($matches) !== 1 ) {
-				return null;
-			}
-
-			return reset($matches);
-		}
-
-		/**
-		 * @access private
-		 *
-		 * @param mixed $input
-		 * @param array $hookExtra
-		 * @return mixed Returns $input unaltered.
-		 */
-		public function setUpgradedThing($input, $hookExtra) {
-			if ( !empty($hookExtra['plugin']) && is_string($hookExtra['plugin']) ) {
-				$this->currentId = $hookExtra['plugin'];
-				$this->currentType = 'plugin';
-			} elseif ( !empty($hookExtra['theme']) && is_string($hookExtra['theme']) ) {
-				$this->currentId = $hookExtra['theme'];
-				$this->currentType = 'theme';
-			} else {
-				$this->currentType = null;
-				$this->currentId = null;
-			}
-			return $input;
-		}
-
-		/**
-		 * @access private
-		 *
-		 * @param array $options
-		 * @return array
-		 */
-		public function setUpgradedPluginFromOptions($options) {
-			if ( isset($options['hook_extra']['plugin']) && is_string($options['hook_extra']['plugin']) ) {
-				$this->currentType = 'plugin';
-				$this->currentId = $options['hook_extra']['plugin'];
-			} else {
-				$this->currentType = null;
-				$this->currentId = null;
-			}
-			return $options;
-		}
-
-		/**
-		 * @access private
-		 *
-		 * @param mixed $input
-		 * @return mixed Returns $input unaltered.
-		 */
-		public function clearUpgradedThing($input = null) {
-			$this->currentId = null;
-			$this->currentType = null;
-			return $input;
-		}
-	}
-
-endif;

update/Puc/v4p1/Utils.php

@@ -1,77 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_Utils', false) ):
-
-	class Puc_v4p1_Utils {
-		/**
-		 * Get a value from a nested array or object based on a path.
-		 *
-		 * @param array|object|null $collection Get an entry from this array.
-		 * @param array|string $path A list of array keys in hierarchy order, or a string path like "foo.bar.baz".
-		 * @param mixed $default The value to return if the specified path is not found.
-		 * @param string $separator Path element separator. Only applies to string paths.
-		 * @return mixed
-		 */
-		public static function get($collection, $path, $default = null, $separator = '.') {
-			if ( is_string($path) ) {
-				$path = explode($separator, $path);
-			}
-			if ( empty($path) ) {
-				return $default;
-			}
-
-			//Follow the $path into $input as far as possible.
-			$currentValue = $collection;
-			$pathExists = true;
-			foreach ($path as $node) {
-				if ( is_array($currentValue) && isset($currentValue[$node]) ) {
-					$currentValue = $currentValue[$node];
-				} else if ( is_object($currentValue) && isset($currentValue->$node) ) {
-					$currentValue = $currentValue->$node;
-				} else {
-					$pathExists = false;
-					break;
-				}
-			}
-
-			if ( $pathExists ) {
-				return $currentValue;
-			}
-			return $default;
-		}
-
-		/**
-		 * Get the first array element that is not empty.
-		 *
-		 * @param array $values
-		 * @param mixed|null $default Returns this value if there are no non-empty elements.
-		 * @return mixed|null
-		 */
-		public static function findNotEmpty($values, $default = null) {
-			if ( empty($values) ) {
-				return $default;
-			}
-
-			foreach ($values as $value) {
-				if ( !empty($value) ) {
-					return $value;
-				}
-			}
-
-			return $default;
-		}
-
-		/**
-		 * Check if the input string starts with the specified prefix.
-		 *
-		 * @param string $input
-		 * @param string $prefix
-		 * @return bool
-		 */
-		public static function startsWith($input, $prefix) {
-			$length = strlen($prefix);
-			return (substr($input, 0, $length) === $prefix);
-		}
-	}
-
-endif;

update/Puc/v4p1/Vcs/Api.php

@@ -1,243 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Vcs_Api') ):
-
-	abstract class Puc_v4p1_Vcs_Api {
-		protected $tagNameProperty = 'name';
-
-		/**
-		 * @var string
-		 */
-		protected $repositoryUrl = '';
-
-		/**
-		 * @var mixed Authentication details for private repositories. Format depends on service.
-		 */
-		protected $credentials = null;
-
-		/**
-		 * @var string The filter tag that's used to filter options passed to wp_remote_get.
-		 * For example, "puc_request_info_options-slug" or "puc_request_update_options_theme-slug".
-		 */
-		protected $httpFilterName = '';
-
-		/**
-		 * Puc_v4p1_Vcs_Api constructor.
-		 *
-		 * @param string $repositoryUrl
-		 * @param array|string|null $credentials
-		 */
-		public function __construct($repositoryUrl, $credentials = null) {
-			$this->repositoryUrl = $repositoryUrl;
-			$this->setAuthentication($credentials);
-		}
-
-		/**
-		 * @return string
-		 */
-		public function getRepositoryUrl() {
-			return $this->repositoryUrl;
-		}
-
-		/**
-		 * Figure out which reference (i.e tag or branch) contains the latest version.
-		 *
-		 * @param string $configBranch Start looking in this branch.
-		 * @return null|Puc_v4p1_Vcs_Reference
-		 */
-		abstract public function chooseReference($configBranch);
-
-		/**
-		 * Get the readme.txt file from the remote repository and parse it
-		 * according to the plugin readme standard.
-		 *
-		 * @param string $ref Tag or branch name.
-		 * @return array Parsed readme.
-		 */
-		public function getRemoteReadme($ref = 'master') {
-			$fileContents = $this->getRemoteFile('readme.txt', $ref);
-			if ( empty($fileContents) ) {
-				return array();
-			}
-
-			$parser = new PucReadmeParser();
-			return $parser->parse_readme_contents($fileContents);
-		}
-
-		/**
-		 * Get a branch.
-		 *
-		 * @param string $branchName
-		 * @return Puc_v4p1_Vcs_Reference|null
-		 */
-		abstract public function getBranch($branchName);
-
-		/**
-		 * Get a specific tag.
-		 *
-		 * @param string $tagName
-		 * @return Puc_v4p1_Vcs_Reference|null
-		 */
-		abstract public function getTag($tagName);
-
-		/**
-		 * Get the tag that looks like the highest version number.
-		 * (Implementations should skip pre-release versions if possible.)
-		 *
-		 * @return Puc_v4p1_Vcs_Reference|null
-		 */
-		abstract public function getLatestTag();
-
-		/**
-		 * Check if a tag name string looks like a version number.
-		 *
-		 * @param string $name
-		 * @return bool
-		 */
-		protected function looksLikeVersion($name) {
-			//Tag names may be prefixed with "v", e.g. "v1.2.3".
-			$name = ltrim($name, 'v');
-
-			//The version string must start with a number.
-			if ( !is_numeric(substr($name, 0, 1)) ) {
-				return false;
-			}
-
-			//The goal is to accept any SemVer-compatible or "PHP-standardized" version number.
-			return (preg_match('@^(\d{1,5}?)(\.\d{1,10}?){0,4}?($|[abrdp+_\-]|\s)@i', $name) === 1);
-		}
-
-		/**
-		 * Check if a tag appears to be named like a version number.
-		 *
-		 * @param stdClass $tag
-		 * @return bool
-		 */
-		protected function isVersionTag($tag) {
-			$property = $this->tagNameProperty;
-			return isset($tag->$property) && $this->looksLikeVersion($tag->$property);
-		}
-
-		/**
-		 * Sort a list of tags as if they were version numbers.
-		 * Tags that don't look like version number will be removed.
-		 *
-		 * @param stdClass[] $tags Array of tag objects.
-		 * @return stdClass[] Filtered array of tags sorted in descending order.
-		 */
-		protected function sortTagsByVersion($tags) {
-			//Keep only those tags that look like version numbers.
-			$versionTags = array_filter($tags, array($this, 'isVersionTag'));
-			//Sort them in descending order.
-			usort($versionTags, array($this, 'compareTagNames'));
-
-			return $versionTags;
-		}
-
-		/**
-		 * Compare two tags as if they were version number.
-		 *
-		 * @param stdClass $tag1 Tag object.
-		 * @param stdClass $tag2 Another tag object.
-		 * @return int
-		 */
-		protected function compareTagNames($tag1, $tag2) {
-			$property = $this->tagNameProperty;
-			if ( !isset($tag1->$property) ) {
-				return 1;
-			}
-			if ( !isset($tag2->$property) ) {
-				return -1;
-			}
-			return -version_compare(ltrim($tag1->$property, 'v'), ltrim($tag2->$property, 'v'));
-		}
-
-		/**
-		 * Get the contents of a file from a specific branch or tag.
-		 *
-		 * @param string $path File name.
-		 * @param string $ref
-		 * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
-		 */
-		abstract public function getRemoteFile($path, $ref = 'master');
-
-		/**
-		 * Get the timestamp of the latest commit that changed the specified branch or tag.
-		 *
-		 * @param string $ref Reference name (e.g. branch or tag).
-		 * @return string|null
-		 */
-		abstract public function getLatestCommitTime($ref);
-
-		/**
-		 * Get the contents of the changelog file from the repository.
-		 *
-		 * @param string $ref
-		 * @param string $localDirectory Full path to the local plugin or theme directory.
-		 * @return null|string The HTML contents of the changelog.
-		 */
-		public function getRemoteChangelog($ref, $localDirectory) {
-			$filename = $this->findChangelogName($localDirectory);
-			if ( empty($filename) ) {
-				return null;
-			}
-
-			$changelog = $this->getRemoteFile($filename, $ref);
-			if ( $changelog === null ) {
-				return null;
-			}
-
-			/** @noinspection PhpUndefinedClassInspection */
-			return Parsedown::instance()->text($changelog);
-		}
-
-		/**
-		 * Guess the name of the changelog file.
-		 *
-		 * @param string $directory
-		 * @return string|null
-		 */
-		protected function findChangelogName($directory) {
-			if ( empty($directory) || !is_dir($directory) || ($directory === '.') ) {
-				return null;
-			}
-
-			$possibleNames = array('CHANGES.md', 'CHANGELOG.md', 'changes.md', 'changelog.md');
-			$files = scandir($directory);
-			$foundNames = array_intersect($possibleNames, $files);
-
-			if ( !empty($foundNames) ) {
-				return reset($foundNames);
-			}
-			return null;
-		}
-
-		/**
-		 * Set authentication credentials.
-		 *
-		 * @param $credentials
-		 */
-		public function setAuthentication($credentials) {
-			$this->credentials = $credentials;
-		}
-
-		public function isAuthenticationEnabled() {
-			return !empty($this->credentials);
-		}
-
-		/**
-		 * @param string $url
-		 * @return string
-		 */
-		public function signDownloadUrl($url) {
-			return $url;
-		}
-
-		/**
-		 * @param string $filterName
-		 */
-		public function setHttpFilterName($filterName) {
-			$this->httpFilterName = $filterName;
-		}
-	}
-
-endif;

update/Puc/v4p1/Vcs/BaseChecker.php

@@ -1,22 +0,0 @@
-<?php
-if ( !interface_exists('Puc_v4p1_Vcs_BaseChecker', false) ):
-
-	interface Puc_v4p1_Vcs_BaseChecker {
-		/**
-		 * Set the repository branch to use for updates. Defaults to 'master'.
-		 *
-		 * @param string $branch
-		 * @return $this
-		 */
-		public function setBranch($branch);
-
-		/**
-		 * Set authentication credentials.
-		 *
-		 * @param array|string $credentials
-		 * @return $this
-		 */
-		public function setAuthentication($credentials);
-	}
-
-endif;

update/Puc/v4p1/Vcs/BitBucketApi.php

@@ -1,251 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Vcs_BitBucketApi', false) ):
-
-	class Puc_v4p1_Vcs_BitBucketApi extends Puc_v4p1_Vcs_Api {
-		/**
-		 * @var Puc_v4p1_OAuthSignature
-		 */
-		private $oauth = null;
-
-		/**
-		 * @var string
-		 */
-		private $username;
-
-		/**
-		 * @var string
-		 */
-		private $repository;
-
-		public function __construct($repositoryUrl, $credentials = array()) {
-			$path = @parse_url($repositoryUrl, PHP_URL_PATH);
-			if ( preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches) ) {
-				$this->username = $matches['username'];
-				$this->repository = $matches['repository'];
-			} else {
-				throw new InvalidArgumentException('Invalid BitBucket repository URL: "' . $repositoryUrl . '"');
-			}
-
-			parent::__construct($repositoryUrl, $credentials);
-		}
-
-		/**
-		 * Figure out which reference (i.e tag or branch) contains the latest version.
-		 *
-		 * @param string $configBranch Start looking in this branch.
-		 * @return null|Puc_v4p1_Vcs_Reference
-		 */
-		public function chooseReference($configBranch) {
-			$updateSource = null;
-
-			//Check if there's a "Stable tag: 1.2.3" header that points to a valid tag.
-			$updateSource = $this->getStableTag($configBranch);
-
-			//Look for version-like tags.
-			if ( !$updateSource && ($configBranch === 'master') ) {
-				$updateSource = $this->getLatestTag();
-			}
-			//If all else fails, use the specified branch itself.
-			if ( !$updateSource ) {
-				$updateSource = $this->getBranch($configBranch);
-			}
-
-			return $updateSource;
-		}
-
-		public function getBranch($branchName) {
-			$branch = $this->api('/refs/branches/' . $branchName);
-			if ( is_wp_error($branch) || empty($branch) ) {
-				return null;
-			}
-
-			return new Puc_v4p1_Vcs_Reference(array(
-				'name' => $branch->name,
-				'updated' => $branch->target->date,
-				'downloadUrl' => $this->getDownloadUrl($branch->name),
-			));
-		}
-
-		/**
-		 * Get a specific tag.
-		 *
-		 * @param string $tagName
-		 * @return Puc_v4p1_Vcs_Reference|null
-		 */
-		public function getTag($tagName) {
-			$tag = $this->api('/refs/tags/' . $tagName);
-			if ( is_wp_error($tag) || empty($tag) ) {
-				return null;
-			}
-
-			return new Puc_v4p1_Vcs_Reference(array(
-				'name' => $tag->name,
-				'version' => ltrim($tag->name, 'v'),
-				'updated' => $tag->target->date,
-				'downloadUrl' => $this->getDownloadUrl($tag->name),
-			));
-		}
-
-		/**
-		 * Get the tag that looks like the highest version number.
-		 *
-		 * @return Puc_v4p1_Vcs_Reference|null
-		 */
-		public function getLatestTag() {
-			$tags = $this->api('/refs/tags?sort=-target.date');
-			if ( !isset($tags, $tags->values) || !is_array($tags->values) ) {
-				return null;
-			}
-
-			//Filter and sort the list of tags.
-			$versionTags = $this->sortTagsByVersion($tags->values);
-
-			//Return the first result.
-			if ( !empty($versionTags) ) {
-				$tag = $versionTags[0];
-				return new Puc_v4p1_Vcs_Reference(array(
-					'name' => $tag->name,
-					'version' => ltrim($tag->name, 'v'),
-					'updated' => $tag->target->date,
-					'downloadUrl' => $this->getDownloadUrl($tag->name),
-				));
-			}
-			return null;
-		}
-
-		/**
-		 * Get the tag/ref specified by the "Stable tag" header in the readme.txt of a given branch.
-		 *
-		 * @param string $branch
-		 * @return null|Puc_v4p1_Vcs_Reference
-		 */
-		protected function getStableTag($branch) {
-			$remoteReadme = $this->getRemoteReadme($branch);
-			if ( !empty($remoteReadme['stable_tag']) ) {
-				$tag = $remoteReadme['stable_tag'];
-
-				//You can explicitly opt out of using tags by setting "Stable tag" to
-				//"trunk" or the name of the current branch.
-				if ( ($tag === $branch) || ($tag === 'trunk') ) {
-					return $this->getBranch($branch);
-				}
-
-				return $this->getTag($tag);
-			}
-
-			return null;
-		}
-
-		/**
-		 * @param string $ref
-		 * @return string
-		 */
-		protected function getDownloadUrl($ref) {
-			return sprintf(
-				'https://bitbucket.org/%s/%s/get/%s.zip',
-				$this->username,
-				$this->repository,
-				$ref
-			);
-		}
-
-		/**
-		 * Get the contents of a file from a specific branch or tag.
-		 *
-		 * @param string $path File name.
-		 * @param string $ref
-		 * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
-		 */
-		public function getRemoteFile($path, $ref = 'master') {
-			$response = $this->api('src/' . $ref . '/' . ltrim($path), '1.0');
-			if ( is_wp_error($response) || !isset($response, $response->data) ) {
-				return null;
-			}
-			return $response->data;
-		}
-
-		/**
-		 * Get the timestamp of the latest commit that changed the specified branch or tag.
-		 *
-		 * @param string $ref Reference name (e.g. branch or tag).
-		 * @return string|null
-		 */
-		public function getLatestCommitTime($ref) {
-			$response = $this->api('commits/' . $ref);
-			if ( isset($response->values, $response->values[0], $response->values[0]->date) ) {
-				return $response->values[0]->date;
-			}
-			return null;
-		}
-
-		/**
-		 * Perform a BitBucket API 2.0 request.
-		 *
-		 * @param string $url
-		 * @param string $version
-		 * @return mixed|WP_Error
-		 */
-		public function api($url, $version = '2.0') {
-			$url = implode('/', array(
-				'https://api.bitbucket.org',
-				$version,
-				'repositories',
-				$this->username,
-				$this->repository,
-				ltrim($url, '/')
-			));
-
-			if ( $this->oauth ) {
-				$url = $this->oauth->sign($url,'GET');
-			}
-
-			$options = array('timeout' => 10);
-			if ( !empty($this->httpFilterName) ) {
-				$options = apply_filters($this->httpFilterName, $options);
-			}
-			$response = wp_remote_get($url, $options);
-			if ( is_wp_error($response) ) {
-				return $response;
-			}
-
-			$code = wp_remote_retrieve_response_code($response);
-			$body = wp_remote_retrieve_body($response);
-			if ( $code === 200 ) {
-				$document = json_decode($body);
-				return $document;
-			}
-
-			return new WP_Error(
-				'puc-bitbucket-http-error',
-				'BitBucket API error. HTTP status: ' . $code
-			);
-		}
-
-		/**
-		 * @param array $credentials
-		 */
-		public function setAuthentication($credentials) {
-			parent::setAuthentication($credentials);
-
-			if ( !empty($credentials) && !empty($credentials['consumer_key']) ) {
-				$this->oauth = new Puc_v4p1_OAuthSignature(
-					$credentials['consumer_key'],
-					$credentials['consumer_secret']
-				);
-			} else {
-				$this->oauth = null;
-			}
-		}
-
-		public function signDownloadUrl($url) {
-			//Add authentication data to download URLs. Since OAuth signatures incorporate
-			//timestamps, we have to do this immediately before inserting the update. Otherwise
-			//authentication could fail due to a stale timestamp.
-			if ( $this->oauth ) {
-				$url = $this->oauth->sign($url);
-			}
-			return $url;
-		}
-	}
-
-endif;

update/Puc/v4p1/Vcs/GitHubApi.php

@@ -1,289 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_Vcs_GitHubApi', false) ):
-
-	class Puc_v4p1_Vcs_GitHubApi extends Puc_v4p1_Vcs_Api {
-		/**
-		 * @var string GitHub username.
-		 */
-		protected $userName;
-		/**
-		 * @var string GitHub repository name.
-		 */
-		protected $repositoryName;
-
-		/**
-		 * @var string Either a fully qualified repository URL, or just "user/repo-name".
-		 */
-		protected $repositoryUrl;
-
-		/**
-		 * @var string GitHub authentication token. Optional.
-		 */
-		protected $accessToken;
-
-		public function __construct($repositoryUrl, $accessToken = null) {
-			$path = @parse_url($repositoryUrl, PHP_URL_PATH);
-			if ( preg_match('@^/?(?P<username>[^/]+?)/(?P<repository>[^/#?&]+?)/?$@', $path, $matches) ) {
-				$this->userName = $matches['username'];
-				$this->repositoryName = $matches['repository'];
-			} else {
-				throw new InvalidArgumentException('Invalid GitHub repository URL: "' . $repositoryUrl . '"');
-			}
-
-			parent::__construct($repositoryUrl, $accessToken);
-		}
-
-		/**
-		 * Get the latest release from GitHub.
-		 *
-		 * @return Puc_v4p1_Vcs_Reference|null
-		 */
-		public function getLatestRelease() {
-			$release = $this->api('/repos/:user/:repo/releases/latest');
-			if ( is_wp_error($release) || !is_object($release) || !isset($release->tag_name) ) {
-				return null;
-			}
-
-			$reference = new Puc_v4p1_Vcs_Reference(array(
-				'name' => $release->tag_name,
-				'version' => ltrim($release->tag_name, 'v'), //Remove the "v" prefix from "v1.2.3".
-				'downloadUrl' => $this->signDownloadUrl($release->zipball_url),
-				'updated' => $release->created_at,
-				'apiResponse' => $release,
-			));
-
-			if ( !empty($release->body) ) {
-				/** @noinspection PhpUndefinedClassInspection */
-				$reference->changelog = Parsedown::instance()->text($release->body);
-			}
-			if ( isset($release->assets[0]) ) {
-				$reference->downloadCount = $release->assets[0]->download_count;
-			}
-
-			return $reference;
-		}
-
-		/**
-		 * Get the tag that looks like the highest version number.
-		 *
-		 * @return Puc_v4p1_Vcs_Reference|null
-		 */
-		public function getLatestTag() {
-			$tags = $this->api('/repos/:user/:repo/tags');
-
-			if ( is_wp_error($tags) || empty($tags) || !is_array($tags) ) {
-				return null;
-			}
-
-			$versionTags = $this->sortTagsByVersion($tags);
-			if ( empty($versionTags) ) {
-				return null;
-			}
-
-			$tag = $versionTags[0];
-			return new Puc_v4p1_Vcs_Reference(array(
-				'name' => $tag->name,
-				'version' => ltrim($tag->name, 'v'),
-				'downloadUrl' => $this->signDownloadUrl($tag->zipball_url),
-				'apiResponse' => $tag,
-			));
-		}
-
-		/**
-		 * Get a branch by name.
-		 *
-		 * @param string $branchName
-		 * @return null|Puc_v4p1_Vcs_Reference
-		 */
-		public function getBranch($branchName) {
-			$branch = $this->api('/repos/:user/:repo/branches/' . $branchName);
-			if ( is_wp_error($branch) || empty($branch) ) {
-				return null;
-			}
-
-			$reference = new Puc_v4p1_Vcs_Reference(array(
-				'name' => $branch->name,
-				'downloadUrl' => $this->buildArchiveDownloadUrl($branch->name),
-				'apiResponse' => $branch,
-			));
-
-			if ( isset($branch->commit, $branch->commit->commit, $branch->commit->commit->author->date) ) {
-				$reference->updated = $branch->commit->commit->author->date;
-			}
-
-			return $reference;
-		}
-
-		/**
-		 * Get the latest commit that changed the specified file.
-		 *
-		 * @param string $filename
-		 * @param string $ref Reference name (e.g. branch or tag).
-		 * @return StdClass|null
-		 */
-		public function getLatestCommit($filename, $ref = 'master') {
-			$commits = $this->api(
-				'/repos/:user/:repo/commits',
-				array(
-					'path' => $filename,
-					'sha' => $ref,
-				)
-			);
-			if ( !is_wp_error($commits) && is_array($commits) && isset($commits[0]) ) {
-				return $commits[0];
-			}
-			return null;
-		}
-
-		/**
-		 * Get the timestamp of the latest commit that changed the specified branch or tag.
-		 *
-		 * @param string $ref Reference name (e.g. branch or tag).
-		 * @return string|null
-		 */
-		public function getLatestCommitTime($ref) {
-			$commits = $this->api('/repos/:user/:repo/commits', array('sha' => $ref));
-			if ( !is_wp_error($commits) && is_array($commits) && isset($commits[0]) ) {
-				return $commits[0]->commit->author->date;
-			}
-			return null;
-		}
-
-		/**
-		 * Perform a GitHub API request.
-		 *
-		 * @param string $url
-		 * @param array $queryParams
-		 * @return mixed|WP_Error
-		 */
-		protected function api($url, $queryParams = array()) {
-			$variables = array(
-				'user' => $this->userName,
-				'repo' => $this->repositoryName,
-			);
-			foreach ($variables as $name => $value) {
-				$url = str_replace('/:' . $name, '/' . urlencode($value), $url);
-			}
-			$url = 'https://api.github.com' . $url;
-
-			if ( !empty($this->accessToken) ) {
-				$queryParams['access_token'] = $this->accessToken;
-			}
-			if ( !empty($queryParams) ) {
-				$url = add_query_arg($queryParams, $url);
-			}
-
-			$options = array('timeout' => 10);
-			if ( !empty($this->httpFilterName) ) {
-				$options = apply_filters($this->httpFilterName, $options);
-			}
-			$response = wp_remote_get($url, $options);
-			if ( is_wp_error($response) ) {
-				return $response;
-			}
-
-			$code = wp_remote_retrieve_response_code($response);
-			$body = wp_remote_retrieve_body($response);
-			if ( $code === 200 ) {
-				$document = json_decode($body);
-				return $document;
-			}
-
-			return new WP_Error(
-				'puc-github-http-error',
-				'GitHub API error. HTTP status: ' . $code
-			);
-		}
-
-		/**
-		 * Get the contents of a file from a specific branch or tag.
-		 *
-		 * @param string $path File name.
-		 * @param string $ref
-		 * @return null|string Either the contents of the file, or null if the file doesn't exist or there's an error.
-		 */
-		public function getRemoteFile($path, $ref = 'master') {
-			$apiUrl = '/repos/:user/:repo/contents/' . $path;
-			$response = $this->api($apiUrl, array('ref' => $ref));
-
-			if ( is_wp_error($response) || !isset($response->content) || ($response->encoding !== 'base64') ) {
-				return null;
-			}
-			return base64_decode($response->content);
-		}
-
-		/**
-		 * Generate a URL to download a ZIP archive of the specified branch/tag/etc.
-		 *
-		 * @param string $ref
-		 * @return string
-		 */
-		public function buildArchiveDownloadUrl($ref = 'master') {
-			$url = sprintf(
-				'https://api.github.com/repos/%1$s/%2$s/zipball/%3$s',
-				urlencode($this->userName),
-				urlencode($this->repositoryName),
-				urlencode($ref)
-			);
-			if ( !empty($this->accessToken) ) {
-				$url = $this->signDownloadUrl($url);
-			}
-			return $url;
-		}
-
-		/**
-		 * Get a specific tag.
-		 *
-		 * @param string $tagName
-		 * @return Puc_v4p1_Vcs_Reference|null
-		 */
-		public function getTag($tagName) {
-			//The current GitHub update checker doesn't use getTag, so I didn't bother to implement it.
-			throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
-		}
-
-		public function setAuthentication($credentials) {
-			parent::setAuthentication($credentials);
-			$this->accessToken = is_string($credentials) ? $credentials : null;
-		}
-
-		/**
-		 * Figure out which reference (i.e tag or branch) contains the latest version.
-		 *
-		 * @param string $configBranch Start looking in this branch.
-		 * @return null|Puc_v4p1_Vcs_Reference
-		 */
-		public function chooseReference($configBranch) {
-			$updateSource = null;
-
-			if ( $configBranch === 'master' ) {
-				//Use the latest release.
-				$updateSource = $this->getLatestRelease();
-				if ( $updateSource === null ) {
-					//Failing that, use the tag with the highest version number.
-					$updateSource = $this->getLatestTag();
-				}
-			}
-			//Alternatively, just use the branch itself.
-			if ( empty($updateSource) ) {
-				$updateSource = $this->getBranch($configBranch);
-			}
-
-			return $updateSource;
-		}
-
-		/**
-		 * @param string $url
-		 * @return string
-		 */
-		public function signDownloadUrl($url) {
-			if ( empty($this->credentials) ) {
-				return $url;
-			}
-			return add_query_arg('access_token', $this->credentials, $url);
-		}
-
-	}
-
-endif;

update/Puc/v4p1/Vcs/PluginUpdateChecker.php

@@ -1,198 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Vcs_PluginUpdateChecker') ):
-
-	class Puc_v4p1_Vcs_PluginUpdateChecker extends Puc_v4p1_Plugin_UpdateChecker implements Puc_v4p1_Vcs_BaseChecker {
-		/**
-		 * @var string The branch where to look for updates. Defaults to "master".
-		 */
-		protected $branch = 'master';
-
-		/**
-		 * @var Puc_v4p1_Vcs_Api Repository API client.
-		 */
-		protected $api = null;
-
-		/**
-		 * Puc_v4p1_Vcs_PluginUpdateChecker constructor.
-		 *
-		 * @param Puc_v4p1_Vcs_Api $api
-		 * @param string $pluginFile
-		 * @param string $slug
-		 * @param int $checkPeriod
-		 * @param string $optionName
-		 * @param string $muPluginFile
-		 */
-		public function __construct($api, $pluginFile, $slug = '', $checkPeriod = 12, $optionName = '', $muPluginFile = '') {
-			$this->api = $api;
-			$this->api->setHttpFilterName($this->getUniqueName('request_info_options'));
-
-			parent::__construct($api->getRepositoryUrl(), $pluginFile, $slug, $checkPeriod, $optionName, $muPluginFile);
-		}
-
-		public function requestInfo($unusedParameter = null) {
-			//We have to make several remote API requests to gather all the necessary info
-			//which can take a while on slow networks.
-			set_time_limit(60);
-
-			$api = $this->api;
-
-			$info = new Puc_v4p1_Plugin_Info();
-			$info->filename = $this->pluginFile;
-			$info->slug = $this->slug;
-
-			$this->setInfoFromHeader($this->getPluginHeader(), $info);
-
-			//Pick a branch or tag.
-			$updateSource = $api->chooseReference($this->branch);
-			if ( $updateSource ) {
-				$ref = $updateSource->name;
-				$info->version = $updateSource->version;
-				$info->last_updated = $updateSource->updated;
-				$info->download_url = $updateSource->downloadUrl;
-
-				if ( !empty($updateSource->changelog) ) {
-					$info->sections['changelog'] = $updateSource->changelog;
-				}
-				if ( isset($updateSource->downloadCount) ) {
-					$info->downloaded = $updateSource->downloadCount;
-				}
-			} else {
-				//There's probably a network problem or an authentication error.
-				return null;
-			}
-
-			//Get headers from the main plugin file in this branch/tag. Its "Version" header and other metadata
-			//are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
-			$mainPluginFile = basename($this->pluginFile);
-			$remotePlugin = $api->getRemoteFile($mainPluginFile, $ref);
-			if ( !empty($remotePlugin) ) {
-				$remoteHeader = $this->getFileHeader($remotePlugin);
-				$this->setInfoFromHeader($remoteHeader, $info);
-			}
-
-			//Try parsing readme.txt. If it's formatted according to WordPress.org standards, it will contain
-			//a lot of useful information like the required/tested WP version, changelog, and so on.
-			if ( $this->readmeTxtExistsLocally() ) {
-				$this->setInfoFromRemoteReadme($ref, $info);
-			}
-
-			//The changelog might be in a separate file.
-			if ( empty($info->sections['changelog']) ) {
-				$info->sections['changelog'] = $api->getRemoteChangelog($ref, dirname($this->getAbsolutePath()));
-				if ( empty($info->sections['changelog']) ) {
-					$info->sections['changelog'] = __('There is no changelog available.', 'plugin-update-checker');
-				}
-			}
-
-			if ( empty($info->last_updated) ) {
-				//Fetch the latest commit that changed the tag or branch and use it as the "last_updated" date.
-				$latestCommitTime = $api->getLatestCommitTime($ref);
-				if ( $latestCommitTime !== null ) {
-					$info->last_updated = $latestCommitTime;
-				}
-			}
-
-			$info = apply_filters($this->getUniqueName('request_info_result'), $info, null);
-			return $info;
-		}
-
-		/**
-		 * Check if the currently installed version has a readme.txt file.
-		 *
-		 * @return bool
-		 */
-		protected function readmeTxtExistsLocally() {
-			$pluginDirectory = dirname($this->pluginAbsolutePath);
-			if ( empty($this->pluginAbsolutePath) || !is_dir($pluginDirectory) || ($pluginDirectory === '.') ) {
-				return false;
-			}
-			return is_file($pluginDirectory . '/readme.txt');
-		}
-
-		/**
-		 * Copy plugin metadata from a file header to a Plugin Info object.
-		 *
-		 * @param array $fileHeader
-		 * @param Puc_v4p1_Plugin_Info $pluginInfo
-		 */
-		protected function setInfoFromHeader($fileHeader, $pluginInfo) {
-			$headerToPropertyMap = array(
-				'Version' => 'version',
-				'Name' => 'name',
-				'PluginURI' => 'homepage',
-				'Author' => 'author',
-				'AuthorName' => 'author',
-				'AuthorURI' => 'author_homepage',
-
-				'Requires WP' => 'requires',
-				'Tested WP' => 'tested',
-				'Requires at least' => 'requires',
-				'Tested up to' => 'tested',
-			);
-			foreach ($headerToPropertyMap as $headerName => $property) {
-				if ( isset($fileHeader[$headerName]) && !empty($fileHeader[$headerName]) ) {
-					$pluginInfo->$property = $fileHeader[$headerName];
-				}
-			}
-
-			if ( !empty($fileHeader['Description']) ) {
-				$pluginInfo->sections['description'] = $fileHeader['Description'];
-			}
-		}
-
-		/**
-		 * Copy plugin metadata from the remote readme.txt file.
-		 *
-		 * @param string $ref GitHub tag or branch where to look for the readme.
-		 * @param Puc_v4p1_Plugin_Info $pluginInfo
-		 */
-		protected function setInfoFromRemoteReadme($ref, $pluginInfo) {
-			$readme = $this->api->getRemoteReadme($ref);
-			if ( empty($readme) ) {
-				return;
-			}
-
-			if ( isset($readme['sections']) ) {
-				$pluginInfo->sections = array_merge($pluginInfo->sections, $readme['sections']);
-			}
-			if ( !empty($readme['tested_up_to']) ) {
-				$pluginInfo->tested = $readme['tested_up_to'];
-			}
-			if ( !empty($readme['requires_at_least']) ) {
-				$pluginInfo->requires = $readme['requires_at_least'];
-			}
-
-			if ( isset($readme['upgrade_notice'], $readme['upgrade_notice'][$pluginInfo->version]) ) {
-				$pluginInfo->upgrade_notice = $readme['upgrade_notice'][$pluginInfo->version];
-			}
-		}
-
-		public function setBranch($branch) {
-			$this->branch = $branch;
-			return $this;
-		}
-
-		public function setAuthentication($credentials) {
-			$this->api->setAuthentication($credentials);
-			return $this;
-		}
-
-		public function getUpdate() {
-			$update = parent::getUpdate();
-
-			if ( isset($update) && !empty($update->download_url) ) {
-				$update->download_url = $this->api->signDownloadUrl($update->download_url);
-			}
-
-			return $update;
-		}
-
-		public function onDisplayConfiguration($panel) {
-			parent::onDisplayConfiguration($panel);
-			$panel->row('Branch', $this->branch);
-			$panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
-			$panel->row('API client', get_class($this->api));
-		}
-	}
-
-endif;

update/Puc/v4p1/Vcs/Reference.php

@@ -1,49 +0,0 @@
-<?php
-if ( !class_exists('Puc_v4p1_Vcs_Reference', false) ):
-
-	/**
-	 * This class represents a VCS branch or tag. It's intended as a read only, short-lived container
-	 * that only exists to provide a limited degree of type checking.
-	 *
-	 * @property string $name
-	 * @property string|null version
-	 * @property string $downloadUrl
-	 * @property string $updated
-	 *
-	 * @property string|null $changelog
-	 * @property int|null $downloadCount
-	 */
-	class Puc_v4p1_Vcs_Reference {
-		private $properties = array();
-
-		public function __construct($properties = array()) {
-			$this->properties = $properties;
-		}
-
-		/**
-		 * @param string $name
-		 * @return mixed|null
-		 */
-		function __get($name) {
-			return array_key_exists($name, $this->properties) ? $this->properties[$name] : null;
-		}
-
-		/**
-		 * @param string $name
-		 * @param mixed $value
-		 */
-		function __set($name, $value) {
-			$this->properties[$name] = $value;
-		}
-
-		/**
-		 * @param string $name
-		 * @return bool
-		 */
-		function __isset($name) {
-			return isset($this->properties[$name]);
-		}
-
-	}
-
-endif;

update/Puc/v4p1/Vcs/ThemeUpdateChecker.php

@@ -1,101 +0,0 @@
-<?php
-
-if ( !class_exists('Puc_v4p1_Vcs_ThemeUpdateChecker', false) ):
-
-	class Puc_v4p1_Vcs_ThemeUpdateChecker extends Puc_v4p1_Theme_UpdateChecker implements Puc_v4p1_Vcs_BaseChecker {
-		/**
-		 * @var string The branch where to look for updates. Defaults to "master".
-		 */
-		protected $branch = 'master';
-
-		/**
-		 * @var Puc_v4p1_Vcs_Api Repository API client.
-		 */
-		protected $api = null;
-
-		/**
-		 * Puc_v4p1_Vcs_ThemeUpdateChecker constructor.
-		 *
-		 * @param Puc_v4p1_Vcs_Api $api
-		 * @param null $stylesheet
-		 * @param null $customSlug
-		 * @param int $checkPeriod
-		 * @param string $optionName
-		 */
-		public function __construct($api, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
-			$this->api = $api;
-			$this->api->setHttpFilterName($this->getUniqueName('request_update_options'));
-
-			parent::__construct($api->getRepositoryUrl(), $stylesheet, $customSlug, $checkPeriod, $optionName);
-		}
-
-		public function requestUpdate() {
-			$api = $this->api;
-
-			$update = new Puc_v4p1_Theme_Update();
-			$update->slug = $this->slug;
-
-			//Figure out which reference (tag or branch) we'll use to get the latest version of the theme.
-			$updateSource = $api->chooseReference($this->branch);
-			if ( $updateSource ) {
-				$ref = $updateSource->name;
-				$update->download_url = $updateSource->downloadUrl;
-			} else {
-				$ref = $this->branch;
-			}
-
-			//Get headers from the main stylesheet in this branch/tag. Its "Version" header and other metadata
-			//are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
-			$remoteHeader = $this->getFileHeader($api->getRemoteFile('style.css', $ref));
-			$update->version = Puc_v4p1_Utils::findNotEmpty(array(
-				$remoteHeader['Version'],
-				Puc_v4p1_Utils::get($updateSource, 'version'),
-			));
-
-			//The details URL defaults to the Theme URI header or the repository URL.
-			$update->details_url = Puc_v4p1_Utils::findNotEmpty(array(
-				$remoteHeader['ThemeURI'],
-				$this->theme->get('ThemeURI'),
-				$this->metadataUrl,
-			));
-
-			if ( empty($update->version) ) {
-				//It looks like we didn't find a valid update after all.
-				$update = null;
-			}
-
-			$update = $this->filterUpdateResult($update);
-			return $update;
-		}
-
-		//FIXME: This is duplicated code. Both theme and plugin subclasses that use VCS share these methods.
-
-		public function setBranch($branch) {
-			$this->branch = $branch;
-			return $this;
-		}
-
-		public function setAuthentication($credentials) {
-			$this->api->setAuthentication($credentials);
-			return $this;
-		}
-
-		public function getUpdate() {
-			$update = parent::getUpdate();
-
-			if ( isset($update) && !empty($update->download_url) ) {
-				$update->download_url = $this->api->signDownloadUrl($update->download_url);
-			}
-
-			return $update;
-		}
-
-		public function onDisplayConfiguration($panel) {
-			parent::onDisplayConfiguration($panel);
-			$panel->row('Branch', $this->branch);
-			$panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
-			$panel->row('API client', get_class($this->api));
-		}
-	}
-
-endif;

update/README.md

@@ -1,221 +0,0 @@
-Plugin Update Checker
-=====================
-
-This is a custom update checker library for WordPress plugins and themes. It lets you add automatic update notifications and one-click upgrades to your commercial plugins, private themes, and so on. All you need to do is put your plugin/theme details in a JSON file, place the file on your server, and pass the URL to the library. The library periodically checks the URL to see if there's a new version available and displays an update notification to the user if necessary.
-
-From the users' perspective, it works just like with plugins and themes hosted on WordPress.org. The update checker uses the default upgrade UI that is familiar to most WordPress users.
-
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**
-
-- [Getting Started](#getting-started)
-  - [Self-hosted Plugins and Themes](#self-hosted-plugins-and-themes)
-    - [How to Release an Update](#how-to-release-an-update)
-    - [Notes](#notes)
-  - [GitHub Integration](#github-integration)
-    - [How to Release an Update](#how-to-release-an-update-1)
-    - [Notes](#notes-1)
-  - [BitBucket Integration](#bitbucket-integration)
-    - [How to Release an Update](#how-to-release-an-update-2)
-- [Resources](#resources)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
-Getting Started
----------------
-
-### Self-hosted Plugins and Themes
-
-1. Download [the latest release](https://github.com/YahnisElsts/plugin-update-checker/releases/latest) and copy the `plugin-update-checker` directory to your plugin or theme.
-2. Go to the `examples` subdirectory and open the .json file that fits your project type. Replace the placeholder data with your plugin/theme details. 
-	- Plugin example:
-	
-		```json
-		{
-			"name" : "Plugin Name",
-			"version" : "2.0",
-			"download_url" : "http://example.com/plugin-name-2.0.zip",
-			"sections" : {
-				"description" : "Plugin description here. You can use HTML."
-			}
-		}
-		```
-		
-        This is a minimal example that leaves out optional fields. See [this table](https://docs.google.com/spreadsheets/d/1eOBbW7Go2qEQXReOOCdidMTf_tDYRq4JfegcO1CBPIs/edit?usp=sharing&authkey=CK7h9toK&output=html) for a full list of supported fields and their descriptions.
-	- Theme example:
-	
-		```json
-		{
-			"version": "2.0",
-			"details_url": "http://example.com/version-2.0-details.html",
-			"download_url": "http://example.com/example-theme-2.0.zip"
-		}
-		```
-		
-		This is actually a complete example that shows all theme-related fields. `version` and `download_url` should be self-explanatory. The `details_url` key specifies the page that the user will see if they click the "View version 1.2.3 details" link in an update notification.  
-3. Upload the JSON file to a publicly accessible location.
-4. Add the following code to the main plugin file or to the `functions.php` file:
-
-	```php
-	require 'path/to/plugin-update-checker/plugin-update-checker.php';
-	$myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
-		'http://example.com/path/to/details.json',
-		__FILE__,
-		'unique-plugin-or-theme-slug'
-	);
-	```
-	Note: If you're using the Composer autoloader, you don't need to explicitly `require` the library.
-
-#### How to Release an Update
-
-Change the `version` number in the JSON file and make sure that `download_url` points to the latest version. Update the other fields if necessary. Tip: You can use [wp-update-server](https://github.com/YahnisElsts/wp-update-server) to automate this process.
-
-By default, the library will check the specified URL for changes every 12 hours. You can force it to check immediately by clicking the "Check Now" link on the "Plugins" page (it's next to the "Visit plugin site" link). Themes don't get a "check now" link, but you can also trigger an update check like this:
- 
- 1. Install [Debug Bar](https://srd.wordpress.org/plugins/debug-bar/).
- 2. Click the "Debug" menu in the Admin Bar (a.k.a Toolbar).
- 3. Open the "PUC (your-slug)" panel. 
- 4. Click the "Check Now" button.  
-
-#### Notes
-- The second argument passed to `buildUpdateChecker` must be the absolute path to the main plugin file or any file in the theme directory. If you followed the "getting started" instructions, you can just use the `__FILE__` constant.
-- The third argument - i.e. the slug - is optional but recommended. In most cases, the slug should be the same as the name of your plugin directory. For example, if your plugin lives in `/wp-content/plugins/my-plugin`, set the slug to `my-plugin`. If the slug is omitted, the update checker will use the name of the main plugin file as the slug (e.g. `my-cool-plugin.php` &rarr; `my-cool-plugin`). This can lead to conflicts if your plugin has a generic file name like `plugin.php`. 
-	
-	This doesn't affect themes because PUC uses the theme directory name as the default slug. Still, if you're planning to use the slug in your own code - e.g. to filter updates or override update checker behaviour - it can be a good idea to set it explicitly. 
-
-### GitHub Integration
-
-1. Download [the latest release](https://github.com/YahnisElsts/plugin-update-checker/releases/latest) and copy the `plugin-update-checker` directory to your plugin or theme.
-2. Add the following code to the main plugin file or `functions.php`:
-
-	```php
-	require 'plugin-update-checker/plugin-update-checker.php';
-	$myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
-		'https://github.com/user-name/repo-name/',
-		__FILE__,
-		'unique-plugin-or-theme-slug'
-	);
-
-	//Optional: If you're using a private repository, specify the access token like this:
-	$myUpdateChecker->setAuthentication('your-token-here');
-
-	//Optional: Set the branch that contains the stable release.
-	$myUpdateChecker->setBranch('stable-branch-name');
-	```
-3. Plugins only: Add a `readme.txt` file formatted according to the [WordPress.org plugin readme standard](https://wordpress.org/plugins/about/readme.txt) to your repository. The contents of this file will be shown when the user clicks the "View version 1.2.3 details" link.
-
-#### How to Release an Update
-
-This library supports a couple of different ways to release updates on GitHub. Pick the one that best fits your workflow.
-
-- **GitHub releases** 
-	
-	Create a new release using the "Releases" feature on GitHub. The tag name and release title don't matter. The description is optional, but if you do provide one, it will be displayed when the user clicks the "View version x.y.z details" link on the "Plugins" page. Note that PUC ignores releases marked as "This is a pre-release".
-	
-- **Tags** 
-	
-	To release version 1.2.3, create a new Git tag named `v1.2.3` or `1.2.3`. That's it.
-	
-	PUC doesn't require strict adherence to [SemVer](http://semver.org/). These are all valid tag names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5`. However, be warned that it's not smart enough to filter out alpha/beta/RC versions. If that's a problem, you might want to use GitHub releases or branches instead.
-	
-- **Stable branch** 
-	
-	Point the update checker at a stable, production-ready branch: 
-	 ```php
-	 $updateChecker->setBranch('branch-name');
-	 ```
-	 PUC will periodically check the `Version` header in the main plugin file or `style.css` and display a notification if it's greater than the installed version.
-	 
-	 Caveat: If you set the branch to `master` (the default), the update checker will look for recent releases and tags first. It'll only use the `master` branch if it doesn't find anything else suitable.
-
-#### Notes
-
-The library will pull update details from the following parts of a release/tag/branch:
-
-- Version number
-	- The "Version" plugin header.
-	- The latest GitHub release or tag name.
-- Changelog
-	- The "Changelog" section of `readme.txt`.
-	- One of the following files:
-		CHANGES.md, CHANGELOG.md, changes.md, changelog.md
-	- GitHub release notes.
-- Required and tested WordPress versions
-	- The "Requires at least" and "Tested up to" fields in `readme.txt`.
-	- The following plugin headers:
-		`Required WP`, `Tested WP`, `Requires at least`, `Tested up to`
-- "Last updated" timestamp
-	- The creation timestamp of the latest GitHub release.
-	- The latest commit in the selected tag or branch.
-- Number of downloads
-	- The `download_count` statistic of the latest release.
-	- If you're not using GitHub releases, there will be no download stats.
-- Other plugin details - author, homepage URL, description
-	- The "Description" section of `readme.txt`.
-	- Remote plugin headers (i.e. the latest version on GitHub).
-	- Local plugin headers (i.e. the currently installed version).
-- Ratings, banners, screenshots
-	- Not supported.
-	
-### BitBucket Integration
-
-1. Download [the latest release](https://github.com/YahnisElsts/plugin-update-checker/releases/latest) and copy the `plugin-update-checker` directory to your plugin or theme.
-2. Add the following code to the main plugin file or `functions.php`:
-
-	```php
-	require 'plugin-update-checker/plugin-update-checker.php';
-	$myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
-		'https://bitbucket.org/user-name/repo-name',
-		__FILE__,
-		'unique-plugin-or-theme-slug'
-	);
-
-	//Optional: If you're using a private repository, create an OAuth consumer
-	//and set the authentication credentials like this:
-	$myUpdateChecker->setAuthentication(array(
-		'consumer_key' => '...',
-		'consumer_secret' => '...',
-	));
-
-	//Optional: Set the branch that contains the stable release.
-	$myUpdateChecker->setBranch('stable-branch-name');
-	```
-3. Optional: Add a `readme.txt` file formatted according to the [WordPress.org plugin readme standard](https://wordpress.org/plugins/about/readme.txt) to your repository. For plugins, the contents of this file will be shown when the user clicks the "View version 1.2.3 details" link.
-
-#### How to Release an Update
-
-BitBucket doesn't have an equivalent to GitHub's releases, so the process is slightly different. You can use any of the following approaches: 
-
-- **`Stable tag` header** 
-	
-	This is the recommended approach if you're using tags to mark each version. Add a `readme.txt` file formatted according to the [WordPress.org plugin readme standard](https://wordpress.org/plugins/about/readme.txt) to your repository. Set the "stable tag" header to the tag that represents the latest release. Example:
-	```text
-	Stable tag: v1.2.3
-	```
-	The tag doesn't have to start with a "v" or follow any particular format. You can use any name you like as long as it's a valid Git tag.
-	
-	Tip: If you explicitly set a stable branch, the update checker will look for a `readme.txt` in that branch. Otherwise it will only look at the `master` branch.
-	
-- **Tags** 
-	
-	You can skip the "stable tag" bit and just create a new Git tag named `v1.2.3` or `1.2.3`. The update checker will look at the most recent tags and pick the one that looks like the highest version number.
-	
-	PUC doesn't require strict adherence to [SemVer](http://semver.org/). These are all valid tag names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5`. However, be warned that it's not smart enough to filter out alpha/beta/RC versions.
-	
-- **Stable branch** 
-	
-	Point the update checker at a stable, production-ready branch: 
-	 ```php
-	 $updateChecker->setBranch('branch-name');
-	 ```
-	 PUC will periodically check the `Version` header in the main plugin file or `style.css` and display a notification if it's greater than the installed version. Caveat: If you set the branch to `master`, the update checker will still look for tags first.
-
-Resources
----------
-
-- [This blog post](http://w-shadow.com/blog/2010/09/02/automatic-updates-for-any-plugin/) has more information about the update checker API. *Slightly out of date.*
-- [Debug Bar](https://wordpress.org/plugins/debug-bar/) - useful for testing and debugging the update checker.
-- [Securing download links](http://w-shadow.com/blog/2013/03/19/plugin-updates-securing-download-links/) - a general overview.
-- [A GUI for entering download credentials](http://open-tools.net/documentation/tutorial-automatic-updates.html#wordpress)
-- [Theme Update Checker](http://w-shadow.com/blog/2011/06/02/automatic-updates-for-commercial-themes/) - an older, theme-only variant of this update checker.

update/composer.json

@@ -1,22 +0,0 @@
-{
-	"name": "yahnis-elsts/plugin-update-checker",
-	"type": "library",
-	"description": "A custom update checker for WordPress plugins and themes. Useful if you can't host your plugin in the official WP repository but still want it to support automatic updates.",
-	"keywords": ["wordpress", "plugin updates", "automatic updates", "theme updates"],
-	"homepage": "https://github.com/YahnisElsts/plugin-update-checker/",
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Yahnis Elsts",
-			"email": "whiteshadow@w-shadow.com",
-			"homepage": "http://w-shadow.com/",
-			"role": "Developer"
-		}
-	],
-	"require": {
-		"php": ">=5.2.0"
-	},
-	"autoload": {
-		"files": ["plugin-update-checker.php"]
-	}
-}

update/css/puc-debug-bar.css

@@ -1,62 +0,0 @@
-.puc-debug-bar-panel-v4 pre {
-	margin-top: 0;
-}
-
-/* Style the debug data table to match "widefat" table style used by WordPress. */
-table.puc-debug-data {
-    width: 100%;
-    clear: both;
-    margin: 0;
-
-    border-spacing: 0;
-    background-color: #f9f9f9;
-
-    border-radius: 3px;
-    border: 1px solid #dfdfdf;
-    border-collapse: separate;
-}
-
-table.puc-debug-data * {
-    word-wrap: break-word;
-}
-
-table.puc-debug-data th {
-	width: 11em;
-    padding: 7px 7px 8px;
-    text-align: left;
-
-    font-family: "Georgia", "Times New Roman", "Bitstream Charter", "Times", serif;
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 1.3em;
-    text-shadow: rgba(255, 255, 255, 0.804) 0 1px 0;
-}
-
-table.puc-debug-data td, table.puc-debug-data th {
-    border-width: 1px 0;
-    border-style: solid;
-
-    border-top-color: #fff;
-    border-bottom-color: #dfdfdf;
-
-    text-transform: none;
-}
-
-table.puc-debug-data td {
-    color: #555;
-    font-size: 12px;
-    padding: 4px 7px 2px;
-    vertical-align: top;
-}
-
-.puc-ajax-response {
-	border: 1px solid #dfdfdf;
-	border-radius: 3px;
-	padding: 0.5em;
-	margin: 5px 0;
-	background-color: white;
-}
-
-.puc-ajax-nonce {
-	display: none;
-}

update/js/debug-bar.js

@@ -1,52 +0,0 @@
-jQuery(function($) {
-
-	function runAjaxAction(button, action) {
-		button = $(button);
-		var panel = button.closest('.puc-debug-bar-panel-v4');
-		var responseBox = button.closest('td').find('.puc-ajax-response');
-
-		responseBox.text('Processing...').show();
-		$.post(
-			ajaxurl,
-			{
-				action  : action,
-				uid     : panel.data('uid'),
-				_wpnonce: panel.data('nonce')
-			},
-			function(data) {
-				responseBox.html(data);
-			},
-			'html'
-		);
-	}
-
-	$('.puc-debug-bar-panel-v4 input[name="puc-check-now-button"]').click(function() {
-		runAjaxAction(this, 'puc_v4_debug_check_now');
-		return false;
-	});
-
-	$('.puc-debug-bar-panel-v4 input[name="puc-request-info-button"]').click(function() {
-		runAjaxAction(this, 'puc_v4_debug_request_info');
-		return false;
-	});
-
-
-	// Debug Bar uses the panel class name as part of its link and container IDs. This means we can
-	// end up with multiple identical IDs if more than one plugin uses the update checker library.
-	// Fix it by replacing the class name with the plugin slug.
-	var panels = $('#debug-menu-targets').find('.puc-debug-bar-panel-v4');
-	panels.each(function() {
-		var panel = $(this);
-		var uid = panel.data('uid');
-		var target = panel.closest('.debug-menu-target');
-
-		//Change the panel wrapper ID.
-		target.attr('id', 'debug-menu-target-puc-' + uid);
-
-		//Change the menu link ID as well and point it at the new target ID.
-		$('#debug-bar-menu').find('.puc-debug-menu-link-' + uid)
-			.closest('.debug-menu-link')
-			.attr('id', 'debug-menu-link-puc-' + uid)
-			.attr('href', '#' + target.attr('id'));
-	});
-});

update/languages/plugin-update-checker-de_DE.po

@@ -1,38 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: plugin-update-checker\n"
-"POT-Creation-Date: 2016-06-29 20:21+0100\n"
-"PO-Revision-Date: 2016-06-29 20:23+0100\n"
-"Last-Translator: Igor Lückel <info@igorlueckel.de>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.1\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"Language: de_DE\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: github-checker.php:137
-msgid "There is no changelog available."
-msgstr "Es ist keine Liste von Programmänderungen verfügbar."
-
-#: plugin-update-checker.php:852
-msgid "Check for updates"
-msgstr "Nach Update suchen"
-
-#: plugin-update-checker.php:896
-msgid "This plugin is up to date."
-msgstr "Das Plugin ist aktuell."
-
-#: plugin-update-checker.php:898
-msgid "A new version of this plugin is available."
-msgstr "Es ist eine neue Version für das Plugin verfügbar."
-
-#: plugin-update-checker.php:900
-#, php-format
-msgid "Unknown update checker status \"%s\""
-msgstr "Unbekannter Update Status \"%s\""

update/languages/plugin-update-checker-fa_IR.po

@@ -1,38 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: plugin-update-checker\n"
-"POT-Creation-Date: 2016-02-17 14:21+0100\n"
-"PO-Revision-Date: 2016-10-28 14:30+0330\n"
-"Last-Translator: studio RVOLA <hello@rvola.com>\n"
-"Language-Team: Pro Style <info@prostyle.ir>\n"
-"Language: fa_IR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: github-checker.php:120
-msgid "There is no changelog available."
-msgstr "شرحی برای تغییرات  یافت نشد"
-
-#: plugin-update-checker.php:637
-msgid "Check for updates"
-msgstr "بررسی برای بروزرسانی "
-
-#: plugin-update-checker.php:681
-msgid "This plugin is up to date."
-msgstr "شما از آخرین نسخه استفاده میکنید . به‌روز باشید"
-
-#: plugin-update-checker.php:683
-msgid "A new version of this plugin is available."
-msgstr "نسخه جدیدی برای افزونه ارائه شده است ."
-
-#: plugin-update-checker.php:685
-#, php-format
-msgid "Unknown update checker status \"%s\""
-msgstr "وضعیت ناشناخته برای بروزرسانی \"%s\""

update/languages/plugin-update-checker-fr_FR.po

@@ -1,38 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: plugin-update-checker\n"
-"POT-Creation-Date: 2016-02-17 14:21+0100\n"
-"PO-Revision-Date: 2016-08-04 21:08+0200\n"
-"Last-Translator: studio RVOLA <hello@rvola.com>\n"
-"Language-Team: studio RVOLA <http://www.rvola.com>\n"
-"Language: fr_FR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: github-checker.php:120
-msgid "There is no changelog available."
-msgstr "Il n’y a aucun journal de mise à jour disponible."
-
-#: plugin-update-checker.php:637
-msgid "Check for updates"
-msgstr "Vérifier les mises à jour"
-
-#: plugin-update-checker.php:681
-msgid "This plugin is up to date."
-msgstr "Cette extension est à jour."
-
-#: plugin-update-checker.php:683
-msgid "A new version of this plugin is available."
-msgstr "Une nouvelle version de cette extension est disponible."
-
-#: plugin-update-checker.php:685
-#, php-format
-msgid "Unknown update checker status \"%s\""
-msgstr "Un problème inconnu est survenu \"%s\""

update/languages/plugin-update-checker-hu_HU.po

@@ -1,41 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: plugin-update-checker\n"
-"POT-Creation-Date: 2016-01-11 21:23+0100\n"
-"PO-Revision-Date: 2016-01-11 21:25+0100\n"
-"Last-Translator: Tamás András Horváth <htomy92@gmail.com>\n"
-"Language-Team: \n"
-"Language: hu_HU\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: github-checker.php:137
-msgid "There is no changelog available."
-msgstr "Nem érhető el a changelog."
-
-#: plugin-update-checker.php:852
-msgid "Check for updates"
-msgstr "Frissítés ellenőrzése"
-
-#: plugin-update-checker.php:896
-msgid "This plugin is up to date."
-msgstr "Ez a plugin naprakész."
-
-#: plugin-update-checker.php:898
-msgid "A new version of this plugin is available."
-msgstr "Új verzió érhető el a kiegészítőhöz"
-
-#: plugin-update-checker.php:900
-#, php-format
-msgid "Unknown update checker status \"%s\""
-msgstr "Ismeretlen a frissítés ellenőrző státusza \"%s\""
-
-#~ msgid "Every %d hours"
-#~ msgstr "Minden %d órában"

update/languages/plugin-update-checker-it_IT.po

@@ -1,38 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: plugin-update-checker\n"
-"POT-Creation-Date: 2016-06-29 20:21+0100\n"
-"PO-Revision-Date: 2017-01-15 12:24+0100\n"
-"Last-Translator: Igor Lückel <info@igorlueckel.de>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"Language: de_DE\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: github-checker.php:137
-msgid "There is no changelog available."
-msgstr "Non c'è alcuna sezione di aggiornamento disponibile"
-
-#: plugin-update-checker.php:852
-msgid "Check for updates"
-msgstr "Verifica aggiornamenti"
-
-#: plugin-update-checker.php:896
-msgid "This plugin is up to date."
-msgstr "Il plugin è aggiornato"
-
-#: plugin-update-checker.php:898
-msgid "A new version of this plugin is available."
-msgstr "Una nuova versione del plugin è disponibile"
-
-#: plugin-update-checker.php:900
-#, php-format
-msgid "Unknown update checker status \"%s\""
-msgstr "Si è verificato un problema sconosciuto \"%s\""

update/languages/plugin-update-checker-ja.po

@@ -1,38 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: plugin-update-checker\n"
-"POT-Creation-Date: 2017-02-26 14:43+0900\n"
-"PO-Revision-Date: 2017-02-26 14:55+0900\n"
-"Last-Translator: tak <tak7725@gmail.com>\n"
-"Language-Team: \n"
-"Language: ja_JP\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.12\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: Puc/v4/Plugin/UpdateChecker.php:358
-msgid "Check for updates"
-msgstr "アップデートを確認"
-
-#: Puc/v4/Plugin/UpdateChecker.php:404
-msgid "This plugin is up to date."
-msgstr "このプラグインは、最新バージョンです。"
-
-#: Puc/v4/Plugin/UpdateChecker.php:406
-msgid "A new version of this plugin is available."
-msgstr "このプラグインの新バージョンがあります。"
-
-#: Puc/v4/Plugin/UpdateChecker.php:408
-#, php-format
-msgid "Unknown update checker status \"%s\""
-msgstr "バージョンアップの確認で想定外の状態になりました。ステータス：\"%s\""
-
-#: Puc/v4/Vcs/PluginUpdateChecker.php:83
-msgid "There is no changelog available."
-msgstr "更新履歴はありません。"

update/languages/plugin-update-checker-pt_BR.po

@@ -1,48 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: plugin-update-checker\n"
-"POT-Creation-Date: 2017-05-19 15:41-0300\n"
-"PO-Revision-Date: 2017-05-19 15:42-0300\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e;_x;_x:1,2c\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: Puc/v4p1/Plugin/UpdateChecker.php:358
-msgid "Check for updates"
-msgstr "Verificar Atualizações"
-
-#: Puc/v4p1/Plugin/UpdateChecker.php:401 Puc/v4p1/Plugin/UpdateChecker.php:406
-#, php-format
-msgctxt "the plugin title"
-msgid "The %s plugin is up to date."
-msgstr "O plugin %s já está na sua versão mais recente."
-
-#: Puc/v4p1/Plugin/UpdateChecker.php:408
-#, php-format
-msgctxt "the plugin title"
-msgid "A new version of the %s plugin is available."
-msgstr "Há uma nova versão para o plugin %s disponível para download."
-
-#: Puc/v4p1/Plugin/UpdateChecker.php:410
-#, php-format
-msgid "Unknown update checker status \"%s\""
-msgstr "Status \"%s\" desconhecido."
-
-#: Puc/v4p1/Vcs/PluginUpdateChecker.php:83
-msgid "There is no changelog available."
-msgstr "Não há um changelog disponível."
-
-#~ msgid "The %s plugin is up to date."
-#~ msgstr "O plugin %s já está na sua versão mais recente."
-
-#~ msgid "A new version of the %s plugin is available."
-#~ msgstr "Há uma nova versão para o plugin %s disponível para download."

update/languages/plugin-update-checker.pot

@@ -1,43 +0,0 @@
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: plugin-update-checker\n"
-"POT-Creation-Date: 2017-05-20 10:53+0300\n"
-"PO-Revision-Date: 2016-01-10 20:59+0100\n"
-"Last-Translator: Tamás András Horváth <htomy92@gmail.com>\n"
-"Language-Team: \n"
-"Language: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.2\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e;_x:1,2c;_x\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: Puc/v4p1/Plugin/UpdateChecker.php:358
-msgid "Check for updates"
-msgstr ""
-
-#: Puc/v4p1/Plugin/UpdateChecker.php:405
-#, php-format
-msgctxt "the plugin title"
-msgid "The %s plugin is up to date."
-msgstr ""
-
-#: Puc/v4p1/Plugin/UpdateChecker.php:407
-#, php-format
-msgctxt "the plugin title"
-msgid "A new version of the %s plugin is available."
-msgstr ""
-
-#: Puc/v4p1/Plugin/UpdateChecker.php:409
-#, php-format
-msgid "Unknown update checker status \"%s\""
-msgstr ""
-
-#: Puc/v4p1/Vcs/PluginUpdateChecker.php:83
-msgid "There is no changelog available."
-msgstr ""

update/license.txt

@@ -1,7 +0,0 @@
-Copyright (c) 2014 Jānis Elsts
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

update/puc.php

@@ -1,22 +0,0 @@
-<?php
-/**
- * Plugin Update Checker Library 4.1
- * http://w-shadow.com/
- * 
- * Copyright 2017 Janis Elsts
- * Released under the MIT license. See license.txt for details.
- */
-
-require dirname(__FILE__) . '/Puc/v4/Factory.php';
-require dirname(__FILE__) . '/Puc/v4p1/Autoloader.php';
-new Puc_v4p1_Autoloader();
-
-//Register classes defined in this file with the factory.
-Puc_v4_Factory::addVersion('Plugin_UpdateChecker', 'Puc_v4p1_Plugin_UpdateChecker', '4.1');
-Puc_v4_Factory::addVersion('Theme_UpdateChecker', 'Puc_v4p1_Theme_UpdateChecker', '4.1');
-
-Puc_v4_Factory::addVersion('Vcs_PluginUpdateChecker', 'Puc_v4p1_Vcs_PluginUpdateChecker', '4.1');
-Puc_v4_Factory::addVersion('Vcs_ThemeUpdateChecker', 'Puc_v4p1_Vcs_ThemeUpdateChecker', '4.1');
-
-Puc_v4_Factory::addVersion('GitHubApi', 'Puc_v4p1_Vcs_GitHubApi', '4.1');
-Puc_v4_Factory::addVersion('BitBucketApi', 'Puc_v4p1_Vcs_BitBucketApi', '4.1');