diff --git a/github-api.php b/github-api.php index 1668c99..8856fe9 100644 --- a/github-api.php +++ b/github-api.php @@ -1,18 +1,18 @@ -client_id = apply_filters ( 'github-embed-client-id', $this->client_id ); - $this->client_secret = apply_filters ( 'github-embed-client-secret', $this->client_id ); + $this->client_id = apply_filters( 'github-embed-client-id', $this->client_id ); + $this->client_secret = apply_filters( 'github-embed-client-secret', $this->client_id ); } - private function call_api ( $url ) { + private function call_api( $url ) { // Allow users to supply auth details to enable a higher rate limit - if ( ! empty ( $this->client_id ) && ! empty ( $this->client_secret ) ) { - $url = add_query_arg(array ( 'client_id' => $this->client_id, - 'client_secret' => $this->client_secret), - $url ); + if ( ! empty( $this->client_id ) && ! empty( $this->client_secret ) ) { + $url = add_query_arg( + array( + 'client_id' => $this->client_id, + 'client_secret' => $this->client_secret ), + $url + ); } - $args = array ( 'user-agent' => 'WordPress Github oEmbed plugin - https://github.com/leewillis77/wp-github-oembed'); - - $this->log ( __FUNCTION__." : $url", GEDEBUG_CALL ); + $args = array( 'user-agent' => 'WordPress Github oEmbed plugin - https://github.com/leewillis77/wp-github-oembed'); - $results = wp_remote_get ( $url, $args ); + $this->log( __FUNCTION__." : $url", GEDEBUG_CALL ); - $this->log ( __FUNCTION__." : ".print_r($results,1), GEDEBUG_RESP ); + $results = wp_remote_get( $url, $args ); - if ( is_wp_error( $results ) || - ! isset ( $results['response']['code'] ) || + $this->log( __FUNCTION__ . " : " . print_r( $results,1 ), GEDEBUG_RESP ); + + if( is_wp_error( $results ) || + ! isset( $results['response']['code'] ) || $results['response']['code'] != '200' ) { - header ( 'HTTP/1.0 404 Not Found' ); - die ( 'Octocat is lost, and afraid' ); + header( 'HTTP/1.0 404 Not Found' ); + die( 'Octocat is lost, and afraid' ); } return $results; @@ -99,16 +102,16 @@ class github_api { * @param string $repository The respository name * @return object The response from the GitHub API */ - public function get_repo ( $owner, $repository ) { + public function get_repo( $owner, $repository ) { - $this->log ( "get_repo ( $owner, $repository )", GEDEBUG_CALL ); + $this->log( "get_repo( $owner, $repository )", GEDEBUG_CALL ); - $owner = trim ( $owner, '/' ); - $repository = trim ( $repository, '/' ); + $owner = trim( $owner, '/' ); + $repository = trim( $repository, '/' ); - $results = $this->call_api ( "https://api.github.com/repos/$owner/$repository" ); + $results = $this->call_api( "https://api.github.com/repos/$owner/$repository" ); - return json_decode ( $results['body'] ); + return json_decode( $results['body'] ); } @@ -120,16 +123,16 @@ class github_api { * @param string $repository The respository name * @return object The response from the GitHub API */ - public function get_repo_commits ( $owner, $repository ) { + public function get_repo_commits( $owner, $repository ) { - $this->log ( "get_repo_commits ( $owner, $repository )", GEDEBUG_CALL ); + $this->log( "get_repo_commits( $owner, $repository )", GEDEBUG_CALL ); - $owner = trim ( $owner, '/' ); - $repository = trim ( $repository, '/' ); + $owner = trim( $owner, '/' ); + $repository = trim( $repository, '/' ); - $results = $this->call_api ( "https://api.github.com/repos/$owner/$repository/commits" ); + $results = $this->call_api( "https://api.github.com/repos/$owner/$repository/commits" ); - return json_decode ( $results['body'] ); + return json_decode( $results['body'] ); } @@ -142,31 +145,31 @@ class github_api { * @param string $milestone The milestone ID * @return object The response from the GitHub API */ - public function get_repo_milestone_summary ( $owner, $repository, $milestone ) { + public function get_repo_milestone_summary( $owner, $repository, $milestone ) { - $this->log ( "get_repo_milestone_summary ( $owner, $repository, $milestone )", GEDEBUG_CALL ); + $this->log( "get_repo_milestone_summary( $owner, $repository, $milestone )", GEDEBUG_CALL ); - $owner = trim ( $owner, '/' ); - $repo = trim ( $repo, '/' ); + $owner = trim( $owner, '/' ); + $repo = trim( $repo, '/' ); - $results = $this->call_api ( "https://api.github.com/repos/$owner/$repository/milestones/$milestone" ); + $results = $this->call_api( "https://api.github.com/repos/$owner/$repository/milestones/$milestone" ); - return json_decode ( $results['body'] ); + return json_decode( $results['body'] ); } - public function get_repo_contributors ( $owner, $repository ) { + public function get_repo_contributors( $owner, $repository ) { - $this->log ( "get_repo_contributors ( $owner, $repository )", GEDEBUG_CALL ); + $this->log( "get_repo_contributors( $owner, $repository )", GEDEBUG_CALL ); - $owner = trim ( $owner, '/' ); - $repo = trim ( $repo, '/' ); + $owner = trim( $owner, '/' ); + $repo = trim( $repository, '/' ); $results = $this->call_api( "https://api.github.com/repos/$owner/$repository/collaborators" ); - return json_decode ( $results['body'] ); + return json_decode( $results['body'] ); } @@ -177,24 +180,24 @@ class github_api { * @param string $user The username * @return object The response from the GitHub API */ - public function get_user ( $user ) { + public function get_user( $user ) { - $this->log ( "get_user ( $user )", GEDEBUG_CALL ); + $this->log( "get_user( $user )", GEDEBUG_CALL ); - $user = trim ( $user, '/' ); - $repository = trim ( $repository, '/' ); + $user = trim( $user, '/' ); + $repository = trim( $repository, '/' ); - $results = $this->call_api ( "https://api.github.com/users/$user" ); + $results = $this->call_api( "https://api.github.com/users/$user" ); - return json_decode ( $results['body'] ); + return json_decode( $results['body'] ); } - - private function log ( $msg, $level ) { + + private function log( $msg, $level ) { if ( GITHUB_API_LEVEL >= $level ) { - error_log ( "[GE$level]: ".$msg ); + error_log( "[GE$level]: ".$msg ); } }