| @@ -1,20 +1,19 @@ | ||
| 1 | 1 | <?php |
| 2 | - | |
| 3 | 2 | /* |
| 4 | 3 | Plugin Name: Github Embed |
| 5 | 4 | Plugin URI: http://www.leewillis.co.uk/wordpress-plugins |
| 6 | 5 | Description: Paste the URL to a Github project into your posts or pages, and have the project information pulled in and displayed automatically |
| 7 | -Version: 1.5 | |
| 6 | +Version: 1.7 | |
| 8 | 7 | Author: Lee Willis |
| 9 | 8 | Author URI: http://www.leewillis.co.uk/ |
| 10 | 9 | */ |
| 11 | 10 | |
| 12 | 11 | /** |
| 13 | - * Copyright (c) 2013 Lee Willis. All rights reserved. | |
| 12 | + * Copyright (c) 2013-2019 Lee Willis. All rights reserved. | |
| 14 | 13 | * |
| 15 | - * Released under the GPL license | |
| 16 | - * http://www.opensource.org/licenses/gpl-license.php | |
| 14 | + * Released under the GPL license v2 | |
| 15 | + * https://www.gnu.org/licenses/gpl-2.0.en.html | |
| 17 | 16 | * |
| 18 | 17 | * This is an add-on for WordPress |
| 19 | 18 | * http://wordpress.org/ |
| 20 | 19 | * |
| @@ -36,51 +35,38 @@ | ||
| 36 | 35 | * we can embed, and handling the actual oEmbed calls. It relies on the github_api |
| 37 | 36 | * class to retrieve the information from the GitHub API. |
| 38 | 37 | * @uses class github_api |
| 39 | 38 | */ |
| 39 | + | |
| 40 | 40 | class github_embed { |
| 41 | 41 | |
| 42 | - | |
| 43 | - | |
| 44 | 42 | private $api; |
| 45 | 43 | |
| 46 | - | |
| 47 | - | |
| 48 | 44 | /** |
| 49 | 45 | * Constructor. Registers hooks and filters |
| 50 | 46 | * @param class $api An instance of the github_api classs |
| 51 | 47 | */ |
| 52 | - public function __construct ( $api ) { | |
| 53 | - | |
| 48 | + public function __construct( $api ) { | |
| 54 | 49 | $this->api = $api; |
| 55 | - | |
| 56 | - add_action( 'init', array ( $this, 'register_oembed_handler' ) ); | |
| 50 | + add_action( 'init', array( $this, 'register_oembed_handler' ) ); | |
| 57 | 51 | add_action( 'init', array( $this, 'maybe_handle_oembed' ) ); |
| 58 | 52 | add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); |
| 59 | 53 | add_action( 'admin_init', array( $this, 'schedule_expiry' ) ); |
| 60 | 54 | add_action( 'github_embed_cron', array( $this, 'cron' ) ); |
| 61 | - | |
| 62 | 55 | // @TODO i18n |
| 63 | - | |
| 64 | 56 | } |
| 65 | 57 | |
| 66 | - | |
| 67 | - | |
| 68 | 58 | /** |
| 69 | 59 | * Make sure we have a scheduled event set to clear down the oEmbed cache until |
| 70 | 60 | * WordPress supports cache_age in oEmbed responses. |
| 71 | 61 | */ |
| 72 | 62 | function schedule_expiry() { |
| 73 | - | |
| 74 | - if( ! wp_next_scheduled( 'github_embed_cron' ) ) { | |
| 75 | - $frequency = apply_filters ( 'github_embed_cache_frequency', 'daily' ); | |
| 76 | - wp_schedule_event( time(), $frequency, 'github_embed_cron' ); | |
| 63 | + if ( ! wp_next_scheduled( 'github_embed_cron' ) ) { | |
| 64 | + $frequency = apply_filters( 'github_embed_cache_frequency', 'daily' ); | |
| 65 | + wp_schedule_event( time(), $frequency, 'github_embed_cron' ); | |
| 77 | 66 | } |
| 78 | - | |
| 79 | 67 | } |
| 80 | 68 | |
| 81 | - | |
| 82 | - | |
| 83 | 69 | /** |
| 84 | 70 | * Expire old oEmbeds. |
| 85 | 71 | * Note: This is a bit sledgehammer-to-crack-a-nut hence why I'm only running it |
| 86 | 72 | * daily. Ideally WP should honour cache_age in oEmbed responses properly |
| @@ -85,34 +71,24 @@ | ||
| 85 | 71 | * Note: This is a bit sledgehammer-to-crack-a-nut hence why I'm only running it |
| 86 | 72 | * daily. Ideally WP should honour cache_age in oEmbed responses properly |
| 87 | 73 | */ |
| 88 | 74 | function cron() { |
| 89 | - | |
| 90 | 75 | global $wpdb, $table_prefix; |
| 91 | - | |
| 92 | 76 | $sql = "DELETE |
| 93 | 77 | FROM {$table_prefix}postmeta |
| 94 | 78 | WHERE meta_key LIKE '_oembed_%'"; |
| 95 | - | |
| 96 | - $results = $wpdb->get_results ( $sql ); | |
| 97 | - | |
| 79 | + $results = $wpdb->get_results( $sql ); | |
| 98 | 80 | } |
| 99 | 81 | |
| 100 | - | |
| 101 | - | |
| 102 | 82 | /** |
| 103 | 83 | * Enqueue the frontend CSS |
| 104 | 84 | * @return void |
| 105 | 85 | */ |
| 106 | 86 | function enqueue_styles() { |
| 107 | - | |
| 108 | - wp_register_style ( 'github-embed', plugins_url(basename(dirname(__FILE__)).'/css/github-embed.css' ) ); | |
| 109 | - wp_enqueue_style ( 'github-embed' ); | |
| 110 | - | |
| 87 | + wp_register_style( 'github-embed', plugins_url( basename( dirname( __FILE__ ) ) . '/css/github-embed.css' ) ); | |
| 88 | + wp_enqueue_style( 'github-embed' ); | |
| 111 | 89 | } |
| 112 | 90 | |
| 113 | - | |
| 114 | - | |
| 115 | 91 | /** |
| 116 | 92 | * Register the oEmbed provider, and point it at a local endpoint since github |
| 117 | 93 | * doesn't directly support oEmbed yet. Our local endpoint will use the github |
| 118 | 94 | * API to fulfil the request. |
| @@ -119,18 +95,14 @@ | ||
| 119 | 95 | * @param array $providers The current list of providers |
| 120 | 96 | * @return array The list, with our new provider added |
| 121 | 97 | */ |
| 122 | 98 | public function register_oembed_handler() { |
| 123 | - | |
| 124 | 99 | $oembed_url = home_url(); |
| 125 | 100 | $key = $this->get_key(); |
| 126 | 101 | $oembed_url = add_query_arg( array( 'github_oembed' => $key ), $oembed_url ); |
| 127 | 102 | wp_oembed_add_provider( '#https?://github.com/.*#i', $oembed_url, true ); |
| 128 | - | |
| 129 | 103 | } |
| 130 | 104 | |
| 131 | - | |
| 132 | - | |
| 133 | 105 | /** |
| 134 | 106 | * Generate a unique key that can be used on our requests to stop others |
| 135 | 107 | * hijacking our internal oEmbed API |
| 136 | 108 | * @return string The site key |
| @@ -135,22 +107,16 @@ | ||
| 135 | 107 | * hijacking our internal oEmbed API |
| 136 | 108 | * @return string The site key |
| 137 | 109 | */ |
| 138 | 110 | private function get_key() { |
| 139 | - | |
| 140 | - $key = get_option ( 'github_oembed_key' ); | |
| 141 | - | |
| 111 | + $key = get_option( 'github_oembed_key' ); | |
| 142 | 112 | if ( ! $key ) { |
| 143 | - $key = md5 ( time() . rand ( 0,65535 ) ); | |
| 144 | - add_option ( 'github_oembed_key', $key, '', 'yes' ); | |
| 113 | + $key = md5( time() . rand( 0, 65535 ) ); | |
| 114 | + add_option( 'github_oembed_key', $key, '', 'yes' ); | |
| 145 | 115 | } |
| 146 | - | |
| 147 | 116 | return $key; |
| 148 | - | |
| 149 | 117 | } |
| 150 | 118 | |
| 151 | - | |
| 152 | - | |
| 153 | 119 | /** |
| 154 | 120 | * Check whether this is an oembed request, handle if it is |
| 155 | 121 | * Ignore it if not. |
| 156 | 122 | * Insert rant here about WP's lack of a front-end AJAX handler. |
| @@ -155,90 +121,70 @@ | ||
| 155 | 121 | * Ignore it if not. |
| 156 | 122 | * Insert rant here about WP's lack of a front-end AJAX handler. |
| 157 | 123 | */ |
| 158 | 124 | public function maybe_handle_oembed() { |
| 159 | - | |
| 160 | - if ( isset ( $_GET['github_oembed'] ) ) { | |
| 125 | + if ( isset( $_GET['github_oembed'] ) ) { | |
| 161 | 126 | return $this->handle_oembed(); |
| 162 | 127 | } |
| 163 | - | |
| 164 | 128 | } |
| 165 | 129 | |
| 166 | - | |
| 167 | - | |
| 168 | 130 | /** |
| 169 | 131 | * Handle an oembed request |
| 170 | 132 | */ |
| 171 | 133 | public function handle_oembed() { |
| 172 | - | |
| 173 | 134 | // Check this request is valid |
| 174 | - if ( $_GET['github_oembed'] != $this->get_key() ) { | |
| 175 | - header ( 'HTTP/1.0 403 Forbidden' ); | |
| 176 | - die ( 'Sad Octocat is sad.' ); | |
| 135 | + if ( $_GET['github_oembed'] !== $this->get_key() ) { | |
| 136 | + header( 'HTTP/1.0 403 Forbidden' ); | |
| 137 | + die( 'Sad Octocat is sad.' ); | |
| 177 | 138 | } |
| 178 | 139 | |
| 179 | 140 | // Check we have the required information |
| 180 | - $url = isset ( $_REQUEST['url'] ) ? $_REQUEST['url'] : null; | |
| 181 | - $format = isset ( $_REQUEST['format'] ) ? $_REQUEST['format'] : null; | |
| 141 | + $url = isset( $_REQUEST['url'] ) ? $_REQUEST['url'] : null; | |
| 142 | + $format = isset( $_REQUEST['format'] ) ? $_REQUEST['format'] : null; | |
| 182 | 143 | |
| 183 | - if ( ! empty ( $format ) && $format != 'json' ) { | |
| 184 | - header ( 'HTTP/1.0 501 Not implemented' ); | |
| 185 | - die ( 'This octocat only does json' ); | |
| 144 | + if ( ! empty( $format ) && 'json' !== $format ) { | |
| 145 | + header( 'HTTP/1.0 501 Not implemented' ); | |
| 146 | + die( 'This octocat only does json' ); | |
| 186 | 147 | } |
| 187 | 148 | |
| 188 | 149 | if ( ! $url ) { |
| 189 | - header ( 'HTTP/1.0 404 Not Found' ); | |
| 190 | - die ( 'Octocat is lost, and afraid' ); | |
| 150 | + header( 'HTTP/1.0 404 Not Found' ); | |
| 151 | + die( 'Octocat is lost, and afraid' ); | |
| 191 | 152 | } |
| 192 | 153 | |
| 193 | 154 | // Issues / Milestones |
| 194 | - if ( preg_match ( '#https?://github.com/([^/]*)/([^/]*)/graphs/contributors/?$#i', $url, $matches ) && ! empty ( $matches[2] ) ) { | |
| 195 | - | |
| 196 | - $this->oembed_github_repo_contributors ( $matches[1], $matches[2] ); | |
| 197 | - | |
| 198 | - } elseif ( preg_match ( '#https?://github.com/([^/]*)/([^/]*)/issues.*$#i', $url, $matches ) && ! empty ( $matches[2] ) ) { | |
| 199 | - | |
| 200 | - if ( preg_match ( '#issues.?milestone=([0-9]*)#i', $url, $milestones ) ) { | |
| 155 | + if ( preg_match( '#https?://github.com/([^/]*)/([^/]*)/graphs/contributors/?$#i', $url, $matches ) && ! empty( $matches[2] ) ) { | |
| 156 | + $this->oembed_github_repo_contributors( $matches[1], $matches[2] ); | |
| 157 | + } elseif ( preg_match( '#https?://github.com/([^/]*)/([^/]*)/issues.*$#i', $url, $matches ) && ! empty( $matches[2] ) ) { | |
| 158 | + if ( preg_match( '#issues.?milestone=([0-9]*)#i', $url, $milestones ) ) { | |
| 201 | 159 | $milestone = $milestones[1]; |
| 202 | 160 | } else { |
| 203 | 161 | $milestone = null; |
| 204 | 162 | } |
| 205 | - | |
| 206 | 163 | if ( $milestone ) { |
| 207 | - $this->oembed_github_repo_milestone_summary ( $matches[1], $matches[2], $milestone ); | |
| 164 | + $this->oembed_github_repo_milestone_summary( $matches[1], $matches[2], $milestone ); | |
| 208 | 165 | } |
| 209 | - | |
| 210 | - // New style milestone URL, e.g. https://github.com/example/example/milestone/1 | |
| 211 | - } elseif ( preg_match ( '#https?://github.com/([^/]*)/([^/]*)/milestone/([0-9]*)$#i', $url, $matches ) ) { | |
| 212 | - | |
| 166 | + } elseif ( preg_match( '#https?://github.com/([^/]*)/([^/]*)/milestone/([0-9]*)$#i', $url, $matches ) ) { | |
| 167 | + // New style milestone URL, e.g. https://github.com/example/example/milestone/1. | |
| 213 | 168 | $this->oembed_github_repo_milestone_summary( $matches[1], $matches[2], $matches[3] ); |
| 214 | - | |
| 215 | - // Repository | |
| 216 | - } elseif ( preg_match ( '#https?://github.com/([^/]*)/([^/]*)/?$#i', $url, $matches ) && ! empty ( $matches[2] ) ) { | |
| 217 | - | |
| 218 | - $this->oembed_github_repo ( $matches[1], $matches[2] ); | |
| 219 | - | |
| 220 | - // User | |
| 221 | - } elseif ( preg_match ( '#https?://github.com/([^/]*)/?$#i', $url, $matches ) ) { | |
| 222 | - | |
| 223 | - $this->oembed_github_author ( $matches[1] ); | |
| 224 | - | |
| 169 | + } elseif ( preg_match( '#https?://github.com/([^/]*)/([^/]*)/?$#i', $url, $matches ) && ! empty( $matches[2] ) ) { | |
| 170 | + // Repository. | |
| 171 | + $this->oembed_github_repo( $matches[1], $matches[2] ); | |
| 172 | + } elseif ( preg_match( '#https?://github.com/([^/]*)/?$#i', $url, $matches ) ) { | |
| 173 | + // User. | |
| 174 | + $this->oembed_github_author( $matches[1] ); | |
| 225 | 175 | } |
| 226 | - | |
| 227 | 176 | } |
| 228 | 177 | |
| 229 | - | |
| 230 | - | |
| 231 | 178 | /** |
| 232 | 179 | * Retrieve a list of contributors for a project |
| 233 | 180 | * @param string $owner The owner of the repository |
| 234 | 181 | * @param string $repository The repository name |
| 235 | 182 | */ |
| 236 | - private function oembed_github_repo_contributors ( $owner, $repository ) { | |
| 183 | + private function oembed_github_repo_contributors( $owner, $repository ) { | |
| 184 | + $repo = $this->api->get_repo( $owner, $repository ); | |
| 185 | + $contributors = $this->api->get_repo_contributors( $owner, $repository ); | |
| 237 | 186 | |
| 238 | - $repo = $this->api->get_repo ( $owner, $repository ); | |
| 239 | - $contributors = $this->api->get_repo_contributors ( $owner, $repository ); | |
| 240 | - | |
| 241 | 187 | $response = new stdClass(); |
| 242 | 188 | $response->type = 'rich'; |
| 243 | 189 | $response->width = '10'; |
| 244 | 190 | $response->height = '10'; |
| @@ -244,49 +190,41 @@ | ||
| 244 | 190 | $response->height = '10'; |
| 245 | 191 | $response->version = '1.0'; |
| 246 | 192 | $response->title = $repo->description; |
| 247 | 193 | |
| 248 | - $gravatar_size = apply_filters ( 'github_oembed_gravatar_size', 64 ); | |
| 194 | + $gravatar_size = apply_filters( 'github_oembed_gravatar_size', 64 ); | |
| 249 | 195 | |
| 250 | 196 | // @TODO This should all be templated |
| 251 | - $response->html = '<div class="github-embed github-embed-repo-contributors">'; | |
| 252 | - $response->html .= '<p><a href="'.esc_attr($repo->html_url).'" target="_blank"><strong>'.esc_html($repo->description)."</strong></a><br/>"; | |
| 253 | - | |
| 197 | + $logo_class = apply_filters( 'wp_github_oembed_logo_class', 'github-logo-octocat' ); | |
| 198 | + $response->html = '<div class="github-embed github-embed-repo-contributors ' . $logo_class . '">'; | |
| 199 | + $response->html .= '<p><a href="' . esc_attr( $repo->html_url ) . '" target="_blank">'; | |
| 200 | + $response->html .= '<strong>' . esc_html( $repo->description ) . '</strong></a><br/>'; | |
| 254 | 201 | $response->html .= '<span class="github-heading">Contributors: </span>'; |
| 255 | - | |
| 256 | 202 | $response->html .= '<ul class="github-repo-contributors">'; |
| 257 | - | |
| 258 | 203 | foreach ( $contributors as $contributor ) { |
| 259 | - | |
| 260 | 204 | $response->html .= '<li class="github-repo-contributor">'; |
| 261 | 205 | $response->html .= '<img class="github-repo-contributor-avatar" src="'; |
| 262 | - $response->html .= esc_url(add_query_arg(array('s'=>$gravatar_size), $contributor->author->avatar_url)); | |
| 263 | - $response->html .= '" alt="Picture of '.esc_attr($contributor->author->login).'">'; | |
| 206 | + $response->html .= esc_url( add_query_arg( array( 's' => $gravatar_size ), $contributor->author->avatar_url ) ); | |
| 207 | + $response->html .= '" alt="Picture of ' . esc_attr( $contributor->author->login ) . '">'; | |
| 264 | 208 | $response->html .= '<span class="github-repo-contributor-login">'; |
| 265 | - $response->html .= '<a href="https://github.com/'.esc_attr($contributor->author->login).'">'.esc_attr($contributor->author->login).'</a></span>'; | |
| 209 | + $response->html .= '<a href="https://github.com/' . esc_attr( $contributor->author->login ) . '">' . esc_attr( $contributor->author->login ) . '</a></span>'; | |
| 266 | 210 | } |
| 267 | - | |
| 268 | 211 | $response->html .= '</ul>'; |
| 269 | 212 | $response->html .= '<div style="clear: both;"></div>'; |
| 270 | 213 | $response->html .= '</div>'; |
| 271 | - | |
| 272 | - header ( 'Content-Type: application/json' ); | |
| 273 | - echo json_encode ( $response ); | |
| 214 | + header( 'Content-Type: application/json' ); | |
| 215 | + echo json_encode( $response ); | |
| 274 | 216 | die(); |
| 275 | - | |
| 276 | 217 | } |
| 277 | 218 | |
| 278 | - | |
| 279 | - | |
| 280 | 219 | /** |
| 281 | 220 | * Retrieve the summary information for a repo's milestone, and |
| 282 | 221 | * output it as an oembed response |
| 283 | 222 | */ |
| 284 | - private function oembed_github_repo_milestone_summary ( $owner, $repository, $milestone ) { | |
| 223 | + private function oembed_github_repo_milestone_summary( $owner, $repository, $milestone ) { | |
| 224 | + $repo = $this->api->get_repo( $owner, $repository ); | |
| 225 | + $summary = $this->api->get_repo_milestone_summary( $owner, $repository, $milestone ); | |
| 285 | 226 | |
| 286 | - $repo = $this->api->get_repo ( $owner, $repository ); | |
| 287 | - $summary = $this->api->get_repo_milestone_summary ( $owner, $repository, $milestone ); | |
| 288 | - | |
| 289 | 227 | $response = new stdClass(); |
| 290 | 228 | $response->type = 'rich'; |
| 291 | 229 | $response->width = '10'; |
| 292 | 230 | $response->height = '10'; |
| @@ -293,46 +231,43 @@ | ||
| 293 | 231 | $response->version = '1.0'; |
| 294 | 232 | $response->title = $repo->description; |
| 295 | 233 | |
| 296 | 234 | // @TODO This should all be templated |
| 297 | - $response->html = '<div class="github-embed github-embed-milestone-summary">'; | |
| 298 | - $response->html .= '<p><a href="'.esc_attr($repo->html_url).'" target="_blank"><strong>'.esc_html($repo->description)."</strong></a><br/>"; | |
| 235 | + $logo_class = apply_filters( 'wp_github_oembed_logo_class', 'github-logo-octocat' ); | |
| 236 | + $response->html = '<div class="github-embed github-embed-milestone-summary ' . $logo_class . '">'; | |
| 237 | + $response->html .= '<p><a href="' . esc_attr( $repo->html_url ) . '" target="_blank"><strong>' . esc_html( $repo->description ) . '</strong></a><br/>'; | |
| 299 | 238 | |
| 300 | 239 | $response->html .= '<span class="github-heading">Milestone: </span>'; |
| 301 | - $response->html .= '<span class="github-milestone-title">'.esc_html($summary->title)."</span><br>"; | |
| 240 | + $response->html .= '<span class="github-milestone-title">' . esc_html( $summary->title ) . '</span><br>'; | |
| 302 | 241 | |
| 303 | 242 | $response->html .= '<span class="github-heading">Issues: </span>'; |
| 304 | 243 | $response->html .= '<span class="github-milestone-issues">'; |
| 305 | - $response->html .= esc_html ( number_format_i18n ( $summary->open_issues ) )." open, "; | |
| 306 | - $response->html .= esc_html ( number_format_i18n ( $summary->closed_issues ) )." closed.</span><br>"; | |
| 244 | + $response->html .= esc_html( number_format_i18n( $summary->open_issues ) ) . ' open, '; | |
| 245 | + $response->html .= esc_html( number_format_i18n( $summary->closed_issues ) ) . ' closed.</span><br>'; | |
| 307 | 246 | |
| 308 | - if ( ! empty ( $summary->due_on ) ) { | |
| 247 | + if ( ! empty( $summary->due_on ) ) { | |
| 309 | 248 | $response->html .= '<span class="github-heading">Due: </span>'; |
| 310 | - $due_date = date_format ( date_create ( $summary->due_on ), 'jS F Y' ); | |
| 311 | - $response->html .= '<span class="github-milestone-due-date">'.esc_html($due_date).'</span><br>'; | |
| 249 | + $due_date = date_format( date_create( $summary->due_on ), 'jS F Y' ); | |
| 250 | + $response->html .= '<span class="github-milestone-due-date">' . esc_html( $due_date ) . '</span><br>'; | |
| 312 | 251 | } |
| 313 | 252 | |
| 314 | - $response->html .= '<p class="github-milestone-description">'.nl2br(esc_html($summary->description))."</p><br>"; | |
| 253 | + $response->html .= '<p class="github-milestone-description">' . nl2br( esc_html( $summary->description ) ) . '</p><br>'; | |
| 315 | 254 | $response->html .= '</div>'; |
| 316 | 255 | |
| 317 | - error_log( basename( __FILE__ ) . ': (' . __LINE__ . ') : response is ' . print_r( $response, 1 ) ); | |
| 318 | - header ( 'Content-Type: application/json' ); | |
| 319 | - echo json_encode ( $response ); | |
| 256 | + header( 'Content-Type: application/json' ); | |
| 257 | + echo json_encode( $response ); | |
| 320 | 258 | die(); |
| 321 | 259 | |
| 322 | 260 | } |
| 323 | 261 | |
| 324 | - | |
| 325 | - | |
| 326 | 262 | /** |
| 327 | 263 | * Retrieve the information from github for a repo, and |
| 328 | 264 | * output it as an oembed response |
| 329 | 265 | */ |
| 330 | 266 | private function oembed_github_repo ( $owner, $repository ) { |
| 267 | + $repo = $this->api->get_repo( $owner, $repository ); | |
| 268 | + $commits =$this->api->get_repo_commits( $owner, $repository ); | |
| 331 | 269 | |
| 332 | - $repo = $this->api->get_repo ( $owner, $repository ); | |
| 333 | - $commits =$this->api->get_repo_commits ( $owner, $repository ); | |
| 334 | - | |
| 335 | 270 | $response = new stdClass(); |
| 336 | 271 | $response->type = 'rich'; |
| 337 | 272 | $response->width = '10'; |
| 338 | 273 | $response->height = '10'; |
| @@ -339,49 +274,39 @@ | ||
| 339 | 274 | $response->version = '1.0'; |
| 340 | 275 | $response->title = $repo->description; |
| 341 | 276 | |
| 342 | 277 | // @TODO This should all be templated |
| 343 | - $response->html = '<div class="github-embed github-embed-repository">'; | |
| 344 | - $response->html .= '<p><a href="'.esc_attr($repo->html_url).'" target="_blank"><strong>'.esc_html($repo->description)."</strong></a><br/>"; | |
| 345 | - $response->html .= '<a href="'.esc_attr($repo->html_url).'" target="_blank">'.esc_html($repo->html_url)."</a><br/>"; | |
| 346 | - $response->html .= '<a href="'.esc_attr($repo->html_url . '/network') . '" target="_blank">'.esc_html ( number_format_i18n ( $repo->forks_count ) ) . "</a> forks.<br/>"; | |
| 347 | - $response->html .= '<a href="'.esc_attr($repo->html_url . '/stargazers') . '" target="_blank">'.esc_html ( number_format_i18n ( $repo->stargazers_count ) ) . "</a> stars.<br/>"; | |
| 348 | - $response->html .= '<a href="'.esc_attr($repo->html_url . '/issues') . '" target="_blank">'.esc_html ( number_format_i18n ( $repo->open_issues_count ) ) . "</a> open issues.<br/>"; | |
| 278 | + $logo_class = apply_filters( 'wp_github_oembed_logo_class', 'github-logo-mark' ); | |
| 279 | + $response->html = '<div class="github-embed github-embed-repository ' . $logo_class . '">'; | |
| 280 | + $response->html .= '<p><a href="' . esc_attr( $repo->html_url ) . '" target="_blank"><strong>' . esc_html( $repo->description ) . '</strong></a><br/>'; | |
| 281 | + $response->html .= '<a href="' . esc_attr( $repo->html_url ) . '" target="_blank">' . esc_html( $repo->html_url ) . '</a><br/>'; | |
| 282 | + $response->html .= '<a href="' . esc_attr( $repo->html_url . '/network' ) . '" target="_blank">' . esc_html( number_format_i18n( $repo->forks_count ) ) . '</a> forks.<br/>'; | |
| 283 | + $response->html .= '<a href="' . esc_attr( $repo->html_url . '/stargazers' ) . '" target="_blank">' . esc_html( number_format_i18n( $repo->stargazers_count ) ) . '</a> stars.<br/>'; | |
| 284 | + $response->html .= '<a href="' . esc_attr( $repo->html_url . '/issues' ) . '" target="_blank">' . esc_html( number_format_i18n( $repo->open_issues_count ) ) . '</a> open issues.<br/>'; | |
| 349 | 285 | |
| 350 | - if ( count ( $commits ) ) { | |
| 351 | - | |
| 286 | + if ( count( $commits ) ) { | |
| 352 | 287 | $cnt = 0; |
| 353 | 288 | $response->html .= 'Recent commits:'; |
| 354 | 289 | $response->html .= '<ul class="github_commits">'; |
| 355 | - | |
| 356 | 290 | foreach ( $commits as $commit ) { |
| 357 | - | |
| 358 | - if ($cnt > 4) | |
| 291 | + if ( $cnt > 4 ) { | |
| 359 | 292 | break; |
| 360 | - | |
| 293 | + } | |
| 361 | 294 | $response->html .= '<li class="github_commit">'; |
| 362 | - $response->html .= '<a href="https://github.com/'.$owner.'/'.$repository.'/commit/'.esc_attr($commit->sha).'" target="_blank">'.esc_html($commit->commit->message)."</a>, "; | |
| 363 | - $response->html .= esc_html($commit->commit->committer->name); | |
| 295 | + $response->html .= '<a href="https://github.com/' . $owner . '/' . $repository . '/commit/' . esc_attr( $commit->sha ) . '" target="_blank">' . esc_html( $commit->commit->message ) . '</a>, '; | |
| 296 | + $response->html .= esc_html( $commit->commit->committer->name ); | |
| 364 | 297 | $response->html .= '</li>'; |
| 365 | - | |
| 366 | 298 | $cnt++; |
| 367 | - | |
| 368 | 299 | } |
| 369 | - | |
| 370 | 300 | $response->html .= '</ul>'; |
| 371 | - | |
| 372 | 301 | } |
| 373 | 302 | $response->html .= '</p>'; |
| 374 | 303 | $response->html .= '</div>'; |
| 375 | - | |
| 376 | - header ( 'Content-Type: application/json' ); | |
| 377 | - echo json_encode ( $response ); | |
| 304 | + header( 'Content-Type: application/json' ); | |
| 305 | + echo json_encode( $response ); | |
| 378 | 306 | die(); |
| 379 | - | |
| 380 | 307 | } |
| 381 | 308 | |
| 382 | - | |
| 383 | - | |
| 384 | 309 | /** |
| 385 | 310 | * Retrieve the information from github for an author, and output |
| 386 | 311 | * it as an oembed response |
| 387 | 312 | */ |
| @@ -386,9 +311,9 @@ | ||
| 386 | 311 | * it as an oembed response |
| 387 | 312 | */ |
| 388 | 313 | private function oembed_github_author ( $owner ) { |
| 389 | 314 | |
| 390 | - $owner_info = $this->api->get_user ( $owner ); | |
| 315 | + $owner_info = $this->api->get_user( $owner ); | |
| 391 | 316 | |
| 392 | 317 | $response = new stdClass(); |
| 393 | 318 | $response->type = 'rich'; |
| 394 | 319 | $response->width = '10'; |
| @@ -396,22 +321,20 @@ | ||
| 396 | 321 | $response->version = '1.0'; |
| 397 | 322 | $response->title = $owner_info->name; |
| 398 | 323 | |
| 399 | 324 | // @TODO This should all be templated |
| 400 | - $response->html = '<div class="github-embed github-embed-user">'; | |
| 401 | - $response->html .= '<p><a href="https://github.com/'.esc_attr($owner).'" target="_blank"><strong>'.esc_html($owner)."</strong></a><br/>"; | |
| 402 | - $response->html .= esc_html ( number_format_i18n ( $owner_info->public_repos ) ).' repositories, '; | |
| 403 | - $response->html .= esc_html ( number_format_i18n ( $owner_info->followers ) ).' followers.</p>'; | |
| 325 | + $logo_class = apply_filters( 'wp_github_oembed_logo_class', 'github-logo-octocat' ); | |
| 326 | + $response->html = '<div class="github-embed github-embed-user ' . $logo_class . '">'; | |
| 327 | + $response->html .= '<p><a href="https://github.com/' . esc_attr( $owner ) . '" target="_blank"><strong>' . esc_html( $owner ) . '</strong></a><br/>'; | |
| 328 | + $response->html .= esc_html( number_format_i18n( $owner_info->public_repos ) ) . ' repositories, '; | |
| 329 | + $response->html .= esc_html( number_format_i18n( $owner_info->followers ) ) . ' followers.</p>'; | |
| 404 | 330 | $response->html .= '</div>'; |
| 405 | - | |
| 406 | - header ( 'Content-Type: application/json' ); | |
| 407 | - echo json_encode ( $response ); | |
| 331 | + header( 'Content-Type: application/json' ); | |
| 332 | + echo json_encode( $response ); | |
| 408 | 333 | die(); |
| 409 | - | |
| 410 | 334 | } |
| 411 | - | |
| 412 | 335 | } |
| 413 | 336 | |
| 414 | -require_once ( 'github-api.php' ); | |
| 337 | +require_once( 'github-api.php' ); | |
| 415 | 338 | |
| 416 | 339 | $github_api = new github_api(); |
| 417 | -$github_embed = new github_embed ( $github_api ); | |
| 340 | +$github_embed = new github_embed( $github_api ); | |
