| @@ -28,11 +28,8 @@ | ||
| 28 | 28 | public $header_parameters = ''; // the header paramaters |
| 29 | 29 | public $body_parameters = ''; // the body paramaters |
| 30 | 30 | public $body_json_encode = ''; // body_json_encode body |
| 31 | 31 | public $body_url_encode = ''; // urlencode body |
| 32 | - public $body_base64_encode = ''; // base64 encode body | |
| 33 | - public $body_xml_format = ''; // xml format body | |
| 34 | - public $xml_root_node = 'root'; // root node for xml | |
| 35 | 32 | |
| 36 | 33 | public $response = ''; // the returned response |
| 37 | 34 | |
| 38 | 35 | public $final_url = ''; // final URL |
| @@ -37,15 +34,12 @@ | ||
| 37 | 34 | |
| 38 | 35 | public $final_url = ''; // final URL |
| 39 | 36 | public $final_request_args = array(); // final request_args |
| 40 | 37 | |
| 41 | - public $results_format = 'json_string'; // results format | |
| 38 | + public $results_format = 'json_string'; // reseults format | |
| 42 | 39 | |
| 43 | - public $response_code = ''; // the response code from the call | |
| 44 | - | |
| 45 | 40 | public $timeout = 10; // the timeout |
| 46 | 41 | public $sslverify = 1; // the paramaters |
| 47 | - public $debug = false; | |
| 48 | 42 | |
| 49 | 43 | |
| 50 | 44 | /** |
| 51 | 45 | * Main constructor |
| @@ -63,9 +57,9 @@ | ||
| 63 | 57 | $this->endpoint_id = sanitize_text_field( $endpoint_id ); |
| 64 | 58 | $this->keys = $keys; |
| 65 | 59 | $this->args = $args; |
| 66 | 60 | |
| 67 | - add_filter( 'wpgetapi_raw_data', array( $this, 'maybe_add_debug_info' ), 99, 2 ); | |
| 61 | + add_filter( 'wpgetapi_raw_data', array( $this, 'maybe_add_debug_info' ), 5, 2 ); | |
| 68 | 62 | |
| 69 | 63 | } |
| 70 | 64 | |
| 71 | 65 | |
| @@ -73,29 +67,8 @@ | ||
| 73 | 67 | * Init our api data |
| 74 | 68 | */ |
| 75 | 69 | public function init() { |
| 76 | 70 | |
| 77 | - // if we are doing importer plugin, | |
| 78 | - // we need to intercept and modify most of our methods values | |
| 79 | - if( $this->api_id == 'wpgetapi_importer' ) { | |
| 80 | - | |
| 81 | - $data = apply_filters( 'wpgetapi_api_importer_init', $this ); | |
| 82 | - | |
| 83 | - if( $data ) { | |
| 84 | - | |
| 85 | - foreach ($data as $key => $value) { | |
| 86 | - $this->{$key} = $value; | |
| 87 | - } | |
| 88 | - | |
| 89 | - $this->query_parameters = ! empty( $this->query_parameters ) ? $this->do_parameters( $this->query_parameters ) : array(); | |
| 90 | - $this->header_parameters = ! empty( $this->header_parameters ) ? $this->do_parameters( $this->header_parameters ) : array(); | |
| 91 | - $this->body_parameters = ! empty( $this->body_parameters ) ? $this->do_parameters( $this->body_parameters ) : array(); | |
| 92 | - return; | |
| 93 | - | |
| 94 | - } | |
| 95 | - | |
| 96 | - } | |
| 97 | - | |
| 98 | 71 | // do some checks |
| 99 | 72 | if( empty( $this->setup ) || ! isset( $this->setup['apis'] ) || empty( $this->setup['apis'] ) ) |
| 100 | 73 | return 'No API found.'; |
| 101 | 74 | |
| @@ -114,9 +87,9 @@ | ||
| 114 | 87 | // loop through endpoints |
| 115 | 88 | foreach ( $this->api['endpoints'] as $index => $endpoint ) { |
| 116 | 89 | |
| 117 | 90 | if( $this->endpoint_id == $endpoint['id'] ) { |
| 118 | - | |
| 91 | + | |
| 119 | 92 | $this->method = isset( $endpoint['method'] ) && $endpoint['method'] != '' ? sanitize_text_field( $endpoint['method'] ) : 'GET'; |
| 120 | 93 | $this->cache_time = isset( $endpoint['cache_time'] ) && ! empty( $endpoint['cache_time'] ) ? absint( $endpoint['cache_time'] ) : ''; |
| 121 | 94 | $this->endpoint = isset( $endpoint['endpoint'] ) && ! empty( $endpoint['endpoint'] ) ? sanitize_text_field( $endpoint['endpoint'] ) : ''; |
| 122 | 95 | |
| @@ -125,30 +98,13 @@ | ||
| 125 | 98 | $this->header_parameters = isset( $endpoint['header_parameters'] ) && ! empty( $endpoint['header_parameters'] ) ? $this->do_parameters( $endpoint['header_parameters'] ) : array(); |
| 126 | 99 | |
| 127 | 100 | $this->body_parameters = isset( $endpoint['body_parameters'] ) && ! empty( $endpoint['body_parameters'] ) ? $this->do_parameters( $endpoint['body_parameters'] ) : array(); |
| 128 | 101 | |
| 129 | - // how to encode the body | |
| 130 | 102 | $this->body_json_encode = isset( $endpoint['body_json_encode'] ) && $endpoint['body_json_encode'] == 'true' ? true : false; |
| 131 | 103 | $this->body_url_encode = isset( $endpoint['body_json_encode'] ) && $endpoint['body_json_encode'] == 'url' ? true : false; |
| 132 | - $this->body_base64_encode = isset( $endpoint['body_json_encode'] ) && $endpoint['body_json_encode'] == 'base64' ? true : false; | |
| 133 | - $this->body_xml_format = isset( $endpoint['body_json_encode'] ) && $endpoint['body_json_encode'] == 'xml' ? true : false; | |
| 134 | 104 | |
| 135 | - $this->xml_root_node = isset( $endpoint['xml_root'] ) && ! empty( $endpoint['xml_root'] ) ? $endpoint['xml_root'] : $this->xml_root_node; | |
| 136 | - | |
| 137 | 105 | $this->results_format = isset( $endpoint['results_format'] ) ? sanitize_text_field( $endpoint['results_format'] ) : $this->results_format; |
| 138 | - | |
| 139 | - | |
| 140 | - if( | |
| 141 | - // set the format to php array data if html format is set | |
| 142 | - ( isset( $this->args['format'] ) && $this->args['format'] == 'html' && $this->results_format != 'xml_array' ) || | |
| 143 | - // set the format to php array data if it is set in the args (coming from the importer) | |
| 144 | - ( isset( $this->args['results_format'] ) && $this->args['results_format'] == 'json_decoded' ) | |
| 145 | - ) { | |
| 146 | - $this->results_format = 'json_decoded'; | |
| 147 | - } | |
| 148 | - | |
| 149 | 106 | } |
| 150 | - | |
| 151 | 107 | } |
| 152 | 108 | |
| 153 | 109 | $this->timeout = isset( $this->api['timeout'] ) && ! empty( $this->api['timeout'] ) ? $this->api['timeout'] : $this->timeout; |
| 154 | 110 | $this->sslverify = isset( $this->api['sslverify'] ) ? absint( $this->api['sslverify'] ) : $this->sslverify; |
| @@ -161,21 +117,58 @@ | ||
| 161 | 117 | * |
| 162 | 118 | * @param string $field Field to retrieve |
| 163 | 119 | */ |
| 164 | 120 | public function endpoint_output() { |
| 121 | + return $this->do_the_call(); | |
| 122 | + } | |
| 165 | 123 | |
| 166 | - do_action( 'wpgetapi_before_do_the_call', $this ); | |
| 167 | 124 | |
| 168 | - return $this->do_the_call(); | |
| 125 | + /** | |
| 126 | + * Sort out the parameters if they exist | |
| 127 | + */ | |
| 128 | + public function do_parameters( $parameters ) { | |
| 129 | + | |
| 130 | + $new_array = array(); | |
| 131 | + $parameters = $this->decrypt($parameters); | |
| 169 | 132 | |
| 133 | + if( is_array( $parameters ) ) { | |
| 134 | + foreach ( $parameters as $key => $parameter ) { | |
| 135 | + if( ! empty( $parameter['name'] ) && ! empty( $parameter['value'] ) ) { | |
| 136 | + $parameter['value'] = stripslashes( $parameter['value'] ); | |
| 137 | + $new_array[ sanitize_text_field( $parameter['name'] ) ] = $parameter['value']; | |
| 138 | + } | |
| 139 | + } | |
| 140 | + } | |
| 141 | + | |
| 142 | + // look for array or json string and sort these out - for using such things in shortcode | |
| 143 | + if( is_array( $new_array ) ) { | |
| 144 | + | |
| 145 | + foreach ( $new_array as $key => $value ) { | |
| 146 | + | |
| 147 | + // checking if the parameters have a json string | |
| 148 | + if ( substr( $value, 0, 1 ) === '{' && substr( $value, -1 ) === '}' ) { | |
| 149 | + $new_array[ $key ] = json_decode( $value, true); | |
| 150 | + } | |
| 151 | + | |
| 152 | + // checking if the parameters have an array within the string | |
| 153 | + // if they do, create them as an actual array | |
| 154 | + if ( substr( $value, 0, 1 ) === '[' && substr( $value, -1 ) === ']' ) { | |
| 155 | + $new_array[ $key ] = array( $value ); | |
| 156 | + } | |
| 157 | + | |
| 158 | + } | |
| 159 | + | |
| 160 | + } | |
| 161 | + | |
| 162 | + return $new_array; | |
| 163 | + | |
| 170 | 164 | } |
| 171 | 165 | |
| 172 | - | |
| 173 | 166 | /** |
| 174 | 167 | * Send the request and return our data |
| 175 | 168 | */ |
| 176 | 169 | public function do_the_call() { |
| 177 | - | |
| 170 | + | |
| 178 | 171 | $this->init(); |
| 179 | 172 | |
| 180 | 173 | // build the URL |
| 181 | 174 | $this->final_url = apply_filters( 'wpgetapi_final_url', $this->build_url(), $this ); |
| @@ -181,60 +174,28 @@ | ||
| 181 | 174 | $this->final_url = apply_filters( 'wpgetapi_final_url', $this->build_url(), $this ); |
| 182 | 175 | |
| 183 | 176 | // build the request args |
| 184 | 177 | $this->final_request_args = apply_filters( 'wpgetapi_final_request_args', $this->build_request_args(), $this ); |
| 185 | - | |
| 186 | - /** | |
| 187 | - * Check if we should stop or not. Setting $on to true, will stop us calling the api. | |
| 188 | - * @param bool $on Whether on is set or not. | |
| 189 | - */ | |
| 190 | 178 | |
| 191 | - if ( apply_filters( 'wpgetapi_should_we_stop', false, $this ) ) { | |
| 192 | - return; | |
| 193 | - } | |
| 194 | - | |
| 195 | 179 | // POST request |
| 196 | 180 | if( $this->method == 'POST' ) |
| 197 | 181 | $this->response = $this->POST_request(); |
| 198 | 182 | |
| 199 | - // PUT request | |
| 200 | - if( $this->method == 'PUT' ) | |
| 201 | - $this->response = $this->PUT_request(); | |
| 202 | - | |
| 203 | - // PATCH request | |
| 204 | - if( $this->method == 'PATCH' ) | |
| 205 | - $this->response = $this->PATCH_request(); | |
| 206 | - | |
| 207 | 183 | // GET request |
| 208 | 184 | if( $this->method == 'GET' ) |
| 209 | 185 | $this->response = $this->GET_request(); |
| 210 | 186 | |
| 211 | - // DELETE request | |
| 212 | - if( $this->method == 'DELETE' ) | |
| 213 | - $this->response = $this->DELETE_request(); | |
| 214 | - | |
| 215 | 187 | // wp error |
| 216 | 188 | if( is_wp_error( $this->response ) ) { |
| 217 | 189 | return apply_filters( 'wpgetapi_raw_error_data', json_encode( $this->response ), $this ); |
| 218 | 190 | } |
| 219 | 191 | |
| 220 | - // get response_code | |
| 221 | - $this->response_code = wp_remote_retrieve_response_code( $this->response ); | |
| 192 | + $data = wp_remote_retrieve_body( $this->response ); | |
| 222 | 193 | |
| 223 | - // action to intercept call depending on response_code | |
| 224 | - $this->response = apply_filters( 'wpgetapi_before_retrieve_body', $this->response, $this->response_code, $this ); | |
| 225 | - | |
| 226 | - // get body | |
| 227 | - // modified in version 1.6.1 to allow for OAuth 2.0 plugin returning body already | |
| 228 | - $data = isset( $this->response['body'] ) ? $this->response['body'] : $this->response; | |
| 229 | - | |
| 230 | 194 | // returning in JSON format |
| 231 | 195 | if( $this->results_format == 'json_string' || $this->results_format == 'json_decoded' ) |
| 232 | 196 | $data = $this->return_data( $data ); |
| 233 | 197 | |
| 234 | - if( $data === 'null' ) | |
| 235 | - $data = 'Result is null. Check that all endpoint settings are correct.'; | |
| 236 | - | |
| 237 | 198 | return apply_filters( 'wpgetapi_raw_data', $data, $this ); |
| 238 | 199 | |
| 239 | 200 | } |
| 240 | 201 | |
| @@ -247,27 +208,15 @@ | ||
| 247 | 208 | // first make sure our endpoint starts with a slash |
| 248 | 209 | if ( substr( $this->endpoint, 0, 1 ) != '/' ) |
| 249 | 210 | $this->endpoint = '/' . $this->endpoint; |
| 250 | 211 | |
| 251 | - $this->endpoint = apply_filters( 'wpgetapi_endpoint', $this->endpoint, $this ); | |
| 252 | - | |
| 253 | 212 | $url = untrailingslashit( $this->base_url ) . $this->endpoint; |
| 254 | 213 | |
| 255 | - // if we have a URL pagination event from the import plugin | |
| 256 | - // we need to modify the URL here | |
| 257 | - if( isset( $this->args['paginate_url'] ) ) | |
| 258 | - $url = $this->args['paginate_url']; | |
| 259 | - | |
| 260 | - // filter our params - added for use in Oauth 2.0 plugin | |
| 261 | - $params = apply_filters( 'wpgetapi_query_parameters', $this->query_parameters, $this ); | |
| 262 | - | |
| 263 | 214 | // add empty array - was getting errors if it was just null or false |
| 264 | - $params = empty( $params ) ? array(''=>'') : $params; | |
| 215 | + $params = empty( $this->query_parameters ) ? array(''=>'') : $this->query_parameters; | |
| 265 | 216 | |
| 266 | - $result = add_query_arg( $params, $url ); | |
| 217 | + return add_query_arg( $params, $url ); | |
| 267 | 218 | |
| 268 | - return $result; | |
| 269 | - | |
| 270 | 219 | } |
| 271 | 220 | |
| 272 | 221 | |
| 273 | 222 | /** |
| @@ -281,54 +230,27 @@ | ||
| 281 | 230 | ), $this ); |
| 282 | 231 | |
| 283 | 232 | |
| 284 | 233 | // if doing POST request, include body paramters |
| 285 | - if( $this->method == 'POST' || $this->method == 'PUT' || $this->method == 'DELETE' || $this->method == 'PATCH' ) { | |
| 286 | - | |
| 287 | - // tokens are sent through here | |
| 234 | + if( $this->method == 'POST' ) { | |
| 235 | + | |
| 288 | 236 | $this->body_parameters = apply_filters( 'wpgetapi_body_parameters', $this->body_parameters, $this ); |
| 289 | 237 | |
| 290 | - // do we json_encode the entire body | |
| 291 | - if( $this->body_json_encode == true ) { | |
| 238 | + // do we json_encode the entire body as a string | |
| 239 | + if( $this->body_json_encode == true ) | |
| 292 | 240 | $this->body_parameters = json_encode( $this->body_parameters ); |
| 293 | - } | |
| 294 | 241 | |
| 295 | - // do we urlencode the entire body | |
| 296 | - if( $this->body_parameters && $this->body_url_encode == true ) { | |
| 297 | - | |
| 298 | - // checking if the parameters have a json string (raw) | |
| 299 | - if ( | |
| 300 | - ( ! is_array( $this->body_parameters ) ) && | |
| 301 | - ( substr( $this->body_parameters, 0, 1 ) === '{' || substr( $this->body_parameters, 0, 1 ) === '[' ) | |
| 302 | - ) { | |
| 303 | - $this->body_parameters = json_decode( $this->body_parameters, true ); | |
| 242 | + | |
| 243 | + // do we urlencode the entire body as a string | |
| 244 | + if( $this->body_url_encode == true ) { | |
| 245 | + $data_raw = ''; | |
| 246 | + foreach ($this->body_parameters as $key => $value){ | |
| 247 | + $data_raw = $data_raw . $key . "=" . urlencode($value) . "&"; | |
| 304 | 248 | } |
| 249 | + $this->body_parameters = $data_raw; | |
| 305 | 250 | |
| 306 | - $this->body_parameters = http_build_query( $this->body_parameters, '', '&' ); | |
| 307 | - | |
| 308 | 251 | } |
| 309 | 252 | |
| 310 | - // do we xml the entire body | |
| 311 | - if( $this->body_parameters && $this->body_xml_format == true ) { | |
| 312 | - | |
| 313 | - $xml = new SimpleXmlElement( '<' . $this->xml_root_node . '/>' ); | |
| 314 | - | |
| 315 | - foreach( $this->body_parameters as $key => $value) { | |
| 316 | - $xml->addChild( $key, $value ); | |
| 317 | - } | |
| 318 | - | |
| 319 | - $this->body_parameters = $xml->asXML(); | |
| 320 | - | |
| 321 | - } | |
| 322 | - | |
| 323 | - // do we base64 encode the entire body | |
| 324 | - if( $this->body_parameters && $this->body_base64_encode == true ) { | |
| 325 | - | |
| 326 | - $this->body_parameters = is_array( $this->body_parameters ) ? json_encode( $this->body_parameters ) : $this->body_parameters; | |
| 327 | - $this->body_parameters = base64_encode( $this->body_parameters ); | |
| 328 | - | |
| 329 | - } | |
| 330 | - | |
| 331 | 253 | // add our body parameters |
| 332 | 254 | if( $this->body_parameters && ! empty( $this->body_parameters ) ) |
| 333 | 255 | $headers['body'] = $this->body_parameters; |
| 334 | 256 | |
| @@ -333,14 +255,11 @@ | ||
| 333 | 255 | $headers['body'] = $this->body_parameters; |
| 334 | 256 | |
| 335 | 257 | } |
| 336 | 258 | |
| 337 | - // get our body paramters as they are formatted | |
| 338 | - $this->body_parameters = apply_filters( 'wpgetapi_final_body_parameters', $this->body_parameters, $this ); | |
| 339 | - | |
| 340 | 259 | // add headers to our final request args |
| 341 | 260 | $this->final_request_args = wp_parse_args( $headers, $this->final_request_args ); |
| 342 | - | |
| 261 | + | |
| 343 | 262 | // build the args taht are sent to the request |
| 344 | 263 | $default_args = apply_filters( 'wpgetapi_default_request_args_parameters', array( |
| 345 | 264 | 'timeout' => $this->timeout, |
| 346 | 265 | 'sslverify' => $this->sslverify, |
| @@ -353,10 +272,8 @@ | ||
| 353 | 272 | |
| 354 | 273 | } |
| 355 | 274 | |
| 356 | 275 | |
| 357 | - | |
| 358 | - | |
| 359 | 276 | /** |
| 360 | 277 | * Do a GET request |
| 361 | 278 | */ |
| 362 | 279 | public function GET_request() { |
| @@ -362,163 +279,42 @@ | ||
| 362 | 279 | public function GET_request() { |
| 363 | 280 | $response = ''; |
| 364 | 281 | // so we can so something before the remote_get (caching) |
| 365 | 282 | $response = apply_filters( 'wpgetapi_before_get_request', $response, $this ); |
| 366 | - | |
| 367 | 283 | if( empty( $response ) ) |
| 368 | 284 | $response = wp_remote_get( $this->final_url, $this->final_request_args ); |
| 285 | + | |
| 369 | 286 | return $response; |
| 370 | 287 | } |
| 371 | 288 | |
| 289 | + | |
| 372 | 290 | /** |
| 373 | 291 | * Do a POST request |
| 374 | 292 | */ |
| 375 | 293 | public function POST_request() { |
| 376 | - $this->final_request_args['method'] = 'POST'; | |
| 377 | 294 | $response = wp_remote_post( $this->final_url, $this->final_request_args ); |
| 378 | 295 | return $response; |
| 379 | 296 | } |
| 380 | 297 | |
| 381 | - /** | |
| 382 | - * Do a PUT request | |
| 383 | - */ | |
| 384 | - public function PUT_request() { | |
| 385 | - $this->final_request_args['method'] = 'PUT'; | |
| 386 | - $response = wp_remote_request( $this->final_url, $this->final_request_args ); | |
| 387 | - return $response; | |
| 388 | - } | |
| 389 | 298 | |
| 390 | 299 | /** |
| 391 | - * Do a PATCH request | |
| 392 | - */ | |
| 393 | - public function PATCH_request() { | |
| 394 | - $this->final_request_args['method'] = 'PATCH'; | |
| 395 | - $response = wp_remote_request( $this->final_url, $this->final_request_args ); | |
| 396 | - return $response; | |
| 397 | - } | |
| 398 | - | |
| 399 | - /** | |
| 400 | - * Do a DELETE request | |
| 401 | - */ | |
| 402 | - public function DELETE_request() { | |
| 403 | - $this->final_request_args['method'] = 'DELETE'; | |
| 404 | - $response = wp_remote_request( $this->final_url, $this->final_request_args ); | |
| 405 | - return $response; | |
| 406 | - } | |
| 407 | - | |
| 408 | - | |
| 409 | - /** | |
| 410 | 300 | * return data |
| 411 | 301 | */ |
| 412 | 302 | public function return_data( $data ) { |
| 413 | - | |
| 414 | - $data = apply_filters( 'wpgetapi_json_response_body_before_decode', $data, $this->keys ); | |
| 415 | - | |
| 303 | + | |
| 416 | 304 | // converts all data to arrays, removing objects |
| 417 | - if( is_string( $data ) ) { | |
| 418 | - $decode = json_decode( $data, true ); | |
| 419 | - if( json_last_error() ) { | |
| 420 | - return esc_html( $data ); | |
| 421 | - } else { | |
| 422 | - $data = $decode; | |
| 423 | - } | |
| 424 | - } | |
| 305 | + $data = json_decode( $data, true ); | |
| 306 | + $data = apply_filters( 'wpgetapi_json_response_body', $data, $this->keys ); | |
| 425 | 307 | |
| 426 | - $data = apply_filters( 'wpgetapi_json_response_body', $data, $this->keys ); | |
| 427 | - | |
| 428 | 308 | if( $this->results_format == 'json_string' ) |
| 429 | 309 | return trim( json_encode( $data ),'"'); |
| 430 | - | |
| 310 | + | |
| 431 | 311 | if( $this->results_format == 'json_decoded' ) |
| 432 | 312 | return $data; |
| 433 | 313 | |
| 434 | 314 | } |
| 435 | 315 | |
| 436 | - /** | |
| 437 | - * Sort out the parameters if they exist | |
| 438 | - */ | |
| 439 | - public function do_parameters( $parameters ) { | |
| 440 | 316 | |
| 441 | - $new_array = array(); | |
| 442 | - $raw = ''; | |
| 443 | - $parameters = $this->decrypt( $parameters ); | |
| 444 | - | |
| 445 | - if( is_array( $parameters ) ) { | |
| 446 | - foreach ( $parameters as $key => $parameter ) { | |
| 447 | - | |
| 448 | - if( ! empty( $parameter['name'] ) && ! empty( $parameter['value'] ) ) { | |
| 449 | - | |
| 450 | - $parameter['value'] = stripslashes( $parameter['value'] ); | |
| 451 | - | |
| 452 | - // if we have wpgetapi_on, delete it so we don't send to api | |
| 453 | - if( $parameter['name'] == 'wpgetapi_on' ) { | |
| 454 | - unset( $parameters[ $key ] ); | |
| 455 | - continue; | |
| 456 | - } | |
| 457 | - | |
| 458 | - $new_array[ sanitize_text_field( $parameter['name'] ) ] = $parameter['value']; | |
| 459 | - | |
| 460 | - // if we are sending raw body | |
| 461 | - } else if( empty( $parameter['name'] ) && ! empty( $parameter['value'] ) ) { | |
| 462 | - | |
| 463 | - $raw = stripslashes( $parameter['value'] ); | |
| 464 | - | |
| 465 | - } | |
| 466 | - | |
| 467 | - } | |
| 468 | - } | |
| 469 | - | |
| 470 | - // look for array or json string and sort these out - for using such things in shortcode | |
| 471 | - if( ! empty( $new_array ) ) { | |
| 472 | - | |
| 473 | - foreach ( $new_array as $key => $value ) { | |
| 474 | - | |
| 475 | - // checking if the parameters have a json string | |
| 476 | - if ( strpos( $value, '{' ) !== false && strpos( $value, '}' ) !== false ) { | |
| 477 | - //if ( substr( $value, 0, 1 ) === '{' && substr( $value, -1 ) === '}' ) { | |
| 478 | - $new_array[ $key ] = json_decode( $value, true ); | |
| 479 | - } else | |
| 480 | - | |
| 481 | - // checking if the parameters have an array within the string | |
| 482 | - // if they do, create them as an actual array | |
| 483 | - if ( substr( $value, 0, 1 ) === '[' && substr( $value, -1 ) === ']' ) { | |
| 484 | - $value = trim( $value,"[]" ); | |
| 485 | - $new_array[ $key ] = array( $value ); | |
| 486 | - } | |
| 487 | - | |
| 488 | - // set value as integer | |
| 489 | - if ( strpos( $value, 'integer(' ) !== false && substr( $value, -1 ) === ')' ) { | |
| 490 | - preg_match("/\(([^\)]*)\)/", $value, $match ); | |
| 491 | - $result = $match[1]; | |
| 492 | - $new_array[ $key ] = absint( $result ); | |
| 493 | - } | |
| 494 | - | |
| 495 | - // set value as float | |
| 496 | - if ( strpos( $value, 'float(' ) !== false && substr( $value, -1 ) === ')' ) { | |
| 497 | - preg_match("/\(([^\)]*)\)/", $value, $match ); | |
| 498 | - $result = $match[1]; | |
| 499 | - $new_array[ $key ] = (float) $result; | |
| 500 | - | |
| 501 | - } | |
| 502 | - | |
| 503 | - // set value as boolean | |
| 504 | - if ( strpos( $value, 'boolean(' ) !== false && substr( $value, -1 ) === ')' ) { | |
| 505 | - preg_match("/\(([^\)]*)\)/", $value, $match ); | |
| 506 | - $result = $match[1]; | |
| 507 | - $result = filter_var( $result, FILTER_VALIDATE_BOOLEAN ); | |
| 508 | - $new_array[ $key ] = $result; | |
| 509 | - | |
| 510 | - } | |
| 511 | - | |
| 512 | - } | |
| 513 | - | |
| 514 | - } | |
| 515 | - | |
| 516 | - return $raw ? $raw : $new_array; | |
| 517 | - | |
| 518 | - } | |
| 519 | - | |
| 520 | - | |
| 521 | 317 | /** |
| 522 | 318 | * decrypt our parameters from the DB |
| 523 | 319 | */ |
| 524 | 320 | public function decrypt( $array_or_string ) { |
| @@ -544,86 +340,20 @@ | ||
| 544 | 340 | |
| 545 | 341 | /** |
| 546 | 342 | * debug |
| 547 | 343 | */ |
| 548 | - public function maybe_add_debug_info( $data, $wpgetapi ) { | |
| 344 | + public function maybe_add_debug_info( $data, $this_data ) { | |
| 549 | 345 | |
| 550 | - if( | |
| 551 | - ( isset( $this->args['debug'] ) && ( $this->args['debug'] === true || $this->args['debug'] === 'true' ) ) || | |
| 552 | - ( isset( $this->args['test_endpoint'] ) && ( $this->args['test_endpoint'] === true ) ) | |
| 553 | - ) { | |
| 346 | + if( isset( $this->args['debug'] ) && ( $this->args['debug'] === true || $this->args['debug'] === 'true' ) ) { | |
| 554 | 347 | |
| 555 | - $this->debug = true; | |
| 556 | - | |
| 557 | - // admin test endpoint button | |
| 558 | - $testing = isset( $this->args['test_endpoint'] ) && ( $this->args['test_endpoint'] === true ) ? true : false; | |
| 559 | - | |
| 560 | - // get api status from response code | |
| 561 | - $status = array( | |
| 562 | - 'title' => 'Error in API response.', | |
| 563 | - 'desc' => 'Check all details within your endpoint. Something is misconfigured.', | |
| 564 | - 'type' => '<span class="dashicons dashicons-dismiss"></span>' | |
| 565 | - ); | |
| 566 | - | |
| 567 | - if( $this->response_code == 200 ) { | |
| 568 | - $status = array( | |
| 569 | - 'title' => 'Success!', | |
| 570 | - 'desc' => 'Your API is returning a success message and is returning the data as shown in the Data Output section below. You can modify this by changing the Results Format option or see <a href="https://wpgetapi.com/docs/format-api-data-as-html/">here</a> for info on formatting this data.', | |
| 571 | - 'type' => '<span class="dashicons dashicons-yes-alt"></span>' | |
| 572 | - ); | |
| 573 | - } | |
| 574 | - if( $this->response_code == 400 || $this->response_code == 404 ) { | |
| 575 | - $status = array( | |
| 576 | - 'title' => 'Bad Request', | |
| 577 | - 'desc' => 'This could indicate that the URL you are calling is incorrect or that some other data is missing or incorrect. Please check your Base URL and Endpoint are correct as well as the Request Method.', | |
| 578 | - 'type' => '<span class="dashicons dashicons-dismiss"></span>' | |
| 579 | - ); | |
| 580 | - } | |
| 581 | - if( $this->response_code == 401 ) { | |
| 582 | - $status = array( | |
| 583 | - 'title' => 'Unauthorised', | |
| 584 | - 'desc' => 'You are successfully connecting to your API. But your API key, login or API credentials are incorrect. See <a href="https://wpgetapi.com/docs/authentication-authorization/">here</a> for info on correctly authorizing your API requests.', | |
| 585 | - 'type' => '<span class="dashicons dashicons-warning"></span>' | |
| 586 | - ); | |
| 587 | - } | |
| 588 | - if( $this->response_code == 403 ) { | |
| 589 | - $status = array( | |
| 590 | - 'title' => 'Forbidden', | |
| 591 | - 'desc' => 'This could indicate that you may need to get your IP address whitelisted with your API provider or that you do not have access to this API.', | |
| 592 | - 'type' => '<span class="dashicons dashicons-dismiss"></span>' | |
| 593 | - ); | |
| 594 | - } | |
| 595 | - if( $this->response_code == 405 ) { | |
| 596 | - $status = array( | |
| 597 | - 'title' => 'Method Not Allowed', | |
| 598 | - 'desc' => 'Try changing the Request Method within the endpoint settings.', | |
| 599 | - 'type' => '<span class="dashicons dashicons-dismiss"></span>' | |
| 600 | - ); | |
| 601 | - } | |
| 602 | - if( $this->response_code == 415 ) { | |
| 603 | - $status = array( | |
| 604 | - 'title' => 'Unsupported Media Type', | |
| 605 | - 'desc' => 'Try adding "Content-type" to the Headers with the Value of "json/application" as shown <a href="https://wpgetapi.com/docs/troubleshooting/">here</a>.', | |
| 606 | - 'type' => '<span class="dashicons dashicons-dismiss"></span>' | |
| 607 | - ); | |
| 608 | - } | |
| 609 | - if( $this->response_code == 500 ) { | |
| 610 | - $status = array( | |
| 611 | - 'title' => 'Internal Server Error', | |
| 612 | - 'desc' => 'This indicates an issue with the server. Contact your API provider.', | |
| 613 | - 'type' => '<span class="dashicons dashicons-dismiss"></span>' | |
| 614 | - ); | |
| 615 | - } | |
| 616 | - | |
| 617 | - | |
| 618 | 348 | ob_start(); ?> |
| 619 | 349 | |
| 620 | 350 | <style> |
| 621 | 351 | |
| 622 | 352 | .wpgetapi-debug { |
| 623 | - background: #fff; | |
| 353 | + background: #f4f4f4; | |
| 624 | 354 | padding: 20px; |
| 625 | - box-shadow: 0 0 1px #aaa; | |
| 355 | + border: 1px solid #ccc; | |
| 626 | 356 | margin: 20px; |
| 627 | 357 | font-size: 15px; |
| 628 | 358 | } |
| 629 | 359 | .wpgetapi-debug |
| @@ -638,9 +368,9 @@ | ||
| 638 | 368 | } |
| 639 | 369 | .wpgetapi-debug p.small { |
| 640 | 370 | font-size: 85%; |
| 641 | 371 | color: #999; |
| 642 | - margin: 0 0 12px !important; | |
| 372 | + margin-bottom: 15px !important | |
| 643 | 373 | } |
| 644 | 374 | .wpgetapi-debug h5 { |
| 645 | 375 | font-weight: bold; |
| 646 | 376 | font-size: 18px; |
| @@ -650,153 +380,85 @@ | ||
| 650 | 380 | .wpgetapi-debug .debug-item { |
| 651 | 381 | margin: 10px 0; |
| 652 | 382 | background: #fff; |
| 653 | 383 | padding: 15px 20px; |
| 654 | - display: inline-block !important; | |
| 384 | + display: inline-block !important;; | |
| 655 | 385 | width: 100% !important; |
| 656 | - box-shadow: 0 3px 8px rgb(0 0 0 / 6%); | |
| 657 | - border: 1px solid #eee; | |
| 386 | + box-shadow: 0 0 5px rgba(0,0,0,0.1) | |
| 658 | 387 | } |
| 659 | 388 | .wpgetapi-debug .debug-item h6 { |
| 660 | 389 | font-weight: bold; |
| 661 | - font-size: 14px; | |
| 662 | - margin: 0; | |
| 390 | + font-size: 16px; | |
| 391 | + margin: 0 0 3px; | |
| 663 | 392 | text-transform: none !important; |
| 664 | 393 | } |
| 665 | 394 | .wpgetapi-debug .debug-item .debug-result, |
| 666 | 395 | .wpgetapi-debug .debug-item .debug-result pre { |
| 667 | 396 | font-family: monospace !important; |
| 668 | - font-size: 13px !important; | |
| 397 | + font-size: 15px !important; | |
| 669 | 398 | margin: 0 !important; |
| 670 | - padding: 8px 12px; | |
| 671 | - background: #f4f7f9; | |
| 399 | + padding: 10px 12px; | |
| 400 | + background: #f8f8f8; | |
| 672 | 401 | } |
| 673 | 402 | .wpgetapi-debug .debug-item .debug-result pre { |
| 674 | 403 | border: none; |
| 675 | 404 | padding: 5px |
| 676 | 405 | } |
| 677 | -.wpgetapi-debug.testing { | |
| 678 | - background: transparent; | |
| 679 | - padding: 0; | |
| 680 | - box-shadow: none; | |
| 681 | -} | |
| 682 | -.wpgetapi-debug.testing .debug-item { | |
| 683 | - margin: 5px 0; | |
| 684 | -} | |
| 685 | -.wpgetapi-debug.testing .debug-item.status { | |
| 686 | - border: none; | |
| 687 | - box-shadow: none; | |
| 688 | - margin-bottom: 15px; | |
| 689 | -} | |
| 690 | -.wpgetapi-debug .debug-item.status h5 { | |
| 691 | - font-size: 15px; | |
| 692 | -} | |
| 693 | -.wpgetapi-debug .status .dashicons { | |
| 694 | - margin: 0 5px 3px 0; | |
| 695 | -} | |
| 696 | -.wpgetapi-debug .status .dashicons-yes-alt { | |
| 697 | - color: #5e9929; | |
| 698 | -} | |
| 699 | -.wpgetapi-debug .status .dashicons-dismiss { | |
| 700 | - color: #cc4646; | |
| 701 | -} | |
| 702 | -.wpgetapi-debug .status .dashicons-warning { | |
| 703 | - color: #dfa12e; | |
| 704 | -} | |
| 705 | -.wpgetapi-debug .status .desc { | |
| 706 | - font-size: 14px; | |
| 707 | - font-weight: 400 !important; | |
| 708 | -} | |
| 406 | + | |
| 709 | 407 | </style> |
| 710 | 408 | |
| 711 | - <div class="wpgetapi-debug <?php echo $testing ? 'testing' : ''; ?>"> | |
| 409 | + <div class="wpgetapi-debug"> | |
| 712 | 410 | |
| 713 | - <?php if( $testing ) { ?> | |
| 411 | + <h5><strong>WPGetAPI, Debug Mode - Plugin Version <?php esc_html_e( WpGetApi()->version ); ?></strong></h5> | |
| 412 | + <p class="small">Below you will find debug info for the current API call. To turn this off, set debug to false in your shortcode or template tag.<br>Connecting to API's can be tricky - if you require help, please see the <a target="_blank" href="https://wpgetapi.com/docs/">Documentation</a> and if you can't find the answer then please use the contact form on our <a target="_blank" title="Connect WordPress with external API" href="https://wpgetapi.com/">website</a> to get assistance.</p> | |
| 714 | 413 | |
| 715 | - <div class="debug-item status"> | |
| 716 | - <div class=""> | |
| 717 | - <h5><?php _e( $status['type'] ); ?> <?php esc_html_e( $status['title'] ); ?></h5> | |
| 718 | - <span class="desc"><?php _e( $status['desc'] ); ?></span> | |
| 719 | - </div> | |
| 720 | - </div> | |
| 721 | - <div class="debug-item"> | |
| 722 | - <h6><?php esc_html_e( 'Full URL', 'wpgetapi' ); ?></h6> | |
| 723 | - <p class="small"><?php esc_html_e( 'The full URL that is being called.', 'wpgetapi' ); ?></p> | |
| 724 | - <div class="debug-result"><?php esc_html_e( $this->final_url ); ?></div> | |
| 725 | - </div> | |
| 726 | - | |
| 727 | - <div class="debug-item"> | |
| 728 | - <h6><?php esc_html_e( 'Data Output', 'wpgetapi' ); ?></h6> | |
| 729 | - <p class="small"><?php esc_html_e( 'The output that has been returned from the API. This is what the shortcode or template tag will display and can be formatted however you like.', 'wpgetapi' ); ?></p> | |
| 730 | - <div class="debug-result"><?php wpgetapi_pp( $data ); ?></div> | |
| 731 | - </div> | |
| 732 | - | |
| 733 | - <div class="debug-item"> | |
| 734 | - <h6><?php esc_html_e( 'Final Request Arguments', 'wpgetapi' ); ?></h6> | |
| 735 | - <p class="small"><?php esc_html_e( 'The final request arguments sent in the API request. Includes headers and body arguments.', 'wpgetapi' ); ?></p> | |
| 736 | - <div class="debug-result"><?php wpgetapi_pp( $this->final_request_args ); ?></div> | |
| 737 | - </div> | |
| 738 | - | |
| 739 | - <div class="debug-item"> | |
| 740 | - <h6><?php esc_html_e( 'Response', 'wpgetapi' ); ?></h6> | |
| 741 | - <p class="small"><?php esc_html_e( 'The full response from the API request.', 'wpgetapi' ); ?></p> | |
| 742 | - <div class="debug-result"><?php wpgetapi_pp( $this->response); ?></div> | |
| 743 | - </div> | |
| 744 | - | |
| 745 | - <?php } else { ?> | |
| 746 | - | |
| 747 | - <h5><strong><?php esc_html_e( 'WPGetAPI, Debug Mode - Plugin Version', 'wpgetapi' ); ?> <?php esc_html_e( WpGetApi()->version ); ?></strong></h5> | |
| 748 | - <p class="small"><?php esc_html_e( 'Below you will find debug info for the current API call. To turn this off, set debug to false in your shortcode or template tag.', 'wpgetapi' ); ?><br><?php esc_html_e( 'Connecting to API\'s can be tricky - if you require help, please see the', 'wpgetapi' ); ?> <a target="_blank" href="https://wpgetapi.com/docs/"><?php esc_html_e( 'Documentation', 'wpgetapi' ); ?></a>.</p> | |
| 749 | - | |
| 750 | 414 | <div class="debug-item"> |
| 751 | - <h6><?php esc_html_e( 'Full URL', 'wpgetapi' ); ?></h6> | |
| 752 | - <p class="small"><?php esc_html_e( 'The full URL that is being called.', 'wpgetapi' ); ?></p> | |
| 415 | + <h6>Full URL</h6> | |
| 416 | + <p class="small">The full URL that is being called.</p> | |
| 753 | 417 | <div class="debug-result"><?php esc_html_e( $this->final_url ); ?></div> |
| 754 | 418 | </div> |
| 755 | 419 | |
| 756 | 420 | <div class="debug-item"> |
| 757 | - <h6><?php esc_html_e( 'Data Output', 'wpgetapi' ); ?></h6> | |
| 758 | - <p class="small"><?php esc_html_e( 'The resulting output that has been returned from the API.', 'wpgetapi' ); ?></p> | |
| 421 | + <h6>Data Output</h6> | |
| 422 | + <p class="small">The resulting output that has been returned from the API.</p> | |
| 759 | 423 | <div class="debug-result"><?php wpgetapi_pp( $data ); ?></div> |
| 760 | 424 | </div> |
| 761 | 425 | |
| 762 | 426 | <div class="debug-item"> |
| 763 | - <h6><?php esc_html_e( 'Query String', 'wpgetapi' ); ?></h6> | |
| 764 | - <p class="small"><?php esc_html_e( 'The query string parameters (if any) that you have set within the endpoint settings.', 'wpgetapi' ); ?></p> | |
| 427 | + <h6>Arguments</h6> | |
| 428 | + <p class="small">The arguments set within your shortcode or template tag.</p> | |
| 429 | + <div class="debug-result"><?php wpgetapi_pp( $this->args ); ?></div> | |
| 430 | + </div> | |
| 431 | + | |
| 432 | + <div class="debug-item"> | |
| 433 | + <h6>Query String</h6> | |
| 434 | + <p class="small">The query string parameters (if any) that you have set within the endpoint settings.</p> | |
| 765 | 435 | <div class="debug-result"><?php wpgetapi_pp( $this->query_parameters ); ?></div> |
| 766 | 436 | </div> |
| 767 | 437 | |
| 768 | 438 | <div class="debug-item"> |
| 769 | - <h6><?php esc_html_e( 'Headers', 'wpgetapi' ); ?></h6> | |
| 770 | - <p class="small"><?php esc_html_e( 'The header parameters (if any) that you have set within the endpoint settings.', 'wpgetapi' ); ?></p> | |
| 439 | + <h6>Headers</h6> | |
| 440 | + <p class="small">The headers parameters (if any) that you have set within the endpoint settings.</p> | |
| 771 | 441 | <div class="debug-result"><?php wpgetapi_pp( $this->header_parameters ); ?></div> |
| 772 | 442 | </div> |
| 773 | 443 | |
| 774 | 444 | <div class="debug-item"> |
| 775 | - <h6><?php esc_html_e( 'Body', 'wpgetapi' ); ?></h6> | |
| 776 | - <p class="small"><?php esc_html_e( 'The body parameters (if any) that you have set within the endpoint settings.', 'wpgetapi' ); ?></p> | |
| 445 | + <h6>Body</h6> | |
| 446 | + <p class="small">The body parameters (if any) that you have set within the endpoint settings.</p> | |
| 777 | 447 | <div class="debug-result"><?php wpgetapi_pp( $this->body_parameters ); ?></div> |
| 778 | 448 | </div> |
| 779 | 449 | |
| 780 | 450 | <div class="debug-item"> |
| 781 | - <h6><?php esc_html_e( 'Final Request Arguments', 'wpgetapi' ); ?></h6> | |
| 782 | - <p class="small"><?php esc_html_e( 'The final request arguments sent in the API request. Includes headers and body arguments.', 'wpgetapi' ); ?></p> | |
| 451 | + <h6>Final Request Arguments</h6> | |
| 452 | + <p class="small">The final request arguments sent in the API request. Includes headers and body arguments.</p> | |
| 783 | 453 | <div class="debug-result"><?php wpgetapi_pp( $this->final_request_args ); ?></div> |
| 784 | 454 | </div> |
| 785 | 455 | |
| 786 | 456 | <div class="debug-item"> |
| 787 | - <h6><?php esc_html_e( 'Arguments', 'wpgetapi' ); ?></h6> | |
| 788 | - <p class="small"><?php esc_html_e( 'The arguments set within your shortcode or template tag.', 'wpgetapi' ); ?></p> | |
| 789 | - <div class="debug-result"><?php wpgetapi_pp( $this->args ); ?></div> | |
| 790 | - </div> | |
| 791 | - | |
| 792 | - <div class="debug-item"> | |
| 793 | - <h6><?php esc_html_e( 'Response', 'wpgetapi' ); ?></h6> | |
| 794 | - <p class="small"><?php esc_html_e( 'The full response from the API request.', 'wpgetapi' ); ?></p> | |
| 457 | + <h6>Response</h6> | |
| 458 | + <p class="small">The full response from the API request.</p> | |
| 795 | 459 | <div class="debug-result"><?php wpgetapi_pp( $this->response); ?></div> |
| 796 | 460 | </div> |
| 797 | - | |
| 798 | - <?php } ?> | |
| 799 | 461 | |
| 800 | 462 | </div> |
| 801 | 463 | |
| 802 | 464 | <?php |
