litefeel / writing-on-github

views/textarea-setting-field.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<textarea name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" rows="10" cols="40">
-<?php echo esc_attr( $value ); ?>
+<?php $value = get_option($args['name'], $args['default']); ?>
+<textarea name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" rows="10" cols="40">
+<?php echo esc_attr($value); ?>
 </textarea>
 <p class="description"><?php echo $args['help_text']; ?></p>

views/options.php

Spacing +12 added lines, -12 removed lines

@@ -6,27 +6,27 @@
 
 ?>
 <div class="wrap">
-	<h2><?php esc_html_e( 'Writing On GitHub', 'writing-on-github' ); ?></h2>
+	<h2><?php esc_html_e('Writing On GitHub', 'writing-on-github'); ?></h2>
 
 	<form method="post" action="options.php">
-		<?php settings_fields( Writing_On_GitHub::$text_domain ); ?>
-		<?php do_settings_sections( Writing_On_GitHub::$text_domain ); ?>
+		<?php settings_fields(Writing_On_GitHub::$text_domain); ?>
+		<?php do_settings_sections(Writing_On_GitHub::$text_domain); ?>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Webhook callback', 'writing-on-github' ); ?></th>
-				<td><code><?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>?action=wogh_push_request</code></td>
+				<th scope="row"><?php esc_html_e('Webhook callback', 'writing-on-github'); ?></th>
+				<td><code><?php echo esc_url(admin_url('admin-ajax.php')); ?>?action=wogh_push_request</code></td>
 			</tr>
 			<tr>
-				<th scope="row"><?php esc_html_e( 'Bulk actions', 'writing-on-github' ); ?></th>
+				<th scope="row"><?php esc_html_e('Bulk actions', 'writing-on-github'); ?></th>
 				<td>
-					<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'export' ) ) ); ?>">
-						<?php esc_html_e( 'Export to GitHub', 'writing-on-github' ); ?>
+					<a href="<?php echo esc_url(add_query_arg(array('action' => 'export'))); ?>">
+						<?php esc_html_e('Export to GitHub', 'writing-on-github'); ?>
 					</a> |
-                    <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'force_export' ) ) ); ?>">
-                        <?php esc_html_e( 'Force export to GitHub', 'writing-on-github' ); ?>
+                    <a href="<?php echo esc_url(add_query_arg(array('action' => 'force_export'))); ?>">
+                        <?php esc_html_e('Force export to GitHub', 'writing-on-github'); ?>
                     </a> |
-					<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'import' ) ) ); ?>">
-						<?php esc_html_e( 'Import from GitHub', 'writing-on-github' ); ?>
+					<a href="<?php echo esc_url(add_query_arg(array('action' => 'import'))); ?>">
+						<?php esc_html_e('Import from GitHub', 'writing-on-github'); ?>
 					</a>
 				</td>
 		</table>

views/user-setting-field.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<select name="<?php echo esc_attr( $args['name'] ) ?>" id="<?php echo esc_attr( $args['name'] ) ?>">
-	<?php foreach ( get_users() as $user ) : ?>
-		<option value="<?php echo esc_attr( $user->ID ); ?>"<?php echo (int) $value === $user->ID ? ' selected' : '';?>>
-			<?php echo esc_html( $user->display_name ); ?>
+<?php $value = get_option($args['name'], $args['default']); ?>
+<select name="<?php echo esc_attr($args['name']) ?>" id="<?php echo esc_attr($args['name']) ?>">
+	<?php foreach (get_users() as $user) : ?>
+		<option value="<?php echo esc_attr($user->ID); ?>"<?php echo (int) $value === $user->ID ? ' selected' : ''; ?>>
+			<?php echo esc_html($user->display_name); ?>
 		</option>
 	<?php endforeach; ?>
 </select>

views/checkbox-setting-field.php

Spacing +2 added lines, -2 removed lines

@@ -5,6 +5,6 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<input type="checkbox" name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" value="yes" <?php echo 'yes' === $value ? 'checked' : '';  ?> />
+<?php $value = get_option($args['name'], $args['default']); ?>
+<input type="checkbox" name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" value="yes" <?php echo 'yes' === $value ? 'checked' : ''; ?> />
 <p class="description"><?php echo $args['help_text']; ?></p>

views/setting-field.php

Spacing +2 added lines, -2 removed lines

@@ -5,6 +5,6 @@
  */
 
 ?>
-<?php $value = get_option( $args['name'], $args['default'] ); ?>
-<input name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr( $value ); ?>" />
+<?php $value = get_option($args['name'], $args['default']); ?>
+<input name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr($value); ?>" />
 <p class="description"><?php echo $args['help_text']; ?></p>

lib/post.php

Indentation +448 added lines, -448 removed lines

@@ -9,452 +9,452 @@
  */
 class Writing_On_GitHub_Post {
 
-    /**
-     * Api object
-     *
-     * @var Writing_On_GitHub_Api
-     */
-    public $api;
-
-    /**
-     * Post ID
-     * @var integer
-     */
-    public $id = 0;
-
-    /**
-     * Post object
-     * @var WP_Post
-     */
-    public $post;
-
-    /**
-     * Post args.
-     *
-     * @var array
-     */
-    protected $args;
-
-    /**
-     * Post meta.
-     *
-     * @var array
-     */
-    protected $meta;
-
-    /**
-     * Whether the post has been saved.
-     *
-     * @var bool
-     */
-    protected $new = true;
-
-
-    protected $old_github_path;
-
-    /**
-     * Instantiates a new Post object
-     *
-     * @param int|array                 $id_or_args Either a post ID or an array of arguments.
-     * @param Writing_On_GitHub_Api $api API object.
-     *
-     * @todo remove database operations from this method
-     */
-    public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
-        $this->api = $api;
-
-        if ( is_numeric( $id_or_args ) ) {
-            $this->id   = (int) $id_or_args;
-            $this->post = get_post( $this->id );
-            $this->new  = false;
-        }
-
-        if ( is_array( $id_or_args ) ) {
-            $this->args = $id_or_args;
-
-            if ( isset( $this->args['ID'] ) ) {
-                $this->post = get_post( $this->args['ID'] );
-
-                if ( $this->post ) {
-                    $this->id  = $this->post->ID;
-                    $this->new = false;
-                } else {
-                    unset( $this->args['ID'] );
-                }
-            }
-        }
-    }
-
-    public function id() {
-        return $this->id;
-    }
-
-    /**
-     * Returns the post type
-     */
-    public function type() {
-        return $this->post->post_type;
-    }
-
-    /**
-     * Returns the post type
-     */
-    public function status() {
-        return $this->post->post_status;
-    }
-
-    /**
-     * Returns the post name
-     */
-    public function name() {
-        return $this->post->post_name;
-    }
-
-    /**
-     * Returns true if the post has a password
-     * @return bool
-     */
-    public function has_password() {
-        return ! empty( $this->post->post_password );
-    }
-
-    /**
-     * Combines the 2 content parts for GitHub
-     */
-    public function github_content() {
-        $content = $this->front_matter() . $this->post_content();
-        $ending  = apply_filters( 'wogh_line_endings', "\n" );
-
-        return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
-    }
-
-    /**
-     * The post's YAML frontmatter
-     *
-     * Returns String the YAML frontmatter, ready to be written to the file
-     */
-    public function front_matter() {
-        return "---\n" . spyc_dump( $this->meta() ) . "---\n";
-    }
-
-    /**
-     * Returns the post_content
-     *
-     * Markdownify's the content if applicable
-     */
-    public function post_content() {
-        $content = $this->post->post_content;
-
-        if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
-            $content = wpmarkdown_html_to_markdown( $content );
-        } else if ( class_exists( 'WPCom_Markdown' ) ) {
-            if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
-                $content = $this->post->post_content_filtered;
-            }
-        }
-
-        return apply_filters( 'wogh_content_export', $content, $this );
-    }
-
-    public function old_github_path() {
-        return $this->old_github_path;
-    }
-
-    public function set_old_github_path( $path ) {
-        $this->old_github_path = $path;
-        update_post_meta( $this->id, '_wogh_github_path', $path );
-    }
-
-
-    /**
-     * Retrieves or calculates the proper GitHub path for a given post
-     *
-     * Returns (string) the path relative to repo root
-     */
-    public function github_path() {
-        $path = $this->github_directory() . $this->github_filename();
-
-        return $path;
-    }
-
-    /**
-     * Get GitHub directory based on post
-     *
-     * @return string
-     */
-    public function github_directory() {
-        if ( 'publish' !== $this->status() ) {
-            return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
-        }
-
-        $name = '';
-
-        switch ( $this->type() ) {
-            case 'post':
-                $name = 'posts';
-                break;
-            case 'page':
-                $name = 'pages';
-                break;
-            default:
-                $obj = get_post_type_object( $this->type() );
-
-                if ( $obj ) {
-                    $name = strtolower( $obj->labels->name );
-                }
-
-                if ( ! $name ) {
-                    $name = '';
-                }
-        }
-
-        if ( $name ) {
-            $name = '_' . $name . '/';
-        }
-
-        return apply_filters( 'wogh_directory_published', $name, $this );
-    }
-
-    /**
-     * Build GitHub filename based on post
-     */
-    public function github_filename() {
-        if ( 'post' === $this->type() ) {
-            $filename = get_the_time( 'Y-m-d-', $this->id ) . $this->get_name() . '.md';
-        } else {
-            $filename = $this->get_name() . '.md';
-        }
-
-        return apply_filters( 'wogh_filename', $filename, $this );
-    }
-
-    /**
-     * Returns a post slug we can use in the GitHub filename
-     *
-     * @return string
-     */
-    protected function get_name() {
-        if ( '' !== $this->name() ) {
-            return $this->name();
-        }
-
-        return sanitize_title( get_the_title( $this->post ) );
-    }
-
-    /**
-     * is put on github
-     * @return boolean
-     */
-    public function is_on_github() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        if ( $sha && $github_path ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns the URL for the post on GitHub.
-     *
-     * @return string
-     */
-    public function github_view_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        $repository = $this->api->fetch()->repository();
-        $branch = $this->api->fetch()->branch();
-
-        return "https://github.com/$repository/blob/$branch/$github_path";
-    }
-
-    /**
-     * Returns the URL for the post on GitHub.
-     *
-     * @return string
-     */
-    public function github_edit_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        $repository = $this->api->fetch()->repository();
-        $branch = $this->api->fetch()->branch();
-
-        return "https://github.com/$repository/edit/$branch/$github_path";
-    }
-
-    /**
-     * Retrieve post type directory from blob path.
-     *
-     * @param string $path Path string.
-     *
-     * @return string
-     */
-    public function get_directory_from_path( $path ) {
-        $directory = explode( '/', $path );
-        $directory = count( $directory ) > 0 ? $directory[0] : '';
-
-        return $directory;
-    }
-
-    /**
-     * Determines the last author to modify the post
-     *
-     * Returns Array an array containing the author name and email
-     */
-    public function last_modified_author() {
-        if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
-            $user = get_userdata( $last_id );
-
-            if ( $user ) {
-                return array( 'name' => $user->display_name, 'email' => $user->user_email );
-            }
-        }
-
-        return array();
-    }
-
-    /**
-     * The post's sha
-     * Cached as post meta, or will make a live call if need be
-     *
-     * Returns String the sha1 hash
-     */
-    public function sha() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-
-        // If we've done a full export and we have no sha
-        // then we should try a live check to see if it exists.
-        // if ( ! $sha && 'yes' === get_option( '_wogh_fully_exported' ) ) {
-
-        //  // @todo could we eliminate this by calling down the full tree and searching it
-        //  $data = $this->api->fetch()->remote_contents( $this );
-
-        //  if ( ! is_wp_error( $data ) ) {
-        //      update_post_meta( $this->id, '_wogh_sha', $data->sha );
-        //      $sha = $data->sha;
-        //  }
-        // }
-
-        // if the sha still doesn't exist, then it's empty
-        if ( ! $sha || is_wp_error( $sha ) ) {
-            $sha = '';
-        }
-
-        return $sha;
-    }
-
-    /**
-     * Save the sha to post
-     *
-     * @param string $sha
-     */
-    public function set_sha( $sha ) {
-        update_post_meta( $this->id, '_wogh_sha', $sha );
-    }
-
-    /**
-     * The post's metadata
-     *
-     * Returns Array the post's metadata
-     */
-    public function meta() {
-        $meta = array(
-            'ID'           => $this->id,
-            'post_title'   => get_the_title( $this->post ),
-            'post_name'    => $this->post->post_name,
-            'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
-            'post_date'    => $this->post->post_date,
-            'post_excerpt' => $this->post->post_excerpt,
-            'layout'       => get_post_type( $this->post ),
-            'link'         => get_permalink( $this->post ),
-            'published'    => 'publish' === $this->status() ? true : false,
-            'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
-            'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
-        );
-        if ( empty($this->post->post_name) ) {
-            unset($meta['post_name']);
-        }
-        if ( empty($this->post->post_excerpt) ) {
-            unset($meta['post_excerpt']);
-        }
-        if ( 'yes' == get_option('wogh_ignore_author') ) {
-            unset($meta['author']);
-        }
-
-        //convert traditional post_meta values, hide hidden values, skip already populated values
-        // foreach ( get_post_custom( $this->id ) as $key => $value ) {
-
-        //  if ( '_' === substr( $key, 0, 1 ) || isset( $meta[ $key ] ) ) {
-        //      continue;
-        //  }
-
-        //  $meta[ $key ] = $value;
-
-        // }
-
-        return apply_filters( 'wogh_post_meta', $meta, $this );
-    }
-
-    /**
-     * Returns whether the Post has been saved in the DB yet.
-     *
-     * @return bool
-     */
-    public function is_new() {
-        return $this->new;
-    }
-
-    /**
-     * Sets the Post's meta.
-     *
-     * @param array $meta
-     */
-    public function set_meta( $meta ) {
-        $this->meta = $meta;
-    }
-
-    /**
-     * Returns the Post's arguments.
-     *
-     * @return array
-     */
-    public function get_args() {
-        return $this->args;
-    }
-
-    /**
-     * Returns the Post's meta.
-     *
-     * @return array
-     */
-    public function get_meta() {
-        return $this->meta;
-    }
-
-    /**
-     * Sets the Post's WP_Post object.
-     *
-     * @param WP_Post $post
-     *
-     * @return $this
-     */
-    public function set_post( WP_Post $post ) {
-        $this->post = $post;
-        $this->id   = $post->ID;
-
-        return $this;
-    }
-
-    /**
-     * Transforms the Post into a Blob.
-     *
-     * @return Writing_On_GitHub_Blob
-     */
-    public function to_blob() {
-        $data = new stdClass;
-
-        $data->path    = $this->github_path();
-        $data->content = $this->github_content();
-        $data->sha     = $this->sha();
-
-        return new Writing_On_GitHub_Blob( $data );
-    }
+	/**
+	 * Api object
+	 *
+	 * @var Writing_On_GitHub_Api
+	 */
+	public $api;
+
+	/**
+	 * Post ID
+	 * @var integer
+	 */
+	public $id = 0;
+
+	/**
+	 * Post object
+	 * @var WP_Post
+	 */
+	public $post;
+
+	/**
+	 * Post args.
+	 *
+	 * @var array
+	 */
+	protected $args;
+
+	/**
+	 * Post meta.
+	 *
+	 * @var array
+	 */
+	protected $meta;
+
+	/**
+	 * Whether the post has been saved.
+	 *
+	 * @var bool
+	 */
+	protected $new = true;
+
+
+	protected $old_github_path;
+
+	/**
+	 * Instantiates a new Post object
+	 *
+	 * @param int|array                 $id_or_args Either a post ID or an array of arguments.
+	 * @param Writing_On_GitHub_Api $api API object.
+	 *
+	 * @todo remove database operations from this method
+	 */
+	public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
+		$this->api = $api;
+
+		if ( is_numeric( $id_or_args ) ) {
+			$this->id   = (int) $id_or_args;
+			$this->post = get_post( $this->id );
+			$this->new  = false;
+		}
+
+		if ( is_array( $id_or_args ) ) {
+			$this->args = $id_or_args;
+
+			if ( isset( $this->args['ID'] ) ) {
+				$this->post = get_post( $this->args['ID'] );
+
+				if ( $this->post ) {
+					$this->id  = $this->post->ID;
+					$this->new = false;
+				} else {
+					unset( $this->args['ID'] );
+				}
+			}
+		}
+	}
+
+	public function id() {
+		return $this->id;
+	}
+
+	/**
+	 * Returns the post type
+	 */
+	public function type() {
+		return $this->post->post_type;
+	}
+
+	/**
+	 * Returns the post type
+	 */
+	public function status() {
+		return $this->post->post_status;
+	}
+
+	/**
+	 * Returns the post name
+	 */
+	public function name() {
+		return $this->post->post_name;
+	}
+
+	/**
+	 * Returns true if the post has a password
+	 * @return bool
+	 */
+	public function has_password() {
+		return ! empty( $this->post->post_password );
+	}
+
+	/**
+	 * Combines the 2 content parts for GitHub
+	 */
+	public function github_content() {
+		$content = $this->front_matter() . $this->post_content();
+		$ending  = apply_filters( 'wogh_line_endings', "\n" );
+
+		return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
+	}
+
+	/**
+	 * The post's YAML frontmatter
+	 *
+	 * Returns String the YAML frontmatter, ready to be written to the file
+	 */
+	public function front_matter() {
+		return "---\n" . spyc_dump( $this->meta() ) . "---\n";
+	}
+
+	/**
+	 * Returns the post_content
+	 *
+	 * Markdownify's the content if applicable
+	 */
+	public function post_content() {
+		$content = $this->post->post_content;
+
+		if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
+			$content = wpmarkdown_html_to_markdown( $content );
+		} else if ( class_exists( 'WPCom_Markdown' ) ) {
+			if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
+				$content = $this->post->post_content_filtered;
+			}
+		}
+
+		return apply_filters( 'wogh_content_export', $content, $this );
+	}
+
+	public function old_github_path() {
+		return $this->old_github_path;
+	}
+
+	public function set_old_github_path( $path ) {
+		$this->old_github_path = $path;
+		update_post_meta( $this->id, '_wogh_github_path', $path );
+	}
+
+
+	/**
+	 * Retrieves or calculates the proper GitHub path for a given post
+	 *
+	 * Returns (string) the path relative to repo root
+	 */
+	public function github_path() {
+		$path = $this->github_directory() . $this->github_filename();
+
+		return $path;
+	}
+
+	/**
+	 * Get GitHub directory based on post
+	 *
+	 * @return string
+	 */
+	public function github_directory() {
+		if ( 'publish' !== $this->status() ) {
+			return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
+		}
+
+		$name = '';
+
+		switch ( $this->type() ) {
+			case 'post':
+				$name = 'posts';
+				break;
+			case 'page':
+				$name = 'pages';
+				break;
+			default:
+				$obj = get_post_type_object( $this->type() );
+
+				if ( $obj ) {
+					$name = strtolower( $obj->labels->name );
+				}
+
+				if ( ! $name ) {
+					$name = '';
+				}
+		}
+
+		if ( $name ) {
+			$name = '_' . $name . '/';
+		}
+
+		return apply_filters( 'wogh_directory_published', $name, $this );
+	}
+
+	/**
+	 * Build GitHub filename based on post
+	 */
+	public function github_filename() {
+		if ( 'post' === $this->type() ) {
+			$filename = get_the_time( 'Y-m-d-', $this->id ) . $this->get_name() . '.md';
+		} else {
+			$filename = $this->get_name() . '.md';
+		}
+
+		return apply_filters( 'wogh_filename', $filename, $this );
+	}
+
+	/**
+	 * Returns a post slug we can use in the GitHub filename
+	 *
+	 * @return string
+	 */
+	protected function get_name() {
+		if ( '' !== $this->name() ) {
+			return $this->name();
+		}
+
+		return sanitize_title( get_the_title( $this->post ) );
+	}
+
+	/**
+	 * is put on github
+	 * @return boolean
+	 */
+	public function is_on_github() {
+		$sha = get_post_meta( $this->id, '_wogh_sha', true );
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		if ( $sha && $github_path ) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the URL for the post on GitHub.
+	 *
+	 * @return string
+	 */
+	public function github_view_url() {
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		$repository = $this->api->fetch()->repository();
+		$branch = $this->api->fetch()->branch();
+
+		return "https://github.com/$repository/blob/$branch/$github_path";
+	}
+
+	/**
+	 * Returns the URL for the post on GitHub.
+	 *
+	 * @return string
+	 */
+	public function github_edit_url() {
+		$github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+		$repository = $this->api->fetch()->repository();
+		$branch = $this->api->fetch()->branch();
+
+		return "https://github.com/$repository/edit/$branch/$github_path";
+	}
+
+	/**
+	 * Retrieve post type directory from blob path.
+	 *
+	 * @param string $path Path string.
+	 *
+	 * @return string
+	 */
+	public function get_directory_from_path( $path ) {
+		$directory = explode( '/', $path );
+		$directory = count( $directory ) > 0 ? $directory[0] : '';
+
+		return $directory;
+	}
+
+	/**
+	 * Determines the last author to modify the post
+	 *
+	 * Returns Array an array containing the author name and email
+	 */
+	public function last_modified_author() {
+		if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
+			$user = get_userdata( $last_id );
+
+			if ( $user ) {
+				return array( 'name' => $user->display_name, 'email' => $user->user_email );
+			}
+		}
+
+		return array();
+	}
+
+	/**
+	 * The post's sha
+	 * Cached as post meta, or will make a live call if need be
+	 *
+	 * Returns String the sha1 hash
+	 */
+	public function sha() {
+		$sha = get_post_meta( $this->id, '_wogh_sha', true );
+
+		// If we've done a full export and we have no sha
+		// then we should try a live check to see if it exists.
+		// if ( ! $sha && 'yes' === get_option( '_wogh_fully_exported' ) ) {
+
+		//  // @todo could we eliminate this by calling down the full tree and searching it
+		//  $data = $this->api->fetch()->remote_contents( $this );
+
+		//  if ( ! is_wp_error( $data ) ) {
+		//      update_post_meta( $this->id, '_wogh_sha', $data->sha );
+		//      $sha = $data->sha;
+		//  }
+		// }
+
+		// if the sha still doesn't exist, then it's empty
+		if ( ! $sha || is_wp_error( $sha ) ) {
+			$sha = '';
+		}
+
+		return $sha;
+	}
+
+	/**
+	 * Save the sha to post
+	 *
+	 * @param string $sha
+	 */
+	public function set_sha( $sha ) {
+		update_post_meta( $this->id, '_wogh_sha', $sha );
+	}
+
+	/**
+	 * The post's metadata
+	 *
+	 * Returns Array the post's metadata
+	 */
+	public function meta() {
+		$meta = array(
+			'ID'           => $this->id,
+			'post_title'   => get_the_title( $this->post ),
+			'post_name'    => $this->post->post_name,
+			'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+			'post_date'    => $this->post->post_date,
+			'post_excerpt' => $this->post->post_excerpt,
+			'layout'       => get_post_type( $this->post ),
+			'link'         => get_permalink( $this->post ),
+			'published'    => 'publish' === $this->status() ? true : false,
+			'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
+			'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
+		);
+		if ( empty($this->post->post_name) ) {
+			unset($meta['post_name']);
+		}
+		if ( empty($this->post->post_excerpt) ) {
+			unset($meta['post_excerpt']);
+		}
+		if ( 'yes' == get_option('wogh_ignore_author') ) {
+			unset($meta['author']);
+		}
+
+		//convert traditional post_meta values, hide hidden values, skip already populated values
+		// foreach ( get_post_custom( $this->id ) as $key => $value ) {
+
+		//  if ( '_' === substr( $key, 0, 1 ) || isset( $meta[ $key ] ) ) {
+		//      continue;
+		//  }
+
+		//  $meta[ $key ] = $value;
+
+		// }
+
+		return apply_filters( 'wogh_post_meta', $meta, $this );
+	}
+
+	/**
+	 * Returns whether the Post has been saved in the DB yet.
+	 *
+	 * @return bool
+	 */
+	public function is_new() {
+		return $this->new;
+	}
+
+	/**
+	 * Sets the Post's meta.
+	 *
+	 * @param array $meta
+	 */
+	public function set_meta( $meta ) {
+		$this->meta = $meta;
+	}
+
+	/**
+	 * Returns the Post's arguments.
+	 *
+	 * @return array
+	 */
+	public function get_args() {
+		return $this->args;
+	}
+
+	/**
+	 * Returns the Post's meta.
+	 *
+	 * @return array
+	 */
+	public function get_meta() {
+		return $this->meta;
+	}
+
+	/**
+	 * Sets the Post's WP_Post object.
+	 *
+	 * @param WP_Post $post
+	 *
+	 * @return $this
+	 */
+	public function set_post( WP_Post $post ) {
+		$this->post = $post;
+		$this->id   = $post->ID;
+
+		return $this;
+	}
+
+	/**
+	 * Transforms the Post into a Blob.
+	 *
+	 * @return Writing_On_GitHub_Blob
+	 */
+	public function to_blob() {
+		$data = new stdClass;
+
+		$data->path    = $this->github_path();
+		$data->content = $this->github_content();
+		$data->sha     = $this->sha();
+
+		return new Writing_On_GitHub_Blob( $data );
+	}
 }

Spacing +62 added lines, -62 removed lines

@@ -60,26 +60,26 @@ 
      *
      * @todo remove database operations from this method
      */
-    public function __construct( $id_or_args, Writing_On_GitHub_Api $api ) {
+    public function __construct($id_or_args, Writing_On_GitHub_Api $api) {
         $this->api = $api;
 
-        if ( is_numeric( $id_or_args ) ) {
+        if (is_numeric($id_or_args)) {
             $this->id   = (int) $id_or_args;
-            $this->post = get_post( $this->id );
+            $this->post = get_post($this->id);
             $this->new  = false;
         }
 
-        if ( is_array( $id_or_args ) ) {
+        if (is_array($id_or_args)) {
             $this->args = $id_or_args;
 
-            if ( isset( $this->args['ID'] ) ) {
-                $this->post = get_post( $this->args['ID'] );
+            if (isset($this->args['ID'])) {
+                $this->post = get_post($this->args['ID']);
 
-                if ( $this->post ) {
+                if ($this->post) {
                     $this->id  = $this->post->ID;
                     $this->new = false;
                 } else {
-                    unset( $this->args['ID'] );
+                    unset($this->args['ID']);
                 }
             }
         }
@@ -115,7 +115,7 @@ 
      * @return bool
      */
     public function has_password() {
-        return ! empty( $this->post->post_password );
+        return ! empty($this->post->post_password);
     }
 
     /**
@@ -123,9 +123,9 @@ 
      */
     public function github_content() {
         $content = $this->front_matter() . $this->post_content();
-        $ending  = apply_filters( 'wogh_line_endings', "\n" );
+        $ending  = apply_filters('wogh_line_endings', "\n");
 
-        return preg_replace( '~(*BSR_ANYCRLF)\R~', $ending, $content );
+        return preg_replace('~(*BSR_ANYCRLF)\R~', $ending, $content);
     }
 
     /**
@@ -134,7 +134,7 @@ 
      * Returns String the YAML frontmatter, ready to be written to the file
      */
     public function front_matter() {
-        return "---\n" . spyc_dump( $this->meta() ) . "---\n";
+        return "---\n" . spyc_dump($this->meta()) . "---\n";
     }
 
     /**
@@ -145,24 +145,24 @@ 
     public function post_content() {
         $content = $this->post->post_content;
 
-        if ( function_exists( 'wpmarkdown_html_to_markdown' ) ) {
-            $content = wpmarkdown_html_to_markdown( $content );
-        } else if ( class_exists( 'WPCom_Markdown' ) ) {
-            if ( WPCom_Markdown::get_instance()->is_markdown( $this->post->ID ) ) {
+        if (function_exists('wpmarkdown_html_to_markdown')) {
+            $content = wpmarkdown_html_to_markdown($content);
+        } else if (class_exists('WPCom_Markdown')) {
+            if (WPCom_Markdown::get_instance()->is_markdown($this->post->ID)) {
                 $content = $this->post->post_content_filtered;
             }
         }
 
-        return apply_filters( 'wogh_content_export', $content, $this );
+        return apply_filters('wogh_content_export', $content, $this);
     }
 
     public function old_github_path() {
         return $this->old_github_path;
     }
 
-    public function set_old_github_path( $path ) {
+    public function set_old_github_path($path) {
         $this->old_github_path = $path;
-        update_post_meta( $this->id, '_wogh_github_path', $path );
+        update_post_meta($this->id, '_wogh_github_path', $path);
     }
 
 
@@ -183,13 +183,13 @@ 
      * @return string
      */
     public function github_directory() {
-        if ( 'publish' !== $this->status() ) {
-            return apply_filters( 'wogh_directory_unpublished', '_drafts/', $this );
+        if ('publish' !== $this->status()) {
+            return apply_filters('wogh_directory_unpublished', '_drafts/', $this);
         }
 
         $name = '';
 
-        switch ( $this->type() ) {
+        switch ($this->type()) {
             case 'post':
                 $name = 'posts';
                 break;
@@ -197,35 +197,35 @@ 
                 $name = 'pages';
                 break;
             default:
-                $obj = get_post_type_object( $this->type() );
+                $obj = get_post_type_object($this->type());
 
-                if ( $obj ) {
-                    $name = strtolower( $obj->labels->name );
+                if ($obj) {
+                    $name = strtolower($obj->labels->name);
                 }
 
-                if ( ! $name ) {
+                if ( ! $name) {
                     $name = '';
                 }
         }
 
-        if ( $name ) {
+        if ($name) {
             $name = '_' . $name . '/';
         }
 
-        return apply_filters( 'wogh_directory_published', $name, $this );
+        return apply_filters('wogh_directory_published', $name, $this);
     }
 
     /**
      * Build GitHub filename based on post
      */
     public function github_filename() {
-        if ( 'post' === $this->type() ) {
-            $filename = get_the_time( 'Y-m-d-', $this->id ) . $this->get_name() . '.md';
+        if ('post' === $this->type()) {
+            $filename = get_the_time('Y-m-d-', $this->id) . $this->get_name() . '.md';
         } else {
             $filename = $this->get_name() . '.md';
         }
 
-        return apply_filters( 'wogh_filename', $filename, $this );
+        return apply_filters('wogh_filename', $filename, $this);
     }
 
     /**
@@ -234,11 +234,11 @@ 
      * @return string
      */
     protected function get_name() {
-        if ( '' !== $this->name() ) {
+        if ('' !== $this->name()) {
             return $this->name();
         }
 
-        return sanitize_title( get_the_title( $this->post ) );
+        return sanitize_title(get_the_title($this->post));
     }
 
     /**
@@ -246,9 +246,9 @@ 
      * @return boolean
      */
     public function is_on_github() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
-        if ( $sha && $github_path ) {
+        $sha = get_post_meta($this->id, '_wogh_sha', true);
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
+        if ($sha && $github_path) {
             return true;
         }
         return false;
@@ -260,7 +260,7 @@ 
      * @return string
      */
     public function github_view_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
         $repository = $this->api->fetch()->repository();
         $branch = $this->api->fetch()->branch();
 
@@ -273,7 +273,7 @@ 
      * @return string
      */
     public function github_edit_url() {
-        $github_path = get_post_meta( $this->id, '_wogh_github_path', true );
+        $github_path = get_post_meta($this->id, '_wogh_github_path', true);
         $repository = $this->api->fetch()->repository();
         $branch = $this->api->fetch()->branch();
 
@@ -287,9 +287,9 @@ 
      *
      * @return string
      */
-    public function get_directory_from_path( $path ) {
-        $directory = explode( '/', $path );
-        $directory = count( $directory ) > 0 ? $directory[0] : '';
+    public function get_directory_from_path($path) {
+        $directory = explode('/', $path);
+        $directory = count($directory) > 0 ? $directory[0] : '';
 
         return $directory;
     }
@@ -300,11 +300,11 @@ 
      * Returns Array an array containing the author name and email
      */
     public function last_modified_author() {
-        if ( $last_id = get_post_meta( $this->id, '_edit_last', true ) ) {
-            $user = get_userdata( $last_id );
+        if ($last_id = get_post_meta($this->id, '_edit_last', true)) {
+            $user = get_userdata($last_id);
 
-            if ( $user ) {
-                return array( 'name' => $user->display_name, 'email' => $user->user_email );
+            if ($user) {
+                return array('name' => $user->display_name, 'email' => $user->user_email);
             }
         }
 
@@ -318,7 +318,7 @@ 
      * Returns String the sha1 hash
      */
     public function sha() {
-        $sha = get_post_meta( $this->id, '_wogh_sha', true );
+        $sha = get_post_meta($this->id, '_wogh_sha', true);
 
         // If we've done a full export and we have no sha
         // then we should try a live check to see if it exists.
@@ -334,7 +334,7 @@ 
         // }
 
         // if the sha still doesn't exist, then it's empty
-        if ( ! $sha || is_wp_error( $sha ) ) {
+        if ( ! $sha || is_wp_error($sha)) {
             $sha = '';
         }
 
@@ -346,8 +346,8 @@ 
      *
      * @param string $sha
      */
-    public function set_sha( $sha ) {
-        update_post_meta( $this->id, '_wogh_sha', $sha );
+    public function set_sha($sha) {
+        update_post_meta($this->id, '_wogh_sha', $sha);
     }
 
     /**
@@ -358,24 +358,24 @@ 
     public function meta() {
         $meta = array(
             'ID'           => $this->id,
-            'post_title'   => get_the_title( $this->post ),
+            'post_title'   => get_the_title($this->post),
             'post_name'    => $this->post->post_name,
-            'author'       => ( $author = get_userdata( $this->post->post_author ) ) ? $author->display_name : '',
+            'author'       => ($author = get_userdata($this->post->post_author)) ? $author->display_name : '',
             'post_date'    => $this->post->post_date,
             'post_excerpt' => $this->post->post_excerpt,
-            'layout'       => get_post_type( $this->post ),
-            'link'         => get_permalink( $this->post ),
+            'layout'       => get_post_type($this->post),
+            'link'         => get_permalink($this->post),
             'published'    => 'publish' === $this->status() ? true : false,
-            'tags'         => wp_get_post_tags( $this->id, array( 'fields' => 'names' ) ),
-            'categories'   => wp_get_post_categories( $this->id, array( 'fields' => 'names' ) )
+            'tags'         => wp_get_post_tags($this->id, array('fields' => 'names')),
+            'categories'   => wp_get_post_categories($this->id, array('fields' => 'names'))
         );
-        if ( empty($this->post->post_name) ) {
+        if (empty($this->post->post_name)) {
             unset($meta['post_name']);
         }
-        if ( empty($this->post->post_excerpt) ) {
+        if (empty($this->post->post_excerpt)) {
             unset($meta['post_excerpt']);
         }
-        if ( 'yes' == get_option('wogh_ignore_author') ) {
+        if ('yes' == get_option('wogh_ignore_author')) {
             unset($meta['author']);
         }
 
@@ -390,7 +390,7 @@ 
 
         // }
 
-        return apply_filters( 'wogh_post_meta', $meta, $this );
+        return apply_filters('wogh_post_meta', $meta, $this);
     }
 
     /**
@@ -407,7 +407,7 @@ 
      *
      * @param array $meta
      */
-    public function set_meta( $meta ) {
+    public function set_meta($meta) {
         $this->meta = $meta;
     }
 
@@ -436,7 +436,7 @@ 
      *
      * @return $this
      */
-    public function set_post( WP_Post $post ) {
+    public function set_post(WP_Post $post) {
         $this->post = $post;
         $this->id   = $post->ID;
 
@@ -455,6 +455,6 @@ 
         $data->content = $this->github_content();
         $data->sha     = $this->sha();
 
-        return new Writing_On_GitHub_Blob( $data );
+        return new Writing_On_GitHub_Blob($data);
     }
 }

writing-on-github.php

Indentation +377 added lines, -377 removed lines

@@ -14,391 +14,391 @@
 // This fixes function duplication during unit testing.
 $path = dirname( __FILE__ ) . '/vendor/autoload.php';
 if ( file_exists( $path ) ) {
-    require_once( $path );
+	require_once( $path );
 }
 
 add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) );
 
 class Writing_On_GitHub {
 
-    /**
-     * Object instance
-     * @var self
-     */
-    public static $instance;
-
-    /**
-     * Language text domain
-     * @var string
-     */
-    public static $text_domain = 'writing-on-github';
-
-    /**
-     * Controller object
-     * @var Writing_On_GitHub_Controller
-     */
-    public $controller;
-
-    /**
-     * Controller object
-     * @var Writing_On_GitHub_Admin
-     */
-    public $admin;
-
-    /**
-     * CLI object.
-     *
-     * @var Writing_On_GitHub_CLI
-     */
-    protected $cli;
-
-    /**
-     * Request object.
-     *
-     * @var Writing_On_GitHub_Request
-     */
-    protected $request;
-
-    /**
-     * Response object.
-     *
-     * @var Writing_On_GitHub_Response
-     */
-    protected $response;
-
-    /**
-     * Api object.
-     *
-     * @var Writing_On_GitHub_Api
-     */
-    protected $api;
-
-    /**
-     * Import object.
-     *
-     * @var Writing_On_GitHub_Import
-     */
-    protected $import;
-
-    /**
-     * Export object.
-     *
-     * @var Writing_On_GitHub_Export
-     */
-    protected $export;
-
-    /**
-     * Semaphore object.
-     *
-     * @var Writing_On_GitHub_Semaphore
-     */
-    protected $semaphore;
-
-    /**
-     * Database object.
-     *
-     * @var Writing_On_GitHub_Database
-     */
-    protected $database;
-
-    /**
-     * Called at load time, hooks into WP core
-     */
-    public function __construct() {
-        self::$instance = $this;
-
-        if ( is_admin() ) {
-            $this->admin = new Writing_On_GitHub_Admin;
-        }
-
-        $this->controller = new Writing_On_GitHub_Controller( $this );
-
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            WP_CLI::add_command( 'wogh', $this->cli() );
-        }
-    }
-
-    /**
-     * Attaches the plugin's hooks into WordPress.
-     */
-    public function boot() {
-        register_activation_hook( __FILE__, array( $this, 'activate' ) );
-        add_action( 'admin_notices', array( $this, 'activation_notice' ) );
-
-        add_action( 'init', array( $this, 'l10n' ) );
-
-        // Controller actions.
-        add_action( 'save_post', array( $this->controller, 'export_post' ) );
-        add_action( 'delete_post', array( $this->controller, 'delete_post' ) );
-        add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) );
-        add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 );
-        add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 );
-        add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 );
-
-        // add_filter( 'wogh_post_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
-        // add_filter( 'wogh_pre_import_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
-        add_filter( 'the_content', array( $this, 'the_content' ) );
-
-        do_action( 'wogh_boot', $this );
-    }
-
-    public function edit_post_link($link, $postID, $context) {
-        if ( ! wp_is_post_revision( $postID ) ) {
-            $post = new Writing_On_GitHub_Post( $postID, Writing_On_GitHub::$instance->api() );
-            if ( $post->is_on_github() ) {
-                return $post->github_edit_url();
-            }
-        }
-
-        return $link;
-    }
-
-    public function ignore_post_meta($meta) {
-        $ignore_meta_keys = get_option('wogh_ignore_metas');
-        if (empty($ignore_meta_keys)) {
-            return $meta;
-        }
-
-        $keys = preg_split("/\\r\\n|\\r|\\n/", $ignore_meta_keys);
-        if (empty($keys)) {
-            return $meta;
-        }
-        foreach ($keys as $key => $value) {
-            $keys[$key] = trim($value);
-        }
-
-        foreach ($meta as $key => $value) {
-            if (in_array($key, $keys)) {
-                unset($meta[$key]);
-            }
-        }
-
-        return $meta;
-    }
-
-    public function the_content($content) {
-        $arr = wp_upload_dir();
-        $baseurl = $arr['baseurl'] . '/writing-on-github';
-
-        $content = preg_replace_callback(
-            '/(<img [^>]*?src=[\'"])\s*(\/images\/[^\s#]\S+)\s*([\'"][^>]*?>)/',
-            function($matchs) use ($baseurl) {
-                $url = $baseurl . $matchs[2];
-                return "${matchs[1]}$url${matchs[3]}";
-            },
-            $content
-        );
-
-        $content = preg_replace_callback(
-            '/(<a [^>]*?href=[\'"])\s*(\/images\/[^\s#]\S+)\s*([\'"][^>]*?>)/',
-            function($matchs) use ($baseurl) {
-                $url = $baseurl . $matchs[2];
-                return "${matchs[1]}$url${matchs[3]}";
-            },
-            $content
-        );
-        return $content;
-    }
-
-    /**
-     * Init i18n files
-     */
-    public function l10n() {
-        load_plugin_textdomain( self::$text_domain );
-    }
-
-    /**
-     * Sets and kicks off the export cronjob
-     */
-    public function start_export( $force = false ) {
-        $this->start_cron( 'export', $force );
-    }
-
-    /**
-     * Sets and kicks off the import cronjob
-     */
-    public function start_import() {
-        $this->start_cron( 'import' );
-    }
-
-    /**
-     * Enables the admin notice on initial activation
-     */
-    public function activate() {
-        if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) {
-            set_transient( '_wogh_activated', 'yes' );
-        }
-    }
-
-    /**
-     * Displays the activation admin notice
-     */
-    public function activation_notice() {
-        if ( ! get_transient( '_wogh_activated' ) ) {
-            return;
-        }
-
-        delete_transient( '_wogh_activated' );
-
-        ?><div class="updated">
+	/**
+	 * Object instance
+	 * @var self
+	 */
+	public static $instance;
+
+	/**
+	 * Language text domain
+	 * @var string
+	 */
+	public static $text_domain = 'writing-on-github';
+
+	/**
+	 * Controller object
+	 * @var Writing_On_GitHub_Controller
+	 */
+	public $controller;
+
+	/**
+	 * Controller object
+	 * @var Writing_On_GitHub_Admin
+	 */
+	public $admin;
+
+	/**
+	 * CLI object.
+	 *
+	 * @var Writing_On_GitHub_CLI
+	 */
+	protected $cli;
+
+	/**
+	 * Request object.
+	 *
+	 * @var Writing_On_GitHub_Request
+	 */
+	protected $request;
+
+	/**
+	 * Response object.
+	 *
+	 * @var Writing_On_GitHub_Response
+	 */
+	protected $response;
+
+	/**
+	 * Api object.
+	 *
+	 * @var Writing_On_GitHub_Api
+	 */
+	protected $api;
+
+	/**
+	 * Import object.
+	 *
+	 * @var Writing_On_GitHub_Import
+	 */
+	protected $import;
+
+	/**
+	 * Export object.
+	 *
+	 * @var Writing_On_GitHub_Export
+	 */
+	protected $export;
+
+	/**
+	 * Semaphore object.
+	 *
+	 * @var Writing_On_GitHub_Semaphore
+	 */
+	protected $semaphore;
+
+	/**
+	 * Database object.
+	 *
+	 * @var Writing_On_GitHub_Database
+	 */
+	protected $database;
+
+	/**
+	 * Called at load time, hooks into WP core
+	 */
+	public function __construct() {
+		self::$instance = $this;
+
+		if ( is_admin() ) {
+			$this->admin = new Writing_On_GitHub_Admin;
+		}
+
+		$this->controller = new Writing_On_GitHub_Controller( $this );
+
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+			WP_CLI::add_command( 'wogh', $this->cli() );
+		}
+	}
+
+	/**
+	 * Attaches the plugin's hooks into WordPress.
+	 */
+	public function boot() {
+		register_activation_hook( __FILE__, array( $this, 'activate' ) );
+		add_action( 'admin_notices', array( $this, 'activation_notice' ) );
+
+		add_action( 'init', array( $this, 'l10n' ) );
+
+		// Controller actions.
+		add_action( 'save_post', array( $this->controller, 'export_post' ) );
+		add_action( 'delete_post', array( $this->controller, 'delete_post' ) );
+		add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) );
+		add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 );
+		add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 );
+		add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 );
+
+		// add_filter( 'wogh_post_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
+		// add_filter( 'wogh_pre_import_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
+		add_filter( 'the_content', array( $this, 'the_content' ) );
+
+		do_action( 'wogh_boot', $this );
+	}
+
+	public function edit_post_link($link, $postID, $context) {
+		if ( ! wp_is_post_revision( $postID ) ) {
+			$post = new Writing_On_GitHub_Post( $postID, Writing_On_GitHub::$instance->api() );
+			if ( $post->is_on_github() ) {
+				return $post->github_edit_url();
+			}
+		}
+
+		return $link;
+	}
+
+	public function ignore_post_meta($meta) {
+		$ignore_meta_keys = get_option('wogh_ignore_metas');
+		if (empty($ignore_meta_keys)) {
+			return $meta;
+		}
+
+		$keys = preg_split("/\\r\\n|\\r|\\n/", $ignore_meta_keys);
+		if (empty($keys)) {
+			return $meta;
+		}
+		foreach ($keys as $key => $value) {
+			$keys[$key] = trim($value);
+		}
+
+		foreach ($meta as $key => $value) {
+			if (in_array($key, $keys)) {
+				unset($meta[$key]);
+			}
+		}
+
+		return $meta;
+	}
+
+	public function the_content($content) {
+		$arr = wp_upload_dir();
+		$baseurl = $arr['baseurl'] . '/writing-on-github';
+
+		$content = preg_replace_callback(
+			'/(<img [^>]*?src=[\'"])\s*(\/images\/[^\s#]\S+)\s*([\'"][^>]*?>)/',
+			function($matchs) use ($baseurl) {
+				$url = $baseurl . $matchs[2];
+				return "${matchs[1]}$url${matchs[3]}";
+			},
+			$content
+		);
+
+		$content = preg_replace_callback(
+			'/(<a [^>]*?href=[\'"])\s*(\/images\/[^\s#]\S+)\s*([\'"][^>]*?>)/',
+			function($matchs) use ($baseurl) {
+				$url = $baseurl . $matchs[2];
+				return "${matchs[1]}$url${matchs[3]}";
+			},
+			$content
+		);
+		return $content;
+	}
+
+	/**
+	 * Init i18n files
+	 */
+	public function l10n() {
+		load_plugin_textdomain( self::$text_domain );
+	}
+
+	/**
+	 * Sets and kicks off the export cronjob
+	 */
+	public function start_export( $force = false ) {
+		$this->start_cron( 'export', $force );
+	}
+
+	/**
+	 * Sets and kicks off the import cronjob
+	 */
+	public function start_import() {
+		$this->start_cron( 'import' );
+	}
+
+	/**
+	 * Enables the admin notice on initial activation
+	 */
+	public function activate() {
+		if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) {
+			set_transient( '_wogh_activated', 'yes' );
+		}
+	}
+
+	/**
+	 * Displays the activation admin notice
+	 */
+	public function activation_notice() {
+		if ( ! get_transient( '_wogh_activated' ) ) {
+			return;
+		}
+
+		delete_transient( '_wogh_activated' );
+
+		?><div class="updated">
             <p>
                 <?php
-                    printf(
-                        __( 'To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github' ),
-                        admin_url( 'options-general.php?page=' . static::$text_domain)
-                    );
-                ?>
+					printf(
+						__( 'To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github' ),
+						admin_url( 'options-general.php?page=' . static::$text_domain)
+					);
+				?>
             </p>
         </div><?php
-    }
-
-    /**
-     * Get the Controller object.
-     *
-     * @return Writing_On_GitHub_Controller
-     */
-    public function controller() {
-        return $this->controller;
-    }
-
-    /**
-     * Lazy-load the CLI object.
-     *
-     * @return Writing_On_GitHub_CLI
-     */
-    public function cli() {
-        if ( ! $this->cli ) {
-            $this->cli = new Writing_On_GitHub_CLI;
-        }
-
-        return $this->cli;
-    }
-
-    /**
-     * Lazy-load the Request object.
-     *
-     * @return Writing_On_GitHub_Request
-     */
-    public function request() {
-        if ( ! $this->request ) {
-            $this->request = new Writing_On_GitHub_Request( $this );
-        }
-
-        return $this->request;
-    }
-
-    /**
-     * Lazy-load the Response object.
-     *
-     * @return Writing_On_GitHub_Response
-     */
-    public function response() {
-        if ( ! $this->response ) {
-            $this->response = new Writing_On_GitHub_Response( $this );
-        }
-
-        return $this->response;
-    }
-
-    /**
-     * Lazy-load the Api object.
-     *
-     * @return Writing_On_GitHub_Api
-     */
-    public function api() {
-        if ( ! $this->api ) {
-            $this->api = new Writing_On_GitHub_Api( $this );
-        }
-
-        return $this->api;
-    }
-
-    /**
-     * Lazy-load the Import object.
-     *
-     * @return Writing_On_GitHub_Import
-     */
-    public function import() {
-        if ( ! $this->import ) {
-            $this->import = new Writing_On_GitHub_Import( $this );
-        }
-
-        return $this->import;
-    }
-
-    /**
-     * Lazy-load the Export object.
-     *
-     * @return Writing_On_GitHub_Export
-     */
-    public function export() {
-        if ( ! $this->export ) {
-            $this->export = new Writing_On_GitHub_Export( $this );
-        }
-
-        return $this->export;
-    }
-
-    /**
-     * Lazy-load the Semaphore object.
-     *
-     * @return Writing_On_GitHub_Semaphore
-     */
-    public function semaphore() {
-        if ( ! $this->semaphore ) {
-            $this->semaphore = new Writing_On_GitHub_Semaphore;
-        }
-
-        return $this->semaphore;
-    }
-
-    /**
-     * Lazy-load the Database object.
-     *
-     * @return Writing_On_GitHub_Database
-     */
-    public function database() {
-        if ( ! $this->database ) {
-            $this->database = new Writing_On_GitHub_Database( $this );
-        }
-
-        return $this->database;
-    }
-
-    /**
-     * Print to WP_CLI if in CLI environment or
-     * write to debug.log if WP_DEBUG is enabled
-     * @source http://www.stumiller.me/sending-output-to-the-wordpress-debug-log/
-     *
-     * @param mixed $msg
-     * @param string $write
-     */
-    public static function write_log( $msg, $write = 'line' ) {
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            if ( is_array( $msg ) || is_object( $msg ) ) {
-                WP_CLI::print_value( $msg );
-            } else {
-                WP_CLI::$write( $msg );
-            }
-        } elseif ( true === WP_DEBUG ) {
-            if ( is_array( $msg ) || is_object( $msg ) ) {
-                error_log( print_r( $msg, true ) );
-            } else {
-                error_log( $msg );
-            }
-        }
-    }
-
-    /**
-     * Kicks of an import or export cronjob.
-     *
-     * @param bool   $force
-     * @param string $type
-     */
-    protected function start_cron( $type, $force = false ) {
-        update_option( '_wogh_' . $type . '_started', 'yes' );
-        $user_id = get_current_user_id();
-        wp_schedule_single_event( time(), 'wogh_' . $type . '', array( $user_id, $force ) );
-        spawn_cron();
-    }
+	}
+
+	/**
+	 * Get the Controller object.
+	 *
+	 * @return Writing_On_GitHub_Controller
+	 */
+	public function controller() {
+		return $this->controller;
+	}
+
+	/**
+	 * Lazy-load the CLI object.
+	 *
+	 * @return Writing_On_GitHub_CLI
+	 */
+	public function cli() {
+		if ( ! $this->cli ) {
+			$this->cli = new Writing_On_GitHub_CLI;
+		}
+
+		return $this->cli;
+	}
+
+	/**
+	 * Lazy-load the Request object.
+	 *
+	 * @return Writing_On_GitHub_Request
+	 */
+	public function request() {
+		if ( ! $this->request ) {
+			$this->request = new Writing_On_GitHub_Request( $this );
+		}
+
+		return $this->request;
+	}
+
+	/**
+	 * Lazy-load the Response object.
+	 *
+	 * @return Writing_On_GitHub_Response
+	 */
+	public function response() {
+		if ( ! $this->response ) {
+			$this->response = new Writing_On_GitHub_Response( $this );
+		}
+
+		return $this->response;
+	}
+
+	/**
+	 * Lazy-load the Api object.
+	 *
+	 * @return Writing_On_GitHub_Api
+	 */
+	public function api() {
+		if ( ! $this->api ) {
+			$this->api = new Writing_On_GitHub_Api( $this );
+		}
+
+		return $this->api;
+	}
+
+	/**
+	 * Lazy-load the Import object.
+	 *
+	 * @return Writing_On_GitHub_Import
+	 */
+	public function import() {
+		if ( ! $this->import ) {
+			$this->import = new Writing_On_GitHub_Import( $this );
+		}
+
+		return $this->import;
+	}
+
+	/**
+	 * Lazy-load the Export object.
+	 *
+	 * @return Writing_On_GitHub_Export
+	 */
+	public function export() {
+		if ( ! $this->export ) {
+			$this->export = new Writing_On_GitHub_Export( $this );
+		}
+
+		return $this->export;
+	}
+
+	/**
+	 * Lazy-load the Semaphore object.
+	 *
+	 * @return Writing_On_GitHub_Semaphore
+	 */
+	public function semaphore() {
+		if ( ! $this->semaphore ) {
+			$this->semaphore = new Writing_On_GitHub_Semaphore;
+		}
+
+		return $this->semaphore;
+	}
+
+	/**
+	 * Lazy-load the Database object.
+	 *
+	 * @return Writing_On_GitHub_Database
+	 */
+	public function database() {
+		if ( ! $this->database ) {
+			$this->database = new Writing_On_GitHub_Database( $this );
+		}
+
+		return $this->database;
+	}
+
+	/**
+	 * Print to WP_CLI if in CLI environment or
+	 * write to debug.log if WP_DEBUG is enabled
+	 * @source http://www.stumiller.me/sending-output-to-the-wordpress-debug-log/
+	 *
+	 * @param mixed $msg
+	 * @param string $write
+	 */
+	public static function write_log( $msg, $write = 'line' ) {
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+			if ( is_array( $msg ) || is_object( $msg ) ) {
+				WP_CLI::print_value( $msg );
+			} else {
+				WP_CLI::$write( $msg );
+			}
+		} elseif ( true === WP_DEBUG ) {
+			if ( is_array( $msg ) || is_object( $msg ) ) {
+				error_log( print_r( $msg, true ) );
+			} else {
+				error_log( $msg );
+			}
+		}
+	}
+
+	/**
+	 * Kicks of an import or export cronjob.
+	 *
+	 * @param bool   $force
+	 * @param string $type
+	 */
+	protected function start_cron( $type, $force = false ) {
+		update_option( '_wogh_' . $type . '_started', 'yes' );
+		$user_id = get_current_user_id();
+		wp_schedule_single_event( time(), 'wogh_' . $type . '', array( $user_id, $force ) );
+		spawn_cron();
+	}
 }

Spacing +58 added lines, -58 removed lines

@@ -12,12 +12,12 @@ 
 
 // If the functions have already been autoloaded, don't reload.
 // This fixes function duplication during unit testing.
-$path = dirname( __FILE__ ) . '/vendor/autoload.php';
-if ( file_exists( $path ) ) {
-    require_once( $path );
+$path = dirname(__FILE__) . '/vendor/autoload.php';
+if (file_exists($path)) {
+    require_once($path);
 }
 
-add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) );
+add_action('plugins_loaded', array(new Writing_On_GitHub, 'boot'));
 
 class Writing_On_GitHub {
 
@@ -107,14 +107,14 @@ 
     public function __construct() {
         self::$instance = $this;
 
-        if ( is_admin() ) {
+        if (is_admin()) {
             $this->admin = new Writing_On_GitHub_Admin;
         }
 
-        $this->controller = new Writing_On_GitHub_Controller( $this );
+        $this->controller = new Writing_On_GitHub_Controller($this);
 
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            WP_CLI::add_command( 'wogh', $this->cli() );
+        if (defined('WP_CLI') && WP_CLI) {
+            WP_CLI::add_command('wogh', $this->cli());
         }
     }
 
@@ -122,30 +122,30 @@ 
      * Attaches the plugin's hooks into WordPress.
      */
     public function boot() {
-        register_activation_hook( __FILE__, array( $this, 'activate' ) );
-        add_action( 'admin_notices', array( $this, 'activation_notice' ) );
+        register_activation_hook(__FILE__, array($this, 'activate'));
+        add_action('admin_notices', array($this, 'activation_notice'));
 
-        add_action( 'init', array( $this, 'l10n' ) );
+        add_action('init', array($this, 'l10n'));
 
         // Controller actions.
-        add_action( 'save_post', array( $this->controller, 'export_post' ) );
-        add_action( 'delete_post', array( $this->controller, 'delete_post' ) );
-        add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) );
-        add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 );
-        add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 );
-        add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 );
+        add_action('save_post', array($this->controller, 'export_post'));
+        add_action('delete_post', array($this->controller, 'delete_post'));
+        add_action('wp_ajax_nopriv_wogh_push_request', array($this->controller, 'pull_posts'));
+        add_action('wogh_export', array($this->controller, 'export_all'), 10, 2);
+        add_action('wogh_import', array($this->controller, 'import_master'), 10, 1);
+        add_filter('get_edit_post_link', array($this, 'edit_post_link'), 10, 3);
 
         // add_filter( 'wogh_post_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
         // add_filter( 'wogh_pre_import_meta', array( $this, 'ignore_post_meta' ), 10, 1 );
-        add_filter( 'the_content', array( $this, 'the_content' ) );
+        add_filter('the_content', array($this, 'the_content'));
 
-        do_action( 'wogh_boot', $this );
+        do_action('wogh_boot', $this);
     }
 
     public function edit_post_link($link, $postID, $context) {
-        if ( ! wp_is_post_revision( $postID ) ) {
-            $post = new Writing_On_GitHub_Post( $postID, Writing_On_GitHub::$instance->api() );
-            if ( $post->is_on_github() ) {
+        if ( ! wp_is_post_revision($postID)) {
+            $post = new Writing_On_GitHub_Post($postID, Writing_On_GitHub::$instance->api());
+            if ($post->is_on_github()) {
                 return $post->github_edit_url();
             }
         }
@@ -204,29 +204,29 @@ 
      * Init i18n files
      */
     public function l10n() {
-        load_plugin_textdomain( self::$text_domain );
+        load_plugin_textdomain(self::$text_domain);
     }
 
     /**
      * Sets and kicks off the export cronjob
      */
-    public function start_export( $force = false ) {
-        $this->start_cron( 'export', $force );
+    public function start_export($force = false) {
+        $this->start_cron('export', $force);
     }
 
     /**
      * Sets and kicks off the import cronjob
      */
     public function start_import() {
-        $this->start_cron( 'import' );
+        $this->start_cron('import');
     }
 
     /**
      * Enables the admin notice on initial activation
      */
     public function activate() {
-        if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) {
-            set_transient( '_wogh_activated', 'yes' );
+        if ('yes' !== get_option('_wogh_fully_exported')) {
+            set_transient('_wogh_activated', 'yes');
         }
     }
 
@@ -234,18 +234,18 @@ 
      * Displays the activation admin notice
      */
     public function activation_notice() {
-        if ( ! get_transient( '_wogh_activated' ) ) {
+        if ( ! get_transient('_wogh_activated')) {
             return;
         }
 
-        delete_transient( '_wogh_activated' );
+        delete_transient('_wogh_activated');
 
         ?><div class="updated">
             <p>
                 <?php
                     printf(
-                        __( 'To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github' ),
-                        admin_url( 'options-general.php?page=' . static::$text_domain)
+                        __('To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github'),
+                        admin_url('options-general.php?page=' . static::$text_domain)
                     );
                 ?>
             </p>
@@ -267,7 +267,7 @@ 
      * @return Writing_On_GitHub_CLI
      */
     public function cli() {
-        if ( ! $this->cli ) {
+        if ( ! $this->cli) {
             $this->cli = new Writing_On_GitHub_CLI;
         }
 
@@ -280,8 +280,8 @@ 
      * @return Writing_On_GitHub_Request
      */
     public function request() {
-        if ( ! $this->request ) {
-            $this->request = new Writing_On_GitHub_Request( $this );
+        if ( ! $this->request) {
+            $this->request = new Writing_On_GitHub_Request($this);
         }
 
         return $this->request;
@@ -293,8 +293,8 @@ 
      * @return Writing_On_GitHub_Response
      */
     public function response() {
-        if ( ! $this->response ) {
-            $this->response = new Writing_On_GitHub_Response( $this );
+        if ( ! $this->response) {
+            $this->response = new Writing_On_GitHub_Response($this);
         }
 
         return $this->response;
@@ -306,8 +306,8 @@ 
      * @return Writing_On_GitHub_Api
      */
     public function api() {
-        if ( ! $this->api ) {
-            $this->api = new Writing_On_GitHub_Api( $this );
+        if ( ! $this->api) {
+            $this->api = new Writing_On_GitHub_Api($this);
         }
 
         return $this->api;
@@ -319,8 +319,8 @@ 
      * @return Writing_On_GitHub_Import
      */
     public function import() {
-        if ( ! $this->import ) {
-            $this->import = new Writing_On_GitHub_Import( $this );
+        if ( ! $this->import) {
+            $this->import = new Writing_On_GitHub_Import($this);
         }
 
         return $this->import;
@@ -332,8 +332,8 @@ 
      * @return Writing_On_GitHub_Export
      */
     public function export() {
-        if ( ! $this->export ) {
-            $this->export = new Writing_On_GitHub_Export( $this );
+        if ( ! $this->export) {
+            $this->export = new Writing_On_GitHub_Export($this);
         }
 
         return $this->export;
@@ -345,7 +345,7 @@ 
      * @return Writing_On_GitHub_Semaphore
      */
     public function semaphore() {
-        if ( ! $this->semaphore ) {
+        if ( ! $this->semaphore) {
             $this->semaphore = new Writing_On_GitHub_Semaphore;
         }
 
@@ -358,8 +358,8 @@ 
      * @return Writing_On_GitHub_Database
      */
     public function database() {
-        if ( ! $this->database ) {
-            $this->database = new Writing_On_GitHub_Database( $this );
+        if ( ! $this->database) {
+            $this->database = new Writing_On_GitHub_Database($this);
         }
 
         return $this->database;
@@ -373,18 +373,18 @@ 
      * @param mixed $msg
      * @param string $write
      */
-    public static function write_log( $msg, $write = 'line' ) {
-        if ( defined( 'WP_CLI' ) && WP_CLI ) {
-            if ( is_array( $msg ) || is_object( $msg ) ) {
-                WP_CLI::print_value( $msg );
+    public static function write_log($msg, $write = 'line') {
+        if (defined('WP_CLI') && WP_CLI) {
+            if (is_array($msg) || is_object($msg)) {
+                WP_CLI::print_value($msg);
             } else {
-                WP_CLI::$write( $msg );
+                WP_CLI::$write($msg);
             }
-        } elseif ( true === WP_DEBUG ) {
-            if ( is_array( $msg ) || is_object( $msg ) ) {
-                error_log( print_r( $msg, true ) );
+        } elseif (true === WP_DEBUG) {
+            if (is_array($msg) || is_object($msg)) {
+                error_log(print_r($msg, true));
             } else {
-                error_log( $msg );
+                error_log($msg);
             }
         }
     }
@@ -395,10 +395,10 @@ 
      * @param bool   $force
      * @param string $type
      */
-    protected function start_cron( $type, $force = false ) {
-        update_option( '_wogh_' . $type . '_started', 'yes' );
+    protected function start_cron($type, $force = false) {
+        update_option('_wogh_' . $type . '_started', 'yes');
         $user_id = get_current_user_id();
-        wp_schedule_single_event( time(), 'wogh_' . $type . '', array( $user_id, $force ) );
+        wp_schedule_single_event(time(), 'wogh_' . $type . '', array($user_id, $force));
         spawn_cron();
     }
 }

lib/admin.php

Indentation +200 added lines, -200 removed lines

@@ -9,227 +9,227 @@
  */
 class Writing_On_GitHub_Admin {
 
-    /**
-     * Hook into GitHub API
-     */
-    public function __construct() {
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-        add_action( 'admin_init', array( $this, 'register_settings' ) );
-        add_action( 'current_screen', array( $this, 'trigger_cron' ) );
-    }
-
-    /**
-     * Callback to render the settings page view
-     */
-    public function settings_page() {
-        include dirname( dirname( __FILE__ ) ) . '/views/options.php';
-    }
-
-    /**
-     * Callback to register the plugin's options
-     */
-    public function register_settings() {
-        add_settings_section(
-            'general',
-            'General Settings',
-            array( $this, 'section_callback' ),
-            Writing_On_GitHub::$text_domain
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
-        add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => 'https://api.github.com',
-                'name'      => 'wogh_host',
-                'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
-        add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_repository',
-                'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
-        add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => 'master',
-                'name'      => 'wogh_branch',
-                'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
-        add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_oauth_token',
-                'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
-        add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_secret',
-                'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
-        add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_default_user',
-                'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
-            )
-        );
-
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-                'default'   => '',
-                'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
-            )
-        );
-
-        // register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
-        // add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
-        //      'default'   => '',
-        //      'name'      => 'wogh_ignore_metas',
-        //      'help_text' => __( 'These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github' ),
-        //  )
-        // );
-    }
-
-    /**
-     * Callback to render an individual options field
-     *
-     * @param array $args Field arguments.
-     */
-    public function field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
-    }
-
-    /**
-     * Callback to render the default import user field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function user_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
-    }
-
-    /**
-     * Callback to render the textarea field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function textarea_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
-    }
-
-    /**
-     * Callback to render the checkbox field.
-     *
-     * @param array $args Field arguments.
-     */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
-    }
-
-    /**
-     * Displays settings messages from background processes
-     */
-    public function section_callback() {
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
-            return;
-        }
-
-        if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+	/**
+	 * Hook into GitHub API
+	 */
+	public function __construct() {
+		add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
+		add_action( 'admin_init', array( $this, 'register_settings' ) );
+		add_action( 'current_screen', array( $this, 'trigger_cron' ) );
+	}
+
+	/**
+	 * Callback to render the settings page view
+	 */
+	public function settings_page() {
+		include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+	}
+
+	/**
+	 * Callback to register the plugin's options
+	 */
+	public function register_settings() {
+		add_settings_section(
+			'general',
+			'General Settings',
+			array( $this, 'section_callback' ),
+			Writing_On_GitHub::$text_domain
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
+		add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => 'https://api.github.com',
+				'name'      => 'wogh_host',
+				'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
+		add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_repository',
+				'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
+		add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => 'master',
+				'name'      => 'wogh_branch',
+				'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
+		add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_oauth_token',
+				'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
+		add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_secret',
+				'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
+		add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_default_user',
+				'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
+			)
+		);
+
+		register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
+		add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+				'default'   => '',
+				'name'      => 'wogh_ignore_author',
+				'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+			)
+		);
+
+		// register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_metas' );
+		// add_settings_field( 'wogh_ignore_metas', __( 'Ignore post metas', 'writing-on-github' ), array( &$this, 'textarea_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+		//      'default'   => '',
+		//      'name'      => 'wogh_ignore_metas',
+		//      'help_text' => __( 'These meta keys will be ignored and cannot be imported and exported. One meta key per line.', 'writing-on-github' ),
+		//  )
+		// );
+	}
+
+	/**
+	 * Callback to render an individual options field
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+	}
+
+	/**
+	 * Callback to render the default import user field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function user_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+	}
+
+	/**
+	 * Callback to render the textarea field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function textarea_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+	}
+
+	/**
+	 * Callback to render the checkbox field.
+	 *
+	 * @param array $args Field arguments.
+	 */
+	public function checkbox_field_callback( $args ) {
+		include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+	}
+
+	/**
+	 * Displays settings messages from background processes
+	 */
+	public function section_callback() {
+		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+			return;
+		}
+
+		if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
             <div class="updated">
                 <p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
             </div><?php
-            delete_option( '_wogh_export_started' );
-        }
+			delete_option( '_wogh_export_started' );
+		}
 
-        if ( $message = get_option( '_wogh_export_error' ) ) { ?>
+		if ( $message = get_option( '_wogh_export_error' ) ) { ?>
             <div class="error">
                 <p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
             </div><?php
-            delete_option( '_wogh_export_error' );
-        }
+			delete_option( '_wogh_export_error' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
             <div class="updated">
                 <p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
             </div><?php
-            delete_option( '_wogh_export_complete' );
-        }
+			delete_option( '_wogh_export_complete' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
             <div class="updated">
             <p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
             </div><?php
-            delete_option( '_wogh_import_started' );
-        }
+			delete_option( '_wogh_import_started' );
+		}
 
-        if ( $message = get_option( '_wogh_import_error' ) ) { ?>
+		if ( $message = get_option( '_wogh_import_error' ) ) { ?>
             <div class="error">
             <p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
             </div><?php
-            delete_option( '_wogh_import_error' );
-        }
+			delete_option( '_wogh_import_error' );
+		}
 
-        if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
+		if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
             <div class="updated">
             <p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
             </div><?php
-            delete_option( '_wogh_import_complete' );
-        }
-    }
-
-    /**
-     * Add options menu to admin navbar
-     */
-    public function add_admin_menu() {
-        add_options_page(
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            'manage_options',
-            Writing_On_GitHub::$text_domain,
-            array( $this, 'settings_page' )
-        );
-    }
-
-    /**
-     * Admin callback to trigger import/export because WordPress admin routing lol
-     */
-    public function trigger_cron() {
-        if ( ! current_user_can( 'manage_options' ) ) {
-            return;
-        }
-
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
-            return;
-        }
-
-        if ( ! isset( $_GET['action'] ) ) {
-            return;
-        }
-
-        if ( 'export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export();
-        }
-
-        if ( 'force_export' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_export(true);
-        }
-
-        if ( 'import' === $_GET['action'] ) {
-            Writing_On_GitHub::$instance->start_import();
-        }
-
-        wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
-        die;
-    }
+			delete_option( '_wogh_import_complete' );
+		}
+	}
+
+	/**
+	 * Add options menu to admin navbar
+	 */
+	public function add_admin_menu() {
+		add_options_page(
+			__( 'Writing On GitHub', 'writing-on-github' ),
+			__( 'Writing On GitHub', 'writing-on-github' ),
+			'manage_options',
+			Writing_On_GitHub::$text_domain,
+			array( $this, 'settings_page' )
+		);
+	}
+
+	/**
+	 * Admin callback to trigger import/export because WordPress admin routing lol
+	 */
+	public function trigger_cron() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			return;
+		}
+
+		if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+			return;
+		}
+
+		if ( ! isset( $_GET['action'] ) ) {
+			return;
+		}
+
+		if ( 'export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export();
+		}
+
+		if ( 'force_export' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_export(true);
+		}
+
+		if ( 'import' === $_GET['action'] ) {
+			Writing_On_GitHub::$instance->start_import();
+		}
+
+		wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+		die;
+	}
 }

Spacing +63 added lines, -63 removed lines

@@ -13,16 +13,16 @@ 
      * Hook into GitHub API
      */
     public function __construct() {
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-        add_action( 'admin_init', array( $this, 'register_settings' ) );
-        add_action( 'current_screen', array( $this, 'trigger_cron' ) );
+        add_action('admin_menu', array($this, 'add_admin_menu'));
+        add_action('admin_init', array($this, 'register_settings'));
+        add_action('current_screen', array($this, 'trigger_cron'));
     }
 
     /**
      * Callback to render the settings page view
      */
     public function settings_page() {
-        include dirname( dirname( __FILE__ ) ) . '/views/options.php';
+        include dirname(dirname(__FILE__)) . '/views/options.php';
     }
 
     /**
@@ -32,63 +32,63 @@ 
         add_settings_section(
             'general',
             'General Settings',
-            array( $this, 'section_callback' ),
+            array($this, 'section_callback'),
             Writing_On_GitHub::$text_domain
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_host' );
-        add_settings_field( 'wogh_host', __( 'GitHub hostname', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_host');
+        add_settings_field('wogh_host', __('GitHub hostname', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => 'https://api.github.com',
                 'name'      => 'wogh_host',
-                'help_text' => __( 'The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github' ),
+                'help_text' => __('The GitHub host to use. This only needs to be changed to support a GitHub Enterprise installation.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_repository' );
-        add_settings_field( 'wogh_repository', __( 'Repository', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_repository');
+        add_settings_field('wogh_repository', __('Repository', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_repository',
-                'help_text' => __( 'The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github' ),
+                'help_text' => __('The GitHub repository to commit to, with owner (<code>[OWNER]/[REPOSITORY]</code>), e.g., <code>github/hubot.github.com</code>. The repository should contain an initial commit, which is satisfied by including a README when you create the repository on GitHub.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_branch' );
-        add_settings_field( 'wogh_branch', __( 'Branch', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_branch');
+        add_settings_field('wogh_branch', __('Branch', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => 'master',
                 'name'      => 'wogh_branch',
-                'help_text' => __( 'The GitHub branch to commit to, default is master.', 'writing-on-github' ),
+                'help_text' => __('The GitHub branch to commit to, default is master.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_oauth_token' );
-        add_settings_field( 'wogh_oauth_token', __( 'Oauth Token', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_oauth_token');
+        add_settings_field('wogh_oauth_token', __('Oauth Token', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_oauth_token',
-                'help_text' => __( "A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github' ),
+                'help_text' => __("A <a href='https://github.com/settings/tokens/new'>personal oauth token</a> with <code>public_repo</code> scope.", 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_secret' );
-        add_settings_field( 'wogh_secret', __( 'Webhook Secret', 'writing-on-github' ), array( $this, 'field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_secret');
+        add_settings_field('wogh_secret', __('Webhook Secret', 'writing-on-github'), array($this, 'field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_secret',
-                'help_text' => __( "The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github' ),
+                'help_text' => __("The webhook's secret phrase. This should be password strength, as it is used to verify the webhook's payload.", 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_default_user' );
-        add_settings_field( 'wogh_default_user', __( 'Default Import User', 'writing-on-github' ), array( &$this, 'user_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_default_user');
+        add_settings_field('wogh_default_user', __('Default Import User', 'writing-on-github'), array(&$this, 'user_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_default_user',
-                'help_text' => __( 'The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github' ),
+                'help_text' => __('The fallback user for import, in case Writing On GitHub cannot find the committer in the database.', 'writing-on-github'),
             )
         );
 
-        register_setting( Writing_On_GitHub::$text_domain, 'wogh_ignore_author' );
-        add_settings_field( 'wogh_ignore_author', __( 'Ignore author', 'writing-on-github' ), array( &$this, 'checkbox_field_callback' ), Writing_On_GitHub::$text_domain, 'general', array(
+        register_setting(Writing_On_GitHub::$text_domain, 'wogh_ignore_author');
+        add_settings_field('wogh_ignore_author', __('Ignore author', 'writing-on-github'), array(&$this, 'checkbox_field_callback'), Writing_On_GitHub::$text_domain, 'general', array(
                 'default'   => '',
                 'name'      => 'wogh_ignore_author',
-                'help_text' => __( 'Do not export author and do not use author info from GitHub.', 'writing-on-github' ),
+                'help_text' => __('Do not export author and do not use author info from GitHub.', 'writing-on-github'),
             )
         );
 
@@ -106,8 +106,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/setting-field.php';
+    public function field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/setting-field.php';
     }
 
     /**
@@ -115,8 +115,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function user_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/user-setting-field.php';
+    public function user_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/user-setting-field.php';
     }
 
     /**
@@ -124,8 +124,8 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function textarea_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/textarea-setting-field.php';
+    public function textarea_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/textarea-setting-field.php';
     }
 
     /**
@@ -133,58 +133,58 @@ 
      *
      * @param array $args Field arguments.
      */
-    public function checkbox_field_callback( $args ) {
-        include dirname( dirname( __FILE__ ) ) . '/views/checkbox-setting-field.php';
+    public function checkbox_field_callback($args) {
+        include dirname(dirname(__FILE__)) . '/views/checkbox-setting-field.php';
     }
 
     /**
      * Displays settings messages from background processes
      */
     public function section_callback() {
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+        if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
             return;
         }
 
-        if ( 'yes' === get_option( '_wogh_export_started' ) ) { ?>
+        if ('yes' === get_option('_wogh_export_started')) { ?>
             <div class="updated">
-                <p><?php esc_html_e( 'Export to GitHub started.', 'writing-on-github' ); ?></p>
+                <p><?php esc_html_e('Export to GitHub started.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_export_started' );
+            delete_option('_wogh_export_started');
         }
 
-        if ( $message = get_option( '_wogh_export_error' ) ) { ?>
+        if ($message = get_option('_wogh_export_error')) { ?>
             <div class="error">
-                <p><?php esc_html_e( 'Export to GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+                <p><?php esc_html_e('Export to GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
             </div><?php
-            delete_option( '_wogh_export_error' );
+            delete_option('_wogh_export_error');
         }
 
-        if ( 'yes' === get_option( '_wogh_export_complete' ) ) { ?>
+        if ('yes' === get_option('_wogh_export_complete')) { ?>
             <div class="updated">
-                <p><?php esc_html_e( 'Export to GitHub completed successfully.', 'writing-on-github' );?></p>
+                <p><?php esc_html_e('Export to GitHub completed successfully.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_export_complete' );
+            delete_option('_wogh_export_complete');
         }
 
-        if ( 'yes' === get_option( '_wogh_import_started' ) ) { ?>
+        if ('yes' === get_option('_wogh_import_started')) { ?>
             <div class="updated">
-            <p><?php esc_html_e( 'Import from GitHub started.', 'writing-on-github' ); ?></p>
+            <p><?php esc_html_e('Import from GitHub started.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_import_started' );
+            delete_option('_wogh_import_started');
         }
 
-        if ( $message = get_option( '_wogh_import_error' ) ) { ?>
+        if ($message = get_option('_wogh_import_error')) { ?>
             <div class="error">
-            <p><?php esc_html_e( 'Import from GitHub failed with error:', 'writing-on-github' ); ?> <?php echo esc_html( $message );?></p>
+            <p><?php esc_html_e('Import from GitHub failed with error:', 'writing-on-github'); ?> <?php echo esc_html($message); ?></p>
             </div><?php
-            delete_option( '_wogh_import_error' );
+            delete_option('_wogh_import_error');
         }
 
-        if ( 'yes' === get_option( '_wogh_import_complete' ) ) { ?>
+        if ('yes' === get_option('_wogh_import_complete')) { ?>
             <div class="updated">
-            <p><?php esc_html_e( 'Import from GitHub completed successfully.', 'writing-on-github' );?></p>
+            <p><?php esc_html_e('Import from GitHub completed successfully.', 'writing-on-github'); ?></p>
             </div><?php
-            delete_option( '_wogh_import_complete' );
+            delete_option('_wogh_import_complete');
         }
     }
 
@@ -193,11 +193,11 @@ 
      */
     public function add_admin_menu() {
         add_options_page(
-            __( 'Writing On GitHub', 'writing-on-github' ),
-            __( 'Writing On GitHub', 'writing-on-github' ),
+            __('Writing On GitHub', 'writing-on-github'),
+            __('Writing On GitHub', 'writing-on-github'),
             'manage_options',
             Writing_On_GitHub::$text_domain,
-            array( $this, 'settings_page' )
+            array($this, 'settings_page')
         );
     }
 
@@ -205,31 +205,31 @@ 
      * Admin callback to trigger import/export because WordPress admin routing lol
      */
     public function trigger_cron() {
-        if ( ! current_user_can( 'manage_options' ) ) {
+        if ( ! current_user_can('manage_options')) {
             return;
         }
 
-        if ( get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain ) {
+        if (get_current_screen()->id !== 'settings_page_' . Writing_On_GitHub::$text_domain) {
             return;
         }
 
-        if ( ! isset( $_GET['action'] ) ) {
+        if ( ! isset($_GET['action'])) {
             return;
         }
 
-        if ( 'export' === $_GET['action'] ) {
+        if ('export' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_export();
         }
 
-        if ( 'force_export' === $_GET['action'] ) {
+        if ('force_export' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_export(true);
         }
 
-        if ( 'import' === $_GET['action'] ) {
+        if ('import' === $_GET['action']) {
             Writing_On_GitHub::$instance->start_import();
         }
 
-        wp_redirect( admin_url( 'options-general.php?page=writing-on-github' ) );
+        wp_redirect(admin_url('options-general.php?page=writing-on-github'));
         die;
     }
 }

lib/client/base.php

Indentation +200 added lines, -200 removed lines

@@ -9,204 +9,204 @@
  */
 class Writing_On_GitHub_Base_Client {
 
-    const HOST_OPTION_KEY   = 'wogh_host';
-    const TOKEN_OPTION_KEY  = 'wogh_oauth_token';
-    const REPO_OPTION_KEY   = 'wogh_repository';
-    const BRANCH_OPTION_KEY = 'wogh_branch';
-
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Instantiates a new Api object.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Generic GitHub API interface and response handler
-     *
-     * @param string $method HTTP method.
-     * @param string $endpoint API endpoint.
-     * @param array  $body Request body.
-     *
-     * @return stdClass|WP_Error
-     */
-    protected function call( $method, $endpoint, $body = array() ) {
-        if ( is_wp_error( $error = $this->can_call() ) ) {
-            /*　@var WP_Error $error */
-            return $error;
-        }
-
-        $args = array(
-            'method'  => $method,
-            'headers' => array(
-                'Authorization' => 'token ' . $this->oauth_token(),
-            ),
-        );
-
-        if ( 'GET' !== $method ) {
-            $args['body'] = json_encode( $body );
-        }
-
-        // $tmpbody = isset( $args['body'] ) ? $args['body'] : '';
-        // error_log( "writing-on-github-call $method $endpoint $tmpbody" );
-
-        $response = wp_remote_request( $endpoint, $args );
-        $status   = wp_remote_retrieve_header( $response, 'status' );
-        $body     = json_decode( wp_remote_retrieve_body( $response ) );
-
-        if ( '2' !== substr( $status, 0, 1 ) && '3' !== substr( $status, 0, 1 ) ) {
-            return new WP_Error(
-                strtolower( str_replace( ' ', '_', $status ) ),
-                sprintf(
-                    __( 'Method %s to endpoint %s failed with error: %s', 'writing-on-github' ),
-                    $method,
-                    $endpoint,
-                    ( $body && $body->message ) ? $body->message : 'Unknown error'
-                )
-            );
-        }
-
-        return $body;
-    }
-
-    /**
-     * Validates whether the Api object can make a call.
-     *
-     * @return true|WP_Error
-     */
-    protected function can_call() {
-        if ( ! $this->oauth_token() ) {
-            return new WP_Error(
-                'missing_token',
-                __( 'Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github' )
-            );
-        }
-
-        $repo = $this->repository();
-
-        if ( ! $repo ) {
-            return new WP_Error(
-                'missing_repository',
-                __( 'Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github' )
-            );
-        }
-
-        $parts = explode( '/', $repo );
-
-        if ( 2 !== count( $parts ) ) {
-            return new WP_Error(
-                'malformed_repository',
-                __( 'Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github' )
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the repository to sync with
-     *
-     * @return string
-     */
-    public function repository() {
-        return (string) get_option( self::REPO_OPTION_KEY );
-    }
-
-    /**
-     * Returns the user's oauth token
-     *
-     * @return string
-     */
-    public function oauth_token() {
-        return (string) get_option( self::TOKEN_OPTION_KEY );
-    }
-
-    /**
-     * Returns the GitHub host to sync with (for GitHub Enterprise support)
-     */
-    public function api_base() {
-        return get_option( self::HOST_OPTION_KEY );
-    }
-
-    public function branch() {
-        $branch = get_option( self::BRANCH_OPTION_KEY );
-        return $branch ? $branch : 'master';
-    }
-
-    /**
-     * API endpoint for the master branch reference
-     */
-    public function reference_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/git/refs/heads/' . $this->branch();
-
-        return $url;
-    }
-
-    /**
-     * Api to get and create commits
-     */
-    public function commit_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/git/commits';
-
-        return $url;
-    }
-
-    /**
-     * Api to compare commits
-     */
-    public function compare_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/compare';
-
-        return $url;
-    }
-
-    /**
-     * Api to get and create trees
-     */
-    public function tree_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/git/trees';
-
-        return $url;
-    }
-
-    /**
-     * Builds the proper blob API endpoint for a given post
-     *
-     * Returns String the relative API call path
-     */
-    public function blob_endpoint() {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/git/blobs';
-
-        return $url;
-    }
-
-    /**
-     * Builds the proper content API endpoint for a given post
-     *
-     * Returns String the relative API call path
-     */
-    public function content_endpoint( $path = false ) {
-        $url = $this->api_base() . '/repos/';
-        $url = $url . $this->repository() . '/contents';
-
-        if ( ! empty($path) ) {
-            $url .= '/' . $path;
-        }
-
-        return $url;
-    }
+	const HOST_OPTION_KEY   = 'wogh_host';
+	const TOKEN_OPTION_KEY  = 'wogh_oauth_token';
+	const REPO_OPTION_KEY   = 'wogh_repository';
+	const BRANCH_OPTION_KEY = 'wogh_branch';
+
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Instantiates a new Api object.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Generic GitHub API interface and response handler
+	 *
+	 * @param string $method HTTP method.
+	 * @param string $endpoint API endpoint.
+	 * @param array  $body Request body.
+	 *
+	 * @return stdClass|WP_Error
+	 */
+	protected function call( $method, $endpoint, $body = array() ) {
+		if ( is_wp_error( $error = $this->can_call() ) ) {
+			/*　@var WP_Error $error */
+			return $error;
+		}
+
+		$args = array(
+			'method'  => $method,
+			'headers' => array(
+				'Authorization' => 'token ' . $this->oauth_token(),
+			),
+		);
+
+		if ( 'GET' !== $method ) {
+			$args['body'] = json_encode( $body );
+		}
+
+		// $tmpbody = isset( $args['body'] ) ? $args['body'] : '';
+		// error_log( "writing-on-github-call $method $endpoint $tmpbody" );
+
+		$response = wp_remote_request( $endpoint, $args );
+		$status   = wp_remote_retrieve_header( $response, 'status' );
+		$body     = json_decode( wp_remote_retrieve_body( $response ) );
+
+		if ( '2' !== substr( $status, 0, 1 ) && '3' !== substr( $status, 0, 1 ) ) {
+			return new WP_Error(
+				strtolower( str_replace( ' ', '_', $status ) ),
+				sprintf(
+					__( 'Method %s to endpoint %s failed with error: %s', 'writing-on-github' ),
+					$method,
+					$endpoint,
+					( $body && $body->message ) ? $body->message : 'Unknown error'
+				)
+			);
+		}
+
+		return $body;
+	}
+
+	/**
+	 * Validates whether the Api object can make a call.
+	 *
+	 * @return true|WP_Error
+	 */
+	protected function can_call() {
+		if ( ! $this->oauth_token() ) {
+			return new WP_Error(
+				'missing_token',
+				__( 'Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github' )
+			);
+		}
+
+		$repo = $this->repository();
+
+		if ( ! $repo ) {
+			return new WP_Error(
+				'missing_repository',
+				__( 'Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github' )
+			);
+		}
+
+		$parts = explode( '/', $repo );
+
+		if ( 2 !== count( $parts ) ) {
+			return new WP_Error(
+				'malformed_repository',
+				__( 'Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github' )
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the repository to sync with
+	 *
+	 * @return string
+	 */
+	public function repository() {
+		return (string) get_option( self::REPO_OPTION_KEY );
+	}
+
+	/**
+	 * Returns the user's oauth token
+	 *
+	 * @return string
+	 */
+	public function oauth_token() {
+		return (string) get_option( self::TOKEN_OPTION_KEY );
+	}
+
+	/**
+	 * Returns the GitHub host to sync with (for GitHub Enterprise support)
+	 */
+	public function api_base() {
+		return get_option( self::HOST_OPTION_KEY );
+	}
+
+	public function branch() {
+		$branch = get_option( self::BRANCH_OPTION_KEY );
+		return $branch ? $branch : 'master';
+	}
+
+	/**
+	 * API endpoint for the master branch reference
+	 */
+	public function reference_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/git/refs/heads/' . $this->branch();
+
+		return $url;
+	}
+
+	/**
+	 * Api to get and create commits
+	 */
+	public function commit_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/git/commits';
+
+		return $url;
+	}
+
+	/**
+	 * Api to compare commits
+	 */
+	public function compare_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/compare';
+
+		return $url;
+	}
+
+	/**
+	 * Api to get and create trees
+	 */
+	public function tree_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/git/trees';
+
+		return $url;
+	}
+
+	/**
+	 * Builds the proper blob API endpoint for a given post
+	 *
+	 * Returns String the relative API call path
+	 */
+	public function blob_endpoint() {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/git/blobs';
+
+		return $url;
+	}
+
+	/**
+	 * Builds the proper content API endpoint for a given post
+	 *
+	 * Returns String the relative API call path
+	 */
+	public function content_endpoint( $path = false ) {
+		$url = $this->api_base() . '/repos/';
+		$url = $url . $this->repository() . '/contents';
+
+		if ( ! empty($path) ) {
+			$url .= '/' . $path;
+		}
+
+		return $url;
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -26,7 +26,7 @@ 
      *
      * @param Writing_On_GitHub $app Application container.
      */
-    public function __construct( Writing_On_GitHub $app ) {
+    public function __construct(Writing_On_GitHub $app) {
         $this->app = $app;
     }
 
@@ -39,8 +39,8 @@ 
      *
      * @return stdClass|WP_Error
      */
-    protected function call( $method, $endpoint, $body = array() ) {
-        if ( is_wp_error( $error = $this->can_call() ) ) {
+    protected function call($method, $endpoint, $body = array()) {
+        if (is_wp_error($error = $this->can_call())) {
             /*　@var WP_Error $error */
             return $error;
         }
@@ -52,25 +52,25 @@ 
             ),
         );
 
-        if ( 'GET' !== $method ) {
-            $args['body'] = json_encode( $body );
+        if ('GET' !== $method) {
+            $args['body'] = json_encode($body);
         }
 
         // $tmpbody = isset( $args['body'] ) ? $args['body'] : '';
         // error_log( "writing-on-github-call $method $endpoint $tmpbody" );
 
-        $response = wp_remote_request( $endpoint, $args );
-        $status   = wp_remote_retrieve_header( $response, 'status' );
-        $body     = json_decode( wp_remote_retrieve_body( $response ) );
+        $response = wp_remote_request($endpoint, $args);
+        $status   = wp_remote_retrieve_header($response, 'status');
+        $body     = json_decode(wp_remote_retrieve_body($response));
 
-        if ( '2' !== substr( $status, 0, 1 ) && '3' !== substr( $status, 0, 1 ) ) {
+        if ('2' !== substr($status, 0, 1) && '3' !== substr($status, 0, 1)) {
             return new WP_Error(
-                strtolower( str_replace( ' ', '_', $status ) ),
+                strtolower(str_replace(' ', '_', $status)),
                 sprintf(
-                    __( 'Method %s to endpoint %s failed with error: %s', 'writing-on-github' ),
+                    __('Method %s to endpoint %s failed with error: %s', 'writing-on-github'),
                     $method,
                     $endpoint,
-                    ( $body && $body->message ) ? $body->message : 'Unknown error'
+                    ($body && $body->message) ? $body->message : 'Unknown error'
                 )
             );
         }
@@ -84,28 +84,28 @@ 
      * @return true|WP_Error
      */
     protected function can_call() {
-        if ( ! $this->oauth_token() ) {
+        if ( ! $this->oauth_token()) {
             return new WP_Error(
                 'missing_token',
-                __( 'Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github' )
+                __('Writing On GitHub needs an auth token. Please update your settings.', 'writing-on-github')
             );
         }
 
         $repo = $this->repository();
 
-        if ( ! $repo ) {
+        if ( ! $repo) {
             return new WP_Error(
                 'missing_repository',
-                __( 'Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github' )
+                __('Writing On GitHub needs a repository. Please update your settings.', 'writing-on-github')
             );
         }
 
-        $parts = explode( '/', $repo );
+        $parts = explode('/', $repo);
 
-        if ( 2 !== count( $parts ) ) {
+        if (2 !== count($parts)) {
             return new WP_Error(
                 'malformed_repository',
-                __( 'Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github' )
+                __('Writing On GitHub needs a properly formed repository. Please update your settings.', 'writing-on-github')
             );
         }
 
@@ -118,7 +118,7 @@ 
      * @return string
      */
     public function repository() {
-        return (string) get_option( self::REPO_OPTION_KEY );
+        return (string) get_option(self::REPO_OPTION_KEY);
     }
 
     /**
@@ -127,18 +127,18 @@ 
      * @return string
      */
     public function oauth_token() {
-        return (string) get_option( self::TOKEN_OPTION_KEY );
+        return (string) get_option(self::TOKEN_OPTION_KEY);
     }
 
     /**
      * Returns the GitHub host to sync with (for GitHub Enterprise support)
      */
     public function api_base() {
-        return get_option( self::HOST_OPTION_KEY );
+        return get_option(self::HOST_OPTION_KEY);
     }
 
     public function branch() {
-        $branch = get_option( self::BRANCH_OPTION_KEY );
+        $branch = get_option(self::BRANCH_OPTION_KEY);
         return $branch ? $branch : 'master';
     }
 
@@ -199,11 +199,11 @@ 
      *
      * Returns String the relative API call path
      */
-    public function content_endpoint( $path = false ) {
+    public function content_endpoint($path = false) {
         $url = $this->api_base() . '/repos/';
         $url = $url . $this->repository() . '/contents';
 
-        if ( ! empty($path) ) {
+        if ( ! empty($path)) {
             $url .= '/' . $path;
         }