diff --git a/github-api.php b/github-api.php
index ba77898..1a64a9d 100644
--- a/github-api.php
+++ b/github-api.php
@@ -1,7 +1,5 @@
client_id = apply_filters( 'github-embed-client-id', $this->client_id );
$this->client_secret = apply_filters( 'github-embed-client-secret', $this->client_secret );
-
}
diff --git a/github-embed.php b/github-embed.php
index 01dca76..af1000b 100644
--- a/github-embed.php
+++ b/github-embed.php
@@ -36,13 +36,13 @@ Author URI: http://www.leewillis.co.uk/
* class to retrieve the information from the GitHub API.
* @uses class github_api
*/
-
class github_embed {
private $api;
/**
* Constructor. Registers hooks and filters
+ *
* @param class $api An instance of the github_api classs
*/
public function __construct( $api ) {
@@ -73,7 +73,7 @@ class github_embed {
*/
function cron() {
global $wpdb, $table_prefix;
- $sql = "DELETE
+ $sql = "DELETE
FROM {$table_prefix}postmeta
WHERE meta_key LIKE '_oembed_%'";
$results = $wpdb->get_results( $sql );
@@ -92,12 +92,14 @@ class github_embed {
* Register the oEmbed provider, and point it at a local endpoint since github
* doesn't directly support oEmbed yet. Our local endpoint will use the github
* API to fulfil the request.
- * @param array $providers The current list of providers
+ *
+ * @param array $providers The current list of providers
+ *
* @return array The list, with our new provider added
*/
public function register_oembed_handler() {
$oembed_url = home_url();
- $key = $this->get_key();
+ $key = $this->get_key();
$oembed_url = add_query_arg( array( 'github_oembed' => $key ), $oembed_url );
wp_oembed_add_provider( '#https?://github.com/.*#i', $oembed_url, true );
}
@@ -113,6 +115,7 @@ class github_embed {
$key = md5( time() . rand( 0, 65535 ) );
add_option( 'github_oembed_key', $key, '', 'yes' );
}
+
return $key;
}
@@ -138,7 +141,7 @@ class github_embed {
}
// Check we have the required information
- $url = isset( $_REQUEST['url'] ) ? $_REQUEST['url'] : null;
+ $url = isset( $_REQUEST['url'] ) ? $_REQUEST['url'] : null;
$format = isset( $_REQUEST['format'] ) ? $_REQUEST['format'] : null;
if ( ! empty( $format ) && 'json' !== $format ) {
@@ -175,42 +178,45 @@ class github_embed {
}
}
+ /**
+ * Capture then return output of template, provided theme or fallback to plugin default.
+ *
+ * @param string $template The template name to process.
+ * @param string $data Array, object, or variable that the template needs.
+ *
+ * @return string
+ */
+ private function process_template( $template, $data ) {
+ ob_start();
+ if ( ! locate_template( 'wp-github-oembed/' . $template, true ) ) {
+ require_once 'templates/' . $template;
+ }
+
+ return ob_get_clean();
+ }
+
/**
* Retrieve a list of contributors for a project
- * @param string $owner The owner of the repository
- * @param string $repository The repository name
+ *
+ * @param string $owner The owner of the repository
+ * @param string $repository The repository name
*/
private function oembed_github_repo_contributors( $owner, $repository ) {
- $repo = $this->api->get_repo( $owner, $repository );
- $contributors = $this->api->get_repo_contributors( $owner, $repository );
-
- $response = new stdClass();
- $response->type = 'rich';
- $response->width = '10';
- $response->height = '10';
+ $data = [];
+ $data['repo'] = $this->api->get_repo( $owner, $repository );
+ $data['contributors'] = $this->api->get_repo_contributors( $owner, $repository );
+ $data['gravatar_size'] = apply_filters( 'github_oembed_gravatar_size', 64 );
+ $data['logo_class'] = apply_filters( 'wp_github_oembed_logo_class', 'github-logo-octocat' );
+
+ $response = new stdClass();
+ $response->type = 'rich';
+ $response->width = '10';
+ $response->height = '10';
$response->version = '1.0';
- $response->title = $repo->description;
-
- $gravatar_size = apply_filters( 'github_oembed_gravatar_size', 64 );
-
- // @TODO This should all be templated
- $logo_class = apply_filters( 'wp_github_oembed_logo_class', 'github-logo-octocat' );
- $response->html = '';
+ $response->title = $data['repo']->description;
+ $response->html = $this->process_template(
+ 'repository_contributors.php', $data );
+
header( 'Content-Type: application/json' );
echo json_encode( $response );
die();
@@ -221,37 +227,19 @@ class github_embed {
* output it as an oembed response
*/
private function oembed_github_repo_milestone_summary( $owner, $repository, $milestone ) {
- $repo = $this->api->get_repo( $owner, $repository );
- $summary = $this->api->get_repo_milestone_summary( $owner, $repository, $milestone );
-
- $response = new stdClass();
- $response->type = 'rich';
- $response->width = '10';
- $response->height = '10';
+ $data = [];
+ $data['repo'] = $this->api->get_repo( $owner, $repository );
+ $data['summary'] = $this->api->get_repo_milestone_summary( $owner, $repository, $milestone );
+ $data['logo_class'] = apply_filters( 'wp_github_oembed_logo_class', 'github-logo-octocat' );
+
+ $response = new stdClass();
+ $response->type = 'rich';
+ $response->width = '10';
+ $response->height = '10';
$response->version = '1.0';
- $response->title = $repo->description;
-
- // @TODO This should all be templated
- $logo_class = apply_filters( 'wp_github_oembed_logo_class', 'github-logo-octocat' );
- $response->html = '';
- $response->html .= '
' . esc_html( $repo->description ) . '
';
-
- $response->html .= 'Milestone: ';
- $response->html .= '' . esc_html( $summary->title ) . '
';
-
- $response->html .= 'Issues: ';
- $response->html .= '';
- $response->html .= esc_html( number_format_i18n( $summary->open_issues ) ) . ' open, ';
- $response->html .= esc_html( number_format_i18n( $summary->closed_issues ) ) . ' closed.
';
-
- if ( ! empty( $summary->due_on ) ) {
- $response->html .= 'Due: ';
- $due_date = date_format( date_create( $summary->due_on ), 'jS F Y' );
- $response->html .= '' . esc_html( $due_date ) . '
';
- }
-
- $response->html .= '
' . nl2br( esc_html( $summary->description ) ) . '
';
- $response->html .= '
';
- $response->html .= '
' . esc_html( $owner ) . '
';
- $response->html .= esc_html( number_format_i18n( $owner_info->public_repos ) ) . ' repositories, ';
- $response->html .= esc_html( number_format_i18n( $owner_info->followers ) ) . ' followers.
';
- $response->html .= '
+
+
+
+
+
+
+
+ public_repos ) ) ?> repositories, followers ) ) ?> followers.
+
+
+
+
+
+ description ) ?>
+
+
+
+ Milestone:
+ title ) ?>
+
+ Issues:
+
+ open_issues ) ) ?> open, closed_issues ) ) ?> closed.
+
+
+ due_on ) ) : ?>
+ Due:
+
+ due_on ), 'jS F Y' ) ) ?>
+
+
+
+
+ description ) ) ?>
+
+
+
+
'; - $response->html .= ''; - $response->html .= '' . esc_attr( $contributor->author->login ) . ''; - } - $response->html .= '
, $contributor->author->avatar_url ) ); ?>)
+