GeoDirectory /
geodirectory
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function geodir_get_ajax_url() |
| 21 | 21 | {
|
| 22 | - return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 22 | + return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | ///////////////////// |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | add_filter('query_vars', 'geodir_add_geodir_page_var');
|
| 88 | 88 | add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8
|
| 89 | 89 | if (get_option('permalink_structure') != '')
|
| 90 | - add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 90 | + add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 91 | 91 | |
| 92 | 92 | add_filter('parse_query', 'geodir_modified_query');
|
| 93 | 93 | |
@@ -154,14 +154,14 @@ discard block |
||
| 154 | 154 | /* POST AND LOOP ACTIONS */ |
| 155 | 155 | //////////////////////// |
| 156 | 156 | if (!is_admin()) {
|
| 157 | - add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere
|
|
| 158 | - add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | - /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | - add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | - add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | - add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | - add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | - add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 157 | + add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere
|
|
| 158 | + add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | + /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | + add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | + add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | + add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | + add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | + add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -222,12 +222,12 @@ discard block |
||
| 222 | 222 | */ |
| 223 | 223 | function geodir_unset_prev_theme_nav_location($newname) |
| 224 | 224 | {
|
| 225 | - $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 226 | - if ($geodir_theme_location) {
|
|
| 227 | - update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 228 | - } else {
|
|
| 229 | - update_option('geodir_theme_location_nav', '');
|
|
| 230 | - } |
|
| 225 | + $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 226 | + if ($geodir_theme_location) {
|
|
| 227 | + update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 228 | + } else {
|
|
| 229 | + update_option('geodir_theme_location_nav', '');
|
|
| 230 | + } |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /// add action for theme switch to blank previous theme navigation location setting |
@@ -248,32 +248,32 @@ discard block |
||
| 248 | 248 | */ |
| 249 | 249 | function geodir_add_post_filters() |
| 250 | 250 | {
|
| 251 | - /** |
|
| 252 | - * Contains all function for filtering listing. |
|
| 253 | - * |
|
| 254 | - * @since 1.0.0 |
|
| 255 | - * @package GeoDirectory |
|
| 256 | - */ |
|
| 257 | - include_once('geodirectory-functions/listing_filters.php');
|
|
| 251 | + /** |
|
| 252 | + * Contains all function for filtering listing. |
|
| 253 | + * |
|
| 254 | + * @since 1.0.0 |
|
| 255 | + * @package GeoDirectory |
|
| 256 | + */ |
|
| 257 | + include_once('geodirectory-functions/listing_filters.php');
|
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | |
| 261 | 261 | if (!function_exists('geodir_init_defaults')) {
|
| 262 | - /** |
|
| 263 | - * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 264 | - * |
|
| 265 | - * @since 1.0.0 |
|
| 266 | - * @package GeoDirectory |
|
| 267 | - */ |
|
| 268 | - function geodir_init_defaults() |
|
| 269 | - {
|
|
| 270 | - if (function_exists('geodir_register_defaults')) {
|
|
| 262 | + /** |
|
| 263 | + * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 264 | + * |
|
| 265 | + * @since 1.0.0 |
|
| 266 | + * @package GeoDirectory |
|
| 267 | + */ |
|
| 268 | + function geodir_init_defaults() |
|
| 269 | + {
|
|
| 270 | + if (function_exists('geodir_register_defaults')) {
|
|
| 271 | 271 | |
| 272 | - geodir_register_defaults(); |
|
| 272 | + geodir_register_defaults(); |
|
| 273 | 273 | |
| 274 | - } |
|
| 274 | + } |
|
| 275 | 275 | |
| 276 | - } |
|
| 276 | + } |
|
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | |
@@ -295,26 +295,26 @@ discard block |
||
| 295 | 295 | // CALLED ON 'sidebars_widgets' FILTER |
| 296 | 296 | |
| 297 | 297 | if (!function_exists('geodir_restrict_widget')) {
|
| 298 | - /** |
|
| 299 | - * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 300 | - * |
|
| 301 | - * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 302 | - * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 303 | - * @since 1.0.0 |
|
| 304 | - * @package GeoDirectory |
|
| 305 | - */ |
|
| 306 | - function geodir_restrict_widget() |
|
| 307 | - {
|
|
| 308 | - global $is_listing, $is_single_place; |
|
| 298 | + /** |
|
| 299 | + * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 300 | + * |
|
| 301 | + * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 302 | + * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 303 | + * @since 1.0.0 |
|
| 304 | + * @package GeoDirectory |
|
| 305 | + */ |
|
| 306 | + function geodir_restrict_widget() |
|
| 307 | + {
|
|
| 308 | + global $is_listing, $is_single_place; |
|
| 309 | 309 | |
| 310 | - // set is listing |
|
| 311 | - (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 310 | + // set is listing |
|
| 311 | + (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 312 | 312 | |
| 313 | - // set is single place |
|
| 314 | - (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 313 | + // set is single place |
|
| 314 | + (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 315 | 315 | |
| 316 | 316 | |
| 317 | - } |
|
| 317 | + } |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | |
@@ -335,31 +335,31 @@ discard block |
||
| 335 | 335 | */ |
| 336 | 336 | function geodir_detail_page_sidebar_content_sorting() |
| 337 | 337 | {
|
| 338 | - $arr_detail_page_sidebar_content = |
|
| 339 | - /** |
|
| 340 | - * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 341 | - * |
|
| 342 | - * This filter can be used to remove sections of the details page sidebar, |
|
| 343 | - * add new sections or rearrange the order of the sections. |
|
| 344 | - * |
|
| 345 | - * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 346 | - * @since 1.0.0 |
|
| 347 | - */ |
|
| 348 | - apply_filters('geodir_detail_page_sidebar_content',
|
|
| 349 | - array('geodir_social_sharing_buttons',
|
|
| 350 | - 'geodir_detail_page_google_analytics', |
|
| 351 | - 'geodir_edit_post_link', |
|
| 352 | - 'geodir_detail_page_review_rating', |
|
| 353 | - 'geodir_detail_page_more_info' |
|
| 354 | - ) // end of array |
|
| 355 | - ); // end of apply filter |
|
| 356 | - if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 357 | - foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 358 | - if (function_exists($content_function)) {
|
|
| 359 | - add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 360 | - } |
|
| 361 | - } |
|
| 362 | - } |
|
| 338 | + $arr_detail_page_sidebar_content = |
|
| 339 | + /** |
|
| 340 | + * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 341 | + * |
|
| 342 | + * This filter can be used to remove sections of the details page sidebar, |
|
| 343 | + * add new sections or rearrange the order of the sections. |
|
| 344 | + * |
|
| 345 | + * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 346 | + * @since 1.0.0 |
|
| 347 | + */ |
|
| 348 | + apply_filters('geodir_detail_page_sidebar_content',
|
|
| 349 | + array('geodir_social_sharing_buttons',
|
|
| 350 | + 'geodir_detail_page_google_analytics', |
|
| 351 | + 'geodir_edit_post_link', |
|
| 352 | + 'geodir_detail_page_review_rating', |
|
| 353 | + 'geodir_detail_page_more_info' |
|
| 354 | + ) // end of array |
|
| 355 | + ); // end of apply filter |
|
| 356 | + if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 357 | + foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 358 | + if (function_exists($content_function)) {
|
|
| 359 | + add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 360 | + } |
|
| 361 | + } |
|
| 362 | + } |
|
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);
|
@@ -374,14 +374,14 @@ discard block |
||
| 374 | 374 | */ |
| 375 | 375 | function geodir_add_to_favourite_link() |
| 376 | 376 | {
|
| 377 | - global $post, $preview; |
|
| 378 | - if (!$preview && geodir_is_page('detail')) {
|
|
| 379 | - ?> |
|
| 377 | + global $post, $preview; |
|
| 378 | + if (!$preview && geodir_is_page('detail')) {
|
|
| 379 | + ?> |
|
| 380 | 380 | <p class="edit_link"> |
| 381 | 381 | <?php geodir_favourite_html($post->post_author, $post->ID); ?> |
| 382 | 382 | </p> |
| 383 | 383 | <?php |
| 384 | - } |
|
| 384 | + } |
|
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | /** |
@@ -395,41 +395,41 @@ discard block |
||
| 395 | 395 | */ |
| 396 | 396 | function geodir_social_sharing_buttons() |
| 397 | 397 | {
|
| 398 | - global $preview; |
|
| 399 | - ob_start(); // Start buffering; |
|
| 400 | - /** |
|
| 401 | - * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 402 | - * |
|
| 403 | - * @since 1.0.0 |
|
| 404 | - */ |
|
| 405 | - do_action('geodir_before_social_sharing_buttons');
|
|
| 406 | - if (!$preview) {
|
|
| 407 | - ?> |
|
| 398 | + global $preview; |
|
| 399 | + ob_start(); // Start buffering; |
|
| 400 | + /** |
|
| 401 | + * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 402 | + * |
|
| 403 | + * @since 1.0.0 |
|
| 404 | + */ |
|
| 405 | + do_action('geodir_before_social_sharing_buttons');
|
|
| 406 | + if (!$preview) {
|
|
| 407 | + ?> |
|
| 408 | 408 | <div class="likethis"> |
| 409 | 409 | <?php geodir_twitter_tweet_button(); ?> |
| 410 | 410 | <?php geodir_fb_like_button(); ?> |
| 411 | 411 | <?php geodir_google_plus_button(); ?> |
| 412 | 412 | </div> |
| 413 | 413 | <?php |
| 414 | - }// end of if, if its a preview or not |
|
| 415 | - |
|
| 416 | - /** |
|
| 417 | - * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 418 | - * |
|
| 419 | - * @since 1.0.0 |
|
| 420 | - */ |
|
| 421 | - do_action('geodir_after_social_sharing_buttons');
|
|
| 422 | - $content_html = ob_get_clean(); |
|
| 423 | - if (trim($content_html) != '') |
|
| 424 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 425 | - if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 426 | - /** |
|
| 427 | - * Filter the geodir_social_sharing_buttons() function content. |
|
| 428 | - * |
|
| 429 | - * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 430 | - */ |
|
| 431 | - echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 432 | - } |
|
| 414 | + }// end of if, if its a preview or not |
|
| 415 | + |
|
| 416 | + /** |
|
| 417 | + * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 418 | + * |
|
| 419 | + * @since 1.0.0 |
|
| 420 | + */ |
|
| 421 | + do_action('geodir_after_social_sharing_buttons');
|
|
| 422 | + $content_html = ob_get_clean(); |
|
| 423 | + if (trim($content_html) != '') |
|
| 424 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 425 | + if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 426 | + /** |
|
| 427 | + * Filter the geodir_social_sharing_buttons() function content. |
|
| 428 | + * |
|
| 429 | + * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 430 | + */ |
|
| 431 | + echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 432 | + } |
|
| 433 | 433 | |
| 434 | 434 | |
| 435 | 435 | } |
@@ -447,46 +447,46 @@ discard block |
||
| 447 | 447 | */ |
| 448 | 448 | function geodir_edit_post_link() |
| 449 | 449 | {
|
| 450 | - global $post, $preview; |
|
| 451 | - ob_start(); // Start buffering; |
|
| 452 | - /** |
|
| 453 | - * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 454 | - * |
|
| 455 | - * @since 1.0.0 |
|
| 456 | - */ |
|
| 457 | - do_action('geodir_before_edit_post_link');
|
|
| 458 | - if (!$preview) {
|
|
| 459 | - $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 450 | + global $post, $preview; |
|
| 451 | + ob_start(); // Start buffering; |
|
| 452 | + /** |
|
| 453 | + * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 454 | + * |
|
| 455 | + * @since 1.0.0 |
|
| 456 | + */ |
|
| 457 | + do_action('geodir_before_edit_post_link');
|
|
| 458 | + if (!$preview) {
|
|
| 459 | + $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 460 | 460 | |
| 461 | - if ($is_current_user_owner) {
|
|
| 462 | - $post_id = $post->ID; |
|
| 461 | + if ($is_current_user_owner) {
|
|
| 462 | + $post_id = $post->ID; |
|
| 463 | 463 | |
| 464 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 465 | - $post_id = (int)$_REQUEST['pid']; |
|
| 466 | - } |
|
| 464 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 465 | + $post_id = (int)$_REQUEST['pid']; |
|
| 466 | + } |
|
| 467 | 467 | |
| 468 | - $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 469 | - $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 470 | - echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 471 | - } |
|
| 472 | - }// end of if, if its a preview or not |
|
| 473 | - /** |
|
| 474 | - * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 475 | - * |
|
| 476 | - * @since 1.0.0 |
|
| 477 | - */ |
|
| 478 | - do_action('geodir_after_edit_post_link');
|
|
| 479 | - $content_html = ob_get_clean(); |
|
| 480 | - if (trim($content_html) != '') |
|
| 481 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 482 | - if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 483 | - /** |
|
| 484 | - * Filter the geodir_edit_post_link() function content. |
|
| 485 | - * |
|
| 486 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 487 | - */ |
|
| 488 | - echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 489 | - } |
|
| 468 | + $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 469 | + $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 470 | + echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 471 | + } |
|
| 472 | + }// end of if, if its a preview or not |
|
| 473 | + /** |
|
| 474 | + * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 475 | + * |
|
| 476 | + * @since 1.0.0 |
|
| 477 | + */ |
|
| 478 | + do_action('geodir_after_edit_post_link');
|
|
| 479 | + $content_html = ob_get_clean(); |
|
| 480 | + if (trim($content_html) != '') |
|
| 481 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 482 | + if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 483 | + /** |
|
| 484 | + * Filter the geodir_edit_post_link() function content. |
|
| 485 | + * |
|
| 486 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 487 | + */ |
|
| 488 | + echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 489 | + } |
|
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | /** |
@@ -500,42 +500,42 @@ discard block |
||
| 500 | 500 | */ |
| 501 | 501 | function geodir_detail_page_google_analytics() |
| 502 | 502 | {
|
| 503 | - global $post,$preview; |
|
| 504 | - if($preview){return '';}
|
|
| 505 | - $package_info = array(); |
|
| 506 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 503 | + global $post,$preview; |
|
| 504 | + if($preview){return '';}
|
|
| 505 | + $package_info = array(); |
|
| 506 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 507 | 507 | |
| 508 | - $id = trim(get_option('geodir_ga_account_id'));
|
|
| 508 | + $id = trim(get_option('geodir_ga_account_id'));
|
|
| 509 | 509 | |
| 510 | - if (!$id) {
|
|
| 511 | - return; //if no Google Analytics ID then bail. |
|
| 512 | - } |
|
| 510 | + if (!$id) {
|
|
| 511 | + return; //if no Google Analytics ID then bail. |
|
| 512 | + } |
|
| 513 | 513 | |
| 514 | - ob_start(); // Start buffering; |
|
| 515 | - /** |
|
| 516 | - * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 517 | - * |
|
| 518 | - * @since 1.0.0 |
|
| 519 | - */ |
|
| 520 | - do_action('geodir_before_google_analytics');
|
|
| 514 | + ob_start(); // Start buffering; |
|
| 515 | + /** |
|
| 516 | + * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 517 | + * |
|
| 518 | + * @since 1.0.0 |
|
| 519 | + */ |
|
| 520 | + do_action('geodir_before_google_analytics');
|
|
| 521 | 521 | |
| 522 | - $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 523 | - /** |
|
| 524 | - * Filter the time interval to check & refresh new users results. |
|
| 525 | - * |
|
| 526 | - * @since 1.5.9 |
|
| 527 | - * |
|
| 528 | - * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 529 | - */ |
|
| 530 | - $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 531 | - $refresh_time = absint($refresh_time * 1000); |
|
| 522 | + $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 523 | + /** |
|
| 524 | + * Filter the time interval to check & refresh new users results. |
|
| 525 | + * |
|
| 526 | + * @since 1.5.9 |
|
| 527 | + * |
|
| 528 | + * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 529 | + */ |
|
| 530 | + $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 531 | + $refresh_time = absint($refresh_time * 1000); |
|
| 532 | 532 | |
| 533 | - $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 533 | + $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 534 | 534 | |
| 535 | - $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 536 | - if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 537 | - $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 538 | - ?> |
|
| 535 | + $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 536 | + if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 537 | + $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 538 | + ?> |
|
| 539 | 539 | <script type="text/javascript"> |
| 540 | 540 | var gd_gaTimeOut; |
| 541 | 541 | var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
@@ -787,15 +787,15 @@ discard block |
||
| 787 | 787 | var labels = results[1].rows.map(function(row) { return +row[0]; });
|
| 788 | 788 | |
| 789 | 789 | <?php |
| 790 | - // Here we list the shorthand days of the week so it can be used in translation. |
|
| 791 | - __("Mon",'geodirectory');
|
|
| 792 | - __("Tue",'geodirectory');
|
|
| 793 | - __("Wed",'geodirectory');
|
|
| 794 | - __("Thu",'geodirectory');
|
|
| 795 | - __("Fri",'geodirectory');
|
|
| 796 | - __("Sat",'geodirectory');
|
|
| 797 | - __("Sun",'geodirectory');
|
|
| 798 | - ?> |
|
| 790 | + // Here we list the shorthand days of the week so it can be used in translation. |
|
| 791 | + __("Mon",'geodirectory');
|
|
| 792 | + __("Tue",'geodirectory');
|
|
| 793 | + __("Wed",'geodirectory');
|
|
| 794 | + __("Thu",'geodirectory');
|
|
| 795 | + __("Fri",'geodirectory');
|
|
| 796 | + __("Sat",'geodirectory');
|
|
| 797 | + __("Sun",'geodirectory');
|
|
| 798 | + ?> |
|
| 799 | 799 | |
| 800 | 800 | labels = [ |
| 801 | 801 | "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
@@ -1044,24 +1044,24 @@ discard block |
||
| 1044 | 1044 | </span> |
| 1045 | 1045 | |
| 1046 | 1046 | <?php |
| 1047 | - } |
|
| 1048 | - /** |
|
| 1049 | - * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1050 | - * |
|
| 1051 | - * @since 1.0.0 |
|
| 1052 | - */ |
|
| 1053 | - do_action('geodir_after_google_analytics');
|
|
| 1054 | - $content_html = ob_get_clean(); |
|
| 1055 | - if (trim($content_html) != '') |
|
| 1056 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1057 | - if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1058 | - /** |
|
| 1059 | - * Filter the geodir_edit_post_link() function content. |
|
| 1060 | - * |
|
| 1061 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1062 | - */ |
|
| 1063 | - echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1064 | - } |
|
| 1047 | + } |
|
| 1048 | + /** |
|
| 1049 | + * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1050 | + * |
|
| 1051 | + * @since 1.0.0 |
|
| 1052 | + */ |
|
| 1053 | + do_action('geodir_after_google_analytics');
|
|
| 1054 | + $content_html = ob_get_clean(); |
|
| 1055 | + if (trim($content_html) != '') |
|
| 1056 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1057 | + if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1058 | + /** |
|
| 1059 | + * Filter the geodir_edit_post_link() function content. |
|
| 1060 | + * |
|
| 1061 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1062 | + */ |
|
| 1063 | + echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1064 | + } |
|
| 1065 | 1065 | } |
| 1066 | 1066 | |
| 1067 | 1067 | /** |
@@ -1077,90 +1077,90 @@ discard block |
||
| 1077 | 1077 | */ |
| 1078 | 1078 | function geodir_detail_page_review_rating() |
| 1079 | 1079 | {
|
| 1080 | - global $post, $preview, $post_images; |
|
| 1081 | - ob_start(); // Start buffering; |
|
| 1082 | - /** |
|
| 1083 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1084 | - * |
|
| 1085 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1086 | - * |
|
| 1087 | - * @since 1.0.0 |
|
| 1088 | - */ |
|
| 1089 | - do_action('geodir_before_detail_page_review_rating');
|
|
| 1090 | - |
|
| 1091 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1092 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1093 | - |
|
| 1094 | - if ($post_avgratings != 0 && !$preview) {
|
|
| 1095 | - /** |
|
| 1096 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1097 | - * |
|
| 1098 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1099 | - * |
|
| 1100 | - * @since 1.0.0 |
|
| 1101 | - * @param float $post_avgratings Average rating for the surrent post. |
|
| 1102 | - * @param int $post->ID Current post ID. |
|
| 1103 | - */ |
|
| 1104 | - do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1105 | - |
|
| 1106 | - $html = '<p style=" float:left;">'; |
|
| 1107 | - $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1108 | - $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1109 | - $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1080 | + global $post, $preview, $post_images; |
|
| 1081 | + ob_start(); // Start buffering; |
|
| 1082 | + /** |
|
| 1083 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1084 | + * |
|
| 1085 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1086 | + * |
|
| 1087 | + * @since 1.0.0 |
|
| 1088 | + */ |
|
| 1089 | + do_action('geodir_before_detail_page_review_rating');
|
|
| 1090 | + |
|
| 1091 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1092 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1093 | + |
|
| 1094 | + if ($post_avgratings != 0 && !$preview) {
|
|
| 1095 | + /** |
|
| 1096 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1097 | + * |
|
| 1098 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1099 | + * |
|
| 1100 | + * @since 1.0.0 |
|
| 1101 | + * @param float $post_avgratings Average rating for the surrent post. |
|
| 1102 | + * @param int $post->ID Current post ID. |
|
| 1103 | + */ |
|
| 1104 | + do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1105 | + |
|
| 1106 | + $html = '<p style=" float:left;">'; |
|
| 1107 | + $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1108 | + $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1109 | + $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1110 | 1110 | |
| 1111 | 1111 | $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
| 1112 | 1112 | |
| 1113 | 1113 | $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
| 1114 | 1114 | |
| 1115 | - $html .= '<span class="item">'; |
|
| 1116 | - $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1115 | + $html .= '<span class="item">'; |
|
| 1116 | + $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1117 | 1117 | |
| 1118 | - if ($post_images) {
|
|
| 1119 | - foreach ($post_images as $img) {
|
|
| 1120 | - $post_img = $img->src; |
|
| 1121 | - break; |
|
| 1122 | - } |
|
| 1123 | - } |
|
| 1124 | - |
|
| 1125 | - if (isset($post_img) && $post_img) {
|
|
| 1126 | - $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1127 | - } |
|
| 1128 | - |
|
| 1129 | - $html .= '</span>'; |
|
| 1130 | - |
|
| 1131 | - echo $html .= '</div>'; |
|
| 1132 | - /** |
|
| 1133 | - * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1134 | - * |
|
| 1135 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1136 | - * |
|
| 1137 | - * @since 1.0.0 |
|
| 1138 | - * @param float $post_avgratings Average rating for the surrent post. |
|
| 1139 | - * @param int $post->ID Current post ID. |
|
| 1140 | - */ |
|
| 1141 | - do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1142 | - } |
|
| 1143 | - /** |
|
| 1144 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1145 | - * |
|
| 1146 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1147 | - * |
|
| 1148 | - * @since 1.0.0 |
|
| 1149 | - */ |
|
| 1150 | - do_action('geodir_after_detail_page_review_rating');
|
|
| 1151 | - $content_html = ob_get_clean(); |
|
| 1152 | - if (trim($content_html) != '') {
|
|
| 1153 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1154 | - } |
|
| 1155 | - if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1156 | - /** |
|
| 1157 | - * Filter the geodir_detail_page_review_rating() function content. |
|
| 1158 | - * |
|
| 1159 | - * @since 1.0.0 |
|
| 1160 | - * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1161 | - */ |
|
| 1162 | - echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1163 | - } |
|
| 1118 | + if ($post_images) {
|
|
| 1119 | + foreach ($post_images as $img) {
|
|
| 1120 | + $post_img = $img->src; |
|
| 1121 | + break; |
|
| 1122 | + } |
|
| 1123 | + } |
|
| 1124 | + |
|
| 1125 | + if (isset($post_img) && $post_img) {
|
|
| 1126 | + $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1127 | + } |
|
| 1128 | + |
|
| 1129 | + $html .= '</span>'; |
|
| 1130 | + |
|
| 1131 | + echo $html .= '</div>'; |
|
| 1132 | + /** |
|
| 1133 | + * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1134 | + * |
|
| 1135 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1136 | + * |
|
| 1137 | + * @since 1.0.0 |
|
| 1138 | + * @param float $post_avgratings Average rating for the surrent post. |
|
| 1139 | + * @param int $post->ID Current post ID. |
|
| 1140 | + */ |
|
| 1141 | + do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1142 | + } |
|
| 1143 | + /** |
|
| 1144 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1145 | + * |
|
| 1146 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1147 | + * |
|
| 1148 | + * @since 1.0.0 |
|
| 1149 | + */ |
|
| 1150 | + do_action('geodir_after_detail_page_review_rating');
|
|
| 1151 | + $content_html = ob_get_clean(); |
|
| 1152 | + if (trim($content_html) != '') {
|
|
| 1153 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1154 | + } |
|
| 1155 | + if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1156 | + /** |
|
| 1157 | + * Filter the geodir_detail_page_review_rating() function content. |
|
| 1158 | + * |
|
| 1159 | + * @since 1.0.0 |
|
| 1160 | + * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1161 | + */ |
|
| 1162 | + echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1163 | + } |
|
| 1164 | 1164 | } |
| 1165 | 1165 | |
| 1166 | 1166 | /** |
@@ -1172,35 +1172,35 @@ discard block |
||
| 1172 | 1172 | */ |
| 1173 | 1173 | function geodir_detail_page_more_info() |
| 1174 | 1174 | {
|
| 1175 | - ob_start(); // Start buffering; |
|
| 1176 | - /** |
|
| 1177 | - * This is called before the info section html. |
|
| 1178 | - * |
|
| 1179 | - * @since 1.0.0 |
|
| 1180 | - */ |
|
| 1181 | - do_action('geodir_before_detail_page_more_info');
|
|
| 1182 | - if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1183 | - echo $geodir_post_detail_fields; |
|
| 1184 | - } |
|
| 1185 | - /** |
|
| 1186 | - * This is called after the info section html. |
|
| 1187 | - * |
|
| 1188 | - * @since 1.0.0 |
|
| 1189 | - */ |
|
| 1190 | - do_action('geodir_after_detail_page_more_info');
|
|
| 1191 | - |
|
| 1192 | - $content_html = ob_get_clean(); |
|
| 1193 | - if (trim($content_html) != '') |
|
| 1194 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1195 | - if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1196 | - /** |
|
| 1197 | - * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1198 | - * |
|
| 1199 | - * @since 1.0.0 |
|
| 1200 | - * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1201 | - */ |
|
| 1202 | - echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1203 | - } |
|
| 1175 | + ob_start(); // Start buffering; |
|
| 1176 | + /** |
|
| 1177 | + * This is called before the info section html. |
|
| 1178 | + * |
|
| 1179 | + * @since 1.0.0 |
|
| 1180 | + */ |
|
| 1181 | + do_action('geodir_before_detail_page_more_info');
|
|
| 1182 | + if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1183 | + echo $geodir_post_detail_fields; |
|
| 1184 | + } |
|
| 1185 | + /** |
|
| 1186 | + * This is called after the info section html. |
|
| 1187 | + * |
|
| 1188 | + * @since 1.0.0 |
|
| 1189 | + */ |
|
| 1190 | + do_action('geodir_after_detail_page_more_info');
|
|
| 1191 | + |
|
| 1192 | + $content_html = ob_get_clean(); |
|
| 1193 | + if (trim($content_html) != '') |
|
| 1194 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1195 | + if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1196 | + /** |
|
| 1197 | + * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1198 | + * |
|
| 1199 | + * @since 1.0.0 |
|
| 1200 | + * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1201 | + */ |
|
| 1202 | + echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1203 | + } |
|
| 1204 | 1204 | } |
| 1205 | 1205 | |
| 1206 | 1206 | |
@@ -1214,15 +1214,15 @@ discard block |
||
| 1214 | 1214 | */ |
| 1215 | 1215 | function geodir_localize_all_js_msg() |
| 1216 | 1216 | {// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
|
| 1217 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1218 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1219 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1220 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1221 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1222 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1223 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1224 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1225 | - } |
|
| 1217 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1218 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1219 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1220 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1221 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1222 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1223 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1224 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1225 | + } |
|
| 1226 | 1226 | |
| 1227 | 1227 | /** |
| 1228 | 1228 | * Filter the allowed image type extensions for post images. |
@@ -1232,60 +1232,60 @@ discard block |
||
| 1232 | 1232 | */ |
| 1233 | 1233 | $allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));
|
| 1234 | 1234 | |
| 1235 | - $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1236 | - $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1237 | - $default_marker_width = $default_marker_size['w']; |
|
| 1238 | - $default_marker_height = $default_marker_size['h']; |
|
| 1235 | + $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1236 | + $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1237 | + $default_marker_width = $default_marker_size['w']; |
|
| 1238 | + $default_marker_height = $default_marker_size['h']; |
|
| 1239 | 1239 | |
| 1240 | - $arr_alert_msg = array( |
|
| 1241 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1242 | - 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1243 | - 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1244 | - 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1245 | - 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1246 | - 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1247 | - //start not show alert msg |
|
| 1248 | - 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1249 | - 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1250 | - 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1251 | - 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1252 | - 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1253 | - // end not show alert msg |
|
| 1254 | - 'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),
|
|
| 1255 | - 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1256 | - //start not show alert msg |
|
| 1257 | - 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1258 | - 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1259 | - 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1260 | - 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1261 | - 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1262 | - 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1263 | - 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1264 | - 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1265 | - 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1266 | - 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1267 | - 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1268 | - 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1269 | - 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1270 | - 'geodir_default_marker_w' => $default_marker_width, |
|
| 1271 | - 'geodir_default_marker_h' => $default_marker_height, |
|
| 1272 | - 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1273 | - 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1274 | - 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1275 | - 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1276 | - 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1277 | - 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1278 | - 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1279 | - 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1280 | - /* on/off dragging for phone devices */ |
|
| 1281 | - 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1282 | - 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1283 | - 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1284 | - 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1285 | - 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1286 | - 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1287 | - 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1288 | - 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1240 | + $arr_alert_msg = array( |
|
| 1241 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1242 | + 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1243 | + 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1244 | + 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1245 | + 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1246 | + 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1247 | + //start not show alert msg |
|
| 1248 | + 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1249 | + 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1250 | + 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1251 | + 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1252 | + 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1253 | + // end not show alert msg |
|
| 1254 | + 'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),
|
|
| 1255 | + 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1256 | + //start not show alert msg |
|
| 1257 | + 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1258 | + 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1259 | + 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1260 | + 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1261 | + 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1262 | + 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1263 | + 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1264 | + 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1265 | + 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1266 | + 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1267 | + 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1268 | + 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1269 | + 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1270 | + 'geodir_default_marker_w' => $default_marker_width, |
|
| 1271 | + 'geodir_default_marker_h' => $default_marker_height, |
|
| 1272 | + 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1273 | + 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1274 | + 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1275 | + 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1276 | + 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1277 | + 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1278 | + 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1279 | + 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1280 | + /* on/off dragging for phone devices */ |
|
| 1281 | + 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1282 | + 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1283 | + 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1284 | + 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1285 | + 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1286 | + 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1287 | + 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1288 | + 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1289 | 1289 | 'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),
|
| 1290 | 1290 | 'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),
|
| 1291 | 1291 | 'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
@@ -1293,35 +1293,35 @@ discard block |
||
| 1293 | 1293 | 'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
| 1294 | 1294 | 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
| 1295 | 1295 | 'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
| 1296 | - 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1297 | - 'geodir_map_name' => geodir_map_name(), |
|
| 1298 | - 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1299 | - 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1300 | - 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1301 | - 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1302 | - |
|
| 1303 | - ); |
|
| 1304 | - |
|
| 1305 | - /** |
|
| 1306 | - * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1307 | - * |
|
| 1308 | - * With this filter you can add, remove or change translated JS strings. |
|
| 1309 | - * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1310 | - * |
|
| 1311 | - * @since 1.0.0 |
|
| 1312 | - */ |
|
| 1313 | - $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1314 | - |
|
| 1315 | - foreach ($arr_alert_msg as $key => $value) {
|
|
| 1316 | - if (!is_scalar($value)) |
|
| 1317 | - continue; |
|
| 1318 | - $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1319 | - } |
|
| 1296 | + 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1297 | + 'geodir_map_name' => geodir_map_name(), |
|
| 1298 | + 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1299 | + 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1300 | + 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1301 | + 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1302 | + |
|
| 1303 | + ); |
|
| 1320 | 1304 | |
| 1321 | - $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1322 | - echo '<script>'; |
|
| 1323 | - echo $script; |
|
| 1324 | - echo '</script>'; |
|
| 1305 | + /** |
|
| 1306 | + * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1307 | + * |
|
| 1308 | + * With this filter you can add, remove or change translated JS strings. |
|
| 1309 | + * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1310 | + * |
|
| 1311 | + * @since 1.0.0 |
|
| 1312 | + */ |
|
| 1313 | + $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1314 | + |
|
| 1315 | + foreach ($arr_alert_msg as $key => $value) {
|
|
| 1316 | + if (!is_scalar($value)) |
|
| 1317 | + continue; |
|
| 1318 | + $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1319 | + } |
|
| 1320 | + |
|
| 1321 | + $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1322 | + echo '<script>'; |
|
| 1323 | + echo $script; |
|
| 1324 | + echo '</script>'; |
|
| 1325 | 1325 | } |
| 1326 | 1326 | |
| 1327 | 1327 | add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);
|
@@ -1337,11 +1337,11 @@ discard block |
||
| 1337 | 1337 | */ |
| 1338 | 1338 | function geodir_admin_bar_site_menu($wp_admin_bar) |
| 1339 | 1339 | {
|
| 1340 | - if (get_option("geodir_installed")) {
|
|
| 1341 | - if (current_user_can('manage_options')) {
|
|
| 1342 | - $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1343 | - } |
|
| 1344 | - } |
|
| 1340 | + if (get_option("geodir_installed")) {
|
|
| 1341 | + if (current_user_can('manage_options')) {
|
|
| 1342 | + $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1343 | + } |
|
| 1344 | + } |
|
| 1345 | 1345 | } |
| 1346 | 1346 | |
| 1347 | 1347 | add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/
|
@@ -1367,25 +1367,25 @@ discard block |
||
| 1367 | 1367 | */ |
| 1368 | 1368 | function geodir_store_sidebars() |
| 1369 | 1369 | {
|
| 1370 | - global $geodir_sidebars; |
|
| 1371 | - global $sidebars_widgets; |
|
| 1372 | - |
|
| 1373 | - if (!is_array($sidebars_widgets)) |
|
| 1374 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1375 | - $geodir_old_sidebars = array(); |
|
| 1376 | - |
|
| 1377 | - if (is_array($geodir_sidebars)) {
|
|
| 1378 | - foreach ($geodir_sidebars as $val) {
|
|
| 1379 | - if (is_array($sidebars_widgets)) {
|
|
| 1380 | - if (array_key_exists($val, $sidebars_widgets)) |
|
| 1381 | - $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1382 | - else |
|
| 1383 | - $geodir_old_sidebars[$val] = array(); |
|
| 1384 | - } |
|
| 1385 | - } |
|
| 1386 | - } |
|
| 1387 | - update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1388 | - geodir_option_version_backup('geodir_sidebars');
|
|
| 1370 | + global $geodir_sidebars; |
|
| 1371 | + global $sidebars_widgets; |
|
| 1372 | + |
|
| 1373 | + if (!is_array($sidebars_widgets)) |
|
| 1374 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1375 | + $geodir_old_sidebars = array(); |
|
| 1376 | + |
|
| 1377 | + if (is_array($geodir_sidebars)) {
|
|
| 1378 | + foreach ($geodir_sidebars as $val) {
|
|
| 1379 | + if (is_array($sidebars_widgets)) {
|
|
| 1380 | + if (array_key_exists($val, $sidebars_widgets)) |
|
| 1381 | + $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1382 | + else |
|
| 1383 | + $geodir_old_sidebars[$val] = array(); |
|
| 1384 | + } |
|
| 1385 | + } |
|
| 1386 | + } |
|
| 1387 | + update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1388 | + geodir_option_version_backup('geodir_sidebars');
|
|
| 1389 | 1389 | |
| 1390 | 1390 | } |
| 1391 | 1391 | |
@@ -1399,28 +1399,28 @@ discard block |
||
| 1399 | 1399 | */ |
| 1400 | 1400 | function geodir_restore_sidebars() |
| 1401 | 1401 | {
|
| 1402 | - global $sidebars_widgets; |
|
| 1403 | - |
|
| 1404 | - if (!is_array($sidebars_widgets)) |
|
| 1405 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1406 | - |
|
| 1407 | - if (is_array($sidebars_widgets)) {
|
|
| 1408 | - $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1409 | - if (is_array($geodir_old_sidebars)) {
|
|
| 1410 | - foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1411 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1412 | - {
|
|
| 1413 | - $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1414 | - } |
|
| 1402 | + global $sidebars_widgets; |
|
| 1415 | 1403 | |
| 1404 | + if (!is_array($sidebars_widgets)) |
|
| 1405 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1416 | 1406 | |
| 1417 | - } |
|
| 1418 | - } |
|
| 1407 | + if (is_array($sidebars_widgets)) {
|
|
| 1408 | + $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1409 | + if (is_array($geodir_old_sidebars)) {
|
|
| 1410 | + foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1411 | + if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1412 | + {
|
|
| 1413 | + $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1414 | + } |
|
| 1419 | 1415 | |
| 1420 | - } |
|
| 1421 | 1416 | |
| 1422 | - update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1423 | - update_option('geodir_sidebars', '');
|
|
| 1417 | + } |
|
| 1418 | + } |
|
| 1419 | + |
|
| 1420 | + } |
|
| 1421 | + |
|
| 1422 | + update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1423 | + update_option('geodir_sidebars', '');
|
|
| 1424 | 1424 | } |
| 1425 | 1425 | |
| 1426 | 1426 | add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');
|
@@ -1433,9 +1433,9 @@ discard block |
||
| 1433 | 1433 | */ |
| 1434 | 1434 | function geodir_after_listing_post_gridview() |
| 1435 | 1435 | {
|
| 1436 | - global $gridview_columns; |
|
| 1436 | + global $gridview_columns; |
|
| 1437 | 1437 | |
| 1438 | - $gridview_columns = ''; |
|
| 1438 | + $gridview_columns = ''; |
|
| 1439 | 1439 | |
| 1440 | 1440 | } |
| 1441 | 1441 | |
@@ -1463,11 +1463,11 @@ discard block |
||
| 1463 | 1463 | */ |
| 1464 | 1464 | function so_handle_038($url, $original_url, $_context) |
| 1465 | 1465 | {
|
| 1466 | - if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1467 | - $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1468 | - } |
|
| 1466 | + if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1467 | + $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1468 | + } |
|
| 1469 | 1469 | |
| 1470 | - return $url; |
|
| 1470 | + return $url; |
|
| 1471 | 1471 | } |
| 1472 | 1472 | |
| 1473 | 1473 | |
@@ -1483,34 +1483,34 @@ discard block |
||
| 1483 | 1483 | function geodir_after_main_form_fields() {
|
| 1484 | 1484 | global $gd_session; |
| 1485 | 1485 | |
| 1486 | - if (get_option('geodir_accept_term_condition')) {
|
|
| 1487 | - global $post; |
|
| 1488 | - $term_condition = ''; |
|
| 1489 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 1490 | - $post = (object)$gd_session->get('listing');
|
|
| 1491 | - $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1492 | - } |
|
| 1493 | - |
|
| 1494 | - ?> |
|
| 1486 | + if (get_option('geodir_accept_term_condition')) {
|
|
| 1487 | + global $post; |
|
| 1488 | + $term_condition = ''; |
|
| 1489 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 1490 | + $post = (object)$gd_session->get('listing');
|
|
| 1491 | + $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1492 | + } |
|
| 1493 | + |
|
| 1494 | + ?> |
|
| 1495 | 1495 | <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix"> |
| 1496 | 1496 | <label> </label> |
| 1497 | 1497 | |
| 1498 | 1498 | <div class="geodir_taxonomy_field" style="float:left; width:70%;"> |
| 1499 | 1499 | <span style="display:block"> |
| 1500 | 1500 | <input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {
|
| 1501 | - echo 'checked="checked"'; |
|
| 1502 | - } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1501 | + echo 'checked="checked"'; |
|
| 1502 | + } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1503 | 1503 | class="geodir_textfield" value="1" |
| 1504 | 1504 | style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
| 1505 | 1505 | </span> |
| 1506 | 1506 | </div> |
| 1507 | 1507 | <span class="geodir_message_error"><?php if (isset($required_msg)) {
|
| 1508 | - _e($required_msg, 'geodirectory'); |
|
| 1509 | - } ?></span> |
|
| 1508 | + _e($required_msg, 'geodirectory'); |
|
| 1509 | + } ?></span> |
|
| 1510 | 1510 | </div> |
| 1511 | 1511 | <?php |
| 1512 | 1512 | |
| 1513 | - } |
|
| 1513 | + } |
|
| 1514 | 1514 | } |
| 1515 | 1515 | |
| 1516 | 1516 | |
@@ -1535,42 +1535,42 @@ discard block |
||
| 1535 | 1535 | */ |
| 1536 | 1536 | function geodir_detail_page_tab_is_display($is_display, $tab) |
| 1537 | 1537 | {
|
| 1538 | - global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1538 | + global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1539 | 1539 | |
| 1540 | - if ($tab == 'post_profile') {
|
|
| 1541 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1542 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1540 | + if ($tab == 'post_profile') {
|
|
| 1541 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1542 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1543 | 1543 | |
| 1544 | - if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1545 | - $is_display = false; |
|
| 1546 | - } |
|
| 1547 | - } |
|
| 1544 | + if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1545 | + $is_display = false; |
|
| 1546 | + } |
|
| 1547 | + } |
|
| 1548 | 1548 | |
| 1549 | - if ($tab == 'post_info') |
|
| 1550 | - $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1549 | + if ($tab == 'post_info') |
|
| 1550 | + $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1551 | 1551 | |
| 1552 | - if ($tab == 'post_images') |
|
| 1553 | - $is_display = (!empty($post_images)) ? true : false; |
|
| 1552 | + if ($tab == 'post_images') |
|
| 1553 | + $is_display = (!empty($post_images)) ? true : false; |
|
| 1554 | 1554 | |
| 1555 | - if ($tab == 'post_video') |
|
| 1556 | - $is_display = (!empty($video)) ? true : false; |
|
| 1555 | + if ($tab == 'post_video') |
|
| 1556 | + $is_display = (!empty($video)) ? true : false; |
|
| 1557 | 1557 | |
| 1558 | - if ($tab == 'special_offers') |
|
| 1559 | - $is_display = (!empty($special_offers)) ? true : false; |
|
| 1558 | + if ($tab == 'special_offers') |
|
| 1559 | + $is_display = (!empty($special_offers)) ? true : false; |
|
| 1560 | 1560 | |
| 1561 | - if ($tab == 'reviews') |
|
| 1562 | - $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1561 | + if ($tab == 'reviews') |
|
| 1562 | + $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1563 | 1563 | |
| 1564 | - if ($tab == 'related_listing') {
|
|
| 1565 | - $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1564 | + if ($tab == 'related_listing') {
|
|
| 1565 | + $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1566 | 1566 | |
| 1567 | - /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1568 | - $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1567 | + /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1568 | + $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1569 | 1569 | |
| 1570 | - $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1571 | - } |
|
| 1570 | + $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1571 | + } |
|
| 1572 | 1572 | |
| 1573 | - return $is_display; |
|
| 1573 | + return $is_display; |
|
| 1574 | 1574 | } |
| 1575 | 1575 | |
| 1576 | 1576 | |
@@ -1586,69 +1586,69 @@ discard block |
||
| 1586 | 1586 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 1587 | 1587 | */ |
| 1588 | 1588 | function geodir_changes_in_custom_fields_table() {
|
| 1589 | - global $wpdb, $plugin_prefix; |
|
| 1589 | + global $wpdb, $plugin_prefix; |
|
| 1590 | 1590 | |
| 1591 | 1591 | // Remove unused virtual page |
| 1592 | 1592 | $listings_page_id = (int)get_option('geodir_listing_page');
|
| 1593 | 1593 | if ($listings_page_id) {
|
| 1594 | 1594 | $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
| 1595 | - delete_option('geodir_listing_page');
|
|
| 1595 | + delete_option('geodir_listing_page');
|
|
| 1596 | 1596 | } |
| 1597 | 1597 | |
| 1598 | - if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1599 | - $wpdb->query( |
|
| 1600 | - $wpdb->prepare( |
|
| 1601 | - "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1602 | - array('1', '1', 'admin')
|
|
| 1603 | - ) |
|
| 1604 | - ); |
|
| 1598 | + if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1599 | + $wpdb->query( |
|
| 1600 | + $wpdb->prepare( |
|
| 1601 | + "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1602 | + array('1', '1', 'admin')
|
|
| 1603 | + ) |
|
| 1604 | + ); |
|
| 1605 | 1605 | |
| 1606 | 1606 | |
| 1607 | - /* --- terms meta value set --- */ |
|
| 1607 | + /* --- terms meta value set --- */ |
|
| 1608 | 1608 | |
| 1609 | - update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1609 | + update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1610 | 1610 | |
| 1611 | - $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1611 | + $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1612 | 1612 | |
| 1613 | - if (!empty($options_data)) {
|
|
| 1613 | + if (!empty($options_data)) {
|
|
| 1614 | 1614 | |
| 1615 | - foreach ($options_data as $optobj) {
|
|
| 1615 | + foreach ($options_data as $optobj) {
|
|
| 1616 | 1616 | |
| 1617 | - $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1617 | + $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1618 | 1618 | |
| 1619 | - $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1619 | + $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1620 | 1620 | |
| 1621 | - if (!empty($taxonomies_data)) {
|
|
| 1621 | + if (!empty($taxonomies_data)) {
|
|
| 1622 | 1622 | |
| 1623 | - foreach ($taxonomies_data as $taxobj) {
|
|
| 1623 | + foreach ($taxonomies_data as $taxobj) {
|
|
| 1624 | 1624 | |
| 1625 | - $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1626 | - $post_type = $taxObject->object_type[0]; |
|
| 1625 | + $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1626 | + $post_type = $taxObject->object_type[0]; |
|
| 1627 | 1627 | |
| 1628 | - $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1628 | + $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1629 | 1629 | |
| 1630 | - $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1630 | + $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1631 | 1631 | |
| 1632 | - if ($duplicate_data) {
|
|
| 1632 | + if ($duplicate_data) {
|
|
| 1633 | 1633 | |
| 1634 | - $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1634 | + $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1635 | 1635 | |
| 1636 | - } else {
|
|
| 1636 | + } else {
|
|
| 1637 | 1637 | |
| 1638 | - $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1638 | + $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1639 | 1639 | |
| 1640 | - } |
|
| 1640 | + } |
|
| 1641 | 1641 | |
| 1642 | - } |
|
| 1642 | + } |
|
| 1643 | 1643 | |
| 1644 | - } |
|
| 1644 | + } |
|
| 1645 | 1645 | |
| 1646 | - } |
|
| 1647 | - } |
|
| 1646 | + } |
|
| 1647 | + } |
|
| 1648 | 1648 | |
| 1649 | - update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1649 | + update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1650 | 1650 | |
| 1651 | - } |
|
| 1651 | + } |
|
| 1652 | 1652 | |
| 1653 | 1653 | } |
| 1654 | 1654 | |
@@ -1667,24 +1667,24 @@ discard block |
||
| 1667 | 1667 | function geodir_location_slug_check($slug) |
| 1668 | 1668 | {
|
| 1669 | 1669 | |
| 1670 | - global $wpdb, $table_prefix; |
|
| 1670 | + global $wpdb, $table_prefix; |
|
| 1671 | 1671 | |
| 1672 | - $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1672 | + $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1673 | 1673 | |
| 1674 | - if ($slug_exists) {
|
|
| 1674 | + if ($slug_exists) {
|
|
| 1675 | 1675 | |
| 1676 | - $suffix = 1; |
|
| 1677 | - do {
|
|
| 1678 | - $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1679 | - $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1680 | - $suffix++; |
|
| 1681 | - } while ($location_slug_check && $suffix < 100); |
|
| 1676 | + $suffix = 1; |
|
| 1677 | + do {
|
|
| 1678 | + $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1679 | + $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1680 | + $suffix++; |
|
| 1681 | + } while ($location_slug_check && $suffix < 100); |
|
| 1682 | 1682 | |
| 1683 | - $slug = $alt_location_name; |
|
| 1683 | + $slug = $alt_location_name; |
|
| 1684 | 1684 | |
| 1685 | - } |
|
| 1685 | + } |
|
| 1686 | 1686 | |
| 1687 | - return $slug; |
|
| 1687 | + return $slug; |
|
| 1688 | 1688 | |
| 1689 | 1689 | } |
| 1690 | 1690 | |
@@ -1709,42 +1709,42 @@ discard block |
||
| 1709 | 1709 | function geodir_update_term_slug($term_id, $tt_id, $taxonomy) |
| 1710 | 1710 | {
|
| 1711 | 1711 | |
| 1712 | - global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1712 | + global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1713 | 1713 | |
| 1714 | - $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1714 | + $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1715 | 1715 | |
| 1716 | - $slug = $tern_data->slug; |
|
| 1716 | + $slug = $tern_data->slug; |
|
| 1717 | 1717 | |
| 1718 | - /** |
|
| 1719 | - * Filter if a term slug exists. |
|
| 1720 | - * |
|
| 1721 | - * @since 1.0.0 |
|
| 1722 | - * @package GeoDirectory |
|
| 1723 | - * @param bool $bool Default: false. |
|
| 1724 | - * @param string $slug The term slug. |
|
| 1725 | - * @param int $term_id The term ID. |
|
| 1726 | - */ |
|
| 1727 | - $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1718 | + /** |
|
| 1719 | + * Filter if a term slug exists. |
|
| 1720 | + * |
|
| 1721 | + * @since 1.0.0 |
|
| 1722 | + * @package GeoDirectory |
|
| 1723 | + * @param bool $bool Default: false. |
|
| 1724 | + * @param string $slug The term slug. |
|
| 1725 | + * @param int $term_id The term ID. |
|
| 1726 | + */ |
|
| 1727 | + $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1728 | 1728 | |
| 1729 | - if ($slug_exists) {
|
|
| 1729 | + if ($slug_exists) {
|
|
| 1730 | 1730 | |
| 1731 | - $suffix = 1; |
|
| 1732 | - do {
|
|
| 1733 | - $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1731 | + $suffix = 1; |
|
| 1732 | + do {
|
|
| 1733 | + $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1734 | 1734 | |
| 1735 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1736 | - $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1735 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1736 | + $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1737 | 1737 | |
| 1738 | - $suffix++; |
|
| 1739 | - } while ($term_slug_check && $suffix < 100); |
|
| 1738 | + $suffix++; |
|
| 1739 | + } while ($term_slug_check && $suffix < 100); |
|
| 1740 | 1740 | |
| 1741 | - $slug = $new_slug; |
|
| 1741 | + $slug = $new_slug; |
|
| 1742 | 1742 | |
| 1743 | - //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1743 | + //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1744 | 1744 | |
| 1745 | - $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1745 | + $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1746 | 1746 | |
| 1747 | - } |
|
| 1747 | + } |
|
| 1748 | 1748 | |
| 1749 | 1749 | // Update tag in detail table. |
| 1750 | 1750 | $taxonomy_obj = get_taxonomy($taxonomy); |
@@ -1785,21 +1785,21 @@ discard block |
||
| 1785 | 1785 | function geodir_term_slug_is_exists($slug_exists, $slug, $term_id) |
| 1786 | 1786 | {
|
| 1787 | 1787 | |
| 1788 | - global $wpdb, $table_prefix; |
|
| 1788 | + global $wpdb, $table_prefix; |
|
| 1789 | 1789 | |
| 1790 | - $default_location = geodir_get_default_location(); |
|
| 1790 | + $default_location = geodir_get_default_location(); |
|
| 1791 | 1791 | |
| 1792 | - $country_slug = $default_location->country_slug; |
|
| 1793 | - $region_slug = $default_location->region_slug; |
|
| 1794 | - $city_slug = $default_location->city_slug; |
|
| 1792 | + $country_slug = $default_location->country_slug; |
|
| 1793 | + $region_slug = $default_location->region_slug; |
|
| 1794 | + $city_slug = $default_location->city_slug; |
|
| 1795 | 1795 | |
| 1796 | - if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1797 | - return $slug_exists = true; |
|
| 1796 | + if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1797 | + return $slug_exists = true; |
|
| 1798 | 1798 | |
| 1799 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1800 | - return $slug_exists = true; |
|
| 1799 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1800 | + return $slug_exists = true; |
|
| 1801 | 1801 | |
| 1802 | - return $slug_exists; |
|
| 1802 | + return $slug_exists; |
|
| 1803 | 1803 | } |
| 1804 | 1804 | |
| 1805 | 1805 | |
@@ -1818,75 +1818,75 @@ discard block |
||
| 1818 | 1818 | */ |
| 1819 | 1819 | function geodir_custom_page_title($title = '', $sep = '') |
| 1820 | 1820 | {
|
| 1821 | - global $wp; |
|
| 1822 | - if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
|
|
| 1823 | - return $title; |
|
| 1824 | - } |
|
| 1821 | + global $wp; |
|
| 1822 | + if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
|
|
| 1823 | + return $title; |
|
| 1824 | + } |
|
| 1825 | 1825 | |
| 1826 | - if ($sep == '') {
|
|
| 1827 | - /** |
|
| 1828 | - * Filter the page title separator. |
|
| 1829 | - * |
|
| 1830 | - * @since 1.0.0 |
|
| 1831 | - * @package GeoDirectory |
|
| 1832 | - * @param string $sep The separator, default: `|`. |
|
| 1833 | - */ |
|
| 1834 | - $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1835 | - } |
|
| 1826 | + if ($sep == '') {
|
|
| 1827 | + /** |
|
| 1828 | + * Filter the page title separator. |
|
| 1829 | + * |
|
| 1830 | + * @since 1.0.0 |
|
| 1831 | + * @package GeoDirectory |
|
| 1832 | + * @param string $sep The separator, default: `|`. |
|
| 1833 | + */ |
|
| 1834 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1835 | + } |
|
| 1836 | 1836 | |
| 1837 | 1837 | |
| 1838 | - $gd_page = ''; |
|
| 1839 | - if(geodir_is_page('home')){
|
|
| 1840 | - $gd_page = 'home'; |
|
| 1841 | - $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1842 | - } |
|
| 1843 | - elseif(geodir_is_page('detail')){
|
|
| 1844 | - $gd_page = 'detail'; |
|
| 1845 | - $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1846 | - } |
|
| 1847 | - elseif(geodir_is_page('pt')){
|
|
| 1848 | - $gd_page = 'pt'; |
|
| 1849 | - $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1850 | - } |
|
| 1851 | - elseif(geodir_is_page('listing')){
|
|
| 1852 | - $gd_page = 'listing'; |
|
| 1853 | - $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1854 | - } |
|
| 1855 | - elseif(geodir_is_page('location')){
|
|
| 1856 | - $gd_page = 'location'; |
|
| 1857 | - $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1858 | - } |
|
| 1859 | - elseif(geodir_is_page('search')){
|
|
| 1860 | - $gd_page = 'search'; |
|
| 1861 | - $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1862 | - } |
|
| 1863 | - elseif(geodir_is_page('add-listing')){
|
|
| 1864 | - $gd_page = 'add-listing'; |
|
| 1865 | - $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1866 | - } |
|
| 1867 | - elseif(geodir_is_page('author')){
|
|
| 1868 | - $gd_page = 'author'; |
|
| 1869 | - $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1870 | - } |
|
| 1871 | - elseif(geodir_is_page('login')){
|
|
| 1872 | - $gd_page = 'login'; |
|
| 1873 | - $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1874 | - } |
|
| 1875 | - elseif(geodir_is_page('listing-success')){
|
|
| 1876 | - $gd_page = 'listing-success'; |
|
| 1877 | - $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1878 | - } |
|
| 1838 | + $gd_page = ''; |
|
| 1839 | + if(geodir_is_page('home')){
|
|
| 1840 | + $gd_page = 'home'; |
|
| 1841 | + $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1842 | + } |
|
| 1843 | + elseif(geodir_is_page('detail')){
|
|
| 1844 | + $gd_page = 'detail'; |
|
| 1845 | + $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1846 | + } |
|
| 1847 | + elseif(geodir_is_page('pt')){
|
|
| 1848 | + $gd_page = 'pt'; |
|
| 1849 | + $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1850 | + } |
|
| 1851 | + elseif(geodir_is_page('listing')){
|
|
| 1852 | + $gd_page = 'listing'; |
|
| 1853 | + $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1854 | + } |
|
| 1855 | + elseif(geodir_is_page('location')){
|
|
| 1856 | + $gd_page = 'location'; |
|
| 1857 | + $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1858 | + } |
|
| 1859 | + elseif(geodir_is_page('search')){
|
|
| 1860 | + $gd_page = 'search'; |
|
| 1861 | + $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1862 | + } |
|
| 1863 | + elseif(geodir_is_page('add-listing')){
|
|
| 1864 | + $gd_page = 'add-listing'; |
|
| 1865 | + $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1866 | + } |
|
| 1867 | + elseif(geodir_is_page('author')){
|
|
| 1868 | + $gd_page = 'author'; |
|
| 1869 | + $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1870 | + } |
|
| 1871 | + elseif(geodir_is_page('login')){
|
|
| 1872 | + $gd_page = 'login'; |
|
| 1873 | + $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1874 | + } |
|
| 1875 | + elseif(geodir_is_page('listing-success')){
|
|
| 1876 | + $gd_page = 'listing-success'; |
|
| 1877 | + $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1878 | + } |
|
| 1879 | 1879 | |
| 1880 | 1880 | |
| 1881 | - /** |
|
| 1882 | - * Filter page meta title to replace variables. |
|
| 1883 | - * |
|
| 1884 | - * @since 1.5.4 |
|
| 1885 | - * @param string $title The page title including variables. |
|
| 1886 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1887 | - * @param string $sep The title separator symbol. |
|
| 1888 | - */ |
|
| 1889 | - return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1881 | + /** |
|
| 1882 | + * Filter page meta title to replace variables. |
|
| 1883 | + * |
|
| 1884 | + * @since 1.5.4 |
|
| 1885 | + * @param string $title The page title including variables. |
|
| 1886 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1887 | + * @param string $sep The title separator symbol. |
|
| 1888 | + */ |
|
| 1889 | + return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1890 | 1890 | |
| 1891 | 1891 | } |
| 1892 | 1892 | |
@@ -1902,36 +1902,36 @@ discard block |
||
| 1902 | 1902 | function geodir_set_post_attachment() |
| 1903 | 1903 | {
|
| 1904 | 1904 | |
| 1905 | - if (!get_option('geodir_set_post_attachments')) {
|
|
| 1905 | + if (!get_option('geodir_set_post_attachments')) {
|
|
| 1906 | 1906 | |
| 1907 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1908 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1907 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1908 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1909 | 1909 | |
| 1910 | - $all_postypes = geodir_get_posttypes(); |
|
| 1910 | + $all_postypes = geodir_get_posttypes(); |
|
| 1911 | 1911 | |
| 1912 | - foreach($all_postypes as $post_type){
|
|
| 1913 | - $args = array( |
|
| 1914 | - 'posts_per_page' => -1, |
|
| 1915 | - 'post_type' => $post_type, |
|
| 1916 | - 'post_status' => 'publish'); |
|
| 1912 | + foreach($all_postypes as $post_type){
|
|
| 1913 | + $args = array( |
|
| 1914 | + 'posts_per_page' => -1, |
|
| 1915 | + 'post_type' => $post_type, |
|
| 1916 | + 'post_status' => 'publish'); |
|
| 1917 | 1917 | |
| 1918 | - $posts_array = get_posts($args); |
|
| 1918 | + $posts_array = get_posts($args); |
|
| 1919 | 1919 | |
| 1920 | - if (!empty($posts_array)) {
|
|
| 1920 | + if (!empty($posts_array)) {
|
|
| 1921 | 1921 | |
| 1922 | - foreach ($posts_array as $post) {
|
|
| 1922 | + foreach ($posts_array as $post) {
|
|
| 1923 | 1923 | |
| 1924 | - geodir_set_wp_featured_image($post->ID); |
|
| 1924 | + geodir_set_wp_featured_image($post->ID); |
|
| 1925 | 1925 | |
| 1926 | - } |
|
| 1926 | + } |
|
| 1927 | 1927 | |
| 1928 | - } |
|
| 1929 | - } |
|
| 1928 | + } |
|
| 1929 | + } |
|
| 1930 | 1930 | |
| 1931 | 1931 | |
| 1932 | - update_option('geodir_set_post_attachments', '1');
|
|
| 1932 | + update_option('geodir_set_post_attachments', '1');
|
|
| 1933 | 1933 | |
| 1934 | - } |
|
| 1934 | + } |
|
| 1935 | 1935 | |
| 1936 | 1936 | } |
| 1937 | 1937 | |
@@ -1948,19 +1948,19 @@ discard block |
||
| 1948 | 1948 | function geodir_remove_url_seperator() |
| 1949 | 1949 | {
|
| 1950 | 1950 | |
| 1951 | - if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1951 | + if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1952 | 1952 | |
| 1953 | - if (get_option('geodir_listingurl_separator'))
|
|
| 1954 | - delete_option('geodir_listingurl_separator');
|
|
| 1953 | + if (get_option('geodir_listingurl_separator'))
|
|
| 1954 | + delete_option('geodir_listingurl_separator');
|
|
| 1955 | 1955 | |
| 1956 | - if (get_option('geodir_detailurl_separator'))
|
|
| 1957 | - delete_option('geodir_detailurl_separator');
|
|
| 1956 | + if (get_option('geodir_detailurl_separator'))
|
|
| 1957 | + delete_option('geodir_detailurl_separator');
|
|
| 1958 | 1958 | |
| 1959 | - flush_rewrite_rules(false); |
|
| 1959 | + flush_rewrite_rules(false); |
|
| 1960 | 1960 | |
| 1961 | - update_option('geodir_remove_url_seperator', '1');
|
|
| 1961 | + update_option('geodir_remove_url_seperator', '1');
|
|
| 1962 | 1962 | |
| 1963 | - } |
|
| 1963 | + } |
|
| 1964 | 1964 | |
| 1965 | 1965 | } |
| 1966 | 1966 | |
@@ -1976,19 +1976,19 @@ discard block |
||
| 1976 | 1976 | */ |
| 1977 | 1977 | function geodir_remove_url_seperator_form_permalink_settings($permalink_arr) |
| 1978 | 1978 | {
|
| 1979 | - foreach ($permalink_arr as $key => $value) {
|
|
| 1979 | + foreach ($permalink_arr as $key => $value) {
|
|
| 1980 | 1980 | |
| 1981 | - if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1982 | - unset($permalink_arr[$key]); |
|
| 1981 | + if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1982 | + unset($permalink_arr[$key]); |
|
| 1983 | 1983 | |
| 1984 | - } |
|
| 1984 | + } |
|
| 1985 | 1985 | |
| 1986 | - return $permalink_arr; |
|
| 1986 | + return $permalink_arr; |
|
| 1987 | 1987 | |
| 1988 | 1988 | } |
| 1989 | 1989 | |
| 1990 | 1990 | if (!is_admin()) {
|
| 1991 | - add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 1991 | + add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 1992 | 1992 | } |
| 1993 | 1993 | /** |
| 1994 | 1994 | * Set status from draft to publish. |
@@ -2001,16 +2001,16 @@ discard block |
||
| 2001 | 2001 | */ |
| 2002 | 2002 | function geodir_set_status_draft_to_publish_for_own_post($post) |
| 2003 | 2003 | {
|
| 2004 | - $user_id = get_current_user_id(); |
|
| 2004 | + $user_id = get_current_user_id(); |
|
| 2005 | 2005 | |
| 2006 | - if(!$user_id){return $post;}
|
|
| 2006 | + if(!$user_id){return $post;}
|
|
| 2007 | 2007 | |
| 2008 | - $gd_post_types = geodir_get_posttypes(); |
|
| 2008 | + $gd_post_types = geodir_get_posttypes(); |
|
| 2009 | 2009 | |
| 2010 | - if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2011 | - $post[0]->post_status = 'publish'; |
|
| 2012 | - } |
|
| 2013 | - return $post; |
|
| 2010 | + if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2011 | + $post[0]->post_status = 'publish'; |
|
| 2012 | + } |
|
| 2013 | + return $post; |
|
| 2014 | 2014 | } |
| 2015 | 2015 | |
| 2016 | 2016 | |
@@ -2102,33 +2102,33 @@ discard block |
||
| 2102 | 2102 | */ |
| 2103 | 2103 | function geodir_detail_page_tab_headings_change($tabs_arr) |
| 2104 | 2104 | {
|
| 2105 | - global $wpdb; |
|
| 2105 | + global $wpdb; |
|
| 2106 | 2106 | |
| 2107 | - $post_type = geodir_get_current_posttype(); |
|
| 2107 | + $post_type = geodir_get_current_posttype(); |
|
| 2108 | 2108 | |
| 2109 | - $all_postypes = geodir_get_posttypes(); |
|
| 2109 | + $all_postypes = geodir_get_posttypes(); |
|
| 2110 | 2110 | |
| 2111 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2111 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2112 | 2112 | |
| 2113 | - if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2113 | + if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2114 | 2114 | |
| 2115 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2115 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2116 | 2116 | |
| 2117 | - if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2118 | - $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2119 | - } |
|
| 2117 | + if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2118 | + $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2119 | + } |
|
| 2120 | 2120 | |
| 2121 | - if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2121 | + if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2122 | 2122 | |
| 2123 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2123 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2124 | 2124 | |
| 2125 | - if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2126 | - $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2127 | - } |
|
| 2125 | + if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2126 | + $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2127 | + } |
|
| 2128 | 2128 | |
| 2129 | - } |
|
| 2129 | + } |
|
| 2130 | 2130 | |
| 2131 | - return $tabs_arr; |
|
| 2131 | + return $tabs_arr; |
|
| 2132 | 2132 | |
| 2133 | 2133 | } |
| 2134 | 2134 | |
@@ -2141,10 +2141,10 @@ discard block |
||
| 2141 | 2141 | */ |
| 2142 | 2142 | function geodir_remove_template_redirect_actions() |
| 2143 | 2143 | {
|
| 2144 | - if (geodir_is_page('login')){
|
|
| 2145 | - remove_all_actions('template_redirect');
|
|
| 2146 | - remove_action('init', 'avia_modify_front', 10);
|
|
| 2147 | - } |
|
| 2144 | + if (geodir_is_page('login')){
|
|
| 2145 | + remove_all_actions('template_redirect');
|
|
| 2146 | + remove_action('init', 'avia_modify_front', 10);
|
|
| 2147 | + } |
|
| 2148 | 2148 | } |
| 2149 | 2149 | |
| 2150 | 2150 | |
@@ -2166,51 +2166,51 @@ discard block |
||
| 2166 | 2166 | function geodirectory_before_featured_image_delete($attachment_id) |
| 2167 | 2167 | {
|
| 2168 | 2168 | |
| 2169 | - global $wpdb, $plugin_prefix; |
|
| 2169 | + global $wpdb, $plugin_prefix; |
|
| 2170 | 2170 | |
| 2171 | - $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2171 | + $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2172 | 2172 | |
| 2173 | - $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2173 | + $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2174 | 2174 | |
| 2175 | - if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2175 | + if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2176 | 2176 | |
| 2177 | - $post_type = get_post_type($post_id); |
|
| 2177 | + $post_type = get_post_type($post_id); |
|
| 2178 | 2178 | |
| 2179 | - $all_postypes = geodir_get_posttypes(); |
|
| 2179 | + $all_postypes = geodir_get_posttypes(); |
|
| 2180 | 2180 | |
| 2181 | - if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2182 | - return false; |
|
| 2181 | + if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2182 | + return false; |
|
| 2183 | 2183 | |
| 2184 | - $uploads = wp_upload_dir(); |
|
| 2184 | + $uploads = wp_upload_dir(); |
|
| 2185 | 2185 | |
| 2186 | - $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2186 | + $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2187 | 2187 | |
| 2188 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2188 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2189 | 2189 | |
| 2190 | - $wpdb->query( |
|
| 2191 | - $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2192 | - array($post_id, $split_img_file_path) |
|
| 2193 | - ) |
|
| 2194 | - ); |
|
| 2190 | + $wpdb->query( |
|
| 2191 | + $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2192 | + array($post_id, $split_img_file_path) |
|
| 2193 | + ) |
|
| 2194 | + ); |
|
| 2195 | 2195 | |
| 2196 | - $attachment_data = $wpdb->get_row( |
|
| 2197 | - $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2198 | - array($post_id) |
|
| 2199 | - ) |
|
| 2200 | - ); |
|
| 2196 | + $attachment_data = $wpdb->get_row( |
|
| 2197 | + $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2198 | + array($post_id) |
|
| 2199 | + ) |
|
| 2200 | + ); |
|
| 2201 | 2201 | |
| 2202 | - if (!empty($attachment_data)) {
|
|
| 2203 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2204 | - } |
|
| 2202 | + if (!empty($attachment_data)) {
|
|
| 2203 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2204 | + } |
|
| 2205 | 2205 | |
| 2206 | 2206 | |
| 2207 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2207 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2208 | 2208 | |
| 2209 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2209 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2210 | 2210 | |
| 2211 | - geodir_set_wp_featured_image($post_id); |
|
| 2211 | + geodir_set_wp_featured_image($post_id); |
|
| 2212 | 2212 | |
| 2213 | - } |
|
| 2213 | + } |
|
| 2214 | 2214 | |
| 2215 | 2215 | } |
| 2216 | 2216 | |
@@ -2228,79 +2228,79 @@ discard block |
||
| 2228 | 2228 | function geodir_temp_set_post_attachment() |
| 2229 | 2229 | {
|
| 2230 | 2230 | |
| 2231 | - global $wpdb, $plugin_prefix; |
|
| 2231 | + global $wpdb, $plugin_prefix; |
|
| 2232 | 2232 | |
| 2233 | - $all_postypes = geodir_get_posttypes(); |
|
| 2233 | + $all_postypes = geodir_get_posttypes(); |
|
| 2234 | 2234 | |
| 2235 | - foreach ($all_postypes as $posttype) {
|
|
| 2235 | + foreach ($all_postypes as $posttype) {
|
|
| 2236 | 2236 | |
| 2237 | - $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2237 | + $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2238 | 2238 | |
| 2239 | - $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2239 | + $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2240 | 2240 | |
| 2241 | - if (!empty($get_post_data)) {
|
|
| 2241 | + if (!empty($get_post_data)) {
|
|
| 2242 | 2242 | |
| 2243 | - foreach ($get_post_data as $data) {
|
|
| 2243 | + foreach ($get_post_data as $data) {
|
|
| 2244 | 2244 | |
| 2245 | - $post_id = $data->post_id; |
|
| 2245 | + $post_id = $data->post_id; |
|
| 2246 | 2246 | |
| 2247 | - $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2247 | + $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2248 | 2248 | |
| 2249 | - if (!empty($attachment_data)) {
|
|
| 2249 | + if (!empty($attachment_data)) {
|
|
| 2250 | 2250 | |
| 2251 | - foreach ($attachment_data as $attach) {
|
|
| 2251 | + foreach ($attachment_data as $attach) {
|
|
| 2252 | 2252 | |
| 2253 | - $file_info = pathinfo($attach->file); |
|
| 2253 | + $file_info = pathinfo($attach->file); |
|
| 2254 | 2254 | |
| 2255 | - $sub_dir = ''; |
|
| 2256 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2257 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2255 | + $sub_dir = ''; |
|
| 2256 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2257 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2258 | 2258 | |
| 2259 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2260 | - $uploads_path = $uploads['basedir']; |
|
| 2259 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2260 | + $uploads_path = $uploads['basedir']; |
|
| 2261 | 2261 | |
| 2262 | - $file_name = $file_info['basename']; |
|
| 2262 | + $file_name = $file_info['basename']; |
|
| 2263 | 2263 | |
| 2264 | - $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2264 | + $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2265 | 2265 | |
| 2266 | - if (!file_exists($img_arr['path'])) {
|
|
| 2266 | + if (!file_exists($img_arr['path'])) {
|
|
| 2267 | 2267 | |
| 2268 | - $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2268 | + $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2269 | 2269 | |
| 2270 | - } |
|
| 2270 | + } |
|
| 2271 | 2271 | |
| 2272 | - } |
|
| 2272 | + } |
|
| 2273 | 2273 | |
| 2274 | - $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2274 | + $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2275 | 2275 | |
| 2276 | - if (!empty($attachment_data)) {
|
|
| 2276 | + if (!empty($attachment_data)) {
|
|
| 2277 | 2277 | |
| 2278 | - if ($attachment_data->ID) |
|
| 2279 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2278 | + if ($attachment_data->ID) |
|
| 2279 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2280 | 2280 | |
| 2281 | - } else {
|
|
| 2281 | + } else {
|
|
| 2282 | 2282 | |
| 2283 | - if (has_post_thumbnail($post_id)) {
|
|
| 2283 | + if (has_post_thumbnail($post_id)) {
|
|
| 2284 | 2284 | |
| 2285 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2285 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2286 | 2286 | |
| 2287 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2287 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2288 | 2288 | |
| 2289 | - } |
|
| 2289 | + } |
|
| 2290 | 2290 | |
| 2291 | - } |
|
| 2291 | + } |
|
| 2292 | 2292 | |
| 2293 | - $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2293 | + $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2294 | 2294 | |
| 2295 | - geodir_set_wp_featured_image($post_id); |
|
| 2295 | + geodir_set_wp_featured_image($post_id); |
|
| 2296 | 2296 | |
| 2297 | - } |
|
| 2297 | + } |
|
| 2298 | 2298 | |
| 2299 | - } |
|
| 2299 | + } |
|
| 2300 | 2300 | |
| 2301 | - } |
|
| 2301 | + } |
|
| 2302 | 2302 | |
| 2303 | - } |
|
| 2303 | + } |
|
| 2304 | 2304 | |
| 2305 | 2305 | } |
| 2306 | 2306 | |
@@ -2318,9 +2318,9 @@ discard block |
||
| 2318 | 2318 | function geodir_default_rating_star_icon() |
| 2319 | 2319 | {
|
| 2320 | 2320 | |
| 2321 | - if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2322 | - update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2323 | - } |
|
| 2321 | + if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2322 | + update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2323 | + } |
|
| 2324 | 2324 | |
| 2325 | 2325 | } |
| 2326 | 2326 | |
@@ -2338,27 +2338,27 @@ discard block |
||
| 2338 | 2338 | */ |
| 2339 | 2339 | function geodir_user_post_listing_count($user_id=null) |
| 2340 | 2340 | {
|
| 2341 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 2342 | - if(!$user_id){
|
|
| 2343 | - $user_id = $current_user->ID; |
|
| 2344 | - } |
|
| 2341 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 2342 | + if(!$user_id){
|
|
| 2343 | + $user_id = $current_user->ID; |
|
| 2344 | + } |
|
| 2345 | 2345 | |
| 2346 | - $user_id = $current_user->ID; |
|
| 2347 | - $all_postypes = geodir_get_posttypes(); |
|
| 2348 | - $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2346 | + $user_id = $current_user->ID; |
|
| 2347 | + $all_postypes = geodir_get_posttypes(); |
|
| 2348 | + $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2349 | 2349 | |
| 2350 | - $user_listing = array(); |
|
| 2351 | - if (is_array($all_posts) && !empty($all_posts)) {
|
|
| 2352 | - foreach ($all_posts as $ptype) {
|
|
| 2353 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2350 | + $user_listing = array(); |
|
| 2351 | + if (is_array($all_posts) && !empty($all_posts)) {
|
|
| 2352 | + foreach ($all_posts as $ptype) {
|
|
| 2353 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2354 | 2354 | |
| 2355 | - if ($total_posts > 0) {
|
|
| 2356 | - $user_listing[$ptype] = $total_posts; |
|
| 2357 | - } |
|
| 2358 | - } |
|
| 2359 | - } |
|
| 2355 | + if ($total_posts > 0) {
|
|
| 2356 | + $user_listing[$ptype] = $total_posts; |
|
| 2357 | + } |
|
| 2358 | + } |
|
| 2359 | + } |
|
| 2360 | 2360 | |
| 2361 | - return $user_listing; |
|
| 2361 | + return $user_listing; |
|
| 2362 | 2362 | } |
| 2363 | 2363 | |
| 2364 | 2364 | |
@@ -2378,192 +2378,192 @@ discard block |
||
| 2378 | 2378 | */ |
| 2379 | 2379 | function geodir_detail_page_custom_field_tab($tabs_arr) |
| 2380 | 2380 | {
|
| 2381 | - global $post; |
|
| 2382 | - |
|
| 2383 | - $post_type = geodir_get_current_posttype(); |
|
| 2384 | - $all_postypes = geodir_get_posttypes(); |
|
| 2385 | - |
|
| 2386 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2387 | - $package_info = array(); |
|
| 2388 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2389 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2390 | - $fields_location = 'owntab'; |
|
| 2391 | - |
|
| 2392 | - $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2393 | - |
|
| 2394 | - //remove video and special offers if it is already set to show |
|
| 2395 | - if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2396 | - $unset_video = true; |
|
| 2397 | - } |
|
| 2398 | - |
|
| 2399 | - if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2400 | - $unset_special_offers = true; |
|
| 2401 | - } |
|
| 2402 | - if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2403 | - foreach($custom_fields as $key => $custom_field){
|
|
| 2404 | - if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2405 | - unset($custom_fields[$key]); |
|
| 2406 | - } |
|
| 2407 | - if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2408 | - unset($custom_fields[$key]); |
|
| 2409 | - } |
|
| 2410 | - } |
|
| 2411 | - } |
|
| 2412 | - |
|
| 2413 | - |
|
| 2381 | + global $post; |
|
| 2414 | 2382 | |
| 2415 | - if (!empty($custom_fields)) {
|
|
| 2416 | - $parse_custom_fields = array(); |
|
| 2417 | - foreach ($custom_fields as $field) {
|
|
| 2418 | - $field = stripslashes_deep($field); // strip slashes |
|
| 2419 | - |
|
| 2420 | - $type = $field; |
|
| 2421 | - $field_name = $field['htmlvar_name']; |
|
| 2422 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2423 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2424 | - } |
|
| 2383 | + $post_type = geodir_get_current_posttype(); |
|
| 2384 | + $all_postypes = geodir_get_posttypes(); |
|
| 2425 | 2385 | |
| 2426 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
|
|
| 2427 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2428 | - continue; |
|
| 2429 | - } |
|
| 2430 | - |
|
| 2431 | - $parse_custom_fields[] = $field; |
|
| 2432 | - } |
|
| 2433 | - } |
|
| 2434 | - $custom_fields = $parse_custom_fields; |
|
| 2435 | - } |
|
| 2436 | - //print_r($custom_fields); |
|
| 2437 | - if (!empty($custom_fields)) {
|
|
| 2386 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2387 | + $package_info = array(); |
|
| 2388 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2389 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2390 | + $fields_location = 'owntab'; |
|
| 2438 | 2391 | |
| 2439 | - global $field_set_start; |
|
| 2392 | + $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2440 | 2393 | |
| 2441 | - $post = stripslashes_deep($post); // strip slashes |
|
| 2442 | - |
|
| 2443 | - $field_set_start = 0; |
|
| 2444 | - $fieldset_count = 0; |
|
| 2445 | - $fieldset = ''; |
|
| 2446 | - $total_fields = count($custom_fields); |
|
| 2447 | - $count_field = 0; |
|
| 2448 | - $fieldset_arr = array(); |
|
| 2449 | - $i = 0; |
|
| 2450 | - $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2451 | - |
|
| 2452 | - foreach ($custom_fields as $field) {
|
|
| 2453 | - $count_field++; |
|
| 2454 | - $field_name = $field['htmlvar_name']; |
|
| 2455 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2456 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2457 | - } |
|
| 2394 | + //remove video and special offers if it is already set to show |
|
| 2395 | + if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2396 | + $unset_video = true; |
|
| 2397 | + } |
|
| 2458 | 2398 | |
| 2459 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
|
|
| 2460 | - $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2461 | - $site_title = trim($field['site_title']); |
|
| 2462 | - $type = $field; |
|
| 2463 | - $variables_array = array(); |
|
| 2399 | + if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2400 | + $unset_special_offers = true; |
|
| 2401 | + } |
|
| 2402 | + if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2403 | + foreach($custom_fields as $key => $custom_field){
|
|
| 2404 | + if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2405 | + unset($custom_fields[$key]); |
|
| 2406 | + } |
|
| 2407 | + if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2408 | + unset($custom_fields[$key]); |
|
| 2409 | + } |
|
| 2410 | + } |
|
| 2411 | + } |
|
| 2464 | 2412 | |
| 2465 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2466 | - continue; |
|
| 2467 | - } |
|
| 2468 | 2413 | |
| 2469 | - if ($type['type'] != 'fieldset') {
|
|
| 2470 | - $i++; |
|
| 2471 | - $variables_array['post_id'] = $post->ID; |
|
| 2472 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2473 | - $variables_array['value'] = ''; |
|
| 2474 | - $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 2475 | - }else{
|
|
| 2476 | - $i = 0; |
|
| 2477 | - $fieldset_count++; |
|
| 2478 | - $field_set_start = 1; |
|
| 2479 | - $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2480 | - $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2481 | - } |
|
| 2482 | 2414 | |
| 2415 | + if (!empty($custom_fields)) {
|
|
| 2416 | + $parse_custom_fields = array(); |
|
| 2417 | + foreach ($custom_fields as $field) {
|
|
| 2418 | + $field = stripslashes_deep($field); // strip slashes |
|
| 2419 | + |
|
| 2420 | + $type = $field; |
|
| 2421 | + $field_name = $field['htmlvar_name']; |
|
| 2422 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2423 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2424 | + } |
|
| 2425 | + |
|
| 2426 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
|
|
| 2427 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2428 | + continue; |
|
| 2429 | + } |
|
| 2430 | + |
|
| 2431 | + $parse_custom_fields[] = $field; |
|
| 2432 | + } |
|
| 2433 | + } |
|
| 2434 | + $custom_fields = $parse_custom_fields; |
|
| 2435 | + } |
|
| 2436 | + //print_r($custom_fields); |
|
| 2437 | + if (!empty($custom_fields)) {
|
|
| 2483 | 2438 | |
| 2484 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2485 | - $type = stripslashes_deep($type); // strip slashes |
|
| 2486 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2487 | - $html = ''; |
|
| 2488 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2489 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 2490 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 2491 | - $filed_type = $type['type']; |
|
| 2492 | - |
|
| 2493 | - /** |
|
| 2494 | - * Filter the output for custom fields. |
|
| 2495 | - * |
|
| 2496 | - * Here we can remove or add new functions depending on the field type. |
|
| 2497 | - * |
|
| 2498 | - * @param string $html The html to be filtered (blank). |
|
| 2499 | - * @param string $fields_location The location the field is to be show. |
|
| 2500 | - * @param array $type The array of field values. |
|
| 2501 | - */ |
|
| 2502 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2503 | - |
|
| 2504 | - |
|
| 2505 | - /** |
|
| 2506 | - * Filter custom field output in tab. |
|
| 2507 | - * |
|
| 2508 | - * @since 1.5.6 |
|
| 2509 | - * |
|
| 2510 | - * @param string $html_var The HTML variable name for the field. |
|
| 2511 | - * @param string $html Custom field unfiltered HTML. |
|
| 2512 | - * @param array $variables_array Custom field variables array. |
|
| 2513 | - */ |
|
| 2514 | - $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2515 | - |
|
| 2516 | - $fieldset_html = ''; |
|
| 2517 | - if ($field_set_start == 1) {
|
|
| 2518 | - $add_html = false; |
|
| 2519 | - if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2520 | - if ($fieldset != '') {
|
|
| 2521 | - $add_html = true; |
|
| 2522 | - $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2523 | - $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2524 | - } |
|
| 2525 | - $fieldset_html = $fieldset; |
|
| 2526 | - $fieldset = ''; |
|
| 2527 | - } else {
|
|
| 2528 | - $fieldset .= $html; |
|
| 2529 | - if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2530 | - $add_html = true; |
|
| 2531 | - $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2532 | - $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2533 | - $fieldset_html = $fieldset; |
|
| 2534 | - } |
|
| 2535 | - } |
|
| 2439 | + global $field_set_start; |
|
| 2536 | 2440 | |
| 2537 | - if ($add_html) {
|
|
| 2538 | - $tabs_arr[$htmlvar_name] = array( |
|
| 2539 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2540 | - 'is_active_tab' => false, |
|
| 2541 | - /** |
|
| 2542 | - * Filter if a custom field should be displayed on the details page tab. |
|
| 2543 | - * |
|
| 2544 | - * @since 1.0.0 |
|
| 2545 | - * @param string $htmlvar_name The field HTML var name. |
|
| 2546 | - */ |
|
| 2547 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2548 | - 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2549 | - ); |
|
| 2550 | - } |
|
| 2551 | - } else {
|
|
| 2552 | - if ($html != '') {
|
|
| 2553 | - $tabs_arr[$field['htmlvar_name']] = array( |
|
| 2554 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2555 | - 'is_active_tab' => false, |
|
| 2556 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2557 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2558 | - 'tab_content' => $html |
|
| 2559 | - ); |
|
| 2560 | - } |
|
| 2561 | - } |
|
| 2562 | - } |
|
| 2563 | - } |
|
| 2564 | - } |
|
| 2565 | - } |
|
| 2566 | - return $tabs_arr; |
|
| 2441 | + $post = stripslashes_deep($post); // strip slashes |
|
| 2442 | + |
|
| 2443 | + $field_set_start = 0; |
|
| 2444 | + $fieldset_count = 0; |
|
| 2445 | + $fieldset = ''; |
|
| 2446 | + $total_fields = count($custom_fields); |
|
| 2447 | + $count_field = 0; |
|
| 2448 | + $fieldset_arr = array(); |
|
| 2449 | + $i = 0; |
|
| 2450 | + $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2451 | + |
|
| 2452 | + foreach ($custom_fields as $field) {
|
|
| 2453 | + $count_field++; |
|
| 2454 | + $field_name = $field['htmlvar_name']; |
|
| 2455 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2456 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2457 | + } |
|
| 2458 | + |
|
| 2459 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {
|
|
| 2460 | + $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2461 | + $site_title = trim($field['site_title']); |
|
| 2462 | + $type = $field; |
|
| 2463 | + $variables_array = array(); |
|
| 2464 | + |
|
| 2465 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2466 | + continue; |
|
| 2467 | + } |
|
| 2468 | + |
|
| 2469 | + if ($type['type'] != 'fieldset') {
|
|
| 2470 | + $i++; |
|
| 2471 | + $variables_array['post_id'] = $post->ID; |
|
| 2472 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2473 | + $variables_array['value'] = ''; |
|
| 2474 | + $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 2475 | + }else{
|
|
| 2476 | + $i = 0; |
|
| 2477 | + $fieldset_count++; |
|
| 2478 | + $field_set_start = 1; |
|
| 2479 | + $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2480 | + $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2481 | + } |
|
| 2482 | + |
|
| 2483 | + |
|
| 2484 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2485 | + $type = stripslashes_deep($type); // strip slashes |
|
| 2486 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2487 | + $html = ''; |
|
| 2488 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2489 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 2490 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 2491 | + $filed_type = $type['type']; |
|
| 2492 | + |
|
| 2493 | + /** |
|
| 2494 | + * Filter the output for custom fields. |
|
| 2495 | + * |
|
| 2496 | + * Here we can remove or add new functions depending on the field type. |
|
| 2497 | + * |
|
| 2498 | + * @param string $html The html to be filtered (blank). |
|
| 2499 | + * @param string $fields_location The location the field is to be show. |
|
| 2500 | + * @param array $type The array of field values. |
|
| 2501 | + */ |
|
| 2502 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2503 | + |
|
| 2504 | + |
|
| 2505 | + /** |
|
| 2506 | + * Filter custom field output in tab. |
|
| 2507 | + * |
|
| 2508 | + * @since 1.5.6 |
|
| 2509 | + * |
|
| 2510 | + * @param string $html_var The HTML variable name for the field. |
|
| 2511 | + * @param string $html Custom field unfiltered HTML. |
|
| 2512 | + * @param array $variables_array Custom field variables array. |
|
| 2513 | + */ |
|
| 2514 | + $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2515 | + |
|
| 2516 | + $fieldset_html = ''; |
|
| 2517 | + if ($field_set_start == 1) {
|
|
| 2518 | + $add_html = false; |
|
| 2519 | + if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2520 | + if ($fieldset != '') {
|
|
| 2521 | + $add_html = true; |
|
| 2522 | + $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2523 | + $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2524 | + } |
|
| 2525 | + $fieldset_html = $fieldset; |
|
| 2526 | + $fieldset = ''; |
|
| 2527 | + } else {
|
|
| 2528 | + $fieldset .= $html; |
|
| 2529 | + if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2530 | + $add_html = true; |
|
| 2531 | + $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2532 | + $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2533 | + $fieldset_html = $fieldset; |
|
| 2534 | + } |
|
| 2535 | + } |
|
| 2536 | + |
|
| 2537 | + if ($add_html) {
|
|
| 2538 | + $tabs_arr[$htmlvar_name] = array( |
|
| 2539 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2540 | + 'is_active_tab' => false, |
|
| 2541 | + /** |
|
| 2542 | + * Filter if a custom field should be displayed on the details page tab. |
|
| 2543 | + * |
|
| 2544 | + * @since 1.0.0 |
|
| 2545 | + * @param string $htmlvar_name The field HTML var name. |
|
| 2546 | + */ |
|
| 2547 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2548 | + 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2549 | + ); |
|
| 2550 | + } |
|
| 2551 | + } else {
|
|
| 2552 | + if ($html != '') {
|
|
| 2553 | + $tabs_arr[$field['htmlvar_name']] = array( |
|
| 2554 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2555 | + 'is_active_tab' => false, |
|
| 2556 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2557 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2558 | + 'tab_content' => $html |
|
| 2559 | + ); |
|
| 2560 | + } |
|
| 2561 | + } |
|
| 2562 | + } |
|
| 2563 | + } |
|
| 2564 | + } |
|
| 2565 | + } |
|
| 2566 | + return $tabs_arr; |
|
| 2567 | 2567 | } |
| 2568 | 2568 | |
| 2569 | 2569 | /* display add listing page for wpml */ |
@@ -2587,39 +2587,39 @@ discard block |
||
| 2587 | 2587 | */ |
| 2588 | 2588 | function geodir_add_post_status_author_page() |
| 2589 | 2589 | {
|
| 2590 | - global $wpdb, $post; |
|
| 2591 | - |
|
| 2592 | - $html = ''; |
|
| 2593 | - if (get_current_user_id()) {
|
|
| 2594 | - |
|
| 2595 | - $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2596 | - if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2597 | - |
|
| 2598 | - // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2599 | - $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2600 | - $status = "<strong>(";
|
|
| 2601 | - $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2602 | - if ($real_status == 'publish') {
|
|
| 2603 | - $status .= __('Published', 'geodirectory');
|
|
| 2604 | - } else {
|
|
| 2605 | - $status .= __('Not published', 'geodirectory');
|
|
| 2606 | - $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2607 | - } |
|
| 2608 | - $status .= ")</strong>"; |
|
| 2590 | + global $wpdb, $post; |
|
| 2591 | + |
|
| 2592 | + $html = ''; |
|
| 2593 | + if (get_current_user_id()) {
|
|
| 2594 | + |
|
| 2595 | + $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2596 | + if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2597 | + |
|
| 2598 | + // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2599 | + $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2600 | + $status = "<strong>(";
|
|
| 2601 | + $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2602 | + if ($real_status == 'publish') {
|
|
| 2603 | + $status .= __('Published', 'geodirectory');
|
|
| 2604 | + } else {
|
|
| 2605 | + $status .= __('Not published', 'geodirectory');
|
|
| 2606 | + $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2607 | + } |
|
| 2608 | + $status .= ")</strong>"; |
|
| 2609 | 2609 | |
| 2610 | - $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2611 | - } |
|
| 2612 | - } |
|
| 2610 | + $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2611 | + } |
|
| 2612 | + } |
|
| 2613 | 2613 | |
| 2614 | - if ($html != '') {
|
|
| 2615 | - /** |
|
| 2616 | - * Filter the post status text on the author page. |
|
| 2617 | - * |
|
| 2618 | - * @since 1.0.0 |
|
| 2619 | - * @param string $html The HTML of the status. |
|
| 2620 | - */ |
|
| 2621 | - echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2622 | - } |
|
| 2614 | + if ($html != '') {
|
|
| 2615 | + /** |
|
| 2616 | + * Filter the post status text on the author page. |
|
| 2617 | + * |
|
| 2618 | + * @since 1.0.0 |
|
| 2619 | + * @param string $html The HTML of the status. |
|
| 2620 | + */ |
|
| 2621 | + echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2622 | + } |
|
| 2623 | 2623 | |
| 2624 | 2624 | |
| 2625 | 2625 | } |
@@ -2633,21 +2633,21 @@ discard block |
||
| 2633 | 2633 | */ |
| 2634 | 2634 | function geodir_init_no_rating() |
| 2635 | 2635 | {
|
| 2636 | - if (get_option('geodir_disable_rating')) {
|
|
| 2637 | - remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');
|
|
| 2638 | - remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');
|
|
| 2639 | - remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');
|
|
| 2640 | - remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');
|
|
| 2641 | - remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');
|
|
| 2642 | - remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);
|
|
| 2643 | - remove_filter('comment_text', 'geodir_wrap_comment_text', 40);
|
|
| 2644 | - |
|
| 2645 | - add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');
|
|
| 2646 | - add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');
|
|
| 2647 | - add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);
|
|
| 2648 | - add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);
|
|
| 2649 | - add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2650 | - } |
|
| 2636 | + if (get_option('geodir_disable_rating')) {
|
|
| 2637 | + remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');
|
|
| 2638 | + remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');
|
|
| 2639 | + remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');
|
|
| 2640 | + remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');
|
|
| 2641 | + remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');
|
|
| 2642 | + remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);
|
|
| 2643 | + remove_filter('comment_text', 'geodir_wrap_comment_text', 40);
|
|
| 2644 | + |
|
| 2645 | + add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');
|
|
| 2646 | + add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');
|
|
| 2647 | + add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);
|
|
| 2648 | + add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);
|
|
| 2649 | + add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2650 | + } |
|
| 2651 | 2651 | } |
| 2652 | 2652 | |
| 2653 | 2653 | /** |
@@ -2659,24 +2659,24 @@ discard block |
||
| 2659 | 2659 | */ |
| 2660 | 2660 | function geodir_no_rating_rating_fields() |
| 2661 | 2661 | {
|
| 2662 | - global $post; |
|
| 2662 | + global $post; |
|
| 2663 | 2663 | |
| 2664 | - $post_types = geodir_get_posttypes(); |
|
| 2664 | + $post_types = geodir_get_posttypes(); |
|
| 2665 | 2665 | |
| 2666 | - if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {
|
|
| 2667 | - if (is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php')) {
|
|
| 2668 | - if (get_option('geodir_reviewrating_enable_rating')) {
|
|
| 2669 | - echo '<input type="hidden" value="1" name="geodir_rating[overall]" />'; |
|
| 2670 | - } else {
|
|
| 2671 | - echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />'; |
|
| 2672 | - } |
|
| 2673 | - if (get_option('geodir_reviewrating_enable_images')) {
|
|
| 2674 | - geodir_reviewrating_rating_img_html(); |
|
| 2675 | - } |
|
| 2676 | - } else {
|
|
| 2677 | - echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />'; |
|
| 2678 | - } |
|
| 2679 | - } |
|
| 2666 | + if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {
|
|
| 2667 | + if (is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php')) {
|
|
| 2668 | + if (get_option('geodir_reviewrating_enable_rating')) {
|
|
| 2669 | + echo '<input type="hidden" value="1" name="geodir_rating[overall]" />'; |
|
| 2670 | + } else {
|
|
| 2671 | + echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />'; |
|
| 2672 | + } |
|
| 2673 | + if (get_option('geodir_reviewrating_enable_images')) {
|
|
| 2674 | + geodir_reviewrating_rating_img_html(); |
|
| 2675 | + } |
|
| 2676 | + } else {
|
|
| 2677 | + echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />'; |
|
| 2678 | + } |
|
| 2679 | + } |
|
| 2680 | 2680 | } |
| 2681 | 2681 | |
| 2682 | 2682 | /** |
@@ -2690,11 +2690,11 @@ discard block |
||
| 2690 | 2690 | */ |
| 2691 | 2691 | function geodir_no_rating_comment_text($content, $comment = '') |
| 2692 | 2692 | {
|
| 2693 | - if (!is_admin()) {
|
|
| 2694 | - return '<div class="description">' . $content . '</div>'; |
|
| 2695 | - } else {
|
|
| 2696 | - return $content; |
|
| 2697 | - } |
|
| 2693 | + if (!is_admin()) {
|
|
| 2694 | + return '<div class="description">' . $content . '</div>'; |
|
| 2695 | + } else {
|
|
| 2696 | + return $content; |
|
| 2697 | + } |
|
| 2698 | 2698 | } |
| 2699 | 2699 | |
| 2700 | 2700 | /** |
@@ -2707,7 +2707,7 @@ discard block |
||
| 2707 | 2707 | */ |
| 2708 | 2708 | function geodir_no_rating_review_rating_html($content = '') |
| 2709 | 2709 | {
|
| 2710 | - return NULL; |
|
| 2710 | + return NULL; |
|
| 2711 | 2711 | } |
| 2712 | 2712 | |
| 2713 | 2713 | /** |
@@ -2721,19 +2721,19 @@ discard block |
||
| 2721 | 2721 | */ |
| 2722 | 2722 | function geodir_no_rating_get_sort_options($options, $post_type = '') |
| 2723 | 2723 | {
|
| 2724 | - $new_options = array(); |
|
| 2725 | - if (!empty($options)) {
|
|
| 2726 | - foreach ($options as $option) {
|
|
| 2727 | - if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2728 | - continue; |
|
| 2729 | - } |
|
| 2730 | - $new_options[] = $option; |
|
| 2731 | - } |
|
| 2724 | + $new_options = array(); |
|
| 2725 | + if (!empty($options)) {
|
|
| 2726 | + foreach ($options as $option) {
|
|
| 2727 | + if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2728 | + continue; |
|
| 2729 | + } |
|
| 2730 | + $new_options[] = $option; |
|
| 2731 | + } |
|
| 2732 | 2732 | |
| 2733 | - $options = $new_options; |
|
| 2734 | - } |
|
| 2733 | + $options = $new_options; |
|
| 2734 | + } |
|
| 2735 | 2735 | |
| 2736 | - return $options; |
|
| 2736 | + return $options; |
|
| 2737 | 2737 | } |
| 2738 | 2738 | |
| 2739 | 2739 | add_filter('geodir_all_js_msg', 'geodir_all_js_msg_no_rating', 100);
|
@@ -2747,11 +2747,11 @@ discard block |
||
| 2747 | 2747 | */ |
| 2748 | 2748 | function geodir_all_js_msg_no_rating($msg = array()) |
| 2749 | 2749 | {
|
| 2750 | - if (get_option('geodir_disable_rating')) {
|
|
| 2751 | - $msg['gd_cmt_no_rating'] = true; |
|
| 2752 | - } |
|
| 2750 | + if (get_option('geodir_disable_rating')) {
|
|
| 2751 | + $msg['gd_cmt_no_rating'] = true; |
|
| 2752 | + } |
|
| 2753 | 2753 | |
| 2754 | - return $msg; |
|
| 2754 | + return $msg; |
|
| 2755 | 2755 | } |
| 2756 | 2756 | |
| 2757 | 2757 | add_filter('body_class', 'geodir_body_class_no_rating', 100);
|
@@ -2765,13 +2765,13 @@ discard block |
||
| 2765 | 2765 | */ |
| 2766 | 2766 | function geodir_body_class_no_rating($classes = array()) |
| 2767 | 2767 | {
|
| 2768 | - if (get_option('geodir_disable_rating')) {
|
|
| 2769 | - $classes[] = 'gd-no-rating'; |
|
| 2770 | - } |
|
| 2768 | + if (get_option('geodir_disable_rating')) {
|
|
| 2769 | + $classes[] = 'gd-no-rating'; |
|
| 2770 | + } |
|
| 2771 | 2771 | |
| 2772 | - $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2772 | + $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2773 | 2773 | |
| 2774 | - return $classes; |
|
| 2774 | + return $classes; |
|
| 2775 | 2775 | } |
| 2776 | 2776 | |
| 2777 | 2777 | add_filter('admin_body_class', 'geodir_admin_body_class_no_rating', 100);
|
@@ -2785,13 +2785,13 @@ discard block |
||
| 2785 | 2785 | */ |
| 2786 | 2786 | function geodir_admin_body_class_no_rating($class = '') |
| 2787 | 2787 | {
|
| 2788 | - if (get_option('geodir_disable_rating')) {
|
|
| 2789 | - $class .= ' gd-no-rating'; |
|
| 2790 | - } |
|
| 2788 | + if (get_option('geodir_disable_rating')) {
|
|
| 2789 | + $class .= ' gd-no-rating'; |
|
| 2790 | + } |
|
| 2791 | 2791 | |
| 2792 | - $class .= ' gd-map-' . geodir_map_name(); |
|
| 2792 | + $class .= ' gd-map-' . geodir_map_name(); |
|
| 2793 | 2793 | |
| 2794 | - return $class; |
|
| 2794 | + return $class; |
|
| 2795 | 2795 | } |
| 2796 | 2796 | |
| 2797 | 2797 | add_action('wp_head', 'geodir_wp_head_no_rating');
|
@@ -2804,10 +2804,10 @@ discard block |
||
| 2804 | 2804 | */ |
| 2805 | 2805 | function geodir_wp_head_no_rating() |
| 2806 | 2806 | {
|
| 2807 | - if (get_option('geodir_disable_rating')) {
|
|
| 2808 | - echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';
|
|
| 2809 | - echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';
|
|
| 2810 | - } |
|
| 2807 | + if (get_option('geodir_disable_rating')) {
|
|
| 2808 | + echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';
|
|
| 2809 | + echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';
|
|
| 2810 | + } |
|
| 2811 | 2811 | } |
| 2812 | 2812 | |
| 2813 | 2813 | add_filter('geodir_load_db_language', 'geodir_load_custom_field_translation');
|
@@ -2824,36 +2824,36 @@ discard block |
||
| 2824 | 2824 | * @return array Translation texts. |
| 2825 | 2825 | */ |
| 2826 | 2826 | function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
| 2827 | - $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2828 | - |
|
| 2829 | - $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2830 | - |
|
| 2831 | - /** |
|
| 2832 | - * Filters the geodirectory option names that requires to add for translation. |
|
| 2833 | - * |
|
| 2834 | - * @since 1.5.7 |
|
| 2835 | - * @package GeoDirectory |
|
| 2836 | - * |
|
| 2837 | - * @param array $gd_options Array of option names. |
|
| 2838 | - */ |
|
| 2839 | - $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2840 | - $gd_options = array_unique($gd_options); |
|
| 2841 | - |
|
| 2842 | - if (!empty($gd_options)) {
|
|
| 2843 | - foreach ($gd_options as $gd_option) {
|
|
| 2844 | - if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2845 | - $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2827 | + $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2828 | + |
|
| 2829 | + $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2830 | + |
|
| 2831 | + /** |
|
| 2832 | + * Filters the geodirectory option names that requires to add for translation. |
|
| 2833 | + * |
|
| 2834 | + * @since 1.5.7 |
|
| 2835 | + * @package GeoDirectory |
|
| 2836 | + * |
|
| 2837 | + * @param array $gd_options Array of option names. |
|
| 2838 | + */ |
|
| 2839 | + $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2840 | + $gd_options = array_unique($gd_options); |
|
| 2841 | + |
|
| 2842 | + if (!empty($gd_options)) {
|
|
| 2843 | + foreach ($gd_options as $gd_option) {
|
|
| 2844 | + if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2845 | + $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2846 | 2846 | |
| 2847 | - if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2848 | - $translation_texts[] = stripslashes_deep($option_value); |
|
| 2849 | - } |
|
| 2850 | - } |
|
| 2851 | - } |
|
| 2852 | - } |
|
| 2847 | + if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2848 | + $translation_texts[] = stripslashes_deep($option_value); |
|
| 2849 | + } |
|
| 2850 | + } |
|
| 2851 | + } |
|
| 2852 | + } |
|
| 2853 | 2853 | |
| 2854 | - $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2854 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2855 | 2855 | |
| 2856 | - return $translation_texts; |
|
| 2856 | + return $translation_texts; |
|
| 2857 | 2857 | } |
| 2858 | 2858 | |
| 2859 | 2859 | add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');
|
@@ -2867,15 +2867,15 @@ discard block |
||
| 2867 | 2867 | |
| 2868 | 2868 | add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);
|
| 2869 | 2869 | function gd_get_comments_link($comments_link, $post_id) {
|
| 2870 | - $post_type = get_post_type($post_id); |
|
| 2870 | + $post_type = get_post_type($post_id); |
|
| 2871 | 2871 | |
| 2872 | - $all_postypes = geodir_get_posttypes(); |
|
| 2873 | - if (in_array($post_type, $all_postypes)) {
|
|
| 2874 | - $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2875 | - $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2876 | - } |
|
| 2872 | + $all_postypes = geodir_get_posttypes(); |
|
| 2873 | + if (in_array($post_type, $all_postypes)) {
|
|
| 2874 | + $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2875 | + $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2876 | + } |
|
| 2877 | 2877 | |
| 2878 | - return $comments_link; |
|
| 2878 | + return $comments_link; |
|
| 2879 | 2879 | } |
| 2880 | 2880 | |
| 2881 | 2881 | |
@@ -2893,11 +2893,11 @@ discard block |
||
| 2893 | 2893 | function geodir_add_nav_menu_class( $args ) |
| 2894 | 2894 | {
|
| 2895 | 2895 | |
| 2896 | - if(isset($args['menu_class'])){
|
|
| 2897 | - $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2898 | - } |
|
| 2896 | + if(isset($args['menu_class'])){
|
|
| 2897 | + $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2898 | + } |
|
| 2899 | 2899 | |
| 2900 | - return $args; |
|
| 2900 | + return $args; |
|
| 2901 | 2901 | } |
| 2902 | 2902 | |
| 2903 | 2903 | add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' ); |
| 2904 | 2904 | \ No newline at end of file |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | public function __construct(Google_Client $client) |
| 29 | 29 | { |
| 30 | - $this->client = $client; |
|
| 30 | + $this->client = $client; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | */ |
| 37 | 37 | public function getClient() |
| 38 | 38 | { |
| 39 | - return $this->client; |
|
| 39 | + return $this->client; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public function createBatch() |
| 48 | 48 | { |
| 49 | - return new Google_Http_Batch( |
|
| 50 | - $this->client, |
|
| 51 | - false, |
|
| 52 | - $this->rootUrl, |
|
| 53 | - $this->batchPath |
|
| 54 | - ); |
|
| 49 | + return new Google_Http_Batch( |
|
| 50 | + $this->client, |
|
| 51 | + false, |
|
| 52 | + $this->rootUrl, |
|
| 53 | + $this->batchPath |
|
| 54 | + ); |
|
| 55 | 55 | } |
| 56 | 56 | } |
@@ -23,23 +23,23 @@ discard block |
||
| 23 | 23 | { |
| 24 | 24 | public static function urlSafeB64Encode($data) |
| 25 | 25 | { |
| 26 | - $b64 = base64_encode($data); |
|
| 27 | - $b64 = str_replace( |
|
| 28 | - array('+', '/', '\r', '\n', '='), |
|
| 29 | - array('-', '_'), |
|
| 30 | - $b64 |
|
| 31 | - ); |
|
| 32 | - return $b64; |
|
| 26 | + $b64 = base64_encode($data); |
|
| 27 | + $b64 = str_replace( |
|
| 28 | + array('+', '/', '\r', '\n', '='), |
|
| 29 | + array('-', '_'), |
|
| 30 | + $b64 |
|
| 31 | + ); |
|
| 32 | + return $b64; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public static function urlSafeB64Decode($b64) |
| 36 | 36 | { |
| 37 | - $b64 = str_replace( |
|
| 38 | - array('-', '_'), |
|
| 39 | - array('+', '/'), |
|
| 40 | - $b64 |
|
| 41 | - ); |
|
| 42 | - return base64_decode($b64); |
|
| 37 | + $b64 = str_replace( |
|
| 38 | + array('-', '_'), |
|
| 39 | + array('+', '/'), |
|
| 40 | + $b64 |
|
| 41 | + ); |
|
| 42 | + return base64_decode($b64); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -59,45 +59,45 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public static function getStrLen($str) |
| 61 | 61 | { |
| 62 | - $strlenVar = strlen($str); |
|
| 63 | - $d = $ret = 0; |
|
| 64 | - for ($count = 0; $count < $strlenVar; ++ $count) { |
|
| 65 | - $ordinalValue = ord($str{$ret}); |
|
| 66 | - switch (true) { |
|
| 67 | - case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)): |
|
| 68 | - // characters U-00000000 - U-0000007F (same as ASCII) |
|
| 69 | - $ret ++; |
|
| 70 | - break; |
|
| 71 | - case (($ordinalValue & 0xE0) == 0xC0): |
|
| 72 | - // characters U-00000080 - U-000007FF, mask 110XXXXX |
|
| 73 | - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 74 | - $ret += 2; |
|
| 75 | - break; |
|
| 76 | - case (($ordinalValue & 0xF0) == 0xE0): |
|
| 77 | - // characters U-00000800 - U-0000FFFF, mask 1110XXXX |
|
| 78 | - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 79 | - $ret += 3; |
|
| 80 | - break; |
|
| 81 | - case (($ordinalValue & 0xF8) == 0xF0): |
|
| 82 | - // characters U-00010000 - U-001FFFFF, mask 11110XXX |
|
| 83 | - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 84 | - $ret += 4; |
|
| 85 | - break; |
|
| 86 | - case (($ordinalValue & 0xFC) == 0xF8): |
|
| 87 | - // characters U-00200000 - U-03FFFFFF, mask 111110XX |
|
| 88 | - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 89 | - $ret += 5; |
|
| 90 | - break; |
|
| 91 | - case (($ordinalValue & 0xFE) == 0xFC): |
|
| 92 | - // characters U-04000000 - U-7FFFFFFF, mask 1111110X |
|
| 93 | - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 94 | - $ret += 6; |
|
| 95 | - break; |
|
| 96 | - default: |
|
| 97 | - $ret ++; |
|
| 98 | - } |
|
| 99 | - } |
|
| 100 | - return $ret; |
|
| 62 | + $strlenVar = strlen($str); |
|
| 63 | + $d = $ret = 0; |
|
| 64 | + for ($count = 0; $count < $strlenVar; ++ $count) { |
|
| 65 | + $ordinalValue = ord($str{$ret}); |
|
| 66 | + switch (true) { |
|
| 67 | + case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)): |
|
| 68 | + // characters U-00000000 - U-0000007F (same as ASCII) |
|
| 69 | + $ret ++; |
|
| 70 | + break; |
|
| 71 | + case (($ordinalValue & 0xE0) == 0xC0): |
|
| 72 | + // characters U-00000080 - U-000007FF, mask 110XXXXX |
|
| 73 | + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 74 | + $ret += 2; |
|
| 75 | + break; |
|
| 76 | + case (($ordinalValue & 0xF0) == 0xE0): |
|
| 77 | + // characters U-00000800 - U-0000FFFF, mask 1110XXXX |
|
| 78 | + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 79 | + $ret += 3; |
|
| 80 | + break; |
|
| 81 | + case (($ordinalValue & 0xF8) == 0xF0): |
|
| 82 | + // characters U-00010000 - U-001FFFFF, mask 11110XXX |
|
| 83 | + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 84 | + $ret += 4; |
|
| 85 | + break; |
|
| 86 | + case (($ordinalValue & 0xFC) == 0xF8): |
|
| 87 | + // characters U-00200000 - U-03FFFFFF, mask 111110XX |
|
| 88 | + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 89 | + $ret += 5; |
|
| 90 | + break; |
|
| 91 | + case (($ordinalValue & 0xFE) == 0xFC): |
|
| 92 | + // characters U-04000000 - U-7FFFFFFF, mask 1111110X |
|
| 93 | + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 |
|
| 94 | + $ret += 6; |
|
| 95 | + break; |
|
| 96 | + default: |
|
| 97 | + $ret ++; |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | + return $ret; |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -107,15 +107,15 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public static function normalize($arr) |
| 109 | 109 | { |
| 110 | - if (!is_array($arr)) { |
|
| 111 | - return array(); |
|
| 112 | - } |
|
| 110 | + if (!is_array($arr)) { |
|
| 111 | + return array(); |
|
| 112 | + } |
|
| 113 | 113 | |
| 114 | - $normalized = array(); |
|
| 115 | - foreach ($arr as $key => $val) { |
|
| 116 | - $normalized[strtolower($key)] = $val; |
|
| 117 | - } |
|
| 118 | - return $normalized; |
|
| 114 | + $normalized = array(); |
|
| 115 | + foreach ($arr as $key => $val) { |
|
| 116 | + $normalized[strtolower($key)] = $val; |
|
| 117 | + } |
|
| 118 | + return $normalized; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -125,9 +125,9 @@ discard block |
||
| 125 | 125 | */ |
| 126 | 126 | public static function camelCase($value) |
| 127 | 127 | { |
| 128 | - $value = ucwords(str_replace(array('-', '_'), ' ', $value)); |
|
| 129 | - $value = str_replace(' ', '', $value); |
|
| 130 | - $value[0] = strtolower($value[0]); |
|
| 131 | - return $value; |
|
| 128 | + $value = ucwords(str_replace(array('-', '_'), ' ', $value)); |
|
| 129 | + $value = str_replace(' ', '', $value); |
|
| 130 | + $value[0] = strtolower($value[0]); |
|
| 131 | + return $value; |
|
| 132 | 132 | } |
| 133 | 133 | } |
@@ -15,87 +15,87 @@ |
||
| 15 | 15 | |
| 16 | 16 | public function rewind() |
| 17 | 17 | { |
| 18 | - if (isset($this->modelData[$this->collection_key]) |
|
| 19 | - && is_array($this->modelData[$this->collection_key])) { |
|
| 20 | - reset($this->modelData[$this->collection_key]); |
|
| 21 | - } |
|
| 18 | + if (isset($this->modelData[$this->collection_key]) |
|
| 19 | + && is_array($this->modelData[$this->collection_key])) { |
|
| 20 | + reset($this->modelData[$this->collection_key]); |
|
| 21 | + } |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | public function current() |
| 25 | 25 | { |
| 26 | - $this->coerceType($this->key()); |
|
| 27 | - if (is_array($this->modelData[$this->collection_key])) { |
|
| 28 | - return current($this->modelData[$this->collection_key]); |
|
| 29 | - } |
|
| 26 | + $this->coerceType($this->key()); |
|
| 27 | + if (is_array($this->modelData[$this->collection_key])) { |
|
| 28 | + return current($this->modelData[$this->collection_key]); |
|
| 29 | + } |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | public function key() |
| 33 | 33 | { |
| 34 | - if (isset($this->modelData[$this->collection_key]) |
|
| 35 | - && is_array($this->modelData[$this->collection_key])) { |
|
| 36 | - return key($this->modelData[$this->collection_key]); |
|
| 37 | - } |
|
| 34 | + if (isset($this->modelData[$this->collection_key]) |
|
| 35 | + && is_array($this->modelData[$this->collection_key])) { |
|
| 36 | + return key($this->modelData[$this->collection_key]); |
|
| 37 | + } |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function next() |
| 41 | 41 | { |
| 42 | - return next($this->modelData[$this->collection_key]); |
|
| 42 | + return next($this->modelData[$this->collection_key]); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function valid() |
| 46 | 46 | { |
| 47 | - $key = $this->key(); |
|
| 48 | - return $key !== null && $key !== false; |
|
| 47 | + $key = $this->key(); |
|
| 48 | + return $key !== null && $key !== false; |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function count() |
| 52 | 52 | { |
| 53 | - if (!isset($this->modelData[$this->collection_key])) { |
|
| 54 | - return 0; |
|
| 55 | - } |
|
| 56 | - return count($this->modelData[$this->collection_key]); |
|
| 53 | + if (!isset($this->modelData[$this->collection_key])) { |
|
| 54 | + return 0; |
|
| 55 | + } |
|
| 56 | + return count($this->modelData[$this->collection_key]); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | public function offsetExists($offset) |
| 60 | 60 | { |
| 61 | - if (!is_numeric($offset)) { |
|
| 62 | - return parent::offsetExists($offset); |
|
| 63 | - } |
|
| 64 | - return isset($this->modelData[$this->collection_key][$offset]); |
|
| 61 | + if (!is_numeric($offset)) { |
|
| 62 | + return parent::offsetExists($offset); |
|
| 63 | + } |
|
| 64 | + return isset($this->modelData[$this->collection_key][$offset]); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public function offsetGet($offset) |
| 68 | 68 | { |
| 69 | - if (!is_numeric($offset)) { |
|
| 70 | - return parent::offsetGet($offset); |
|
| 71 | - } |
|
| 72 | - $this->coerceType($offset); |
|
| 73 | - return $this->modelData[$this->collection_key][$offset]; |
|
| 69 | + if (!is_numeric($offset)) { |
|
| 70 | + return parent::offsetGet($offset); |
|
| 71 | + } |
|
| 72 | + $this->coerceType($offset); |
|
| 73 | + return $this->modelData[$this->collection_key][$offset]; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | public function offsetSet($offset, $value) |
| 77 | 77 | { |
| 78 | - if (!is_numeric($offset)) { |
|
| 79 | - return parent::offsetSet($offset, $value); |
|
| 80 | - } |
|
| 81 | - $this->modelData[$this->collection_key][$offset] = $value; |
|
| 78 | + if (!is_numeric($offset)) { |
|
| 79 | + return parent::offsetSet($offset, $value); |
|
| 80 | + } |
|
| 81 | + $this->modelData[$this->collection_key][$offset] = $value; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | public function offsetUnset($offset) |
| 85 | 85 | { |
| 86 | - if (!is_numeric($offset)) { |
|
| 87 | - return parent::offsetUnset($offset); |
|
| 88 | - } |
|
| 89 | - unset($this->modelData[$this->collection_key][$offset]); |
|
| 86 | + if (!is_numeric($offset)) { |
|
| 87 | + return parent::offsetUnset($offset); |
|
| 88 | + } |
|
| 89 | + unset($this->modelData[$this->collection_key][$offset]); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | private function coerceType($offset) |
| 93 | 93 | { |
| 94 | - $typeKey = $this->keyType($this->collection_key); |
|
| 95 | - if (isset($this->$typeKey) && !is_object($this->modelData[$this->collection_key][$offset])) { |
|
| 96 | - $type = $this->$typeKey; |
|
| 97 | - $this->modelData[$this->collection_key][$offset] = |
|
| 98 | - new $type($this->modelData[$this->collection_key][$offset]); |
|
| 99 | - } |
|
| 94 | + $typeKey = $this->keyType($this->collection_key); |
|
| 95 | + if (isset($this->$typeKey) && !is_object($this->modelData[$this->collection_key][$offset])) { |
|
| 96 | + $type = $this->$typeKey; |
|
| 97 | + $this->modelData[$this->collection_key][$offset] = |
|
| 98 | + new $type($this->modelData[$this->collection_key][$offset]); |
|
| 99 | + } |
|
| 100 | 100 | } |
| 101 | 101 | } |
@@ -38,20 +38,20 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | public function __construct($pem) |
| 40 | 40 | { |
| 41 | - if (!function_exists('openssl_x509_read')) { |
|
| 42 | - throw new Google_Exception('Google API PHP client needs the openssl PHP extension'); |
|
| 43 | - } |
|
| 44 | - $this->publicKey = openssl_x509_read($pem); |
|
| 45 | - if (!$this->publicKey) { |
|
| 46 | - throw new Google_Auth_Exception("Unable to parse PEM: $pem"); |
|
| 47 | - } |
|
| 41 | + if (!function_exists('openssl_x509_read')) { |
|
| 42 | + throw new Google_Exception('Google API PHP client needs the openssl PHP extension'); |
|
| 43 | + } |
|
| 44 | + $this->publicKey = openssl_x509_read($pem); |
|
| 45 | + if (!$this->publicKey) { |
|
| 46 | + throw new Google_Auth_Exception("Unable to parse PEM: $pem"); |
|
| 47 | + } |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | public function __destruct() |
| 51 | 51 | { |
| 52 | - if ($this->publicKey) { |
|
| 53 | - openssl_x509_free($this->publicKey); |
|
| 54 | - } |
|
| 52 | + if ($this->publicKey) { |
|
| 53 | + openssl_x509_free($this->publicKey); |
|
| 54 | + } |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -65,11 +65,11 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function verify($data, $signature) |
| 67 | 67 | { |
| 68 | - $hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256"; |
|
| 69 | - $status = openssl_verify($data, $signature, $this->publicKey, $hash); |
|
| 70 | - if ($status === -1) { |
|
| 71 | - throw new Google_Auth_Exception('Signature verification error: ' . openssl_error_string()); |
|
| 72 | - } |
|
| 73 | - return $status === 1; |
|
| 68 | + $hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256"; |
|
| 69 | + $status = openssl_verify($data, $signature, $this->publicKey, $hash); |
|
| 70 | + if ($status === -1) { |
|
| 71 | + throw new Google_Auth_Exception('Signature verification error: ' . openssl_error_string()); |
|
| 72 | + } |
|
| 73 | + return $status === 1; |
|
| 74 | 74 | } |
| 75 | 75 | } |
@@ -74,32 +74,32 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | public function __construct($config = null) |
| 76 | 76 | { |
| 77 | - if (is_string($config) && strlen($config)) { |
|
| 78 | - $config = new Google_Config($config); |
|
| 79 | - } else if ( !($config instanceof Google_Config)) { |
|
| 80 | - $config = new Google_Config(); |
|
| 77 | + if (is_string($config) && strlen($config)) { |
|
| 78 | + $config = new Google_Config($config); |
|
| 79 | + } else if ( !($config instanceof Google_Config)) { |
|
| 80 | + $config = new Google_Config(); |
|
| 81 | 81 | |
| 82 | - if ($this->isAppEngine()) { |
|
| 83 | - // Automatically use Memcache if we're in AppEngine. |
|
| 84 | - $config->setCacheClass('Google_Cache_Memcache'); |
|
| 85 | - } |
|
| 82 | + if ($this->isAppEngine()) { |
|
| 83 | + // Automatically use Memcache if we're in AppEngine. |
|
| 84 | + $config->setCacheClass('Google_Cache_Memcache'); |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | - if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) { |
|
| 88 | - // Automatically disable compress.zlib, as currently unsupported. |
|
| 89 | - $config->setClassConfig('Google_Http_Request', 'disable_gzip', true); |
|
| 90 | - } |
|
| 91 | - } |
|
| 87 | + if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) { |
|
| 88 | + // Automatically disable compress.zlib, as currently unsupported. |
|
| 89 | + $config->setClassConfig('Google_Http_Request', 'disable_gzip', true); |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) { |
|
| 94 | - if (function_exists('curl_version') && function_exists('curl_exec') |
|
| 95 | - && !$this->isAppEngine()) { |
|
| 96 | - $config->setIoClass("Google_IO_Curl"); |
|
| 97 | - } else { |
|
| 98 | - $config->setIoClass("Google_IO_Stream"); |
|
| 99 | - } |
|
| 100 | - } |
|
| 93 | + if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) { |
|
| 94 | + if (function_exists('curl_version') && function_exists('curl_exec') |
|
| 95 | + && !$this->isAppEngine()) { |
|
| 96 | + $config->setIoClass("Google_IO_Curl"); |
|
| 97 | + } else { |
|
| 98 | + $config->setIoClass("Google_IO_Stream"); |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | 101 | |
| 102 | - $this->config = $config; |
|
| 102 | + $this->config = $config; |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | public function getLibraryVersion() |
| 111 | 111 | { |
| 112 | - return self::LIBVER; |
|
| 112 | + return self::LIBVER; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | */ |
| 125 | 125 | public function authenticate($code, $crossClient = false) |
| 126 | 126 | { |
| 127 | - $this->authenticated = true; |
|
| 128 | - return $this->getAuth()->authenticate($code, $crossClient); |
|
| 127 | + $this->authenticated = true; |
|
| 128 | + return $this->getAuth()->authenticate($code, $crossClient); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -141,18 +141,18 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | public function loadServiceAccountJson($jsonLocation, $scopes) |
| 143 | 143 | { |
| 144 | - $data = json_decode(file_get_contents($jsonLocation)); |
|
| 145 | - if (isset($data->type) && $data->type == 'service_account') { |
|
| 146 | - // Service Account format. |
|
| 147 | - $cred = new Google_Auth_AssertionCredentials( |
|
| 148 | - $data->client_email, |
|
| 149 | - $scopes, |
|
| 150 | - $data->private_key |
|
| 151 | - ); |
|
| 152 | - return $cred; |
|
| 153 | - } else { |
|
| 154 | - throw new Google_Exception("Invalid service account JSON file."); |
|
| 155 | - } |
|
| 144 | + $data = json_decode(file_get_contents($jsonLocation)); |
|
| 145 | + if (isset($data->type) && $data->type == 'service_account') { |
|
| 146 | + // Service Account format. |
|
| 147 | + $cred = new Google_Auth_AssertionCredentials( |
|
| 148 | + $data->client_email, |
|
| 149 | + $scopes, |
|
| 150 | + $data->private_key |
|
| 151 | + ); |
|
| 152 | + return $cred; |
|
| 153 | + } else { |
|
| 154 | + throw new Google_Exception("Invalid service account JSON file."); |
|
| 155 | + } |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
@@ -165,16 +165,16 @@ discard block |
||
| 165 | 165 | */ |
| 166 | 166 | public function setAuthConfig($json) |
| 167 | 167 | { |
| 168 | - $data = json_decode($json); |
|
| 169 | - $key = isset($data->installed) ? 'installed' : 'web'; |
|
| 170 | - if (!isset($data->$key)) { |
|
| 171 | - throw new Google_Exception("Invalid client secret JSON file."); |
|
| 172 | - } |
|
| 173 | - $this->setClientId($data->$key->client_id); |
|
| 174 | - $this->setClientSecret($data->$key->client_secret); |
|
| 175 | - if (isset($data->$key->redirect_uris)) { |
|
| 176 | - $this->setRedirectUri($data->$key->redirect_uris[0]); |
|
| 177 | - } |
|
| 168 | + $data = json_decode($json); |
|
| 169 | + $key = isset($data->installed) ? 'installed' : 'web'; |
|
| 170 | + if (!isset($data->$key)) { |
|
| 171 | + throw new Google_Exception("Invalid client secret JSON file."); |
|
| 172 | + } |
|
| 173 | + $this->setClientId($data->$key->client_id); |
|
| 174 | + $this->setClientSecret($data->$key->client_secret); |
|
| 175 | + if (isset($data->$key->redirect_uris)) { |
|
| 176 | + $this->setRedirectUri($data->$key->redirect_uris[0]); |
|
| 177 | + } |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | /** |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | */ |
| 187 | 187 | public function setAuthConfigFile($file) |
| 188 | 188 | { |
| 189 | - $this->setAuthConfig(file_get_contents($file)); |
|
| 189 | + $this->setAuthConfig(file_get_contents($file)); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | /** |
@@ -196,11 +196,11 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | public function prepareScopes() |
| 198 | 198 | { |
| 199 | - if (empty($this->requestedScopes)) { |
|
| 200 | - throw new Google_Auth_Exception("No scopes specified"); |
|
| 201 | - } |
|
| 202 | - $scopes = implode(' ', $this->requestedScopes); |
|
| 203 | - return $scopes; |
|
| 199 | + if (empty($this->requestedScopes)) { |
|
| 200 | + throw new Google_Auth_Exception("No scopes specified"); |
|
| 201 | + } |
|
| 202 | + $scopes = implode(' ', $this->requestedScopes); |
|
| 203 | + return $scopes; |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -212,10 +212,10 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public function setAccessToken($accessToken) |
| 214 | 214 | { |
| 215 | - if ($accessToken == 'null') { |
|
| 216 | - $accessToken = null; |
|
| 217 | - } |
|
| 218 | - $this->getAuth()->setAccessToken($accessToken); |
|
| 215 | + if ($accessToken == 'null') { |
|
| 216 | + $accessToken = null; |
|
| 217 | + } |
|
| 218 | + $this->getAuth()->setAccessToken($accessToken); |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | |
@@ -226,8 +226,8 @@ discard block |
||
| 226 | 226 | */ |
| 227 | 227 | public function setAuth(Google_Auth_Abstract $auth) |
| 228 | 228 | { |
| 229 | - $this->config->setAuthClass(get_class($auth)); |
|
| 230 | - $this->auth = $auth; |
|
| 229 | + $this->config->setAuthClass(get_class($auth)); |
|
| 230 | + $this->auth = $auth; |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /** |
@@ -236,8 +236,8 @@ discard block |
||
| 236 | 236 | */ |
| 237 | 237 | public function setIo(Google_IO_Abstract $io) |
| 238 | 238 | { |
| 239 | - $this->config->setIoClass(get_class($io)); |
|
| 240 | - $this->io = $io; |
|
| 239 | + $this->config->setIoClass(get_class($io)); |
|
| 240 | + $this->io = $io; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
@@ -246,8 +246,8 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | public function setCache(Google_Cache_Abstract $cache) |
| 248 | 248 | { |
| 249 | - $this->config->setCacheClass(get_class($cache)); |
|
| 250 | - $this->cache = $cache; |
|
| 249 | + $this->config->setCacheClass(get_class($cache)); |
|
| 250 | + $this->cache = $cache; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | /** |
@@ -256,8 +256,8 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | public function setLogger(Google_Logger_Abstract $logger) |
| 258 | 258 | { |
| 259 | - $this->config->setLoggerClass(get_class($logger)); |
|
| 260 | - $this->logger = $logger; |
|
| 259 | + $this->config->setLoggerClass(get_class($logger)); |
|
| 260 | + $this->logger = $logger; |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | /** |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | public function createAuthUrl() |
| 268 | 268 | { |
| 269 | - $scopes = $this->prepareScopes(); |
|
| 270 | - return $this->getAuth()->createAuthUrl($scopes); |
|
| 269 | + $scopes = $this->prepareScopes(); |
|
| 270 | + return $this->getAuth()->createAuthUrl($scopes); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | /** |
@@ -278,11 +278,11 @@ discard block |
||
| 278 | 278 | */ |
| 279 | 279 | public function getAccessToken() |
| 280 | 280 | { |
| 281 | - $token = $this->getAuth()->getAccessToken(); |
|
| 282 | - // The response is json encoded, so could be the string null. |
|
| 283 | - // It is arguable whether this check should be here or lower |
|
| 284 | - // in the library. |
|
| 285 | - return (null == $token || 'null' == $token || '[]' == $token) ? null : $token; |
|
| 281 | + $token = $this->getAuth()->getAccessToken(); |
|
| 282 | + // The response is json encoded, so could be the string null. |
|
| 283 | + // It is arguable whether this check should be here or lower |
|
| 284 | + // in the library. |
|
| 285 | + return (null == $token || 'null' == $token || '[]' == $token) ? null : $token; |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | /** |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | public function getRefreshToken() |
| 293 | 293 | { |
| 294 | - return $this->getAuth()->getRefreshToken(); |
|
| 294 | + return $this->getAuth()->getRefreshToken(); |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | /** |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | */ |
| 301 | 301 | public function isAccessTokenExpired() |
| 302 | 302 | { |
| 303 | - return $this->getAuth()->isAccessTokenExpired(); |
|
| 303 | + return $this->getAuth()->isAccessTokenExpired(); |
|
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | /** |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | */ |
| 311 | 311 | public function setState($state) |
| 312 | 312 | { |
| 313 | - $this->getAuth()->setState($state); |
|
| 313 | + $this->getAuth()->setState($state); |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /** |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | public function setAccessType($accessType) |
| 322 | 322 | { |
| 323 | - $this->config->setAccessType($accessType); |
|
| 323 | + $this->config->setAccessType($accessType); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | /** |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | */ |
| 331 | 331 | public function setApprovalPrompt($approvalPrompt) |
| 332 | 332 | { |
| 333 | - $this->config->setApprovalPrompt($approvalPrompt); |
|
| 333 | + $this->config->setApprovalPrompt($approvalPrompt); |
|
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | /** |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | */ |
| 340 | 340 | public function setLoginHint($loginHint) |
| 341 | 341 | { |
| 342 | - $this->config->setLoginHint($loginHint); |
|
| 342 | + $this->config->setLoginHint($loginHint); |
|
| 343 | 343 | } |
| 344 | 344 | |
| 345 | 345 | /** |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | */ |
| 349 | 349 | public function setApplicationName($applicationName) |
| 350 | 350 | { |
| 351 | - $this->config->setApplicationName($applicationName); |
|
| 351 | + $this->config->setApplicationName($applicationName); |
|
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | /** |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | */ |
| 358 | 358 | public function setClientId($clientId) |
| 359 | 359 | { |
| 360 | - $this->config->setClientId($clientId); |
|
| 360 | + $this->config->setClientId($clientId); |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | /** |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | */ |
| 367 | 367 | public function setClientSecret($clientSecret) |
| 368 | 368 | { |
| 369 | - $this->config->setClientSecret($clientSecret); |
|
| 369 | + $this->config->setClientSecret($clientSecret); |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | /** |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | */ |
| 376 | 376 | public function setRedirectUri($redirectUri) |
| 377 | 377 | { |
| 378 | - $this->config->setRedirectUri($redirectUri); |
|
| 378 | + $this->config->setRedirectUri($redirectUri); |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | /** |
@@ -388,10 +388,10 @@ discard block |
||
| 388 | 388 | */ |
| 389 | 389 | public function setRequestVisibleActions($requestVisibleActions) |
| 390 | 390 | { |
| 391 | - if (is_array($requestVisibleActions)) { |
|
| 392 | - $requestVisibleActions = join(" ", $requestVisibleActions); |
|
| 393 | - } |
|
| 394 | - $this->config->setRequestVisibleActions($requestVisibleActions); |
|
| 391 | + if (is_array($requestVisibleActions)) { |
|
| 392 | + $requestVisibleActions = join(" ", $requestVisibleActions); |
|
| 393 | + } |
|
| 394 | + $this->config->setRequestVisibleActions($requestVisibleActions); |
|
| 395 | 395 | } |
| 396 | 396 | |
| 397 | 397 | /** |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | */ |
| 402 | 402 | public function setDeveloperKey($developerKey) |
| 403 | 403 | { |
| 404 | - $this->config->setDeveloperKey($developerKey); |
|
| 404 | + $this->config->setDeveloperKey($developerKey); |
|
| 405 | 405 | } |
| 406 | 406 | |
| 407 | 407 | /** |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | */ |
| 413 | 413 | public function setHostedDomain($hd) |
| 414 | 414 | { |
| 415 | - $this->config->setHostedDomain($hd); |
|
| 415 | + $this->config->setHostedDomain($hd); |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | /** |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | */ |
| 424 | 424 | public function setPrompt($prompt) |
| 425 | 425 | { |
| 426 | - $this->config->setPrompt($prompt); |
|
| 426 | + $this->config->setPrompt($prompt); |
|
| 427 | 427 | } |
| 428 | 428 | |
| 429 | 429 | /** |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | */ |
| 435 | 435 | public function setOpenidRealm($realm) |
| 436 | 436 | { |
| 437 | - $this->config->setOpenidRealm($realm); |
|
| 437 | + $this->config->setOpenidRealm($realm); |
|
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | /** |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | */ |
| 446 | 446 | public function setIncludeGrantedScopes($include) |
| 447 | 447 | { |
| 448 | - $this->config->setIncludeGrantedScopes($include); |
|
| 448 | + $this->config->setIncludeGrantedScopes($include); |
|
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | /** |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | */ |
| 455 | 455 | public function refreshToken($refreshToken) |
| 456 | 456 | { |
| 457 | - $this->getAuth()->refreshToken($refreshToken); |
|
| 457 | + $this->getAuth()->refreshToken($refreshToken); |
|
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | /** |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | */ |
| 467 | 467 | public function revokeToken($token = null) |
| 468 | 468 | { |
| 469 | - return $this->getAuth()->revokeToken($token); |
|
| 469 | + return $this->getAuth()->revokeToken($token); |
|
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | /** |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | */ |
| 480 | 480 | public function verifyIdToken($token = null) |
| 481 | 481 | { |
| 482 | - return $this->getAuth()->verifyIdToken($token); |
|
| 482 | + return $this->getAuth()->verifyIdToken($token); |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | /** |
@@ -494,9 +494,9 @@ discard block |
||
| 494 | 494 | */ |
| 495 | 495 | public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null) |
| 496 | 496 | { |
| 497 | - $auth = new Google_Auth_OAuth2($this); |
|
| 498 | - $certs = $auth->retrieveCertsFromLocation($cert_location); |
|
| 499 | - return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry); |
|
| 497 | + $auth = new Google_Auth_OAuth2($this); |
|
| 498 | + $certs = $auth->retrieveCertsFromLocation($cert_location); |
|
| 499 | + return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry); |
|
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | /** |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | */ |
| 505 | 505 | public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds) |
| 506 | 506 | { |
| 507 | - $this->getAuth()->setAssertionCredentials($creds); |
|
| 507 | + $this->getAuth()->setAssertionCredentials($creds); |
|
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | /** |
@@ -515,8 +515,8 @@ discard block |
||
| 515 | 515 | */ |
| 516 | 516 | public function setScopes($scopes) |
| 517 | 517 | { |
| 518 | - $this->requestedScopes = array(); |
|
| 519 | - $this->addScope($scopes); |
|
| 518 | + $this->requestedScopes = array(); |
|
| 519 | + $this->addScope($scopes); |
|
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | /** |
@@ -528,13 +528,13 @@ discard block |
||
| 528 | 528 | */ |
| 529 | 529 | public function addScope($scope_or_scopes) |
| 530 | 530 | { |
| 531 | - if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) { |
|
| 532 | - $this->requestedScopes[] = $scope_or_scopes; |
|
| 533 | - } else if (is_array($scope_or_scopes)) { |
|
| 534 | - foreach ($scope_or_scopes as $scope) { |
|
| 535 | - $this->addScope($scope); |
|
| 536 | - } |
|
| 537 | - } |
|
| 531 | + if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) { |
|
| 532 | + $this->requestedScopes[] = $scope_or_scopes; |
|
| 533 | + } else if (is_array($scope_or_scopes)) { |
|
| 534 | + foreach ($scope_or_scopes as $scope) { |
|
| 535 | + $this->addScope($scope); |
|
| 536 | + } |
|
| 537 | + } |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | /** |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | */ |
| 545 | 545 | public function getScopes() |
| 546 | 546 | { |
| 547 | - return $this->requestedScopes; |
|
| 547 | + return $this->requestedScopes; |
|
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | /** |
@@ -556,8 +556,8 @@ discard block |
||
| 556 | 556 | */ |
| 557 | 557 | public function setUseBatch($useBatch) |
| 558 | 558 | { |
| 559 | - // This is actually an alias for setDefer. |
|
| 560 | - $this->setDefer($useBatch); |
|
| 559 | + // This is actually an alias for setDefer. |
|
| 560 | + $this->setDefer($useBatch); |
|
| 561 | 561 | } |
| 562 | 562 | |
| 563 | 563 | /** |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | */ |
| 569 | 569 | public function setDefer($defer) |
| 570 | 570 | { |
| 571 | - $this->deferExecution = $defer; |
|
| 571 | + $this->deferExecution = $defer; |
|
| 572 | 572 | } |
| 573 | 573 | |
| 574 | 574 | /** |
@@ -580,22 +580,22 @@ discard block |
||
| 580 | 580 | */ |
| 581 | 581 | public function execute($request) |
| 582 | 582 | { |
| 583 | - if ($request instanceof Google_Http_Request) { |
|
| 584 | - $request->setUserAgent( |
|
| 585 | - $this->getApplicationName() |
|
| 586 | - . " " . self::USER_AGENT_SUFFIX |
|
| 587 | - . $this->getLibraryVersion() |
|
| 588 | - ); |
|
| 589 | - if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) { |
|
| 590 | - $request->enableGzip(); |
|
| 591 | - } |
|
| 592 | - $request->maybeMoveParametersToBody(); |
|
| 593 | - return Google_Http_REST::execute($this, $request); |
|
| 594 | - } else if ($request instanceof Google_Http_Batch) { |
|
| 595 | - return $request->execute(); |
|
| 596 | - } else { |
|
| 597 | - throw new Google_Exception("Do not know how to execute this type of object."); |
|
| 598 | - } |
|
| 583 | + if ($request instanceof Google_Http_Request) { |
|
| 584 | + $request->setUserAgent( |
|
| 585 | + $this->getApplicationName() |
|
| 586 | + . " " . self::USER_AGENT_SUFFIX |
|
| 587 | + . $this->getLibraryVersion() |
|
| 588 | + ); |
|
| 589 | + if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) { |
|
| 590 | + $request->enableGzip(); |
|
| 591 | + } |
|
| 592 | + $request->maybeMoveParametersToBody(); |
|
| 593 | + return Google_Http_REST::execute($this, $request); |
|
| 594 | + } else if ($request instanceof Google_Http_Batch) { |
|
| 595 | + return $request->execute(); |
|
| 596 | + } else { |
|
| 597 | + throw new Google_Exception("Do not know how to execute this type of object."); |
|
| 598 | + } |
|
| 599 | 599 | } |
| 600 | 600 | |
| 601 | 601 | /** |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | */ |
| 605 | 605 | public function shouldDefer() |
| 606 | 606 | { |
| 607 | - return $this->deferExecution; |
|
| 607 | + return $this->deferExecution; |
|
| 608 | 608 | } |
| 609 | 609 | |
| 610 | 610 | /** |
@@ -612,11 +612,11 @@ discard block |
||
| 612 | 612 | */ |
| 613 | 613 | public function getAuth() |
| 614 | 614 | { |
| 615 | - if (!isset($this->auth)) { |
|
| 616 | - $class = $this->config->getAuthClass(); |
|
| 617 | - $this->auth = new $class($this); |
|
| 618 | - } |
|
| 619 | - return $this->auth; |
|
| 615 | + if (!isset($this->auth)) { |
|
| 616 | + $class = $this->config->getAuthClass(); |
|
| 617 | + $this->auth = new $class($this); |
|
| 618 | + } |
|
| 619 | + return $this->auth; |
|
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | /** |
@@ -624,11 +624,11 @@ discard block |
||
| 624 | 624 | */ |
| 625 | 625 | public function getIo() |
| 626 | 626 | { |
| 627 | - if (!isset($this->io)) { |
|
| 628 | - $class = $this->config->getIoClass(); |
|
| 629 | - $this->io = new $class($this); |
|
| 630 | - } |
|
| 631 | - return $this->io; |
|
| 627 | + if (!isset($this->io)) { |
|
| 628 | + $class = $this->config->getIoClass(); |
|
| 629 | + $this->io = new $class($this); |
|
| 630 | + } |
|
| 631 | + return $this->io; |
|
| 632 | 632 | } |
| 633 | 633 | |
| 634 | 634 | /** |
@@ -636,11 +636,11 @@ discard block |
||
| 636 | 636 | */ |
| 637 | 637 | public function getCache() |
| 638 | 638 | { |
| 639 | - if (!isset($this->cache)) { |
|
| 640 | - $class = $this->config->getCacheClass(); |
|
| 641 | - $this->cache = new $class($this); |
|
| 642 | - } |
|
| 643 | - return $this->cache; |
|
| 639 | + if (!isset($this->cache)) { |
|
| 640 | + $class = $this->config->getCacheClass(); |
|
| 641 | + $this->cache = new $class($this); |
|
| 642 | + } |
|
| 643 | + return $this->cache; |
|
| 644 | 644 | } |
| 645 | 645 | |
| 646 | 646 | /** |
@@ -648,11 +648,11 @@ discard block |
||
| 648 | 648 | */ |
| 649 | 649 | public function getLogger() |
| 650 | 650 | { |
| 651 | - if (!isset($this->logger)) { |
|
| 652 | - $class = $this->config->getLoggerClass(); |
|
| 653 | - $this->logger = new $class($this); |
|
| 654 | - } |
|
| 655 | - return $this->logger; |
|
| 651 | + if (!isset($this->logger)) { |
|
| 652 | + $class = $this->config->getLoggerClass(); |
|
| 653 | + $this->logger = new $class($this); |
|
| 654 | + } |
|
| 655 | + return $this->logger; |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | /** |
@@ -663,10 +663,10 @@ discard block |
||
| 663 | 663 | */ |
| 664 | 664 | public function getClassConfig($class, $key = null) |
| 665 | 665 | { |
| 666 | - if (!is_string($class)) { |
|
| 667 | - $class = get_class($class); |
|
| 668 | - } |
|
| 669 | - return $this->config->getClassConfig($class, $key); |
|
| 666 | + if (!is_string($class)) { |
|
| 667 | + $class = get_class($class); |
|
| 668 | + } |
|
| 669 | + return $this->config->getClassConfig($class, $key); |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | /** |
@@ -680,10 +680,10 @@ discard block |
||
| 680 | 680 | */ |
| 681 | 681 | public function setClassConfig($class, $config, $value = null) |
| 682 | 682 | { |
| 683 | - if (!is_string($class)) { |
|
| 684 | - $class = get_class($class); |
|
| 685 | - } |
|
| 686 | - $this->config->setClassConfig($class, $config, $value); |
|
| 683 | + if (!is_string($class)) { |
|
| 684 | + $class = get_class($class); |
|
| 685 | + } |
|
| 686 | + $this->config->setClassConfig($class, $config, $value); |
|
| 687 | 687 | |
| 688 | 688 | } |
| 689 | 689 | |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | */ |
| 693 | 693 | public function getBasePath() |
| 694 | 694 | { |
| 695 | - return $this->config->getBasePath(); |
|
| 695 | + return $this->config->getBasePath(); |
|
| 696 | 696 | } |
| 697 | 697 | |
| 698 | 698 | /** |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | */ |
| 701 | 701 | public function getApplicationName() |
| 702 | 702 | { |
| 703 | - return $this->config->getApplicationName(); |
|
| 703 | + return $this->config->getApplicationName(); |
|
| 704 | 704 | } |
| 705 | 705 | |
| 706 | 706 | /** |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | */ |
| 710 | 710 | public function isAppEngine() |
| 711 | 711 | { |
| 712 | - return (isset($_SERVER['SERVER_SOFTWARE']) && |
|
| 713 | - strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false); |
|
| 712 | + return (isset($_SERVER['SERVER_SOFTWARE']) && |
|
| 713 | + strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false); |
|
| 714 | 714 | } |
| 715 | 715 | } |
@@ -36,44 +36,44 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | public function __construct(Google_Client $client) |
| 38 | 38 | { |
| 39 | - if (! function_exists('apc_add') ) { |
|
| 40 | - $error = "Apc functions not available"; |
|
| 39 | + if (! function_exists('apc_add') ) { |
|
| 40 | + $error = "Apc functions not available"; |
|
| 41 | 41 | |
| 42 | - $client->getLogger()->error($error); |
|
| 43 | - throw new Google_Cache_Exception($error); |
|
| 44 | - } |
|
| 42 | + $client->getLogger()->error($error); |
|
| 43 | + throw new Google_Cache_Exception($error); |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - $this->client = $client; |
|
| 46 | + $this->client = $client; |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | - * @inheritDoc |
|
| 51 | - */ |
|
| 50 | + * @inheritDoc |
|
| 51 | + */ |
|
| 52 | 52 | public function get($key, $expiration = false) |
| 53 | 53 | { |
| 54 | - $ret = apc_fetch($key); |
|
| 55 | - if ($ret === false) { |
|
| 56 | - $this->client->getLogger()->debug( |
|
| 57 | - 'APC cache miss', |
|
| 58 | - array('key' => $key) |
|
| 59 | - ); |
|
| 60 | - return false; |
|
| 61 | - } |
|
| 62 | - if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) { |
|
| 63 | - $this->client->getLogger()->debug( |
|
| 64 | - 'APC cache miss (expired)', |
|
| 65 | - array('key' => $key, 'var' => $ret) |
|
| 66 | - ); |
|
| 67 | - $this->delete($key); |
|
| 68 | - return false; |
|
| 69 | - } |
|
| 54 | + $ret = apc_fetch($key); |
|
| 55 | + if ($ret === false) { |
|
| 56 | + $this->client->getLogger()->debug( |
|
| 57 | + 'APC cache miss', |
|
| 58 | + array('key' => $key) |
|
| 59 | + ); |
|
| 60 | + return false; |
|
| 61 | + } |
|
| 62 | + if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) { |
|
| 63 | + $this->client->getLogger()->debug( |
|
| 64 | + 'APC cache miss (expired)', |
|
| 65 | + array('key' => $key, 'var' => $ret) |
|
| 66 | + ); |
|
| 67 | + $this->delete($key); |
|
| 68 | + return false; |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - $this->client->getLogger()->debug( |
|
| 72 | - 'APC cache hit', |
|
| 73 | - array('key' => $key, 'var' => $ret) |
|
| 74 | - ); |
|
| 71 | + $this->client->getLogger()->debug( |
|
| 72 | + 'APC cache hit', |
|
| 73 | + array('key' => $key, 'var' => $ret) |
|
| 74 | + ); |
|
| 75 | 75 | |
| 76 | - return $ret['data']; |
|
| 76 | + return $ret['data']; |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
@@ -81,21 +81,21 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function set($key, $value) |
| 83 | 83 | { |
| 84 | - $var = array('time' => time(), 'data' => $value); |
|
| 85 | - $rc = apc_store($key, $var); |
|
| 84 | + $var = array('time' => time(), 'data' => $value); |
|
| 85 | + $rc = apc_store($key, $var); |
|
| 86 | 86 | |
| 87 | - if ($rc == false) { |
|
| 88 | - $this->client->getLogger()->error( |
|
| 89 | - 'APC cache set failed', |
|
| 90 | - array('key' => $key, 'var' => $var) |
|
| 91 | - ); |
|
| 92 | - throw new Google_Cache_Exception("Couldn't store data"); |
|
| 93 | - } |
|
| 87 | + if ($rc == false) { |
|
| 88 | + $this->client->getLogger()->error( |
|
| 89 | + 'APC cache set failed', |
|
| 90 | + array('key' => $key, 'var' => $var) |
|
| 91 | + ); |
|
| 92 | + throw new Google_Cache_Exception("Couldn't store data"); |
|
| 93 | + } |
|
| 94 | 94 | |
| 95 | - $this->client->getLogger()->debug( |
|
| 96 | - 'APC cache set', |
|
| 97 | - array('key' => $key, 'var' => $var) |
|
| 98 | - ); |
|
| 95 | + $this->client->getLogger()->debug( |
|
| 96 | + 'APC cache set', |
|
| 97 | + array('key' => $key, 'var' => $var) |
|
| 98 | + ); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -104,10 +104,10 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function delete($key) |
| 106 | 106 | { |
| 107 | - $this->client->getLogger()->debug( |
|
| 108 | - 'APC cache delete', |
|
| 109 | - array('key' => $key) |
|
| 110 | - ); |
|
| 111 | - apc_delete($key); |
|
| 107 | + $this->client->getLogger()->debug( |
|
| 108 | + 'APC cache delete', |
|
| 109 | + array('key' => $key) |
|
| 110 | + ); |
|
| 111 | + apc_delete($key); |
|
| 112 | 112 | } |
| 113 | 113 | } |
@@ -43,29 +43,29 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | public function __construct(Google_Client $client) |
| 45 | 45 | { |
| 46 | - if (!function_exists('memcache_connect') && !class_exists("Memcached")) { |
|
| 47 | - $error = "Memcache functions not available"; |
|
| 48 | - |
|
| 49 | - $client->getLogger()->error($error); |
|
| 50 | - throw new Google_Cache_Exception($error); |
|
| 51 | - } |
|
| 52 | - |
|
| 53 | - $this->client = $client; |
|
| 54 | - |
|
| 55 | - if ($client->isAppEngine()) { |
|
| 56 | - // No credentials needed for GAE. |
|
| 57 | - $this->mc = new Memcached(); |
|
| 58 | - $this->connection = true; |
|
| 59 | - } else { |
|
| 60 | - $this->host = $client->getClassConfig($this, 'host'); |
|
| 61 | - $this->port = $client->getClassConfig($this, 'port'); |
|
| 62 | - if (empty($this->host) || (empty($this->port) && (string) $this->port != "0")) { |
|
| 63 | - $error = "You need to supply a valid memcache host and port"; |
|
| 64 | - |
|
| 65 | - $client->getLogger()->error($error); |
|
| 66 | - throw new Google_Cache_Exception($error); |
|
| 67 | - } |
|
| 68 | - } |
|
| 46 | + if (!function_exists('memcache_connect') && !class_exists("Memcached")) { |
|
| 47 | + $error = "Memcache functions not available"; |
|
| 48 | + |
|
| 49 | + $client->getLogger()->error($error); |
|
| 50 | + throw new Google_Cache_Exception($error); |
|
| 51 | + } |
|
| 52 | + |
|
| 53 | + $this->client = $client; |
|
| 54 | + |
|
| 55 | + if ($client->isAppEngine()) { |
|
| 56 | + // No credentials needed for GAE. |
|
| 57 | + $this->mc = new Memcached(); |
|
| 58 | + $this->connection = true; |
|
| 59 | + } else { |
|
| 60 | + $this->host = $client->getClassConfig($this, 'host'); |
|
| 61 | + $this->port = $client->getClassConfig($this, 'port'); |
|
| 62 | + if (empty($this->host) || (empty($this->port) && (string) $this->port != "0")) { |
|
| 63 | + $error = "You need to supply a valid memcache host and port"; |
|
| 64 | + |
|
| 65 | + $client->getLogger()->error($error); |
|
| 66 | + throw new Google_Cache_Exception($error); |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -73,35 +73,35 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function get($key, $expiration = false) |
| 75 | 75 | { |
| 76 | - $this->connect(); |
|
| 77 | - $ret = false; |
|
| 78 | - if ($this->mc) { |
|
| 79 | - $ret = $this->mc->get($key); |
|
| 80 | - } else { |
|
| 81 | - $ret = memcache_get($this->connection, $key); |
|
| 82 | - } |
|
| 83 | - if ($ret === false) { |
|
| 84 | - $this->client->getLogger()->debug( |
|
| 85 | - 'Memcache cache miss', |
|
| 86 | - array('key' => $key) |
|
| 87 | - ); |
|
| 88 | - return false; |
|
| 89 | - } |
|
| 90 | - if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) { |
|
| 91 | - $this->client->getLogger()->debug( |
|
| 92 | - 'Memcache cache miss (expired)', |
|
| 93 | - array('key' => $key, 'var' => $ret) |
|
| 94 | - ); |
|
| 95 | - $this->delete($key); |
|
| 96 | - return false; |
|
| 97 | - } |
|
| 98 | - |
|
| 99 | - $this->client->getLogger()->debug( |
|
| 100 | - 'Memcache cache hit', |
|
| 101 | - array('key' => $key, 'var' => $ret) |
|
| 102 | - ); |
|
| 103 | - |
|
| 104 | - return $ret['data']; |
|
| 76 | + $this->connect(); |
|
| 77 | + $ret = false; |
|
| 78 | + if ($this->mc) { |
|
| 79 | + $ret = $this->mc->get($key); |
|
| 80 | + } else { |
|
| 81 | + $ret = memcache_get($this->connection, $key); |
|
| 82 | + } |
|
| 83 | + if ($ret === false) { |
|
| 84 | + $this->client->getLogger()->debug( |
|
| 85 | + 'Memcache cache miss', |
|
| 86 | + array('key' => $key) |
|
| 87 | + ); |
|
| 88 | + return false; |
|
| 89 | + } |
|
| 90 | + if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) { |
|
| 91 | + $this->client->getLogger()->debug( |
|
| 92 | + 'Memcache cache miss (expired)', |
|
| 93 | + array('key' => $key, 'var' => $ret) |
|
| 94 | + ); |
|
| 95 | + $this->delete($key); |
|
| 96 | + return false; |
|
| 97 | + } |
|
| 98 | + |
|
| 99 | + $this->client->getLogger()->debug( |
|
| 100 | + 'Memcache cache hit', |
|
| 101 | + array('key' => $key, 'var' => $ret) |
|
| 102 | + ); |
|
| 103 | + |
|
| 104 | + return $ret['data']; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | /** |
@@ -112,29 +112,29 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | public function set($key, $value) |
| 114 | 114 | { |
| 115 | - $this->connect(); |
|
| 116 | - // we store it with the cache_time default expiration so objects will at |
|
| 117 | - // least get cleaned eventually. |
|
| 118 | - $data = array('time' => time(), 'data' => $value); |
|
| 119 | - $rc = false; |
|
| 120 | - if ($this->mc) { |
|
| 121 | - $rc = $this->mc->set($key, $data); |
|
| 122 | - } else { |
|
| 123 | - $rc = memcache_set($this->connection, $key, $data, false); |
|
| 124 | - } |
|
| 125 | - if ($rc == false) { |
|
| 126 | - $this->client->getLogger()->error( |
|
| 127 | - 'Memcache cache set failed', |
|
| 128 | - array('key' => $key, 'var' => $data) |
|
| 129 | - ); |
|
| 130 | - |
|
| 131 | - throw new Google_Cache_Exception("Couldn't store data in cache"); |
|
| 132 | - } |
|
| 133 | - |
|
| 134 | - $this->client->getLogger()->debug( |
|
| 135 | - 'Memcache cache set', |
|
| 136 | - array('key' => $key, 'var' => $data) |
|
| 137 | - ); |
|
| 115 | + $this->connect(); |
|
| 116 | + // we store it with the cache_time default expiration so objects will at |
|
| 117 | + // least get cleaned eventually. |
|
| 118 | + $data = array('time' => time(), 'data' => $value); |
|
| 119 | + $rc = false; |
|
| 120 | + if ($this->mc) { |
|
| 121 | + $rc = $this->mc->set($key, $data); |
|
| 122 | + } else { |
|
| 123 | + $rc = memcache_set($this->connection, $key, $data, false); |
|
| 124 | + } |
|
| 125 | + if ($rc == false) { |
|
| 126 | + $this->client->getLogger()->error( |
|
| 127 | + 'Memcache cache set failed', |
|
| 128 | + array('key' => $key, 'var' => $data) |
|
| 129 | + ); |
|
| 130 | + |
|
| 131 | + throw new Google_Cache_Exception("Couldn't store data in cache"); |
|
| 132 | + } |
|
| 133 | + |
|
| 134 | + $this->client->getLogger()->debug( |
|
| 135 | + 'Memcache cache set', |
|
| 136 | + array('key' => $key, 'var' => $data) |
|
| 137 | + ); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
@@ -143,17 +143,17 @@ discard block |
||
| 143 | 143 | */ |
| 144 | 144 | public function delete($key) |
| 145 | 145 | { |
| 146 | - $this->connect(); |
|
| 147 | - if ($this->mc) { |
|
| 148 | - $this->mc->delete($key, 0); |
|
| 149 | - } else { |
|
| 150 | - memcache_delete($this->connection, $key, 0); |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - $this->client->getLogger()->debug( |
|
| 154 | - 'Memcache cache delete', |
|
| 155 | - array('key' => $key) |
|
| 156 | - ); |
|
| 146 | + $this->connect(); |
|
| 147 | + if ($this->mc) { |
|
| 148 | + $this->mc->delete($key, 0); |
|
| 149 | + } else { |
|
| 150 | + memcache_delete($this->connection, $key, 0); |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + $this->client->getLogger()->debug( |
|
| 154 | + 'Memcache cache delete', |
|
| 155 | + array('key' => $key) |
|
| 156 | + ); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -162,23 +162,23 @@ discard block |
||
| 162 | 162 | */ |
| 163 | 163 | private function connect() |
| 164 | 164 | { |
| 165 | - if ($this->connection) { |
|
| 166 | - return; |
|
| 167 | - } |
|
| 168 | - |
|
| 169 | - if (class_exists("Memcached")) { |
|
| 170 | - $this->mc = new Memcached(); |
|
| 171 | - $this->mc->addServer($this->host, $this->port); |
|
| 172 | - $this->connection = true; |
|
| 173 | - } else { |
|
| 174 | - $this->connection = memcache_pconnect($this->host, $this->port); |
|
| 175 | - } |
|
| 176 | - |
|
| 177 | - if (! $this->connection) { |
|
| 178 | - $error = "Couldn't connect to memcache server"; |
|
| 179 | - |
|
| 180 | - $this->client->getLogger()->error($error); |
|
| 181 | - throw new Google_Cache_Exception($error); |
|
| 182 | - } |
|
| 165 | + if ($this->connection) { |
|
| 166 | + return; |
|
| 167 | + } |
|
| 168 | + |
|
| 169 | + if (class_exists("Memcached")) { |
|
| 170 | + $this->mc = new Memcached(); |
|
| 171 | + $this->mc->addServer($this->host, $this->port); |
|
| 172 | + $this->connection = true; |
|
| 173 | + } else { |
|
| 174 | + $this->connection = memcache_pconnect($this->host, $this->port); |
|
| 175 | + } |
|
| 176 | + |
|
| 177 | + if (! $this->connection) { |
|
| 178 | + $error = "Couldn't connect to memcache server"; |
|
| 179 | + |
|
| 180 | + $this->client->getLogger()->error($error); |
|
| 181 | + throw new Google_Cache_Exception($error); |
|
| 182 | + } |
|
| 183 | 183 | } |
| 184 | 184 | } |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | - * @inheritDoc |
|
| 35 | - */ |
|
| 34 | + * @inheritDoc |
|
| 35 | + */ |
|
| 36 | 36 | public function get($key, $expiration = false) |
| 37 | 37 | { |
| 38 | - return false; |
|
| 38 | + return false; |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function set($key, $value) |
| 45 | 45 | { |
| 46 | - // Nop. |
|
| 46 | + // Nop. |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -52,6 +52,6 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function delete($key) |
| 54 | 54 | { |
| 55 | - // Nop. |
|
| 55 | + // Nop. |
|
| 56 | 56 | } |
| 57 | 57 | } |
