GeoDirectory /
geodirectory
@@ -10,33 +10,33 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | add_action('admin_init', 'geodir_admin_init');
|
| 12 | 12 | if (!function_exists('geodir_admin_init')) {
|
| 13 | - /** |
|
| 14 | - * Adds GD setting pages in admin. |
|
| 15 | - * |
|
| 16 | - * @since 1.0.0 |
|
| 17 | - * @package GeoDirectory |
|
| 18 | - * @global string $current_tab The current settings tab name. |
|
| 19 | - */ |
|
| 20 | - function geodir_admin_init() |
|
| 21 | - {
|
|
| 22 | - |
|
| 23 | - if (is_admin()): |
|
| 24 | - global $current_tab; |
|
| 25 | - geodir_redirect_to_admin_panel_on_installed(); |
|
| 26 | - $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings'; |
|
| 27 | - if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests |
|
| 28 | - geodir_handle_option_form_submit($current_tab); // located in admin function.php |
|
| 29 | - /** |
|
| 30 | - * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area. |
|
| 31 | - * |
|
| 32 | - * @since 1.0.0 |
|
| 33 | - */ |
|
| 34 | - do_action('admin_panel_init');
|
|
| 35 | - add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
|
|
| 36 | - |
|
| 37 | - |
|
| 38 | - endif; |
|
| 39 | - } |
|
| 13 | + /** |
|
| 14 | + * Adds GD setting pages in admin. |
|
| 15 | + * |
|
| 16 | + * @since 1.0.0 |
|
| 17 | + * @package GeoDirectory |
|
| 18 | + * @global string $current_tab The current settings tab name. |
|
| 19 | + */ |
|
| 20 | + function geodir_admin_init() |
|
| 21 | + {
|
|
| 22 | + |
|
| 23 | + if (is_admin()): |
|
| 24 | + global $current_tab; |
|
| 25 | + geodir_redirect_to_admin_panel_on_installed(); |
|
| 26 | + $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings'; |
|
| 27 | + if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests |
|
| 28 | + geodir_handle_option_form_submit($current_tab); // located in admin function.php |
|
| 29 | + /** |
|
| 30 | + * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area. |
|
| 31 | + * |
|
| 32 | + * @since 1.0.0 |
|
| 33 | + */ |
|
| 34 | + do_action('admin_panel_init');
|
|
| 35 | + add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
|
|
| 36 | + |
|
| 37 | + |
|
| 38 | + endif; |
|
| 39 | + } |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | function geodir_redirect_to_admin_panel_on_installed() |
| 49 | 49 | {
|
| 50 | - if (get_option('geodir_installation_redirect', false)) {
|
|
| 51 | - delete_option('geodir_installation_redirect');
|
|
| 52 | - wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
|
|
| 53 | - } |
|
| 50 | + if (get_option('geodir_installation_redirect', false)) {
|
|
| 51 | + delete_option('geodir_installation_redirect');
|
|
| 52 | + wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
|
|
| 53 | + } |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | function geodir_get_admin_option_form($current_tab) |
| 64 | 64 | {
|
| 65 | - geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 65 | + geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
@@ -86,24 +86,24 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | function geodir_conditional_admin_script_load() |
| 88 | 88 | {
|
| 89 | - global $pagenow; |
|
| 89 | + global $pagenow; |
|
| 90 | 90 | |
| 91 | 91 | // Get the current post type |
| 92 | 92 | $post_type = geodir_admin_current_post_type(); |
| 93 | 93 | $geodir_post_types = geodir_get_posttypes(); |
| 94 | 94 | |
| 95 | 95 | if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'term.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {
|
| 96 | - add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
|
|
| 97 | - add_action('admin_enqueue_scripts', 'geodir_admin_styles');
|
|
| 98 | - add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
|
|
| 96 | + add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
|
|
| 97 | + add_action('admin_enqueue_scripts', 'geodir_admin_styles');
|
|
| 98 | + add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
|
|
| 99 | 99 | |
| 100 | - // Disable VC editor for GD post types. |
|
| 101 | - if (class_exists('Vc_Role_Access_Controller')) {
|
|
| 102 | - add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 103 | - } |
|
| 104 | - } |
|
| 100 | + // Disable VC editor for GD post types. |
|
| 101 | + if (class_exists('Vc_Role_Access_Controller')) {
|
|
| 102 | + add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 103 | + } |
|
| 104 | + } |
|
| 105 | 105 | |
| 106 | - add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
|
|
| 106 | + add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
|
|
| 107 | 107 | |
| 108 | 108 | } |
| 109 | 109 | |
@@ -138,12 +138,12 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | function create_default_admin_main_nav() |
| 140 | 140 | {
|
| 141 | - add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
|
|
| 142 | - add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
|
|
| 143 | - add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
|
|
| 144 | - add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
|
|
| 145 | - add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
|
|
| 146 | - //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
|
|
| 141 | + add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
|
|
| 142 | + add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
|
|
| 143 | + add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
|
|
| 144 | + add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
|
|
| 145 | + add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
|
|
| 146 | + //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
|
|
| 147 | 147 | |
| 148 | 148 | } |
| 149 | 149 | |
@@ -157,19 +157,19 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | function geodir_admin_list_columns() |
| 159 | 159 | {
|
| 160 | - if ($post_types = geodir_get_posttypes()) {
|
|
| 160 | + if ($post_types = geodir_get_posttypes()) {
|
|
| 161 | 161 | |
| 162 | - foreach ($post_types as $post_type): |
|
| 163 | - add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
|
|
| 164 | - //Filter-Payment-Manager to show Package |
|
| 165 | - add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
|
|
| 162 | + foreach ($post_types as $post_type): |
|
| 163 | + add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
|
|
| 164 | + //Filter-Payment-Manager to show Package |
|
| 165 | + add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
|
|
| 166 | 166 | |
| 167 | - add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
|
|
| 167 | + add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
|
|
| 168 | 168 | |
| 169 | - // Filter bulk actions |
|
| 170 | - add_filter("bulk_actions-edit-{$post_type}", 'geodir_filter_bulk_actions', 10, 1);
|
|
| 171 | - endforeach; |
|
| 172 | - } |
|
| 169 | + // Filter bulk actions |
|
| 170 | + add_filter("bulk_actions-edit-{$post_type}", 'geodir_filter_bulk_actions', 10, 1);
|
|
| 171 | + endforeach; |
|
| 172 | + } |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | /** |
@@ -182,15 +182,15 @@ discard block |
||
| 182 | 182 | */ |
| 183 | 183 | function geodir_default_admin_main_tabs($tabs) |
| 184 | 184 | {
|
| 185 | - return $tabs = array( |
|
| 186 | - 'general_settings' => array('label' => __('General', 'geodirectory')),
|
|
| 187 | - 'design_settings' => array('label' => __('Design', 'geodirectory')),
|
|
| 188 | - 'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
|
|
| 189 | - 'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
|
|
| 190 | - 'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
|
|
| 191 | - 'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
|
|
| 192 | - |
|
| 193 | - ); |
|
| 185 | + return $tabs = array( |
|
| 186 | + 'general_settings' => array('label' => __('General', 'geodirectory')),
|
|
| 187 | + 'design_settings' => array('label' => __('Design', 'geodirectory')),
|
|
| 188 | + 'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
|
|
| 189 | + 'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
|
|
| 190 | + 'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
|
|
| 191 | + 'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
|
|
| 192 | + |
|
| 193 | + ); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | add_action('do_meta_boxes', 'geodir_remove_image_box');
|
@@ -203,16 +203,16 @@ discard block |
||
| 203 | 203 | */ |
| 204 | 204 | function geodir_remove_image_box() |
| 205 | 205 | {
|
| 206 | - global $post; |
|
| 206 | + global $post; |
|
| 207 | 207 | |
| 208 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 208 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 209 | 209 | |
| 210 | - if (isset($post) && in_array($post->post_type, $geodir_posttypes)): |
|
| 210 | + if (isset($post) && in_array($post->post_type, $geodir_posttypes)): |
|
| 211 | 211 | |
| 212 | - remove_meta_box('postimagediv', $post->post_type, 'side');
|
|
| 213 | - remove_meta_box('revisionsdiv', $post->post_type, 'normal');
|
|
| 212 | + remove_meta_box('postimagediv', $post->post_type, 'side');
|
|
| 213 | + remove_meta_box('revisionsdiv', $post->post_type, 'normal');
|
|
| 214 | 214 | |
| 215 | - endif; |
|
| 215 | + endif; |
|
| 216 | 216 | |
| 217 | 217 | } |
| 218 | 218 | |
@@ -227,27 +227,27 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | function geodir_meta_box_add() |
| 229 | 229 | {
|
| 230 | - global $post; |
|
| 230 | + global $post; |
|
| 231 | 231 | |
| 232 | - $geodir_post_types = geodir_get_posttypes('array');
|
|
| 233 | - $geodir_posttypes = array_keys($geodir_post_types); |
|
| 232 | + $geodir_post_types = geodir_get_posttypes('array');
|
|
| 233 | + $geodir_posttypes = array_keys($geodir_post_types); |
|
| 234 | 234 | |
| 235 | - if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)): |
|
| 235 | + if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)): |
|
| 236 | 236 | |
| 237 | - $geodir_posttype = $post->post_type; |
|
| 238 | - $post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory'); |
|
| 239 | - $post_typename = geodir_ucwords($post_typename); |
|
| 237 | + $geodir_posttype = $post->post_type; |
|
| 238 | + $post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory'); |
|
| 239 | + $post_typename = geodir_ucwords($post_typename); |
|
| 240 | 240 | |
| 241 | - // Filter-Payment-Manager |
|
| 241 | + // Filter-Payment-Manager |
|
| 242 | 242 | |
| 243 | - add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 243 | + add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 244 | 244 | |
| 245 | - add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 245 | + add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 246 | 246 | |
| 247 | - // no need of this box as all fields moved to main information box |
|
| 248 | - //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
|
| 247 | + // no need of this box as all fields moved to main information box |
|
| 248 | + //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
|
| 249 | 249 | |
| 250 | - endif; |
|
| 250 | + endif; |
|
| 251 | 251 | |
| 252 | 252 | } |
| 253 | 253 | |
@@ -271,23 +271,23 @@ discard block |
||
| 271 | 271 | function geodir_hide_post_taxonomy_meta_boxes() |
| 272 | 272 | {
|
| 273 | 273 | |
| 274 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 274 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 275 | 275 | |
| 276 | - if (!empty($geodir_post_types)) {
|
|
| 277 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
|
|
| 276 | + if (!empty($geodir_post_types)) {
|
|
| 277 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
|
|
| 278 | 278 | |
| 279 | - $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
|
| 279 | + $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
|
| 280 | 280 | |
| 281 | - if(!empty($gd_taxonomy)) {
|
|
| 282 | - foreach ($gd_taxonomy as $tax) {
|
|
| 281 | + if(!empty($gd_taxonomy)) {
|
|
| 282 | + foreach ($gd_taxonomy as $tax) {
|
|
| 283 | 283 | |
| 284 | - remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 284 | + remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 285 | 285 | |
| 286 | - } |
|
| 287 | - } |
|
| 286 | + } |
|
| 287 | + } |
|
| 288 | 288 | |
| 289 | - } |
|
| 290 | - } |
|
| 289 | + } |
|
| 290 | + } |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');
|
@@ -301,12 +301,12 @@ discard block |
||
| 301 | 301 | */ |
| 302 | 302 | function geodir_add_listing_map_restrict($map_restirct) |
| 303 | 303 | {
|
| 304 | - if (is_admin()) {
|
|
| 305 | - if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
|
|
| 306 | - $map_restirct = false; |
|
| 307 | - } |
|
| 308 | - } |
|
| 309 | - return $map_restirct; |
|
| 304 | + if (is_admin()) {
|
|
| 305 | + if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
|
|
| 306 | + $map_restirct = false; |
|
| 307 | + } |
|
| 308 | + } |
|
| 309 | + return $map_restirct; |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | |
@@ -325,16 +325,16 @@ discard block |
||
| 325 | 325 | function geodir_enable_editor_on_notifications($notification) |
| 326 | 326 | {
|
| 327 | 327 | |
| 328 | - if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
|
|
| 328 | + if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
|
|
| 329 | 329 | |
| 330 | - foreach ($notification as $key => $value) {
|
|
| 331 | - if ($value['type'] == 'textarea') |
|
| 332 | - $notification[$key]['type'] = 'editor'; |
|
| 333 | - } |
|
| 330 | + foreach ($notification as $key => $value) {
|
|
| 331 | + if ($value['type'] == 'textarea') |
|
| 332 | + $notification[$key]['type'] = 'editor'; |
|
| 333 | + } |
|
| 334 | 334 | |
| 335 | - } |
|
| 335 | + } |
|
| 336 | 336 | |
| 337 | - return $notification; |
|
| 337 | + return $notification; |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | |
@@ -351,16 +351,16 @@ discard block |
||
| 351 | 351 | function geodir_enable_editor_on_design_settings($design_setting) |
| 352 | 352 | {
|
| 353 | 353 | |
| 354 | - if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
|
|
| 354 | + if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
|
|
| 355 | 355 | |
| 356 | - foreach ($design_setting as $key => $value) {
|
|
| 357 | - if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') |
|
| 358 | - $design_setting[$key]['type'] = 'editor'; |
|
| 359 | - } |
|
| 356 | + foreach ($design_setting as $key => $value) {
|
|
| 357 | + if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') |
|
| 358 | + $design_setting[$key]['type'] = 'editor'; |
|
| 359 | + } |
|
| 360 | 360 | |
| 361 | - } |
|
| 361 | + } |
|
| 362 | 362 | |
| 363 | - return $design_setting; |
|
| 363 | + return $design_setting; |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | /* ----------- START MANAGE CUSTOM FIELDS ---------------- */ |
@@ -368,15 +368,15 @@ discard block |
||
| 368 | 368 | add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
|
| 369 | 369 | |
| 370 | 370 | function geodir_manage_available_fields_predefined($sub_tab){
|
| 371 | - if($sub_tab=='custom_fields'){
|
|
| 372 | - geodir_custom_available_fields('predefined');
|
|
| 373 | - } |
|
| 371 | + if($sub_tab=='custom_fields'){
|
|
| 372 | + geodir_custom_available_fields('predefined');
|
|
| 373 | + } |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | function geodir_manage_available_fields_custom($sub_tab){
|
| 377 | - if($sub_tab=='custom_fields'){
|
|
| 378 | - geodir_custom_available_fields('custom');
|
|
| 379 | - } |
|
| 377 | + if($sub_tab=='custom_fields'){
|
|
| 378 | + geodir_custom_available_fields('custom');
|
|
| 379 | + } |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | |
@@ -395,16 +395,16 @@ discard block |
||
| 395 | 395 | function geodir_manage_available_fields($sub_tab) |
| 396 | 396 | {
|
| 397 | 397 | |
| 398 | - switch ($sub_tab) {
|
|
| 399 | - case 'custom_fields': |
|
| 400 | - geodir_custom_available_fields(); |
|
| 401 | - break; |
|
| 398 | + switch ($sub_tab) {
|
|
| 399 | + case 'custom_fields': |
|
| 400 | + geodir_custom_available_fields(); |
|
| 401 | + break; |
|
| 402 | 402 | |
| 403 | - case 'sorting_options': |
|
| 404 | - geodir_sorting_options_available_fields(); |
|
| 405 | - break; |
|
| 403 | + case 'sorting_options': |
|
| 404 | + geodir_sorting_options_available_fields(); |
|
| 405 | + break; |
|
| 406 | 406 | |
| 407 | - } |
|
| 407 | + } |
|
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | |
@@ -420,16 +420,16 @@ discard block |
||
| 420 | 420 | function geodir_manage_selected_fields($sub_tab) |
| 421 | 421 | {
|
| 422 | 422 | |
| 423 | - switch ($sub_tab) {
|
|
| 424 | - case 'custom_fields': |
|
| 425 | - geodir_custom_selected_fields(); |
|
| 426 | - break; |
|
| 423 | + switch ($sub_tab) {
|
|
| 424 | + case 'custom_fields': |
|
| 425 | + geodir_custom_selected_fields(); |
|
| 426 | + break; |
|
| 427 | 427 | |
| 428 | - case 'sorting_options': |
|
| 429 | - geodir_sorting_options_selected_fields(); |
|
| 430 | - break; |
|
| 428 | + case 'sorting_options': |
|
| 429 | + geodir_sorting_options_selected_fields(); |
|
| 430 | + break; |
|
| 431 | 431 | |
| 432 | - } |
|
| 432 | + } |
|
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | /** |
@@ -441,52 +441,52 @@ discard block |
||
| 441 | 441 | */ |
| 442 | 442 | function geodir_sorting_options_available_fields() |
| 443 | 443 | {
|
| 444 | - global $wpdb; |
|
| 445 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 446 | - ?> |
|
| 444 | + global $wpdb; |
|
| 445 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 446 | + ?> |
|
| 447 | 447 | <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
| 448 | 448 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 449 | 449 | <ul> |
| 450 | 450 | <?php |
| 451 | - $sort_options = geodir_get_custom_sort_options($listing_type); |
|
| 451 | + $sort_options = geodir_get_custom_sort_options($listing_type); |
|
| 452 | 452 | |
| 453 | - foreach ($sort_options as $key => $val) {
|
|
| 454 | - $val = stripslashes_deep($val); // strip slashes |
|
| 455 | - |
|
| 456 | - $check_html_variable = $wpdb->get_var( |
|
| 457 | - $wpdb->prepare( |
|
| 458 | - "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 459 | - array($val['htmlvar_name'], $listing_type, $val['field_type']) |
|
| 460 | - ) |
|
| 461 | - ); |
|
| 453 | + foreach ($sort_options as $key => $val) {
|
|
| 454 | + $val = stripslashes_deep($val); // strip slashes |
|
| 455 | + |
|
| 456 | + $check_html_variable = $wpdb->get_var( |
|
| 457 | + $wpdb->prepare( |
|
| 458 | + "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 459 | + array($val['htmlvar_name'], $listing_type, $val['field_type']) |
|
| 460 | + ) |
|
| 461 | + ); |
|
| 462 | 462 | |
| 463 | - $display = $check_html_variable ? ' style="display:none;"' : ''; |
|
| 464 | - ?> |
|
| 463 | + $display = $check_html_variable ? ' style="display:none;"' : ''; |
|
| 464 | + ?> |
|
| 465 | 465 | |
| 466 | 466 | <li class="gd-cf-tooltip-wrap" <?php echo $display;?>> |
| 467 | 467 | <?php |
| 468 | - if(isset($val['description']) && $val['description']){
|
|
| 469 | - echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
|
| 470 | - }?> |
|
| 468 | + if(isset($val['description']) && $val['description']){
|
|
| 469 | + echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
|
| 470 | + }?> |
|
| 471 | 471 | |
| 472 | 472 | <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>" data-field-type="<?php echo $val['field_type'];?>" |
| 473 | 473 | title="<?php echo $val['site_title'];?>" |
| 474 | 474 | class="gd-draggable-form-items gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);"> |
| 475 | 475 | <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
|
| 476 | - echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
|
| 477 | - }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 478 | - echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>'; |
|
| 479 | - }else{
|
|
| 480 | - echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 481 | - }?> |
|
| 476 | + echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
|
| 477 | + }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 478 | + echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>'; |
|
| 479 | + }else{
|
|
| 480 | + echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 481 | + }?> |
|
| 482 | 482 | <?php echo (! empty( $val['admin_title'] ) ? $val['admin_title'] : $val['site_title'] );?> |
| 483 | 483 | </a> |
| 484 | 484 | </li> |
| 485 | 485 | |
| 486 | 486 | |
| 487 | 487 | <?php |
| 488 | - } |
|
| 489 | - ?> |
|
| 488 | + } |
|
| 489 | + ?> |
|
| 490 | 490 | </ul> |
| 491 | 491 | <?php |
| 492 | 492 | } |
@@ -500,28 +500,28 @@ discard block |
||
| 500 | 500 | */ |
| 501 | 501 | function geodir_sorting_options_selected_fields() |
| 502 | 502 | {
|
| 503 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 504 | - ?> |
|
| 503 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 504 | + ?> |
|
| 505 | 505 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 506 | 506 | <ul class="core"> |
| 507 | 507 | <?php |
| 508 | - global $wpdb; |
|
| 508 | + global $wpdb; |
|
| 509 | 509 | |
| 510 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 510 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 511 | 511 | |
| 512 | - if (!empty($fields)) {
|
|
| 513 | - foreach ($fields as $field) {
|
|
| 514 | - //$result_str = $field->id; |
|
| 515 | - $result_str = $field; |
|
| 516 | - $field_type = $field->field_type; |
|
| 517 | - $field_ins_upd = 'display'; |
|
| 512 | + if (!empty($fields)) {
|
|
| 513 | + foreach ($fields as $field) {
|
|
| 514 | + //$result_str = $field->id; |
|
| 515 | + $result_str = $field; |
|
| 516 | + $field_type = $field->field_type; |
|
| 517 | + $field_ins_upd = 'display'; |
|
| 518 | 518 | |
| 519 | - $default = false; |
|
| 519 | + $default = false; |
|
| 520 | 520 | |
| 521 | - geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default); |
|
| 522 | - } |
|
| 523 | - } |
|
| 524 | - ?> |
|
| 521 | + geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default); |
|
| 522 | + } |
|
| 523 | + } |
|
| 524 | + ?> |
|
| 525 | 525 | </ul> |
| 526 | 526 | <?php |
| 527 | 527 | } |
@@ -534,12 +534,12 @@ discard block |
||
| 534 | 534 | */ |
| 535 | 535 | function geodir_custom_fields_custom($post_type=''){
|
| 536 | 536 | |
| 537 | - $custom_fields = array(); |
|
| 537 | + $custom_fields = array(); |
|
| 538 | 538 | |
| 539 | - /** |
|
| 540 | - * @see `geodir_custom_fields` |
|
| 541 | - */ |
|
| 542 | - return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 539 | + /** |
|
| 540 | + * @see `geodir_custom_fields` |
|
| 541 | + */ |
|
| 542 | + return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | |
@@ -552,140 +552,140 @@ discard block |
||
| 552 | 552 | */ |
| 553 | 553 | function geodir_custom_fields($post_type=''){
|
| 554 | 554 | |
| 555 | - $custom_fields = array( |
|
| 556 | - 'text' => array( |
|
| 557 | - 'field_type' => 'text', |
|
| 558 | - 'class' => 'gd-text', |
|
| 559 | - 'icon' => 'fa fa-minus', |
|
| 560 | - 'name' => __('Text', 'geodirectory'),
|
|
| 561 | - 'description' => __('Add any sort of text field, text or numbers', 'geodirectory')
|
|
| 562 | - ), |
|
| 563 | - 'datepicker' => array( |
|
| 564 | - 'field_type' => 'datepicker', |
|
| 565 | - 'class' => 'gd-datepicker', |
|
| 566 | - 'icon' => 'fa fa-calendar', |
|
| 567 | - 'name' => __('Date', 'geodirectory'),
|
|
| 568 | - 'description' => __('Adds a date picker.', 'geodirectory')
|
|
| 569 | - ), |
|
| 570 | - 'textarea' => array( |
|
| 571 | - 'field_type' => 'textarea', |
|
| 572 | - 'class' => 'gd-textarea', |
|
| 573 | - 'icon' => 'fa fa-bars', |
|
| 574 | - 'name' => __('Textarea', 'geodirectory'),
|
|
| 575 | - 'description' => __('Adds a textarea', 'geodirectory')
|
|
| 576 | - ), |
|
| 577 | - 'time' => array( |
|
| 578 | - 'field_type' => 'time', |
|
| 579 | - 'class' => 'gd-time', |
|
| 580 | - 'icon' => 'fa fa-clock-o', |
|
| 581 | - 'name' => __('Time', 'geodirectory'),
|
|
| 582 | - 'description' => __('Adds a time picker', 'geodirectory')
|
|
| 583 | - ), |
|
| 584 | - 'checkbox' => array( |
|
| 585 | - 'field_type' => 'checkbox', |
|
| 586 | - 'class' => 'gd-checkbox', |
|
| 587 | - 'icon' => 'fa fa-check-square-o', |
|
| 588 | - 'name' => __('Checkbox', 'geodirectory'),
|
|
| 589 | - 'description' => __('Adds a checkbox', 'geodirectory')
|
|
| 590 | - ), |
|
| 591 | - 'phone' => array( |
|
| 592 | - 'field_type' => 'phone', |
|
| 593 | - 'class' => 'gd-phone', |
|
| 594 | - 'icon' => 'fa fa-phone', |
|
| 595 | - 'name' => __('Phone', 'geodirectory'),
|
|
| 596 | - 'description' => __('Adds a phone input', 'geodirectory')
|
|
| 597 | - ), |
|
| 598 | - 'radio' => array( |
|
| 599 | - 'field_type' => 'radio', |
|
| 600 | - 'class' => 'gd-radio', |
|
| 601 | - 'icon' => 'fa fa-dot-circle-o', |
|
| 602 | - 'name' => __('Radio', 'geodirectory'),
|
|
| 603 | - 'description' => __('Adds a radio input', 'geodirectory')
|
|
| 604 | - ), |
|
| 605 | - 'email' => array( |
|
| 606 | - 'field_type' => 'email', |
|
| 607 | - 'class' => 'gd-email', |
|
| 608 | - 'icon' => 'fa fa-envelope-o', |
|
| 609 | - 'name' => __('Email', 'geodirectory'),
|
|
| 610 | - 'description' => __('Adds a email input', 'geodirectory')
|
|
| 611 | - ), |
|
| 612 | - 'select' => array( |
|
| 613 | - 'field_type' => 'select', |
|
| 614 | - 'class' => 'gd-select', |
|
| 615 | - 'icon' => 'fa fa-caret-square-o-down', |
|
| 616 | - 'name' => __('Select', 'geodirectory'),
|
|
| 617 | - 'description' => __('Adds a select input', 'geodirectory')
|
|
| 618 | - ), |
|
| 619 | - 'multiselect' => array( |
|
| 620 | - 'field_type' => 'multiselect', |
|
| 621 | - 'class' => 'gd-multiselect', |
|
| 622 | - 'icon' => 'fa fa-caret-square-o-down', |
|
| 623 | - 'name' => __('Multi Select', 'geodirectory'),
|
|
| 624 | - 'description' => __('Adds a multiselect input', 'geodirectory')
|
|
| 625 | - ), |
|
| 626 | - 'url' => array( |
|
| 627 | - 'field_type' => 'url', |
|
| 628 | - 'class' => 'gd-url', |
|
| 629 | - 'icon' => 'fa fa-link', |
|
| 630 | - 'name' => __('URL', 'geodirectory'),
|
|
| 631 | - 'description' => __('Adds a url input', 'geodirectory')
|
|
| 632 | - ), |
|
| 633 | - 'html' => array( |
|
| 634 | - 'field_type' => 'html', |
|
| 635 | - 'class' => 'gd-html', |
|
| 636 | - 'icon' => 'fa fa-code', |
|
| 637 | - 'name' => __('HTML', 'geodirectory'),
|
|
| 638 | - 'description' => __('Adds a html input textarea', 'geodirectory')
|
|
| 639 | - ), |
|
| 640 | - 'file' => array( |
|
| 641 | - 'field_type' => 'file', |
|
| 642 | - 'class' => 'gd-file', |
|
| 643 | - 'icon' => 'fa fa-file', |
|
| 644 | - 'name' => __('File Upload', 'geodirectory'),
|
|
| 645 | - 'description' => __('Adds a file input', 'geodirectory')
|
|
| 646 | - ) |
|
| 647 | - ); |
|
| 648 | - |
|
| 649 | - /** |
|
| 650 | - * Filter the custom fields array to be able to add or remove items. |
|
| 651 | - * |
|
| 652 | - * @since 1.6.6 |
|
| 653 | - * |
|
| 654 | - * @param array $custom_fields {
|
|
| 655 | - * The custom fields array to be filtered. |
|
| 656 | - * |
|
| 657 | - * @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file. |
|
| 658 | - * @type string $class The class for the field in backend. |
|
| 659 | - * @type string $icon Can be font-awesome class name or icon image url. |
|
| 660 | - * @type string $name The name of the field. |
|
| 661 | - * @type string $description A short description about the field. |
|
| 662 | - * @type array $defaults {
|
|
| 663 | - * Optional. Used to set the default value of the field. |
|
| 664 | - * |
|
| 665 | - * @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE |
|
| 666 | - * @type int decimal_point limit if using FLOAT data_type |
|
| 667 | - * @type string admin_title The admin title for the field. |
|
| 668 | - * @type string site_title This will be the title for the field on the frontend. |
|
| 669 | - * @type string admin_desc This will be shown below the field on the add listing form. |
|
| 670 | - * @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters. |
|
| 671 | - * @type bool is_active If false the field will not be displayed anywhere. |
|
| 672 | - * @type bool for_admin_use If true then only site admin can see and edit this field. |
|
| 673 | - * @type string default_value The default value for the input on the add listing page. |
|
| 674 | - * @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble] |
|
| 675 | - * @type bool is_required If true the field will be required on the add listing page. |
|
| 676 | - * @type string option_values The option values for select and multiselect only |
|
| 677 | - * @type string validation_pattern HTML5 validation pattern (text input only by default). |
|
| 678 | - * @type string validation_msg HTML5 validation message (text input only by default). |
|
| 679 | - * @type string required_msg Required warning message. |
|
| 680 | - * @type string field_icon Icon url or font awesome class. |
|
| 681 | - * @type string css_class Field custom css class for field custom style. |
|
| 682 | - * @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option. |
|
| 683 | - * @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required) |
|
| 684 | - * } |
|
| 685 | - * } |
|
| 686 | - * @param string $post_type The post type requested. |
|
| 687 | - */ |
|
| 688 | - return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 555 | + $custom_fields = array( |
|
| 556 | + 'text' => array( |
|
| 557 | + 'field_type' => 'text', |
|
| 558 | + 'class' => 'gd-text', |
|
| 559 | + 'icon' => 'fa fa-minus', |
|
| 560 | + 'name' => __('Text', 'geodirectory'),
|
|
| 561 | + 'description' => __('Add any sort of text field, text or numbers', 'geodirectory')
|
|
| 562 | + ), |
|
| 563 | + 'datepicker' => array( |
|
| 564 | + 'field_type' => 'datepicker', |
|
| 565 | + 'class' => 'gd-datepicker', |
|
| 566 | + 'icon' => 'fa fa-calendar', |
|
| 567 | + 'name' => __('Date', 'geodirectory'),
|
|
| 568 | + 'description' => __('Adds a date picker.', 'geodirectory')
|
|
| 569 | + ), |
|
| 570 | + 'textarea' => array( |
|
| 571 | + 'field_type' => 'textarea', |
|
| 572 | + 'class' => 'gd-textarea', |
|
| 573 | + 'icon' => 'fa fa-bars', |
|
| 574 | + 'name' => __('Textarea', 'geodirectory'),
|
|
| 575 | + 'description' => __('Adds a textarea', 'geodirectory')
|
|
| 576 | + ), |
|
| 577 | + 'time' => array( |
|
| 578 | + 'field_type' => 'time', |
|
| 579 | + 'class' => 'gd-time', |
|
| 580 | + 'icon' => 'fa fa-clock-o', |
|
| 581 | + 'name' => __('Time', 'geodirectory'),
|
|
| 582 | + 'description' => __('Adds a time picker', 'geodirectory')
|
|
| 583 | + ), |
|
| 584 | + 'checkbox' => array( |
|
| 585 | + 'field_type' => 'checkbox', |
|
| 586 | + 'class' => 'gd-checkbox', |
|
| 587 | + 'icon' => 'fa fa-check-square-o', |
|
| 588 | + 'name' => __('Checkbox', 'geodirectory'),
|
|
| 589 | + 'description' => __('Adds a checkbox', 'geodirectory')
|
|
| 590 | + ), |
|
| 591 | + 'phone' => array( |
|
| 592 | + 'field_type' => 'phone', |
|
| 593 | + 'class' => 'gd-phone', |
|
| 594 | + 'icon' => 'fa fa-phone', |
|
| 595 | + 'name' => __('Phone', 'geodirectory'),
|
|
| 596 | + 'description' => __('Adds a phone input', 'geodirectory')
|
|
| 597 | + ), |
|
| 598 | + 'radio' => array( |
|
| 599 | + 'field_type' => 'radio', |
|
| 600 | + 'class' => 'gd-radio', |
|
| 601 | + 'icon' => 'fa fa-dot-circle-o', |
|
| 602 | + 'name' => __('Radio', 'geodirectory'),
|
|
| 603 | + 'description' => __('Adds a radio input', 'geodirectory')
|
|
| 604 | + ), |
|
| 605 | + 'email' => array( |
|
| 606 | + 'field_type' => 'email', |
|
| 607 | + 'class' => 'gd-email', |
|
| 608 | + 'icon' => 'fa fa-envelope-o', |
|
| 609 | + 'name' => __('Email', 'geodirectory'),
|
|
| 610 | + 'description' => __('Adds a email input', 'geodirectory')
|
|
| 611 | + ), |
|
| 612 | + 'select' => array( |
|
| 613 | + 'field_type' => 'select', |
|
| 614 | + 'class' => 'gd-select', |
|
| 615 | + 'icon' => 'fa fa-caret-square-o-down', |
|
| 616 | + 'name' => __('Select', 'geodirectory'),
|
|
| 617 | + 'description' => __('Adds a select input', 'geodirectory')
|
|
| 618 | + ), |
|
| 619 | + 'multiselect' => array( |
|
| 620 | + 'field_type' => 'multiselect', |
|
| 621 | + 'class' => 'gd-multiselect', |
|
| 622 | + 'icon' => 'fa fa-caret-square-o-down', |
|
| 623 | + 'name' => __('Multi Select', 'geodirectory'),
|
|
| 624 | + 'description' => __('Adds a multiselect input', 'geodirectory')
|
|
| 625 | + ), |
|
| 626 | + 'url' => array( |
|
| 627 | + 'field_type' => 'url', |
|
| 628 | + 'class' => 'gd-url', |
|
| 629 | + 'icon' => 'fa fa-link', |
|
| 630 | + 'name' => __('URL', 'geodirectory'),
|
|
| 631 | + 'description' => __('Adds a url input', 'geodirectory')
|
|
| 632 | + ), |
|
| 633 | + 'html' => array( |
|
| 634 | + 'field_type' => 'html', |
|
| 635 | + 'class' => 'gd-html', |
|
| 636 | + 'icon' => 'fa fa-code', |
|
| 637 | + 'name' => __('HTML', 'geodirectory'),
|
|
| 638 | + 'description' => __('Adds a html input textarea', 'geodirectory')
|
|
| 639 | + ), |
|
| 640 | + 'file' => array( |
|
| 641 | + 'field_type' => 'file', |
|
| 642 | + 'class' => 'gd-file', |
|
| 643 | + 'icon' => 'fa fa-file', |
|
| 644 | + 'name' => __('File Upload', 'geodirectory'),
|
|
| 645 | + 'description' => __('Adds a file input', 'geodirectory')
|
|
| 646 | + ) |
|
| 647 | + ); |
|
| 648 | + |
|
| 649 | + /** |
|
| 650 | + * Filter the custom fields array to be able to add or remove items. |
|
| 651 | + * |
|
| 652 | + * @since 1.6.6 |
|
| 653 | + * |
|
| 654 | + * @param array $custom_fields {
|
|
| 655 | + * The custom fields array to be filtered. |
|
| 656 | + * |
|
| 657 | + * @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file. |
|
| 658 | + * @type string $class The class for the field in backend. |
|
| 659 | + * @type string $icon Can be font-awesome class name or icon image url. |
|
| 660 | + * @type string $name The name of the field. |
|
| 661 | + * @type string $description A short description about the field. |
|
| 662 | + * @type array $defaults {
|
|
| 663 | + * Optional. Used to set the default value of the field. |
|
| 664 | + * |
|
| 665 | + * @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE |
|
| 666 | + * @type int decimal_point limit if using FLOAT data_type |
|
| 667 | + * @type string admin_title The admin title for the field. |
|
| 668 | + * @type string site_title This will be the title for the field on the frontend. |
|
| 669 | + * @type string admin_desc This will be shown below the field on the add listing form. |
|
| 670 | + * @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters. |
|
| 671 | + * @type bool is_active If false the field will not be displayed anywhere. |
|
| 672 | + * @type bool for_admin_use If true then only site admin can see and edit this field. |
|
| 673 | + * @type string default_value The default value for the input on the add listing page. |
|
| 674 | + * @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble] |
|
| 675 | + * @type bool is_required If true the field will be required on the add listing page. |
|
| 676 | + * @type string option_values The option values for select and multiselect only |
|
| 677 | + * @type string validation_pattern HTML5 validation pattern (text input only by default). |
|
| 678 | + * @type string validation_msg HTML5 validation message (text input only by default). |
|
| 679 | + * @type string required_msg Required warning message. |
|
| 680 | + * @type string field_icon Icon url or font awesome class. |
|
| 681 | + * @type string css_class Field custom css class for field custom style. |
|
| 682 | + * @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option. |
|
| 683 | + * @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required) |
|
| 684 | + * } |
|
| 685 | + * } |
|
| 686 | + * @param string $post_type The post type requested. |
|
| 687 | + */ |
|
| 688 | + return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | /** |
@@ -698,19 +698,19 @@ discard block |
||
| 698 | 698 | */ |
| 699 | 699 | function geodir_custom_available_fields($type='') |
| 700 | 700 | {
|
| 701 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 702 | - ?> |
|
| 701 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 702 | + ?> |
|
| 703 | 703 | <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
| 704 | 704 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" /> |
| 705 | 705 | |
| 706 | 706 | <?php |
| 707 | - if($type=='predefined'){
|
|
| 708 | - $cfs = geodir_custom_fields_predefined($listing_type); |
|
| 709 | - }elseif($type=='custom'){
|
|
| 710 | - $cfs = geodir_custom_fields_custom($listing_type); |
|
| 711 | - }else{
|
|
| 712 | - $cfs = geodir_custom_fields($listing_type); |
|
| 713 | - ?> |
|
| 707 | + if($type=='predefined'){
|
|
| 708 | + $cfs = geodir_custom_fields_predefined($listing_type); |
|
| 709 | + }elseif($type=='custom'){
|
|
| 710 | + $cfs = geodir_custom_fields_custom($listing_type); |
|
| 711 | + }else{
|
|
| 712 | + $cfs = geodir_custom_fields($listing_type); |
|
| 713 | + ?> |
|
| 714 | 714 | <ul class="full gd-cf-tooltip-wrap"> |
| 715 | 715 | <li> |
| 716 | 716 | <div class="gdcf-tooltip"> |
@@ -731,18 +731,18 @@ discard block |
||
| 731 | 731 | </ul> |
| 732 | 732 | |
| 733 | 733 | <?php |
| 734 | - } |
|
| 734 | + } |
|
| 735 | 735 | |
| 736 | - if(!empty($cfs)) {
|
|
| 737 | - echo '<ul>'; |
|
| 738 | - foreach ( $cfs as $id => $cf ) {
|
|
| 739 | - ?> |
|
| 736 | + if(!empty($cfs)) {
|
|
| 737 | + echo '<ul>'; |
|
| 738 | + foreach ( $cfs as $id => $cf ) {
|
|
| 739 | + ?> |
|
| 740 | 740 | |
| 741 | 741 | <li class="gd-cf-tooltip-wrap"> |
| 742 | 742 | <?php |
| 743 | - if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 744 | - echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 745 | - } ?> |
|
| 743 | + if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 744 | + echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 745 | + } ?> |
|
| 746 | 746 | |
| 747 | 747 | <a id="gd-<?php echo $id; ?>" |
| 748 | 748 | data-field-custom-type="<?php echo $type; ?>" |
@@ -752,21 +752,21 @@ discard block |
||
| 752 | 752 | href="javascript:void(0);"> |
| 753 | 753 | |
| 754 | 754 | <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
|
| 755 | - echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 756 | - } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 757 | - echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>'; |
|
| 758 | - } else {
|
|
| 759 | - echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 760 | - } ?> |
|
| 755 | + echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 756 | + } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 757 | + echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>'; |
|
| 758 | + } else {
|
|
| 759 | + echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 760 | + } ?> |
|
| 761 | 761 | <?php echo $cf['name']; ?> |
| 762 | 762 | </a> |
| 763 | 763 | </li> |
| 764 | 764 | <?php |
| 765 | - } |
|
| 766 | - }else{
|
|
| 767 | - _e('There are no custom fields here yet.', 'geodirectory');
|
|
| 768 | - } |
|
| 769 | - ?> |
|
| 765 | + } |
|
| 766 | + }else{
|
|
| 767 | + _e('There are no custom fields here yet.', 'geodirectory');
|
|
| 768 | + } |
|
| 769 | + ?> |
|
| 770 | 770 | |
| 771 | 771 | |
| 772 | 772 | </ul> |
@@ -785,26 +785,26 @@ discard block |
||
| 785 | 785 | */ |
| 786 | 786 | function geodir_custom_selected_fields() |
| 787 | 787 | {
|
| 788 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 789 | - ?> |
|
| 788 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 789 | + ?> |
|
| 790 | 790 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 791 | 791 | <ul class="core"> |
| 792 | 792 | <?php |
| 793 | - global $wpdb; |
|
| 794 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 795 | - |
|
| 796 | - if (!empty($fields)) {
|
|
| 797 | - foreach ($fields as $field) {
|
|
| 798 | - //$result_str = $field->id; |
|
| 799 | - $result_str = $field; |
|
| 800 | - $field_type = $field->field_type; |
|
| 801 | - $field_type_key = $field->field_type_key; |
|
| 802 | - $field_ins_upd = 'display'; |
|
| 803 | - |
|
| 804 | - geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 805 | - } |
|
| 806 | - } |
|
| 807 | - ?></ul> |
|
| 793 | + global $wpdb; |
|
| 794 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 795 | + |
|
| 796 | + if (!empty($fields)) {
|
|
| 797 | + foreach ($fields as $field) {
|
|
| 798 | + //$result_str = $field->id; |
|
| 799 | + $result_str = $field; |
|
| 800 | + $field_type = $field->field_type; |
|
| 801 | + $field_type_key = $field->field_type_key; |
|
| 802 | + $field_ins_upd = 'display'; |
|
| 803 | + |
|
| 804 | + geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 805 | + } |
|
| 806 | + } |
|
| 807 | + ?></ul> |
|
| 808 | 808 | <?php |
| 809 | 809 | |
| 810 | 810 | } |
@@ -823,16 +823,16 @@ discard block |
||
| 823 | 823 | function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type) |
| 824 | 824 | {
|
| 825 | 825 | |
| 826 | - switch ($sub_tab) {
|
|
| 827 | - case 'custom_fields': |
|
| 828 | - $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 829 | - break; |
|
| 826 | + switch ($sub_tab) {
|
|
| 827 | + case 'custom_fields': |
|
| 828 | + $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 829 | + break; |
|
| 830 | 830 | |
| 831 | - case 'sorting_options': |
|
| 832 | - $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 833 | - break; |
|
| 834 | - } |
|
| 835 | - return $heading; |
|
| 831 | + case 'sorting_options': |
|
| 832 | + $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 833 | + break; |
|
| 834 | + } |
|
| 835 | + return $heading; |
|
| 836 | 836 | } |
| 837 | 837 | |
| 838 | 838 | |
@@ -850,16 +850,16 @@ discard block |
||
| 850 | 850 | function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type) |
| 851 | 851 | {
|
| 852 | 852 | |
| 853 | - switch ($sub_tab) {
|
|
| 854 | - case 'custom_fields': |
|
| 855 | - $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 856 | - break; |
|
| 853 | + switch ($sub_tab) {
|
|
| 854 | + case 'custom_fields': |
|
| 855 | + $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 856 | + break; |
|
| 857 | 857 | |
| 858 | - case 'sorting_options': |
|
| 859 | - $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 860 | - break; |
|
| 861 | - } |
|
| 862 | - return $heading; |
|
| 858 | + case 'sorting_options': |
|
| 859 | + $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 860 | + break; |
|
| 861 | + } |
|
| 862 | + return $heading; |
|
| 863 | 863 | } |
| 864 | 864 | |
| 865 | 865 | |
@@ -877,16 +877,16 @@ discard block |
||
| 877 | 877 | function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type) |
| 878 | 878 | {
|
| 879 | 879 | |
| 880 | - switch ($sub_tab) {
|
|
| 881 | - case 'custom_fields': |
|
| 882 | - $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 883 | - break; |
|
| 880 | + switch ($sub_tab) {
|
|
| 881 | + case 'custom_fields': |
|
| 882 | + $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 883 | + break; |
|
| 884 | 884 | |
| 885 | - case 'sorting_options': |
|
| 886 | - $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing page.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 887 | - break; |
|
| 888 | - } |
|
| 889 | - return $note; |
|
| 885 | + case 'sorting_options': |
|
| 886 | + $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing page.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 887 | + break; |
|
| 888 | + } |
|
| 889 | + return $note; |
|
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | |
@@ -904,16 +904,16 @@ discard block |
||
| 904 | 904 | function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type) |
| 905 | 905 | {
|
| 906 | 906 | |
| 907 | - switch ($sub_tab) {
|
|
| 908 | - case 'custom_fields': |
|
| 909 | - $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 910 | - break; |
|
| 907 | + switch ($sub_tab) {
|
|
| 908 | + case 'custom_fields': |
|
| 909 | + $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 910 | + break; |
|
| 911 | 911 | |
| 912 | - case 'sorting_options': |
|
| 913 | - $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 914 | - break; |
|
| 915 | - } |
|
| 916 | - return $heading; |
|
| 912 | + case 'sorting_options': |
|
| 913 | + $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 914 | + break; |
|
| 915 | + } |
|
| 916 | + return $heading; |
|
| 917 | 917 | } |
| 918 | 918 | |
| 919 | 919 | |
@@ -931,16 +931,16 @@ discard block |
||
| 931 | 931 | function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type) |
| 932 | 932 | {
|
| 933 | 933 | |
| 934 | - switch ($sub_tab) {
|
|
| 935 | - case 'custom_fields': |
|
| 936 | - $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 937 | - break; |
|
| 934 | + switch ($sub_tab) {
|
|
| 935 | + case 'custom_fields': |
|
| 936 | + $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 937 | + break; |
|
| 938 | 938 | |
| 939 | - case 'sorting_options': |
|
| 940 | - $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 941 | - break; |
|
| 942 | - } |
|
| 943 | - return $note; |
|
| 939 | + case 'sorting_options': |
|
| 940 | + $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 941 | + break; |
|
| 942 | + } |
|
| 943 | + return $note; |
|
| 944 | 944 | } |
| 945 | 945 | |
| 946 | 946 | |
@@ -956,16 +956,16 @@ discard block |
||
| 956 | 956 | */ |
| 957 | 957 | function geodir_remove_unnecessary_fields() |
| 958 | 958 | {
|
| 959 | - global $wpdb, $plugin_prefix; |
|
| 959 | + global $wpdb, $plugin_prefix; |
|
| 960 | 960 | |
| 961 | - if (!get_option('geodir_remove_unnecessary_fields')) {
|
|
| 961 | + if (!get_option('geodir_remove_unnecessary_fields')) {
|
|
| 962 | 962 | |
| 963 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 964 | - $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 963 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 964 | + $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 965 | 965 | |
| 966 | - update_option('geodir_remove_unnecessary_fields', '1');
|
|
| 966 | + update_option('geodir_remove_unnecessary_fields', '1');
|
|
| 967 | 967 | |
| 968 | - } |
|
| 968 | + } |
|
| 969 | 969 | |
| 970 | 970 | } |
| 971 | 971 | |
@@ -983,28 +983,28 @@ discard block |
||
| 983 | 983 | */ |
| 984 | 984 | function geodir_admin_ajax_handler() |
| 985 | 985 | {
|
| 986 | - if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
|
|
| 987 | - $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action']; |
|
| 988 | - $diagnose_this = ""; |
|
| 989 | - switch ($geodir_admin_ajax_action) {
|
|
| 990 | - case 'diagnosis' : |
|
| 991 | - if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
|
| 992 | - $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 993 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 994 | - |
|
| 995 | - } |
|
| 996 | - exit(); |
|
| 997 | - break; |
|
| 998 | - |
|
| 999 | - case 'diagnosis-fix' : |
|
| 1000 | - if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
|
| 1001 | - $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 1002 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 1003 | - exit(); |
|
| 1004 | - break; |
|
| 1005 | - } |
|
| 1006 | - } |
|
| 1007 | - exit(); |
|
| 986 | + if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
|
|
| 987 | + $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action']; |
|
| 988 | + $diagnose_this = ""; |
|
| 989 | + switch ($geodir_admin_ajax_action) {
|
|
| 990 | + case 'diagnosis' : |
|
| 991 | + if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
|
| 992 | + $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 993 | + call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 994 | + |
|
| 995 | + } |
|
| 996 | + exit(); |
|
| 997 | + break; |
|
| 998 | + |
|
| 999 | + case 'diagnosis-fix' : |
|
| 1000 | + if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
|
| 1001 | + $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 1002 | + call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 1003 | + exit(); |
|
| 1004 | + break; |
|
| 1005 | + } |
|
| 1006 | + } |
|
| 1007 | + exit(); |
|
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | 1010 | |
@@ -1022,127 +1022,127 @@ discard block |
||
| 1022 | 1022 | */ |
| 1023 | 1023 | function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix) |
| 1024 | 1024 | {
|
| 1025 | - global $wpdb; |
|
| 1026 | - //$filter_arr['output_str'] .='###'.$table.'###'; |
|
| 1027 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1028 | - $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1029 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1030 | - |
|
| 1031 | - } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1032 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1033 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1034 | - $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1035 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1036 | - |
|
| 1037 | - if ($fix) {
|
|
| 1038 | - $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1039 | - $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1040 | - |
|
| 1041 | - if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
|
| 1042 | - //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
|
| 1043 | - |
|
| 1044 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1045 | - |
|
| 1046 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1047 | - $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1048 | - } else {
|
|
| 1049 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1050 | - } |
|
| 1051 | - |
|
| 1052 | - } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
|
| 1053 | - |
|
| 1054 | - $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1055 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1056 | - |
|
| 1057 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1058 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1059 | - } else {
|
|
| 1060 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1061 | - } |
|
| 1062 | - |
|
| 1063 | - } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
|
| 1064 | - |
|
| 1065 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1066 | - |
|
| 1067 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1068 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1069 | - } else {
|
|
| 1070 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1071 | - } |
|
| 1072 | - |
|
| 1073 | - } |
|
| 1074 | - |
|
| 1075 | - } |
|
| 1076 | - |
|
| 1077 | - |
|
| 1078 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1079 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1080 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1081 | - |
|
| 1082 | - if ($fix) {
|
|
| 1083 | - if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
|
| 1084 | - if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
|
| 1085 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1086 | - } else {
|
|
| 1087 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1088 | - } |
|
| 1089 | - |
|
| 1090 | - } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1091 | - if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1092 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1093 | - } else {
|
|
| 1094 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1095 | - } |
|
| 1096 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1097 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1098 | - } else {
|
|
| 1099 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1100 | - } |
|
| 1101 | - } else {// else rename the original table to _ms_bak
|
|
| 1102 | - if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1103 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1104 | - } else {
|
|
| 1105 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1106 | - } |
|
| 1107 | - } |
|
| 1108 | - } |
|
| 1109 | - |
|
| 1110 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1111 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1112 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1113 | - |
|
| 1114 | - if ($fix) {
|
|
| 1115 | - // if original table exists but new does not, rename |
|
| 1116 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1117 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1118 | - } else {
|
|
| 1119 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1120 | - } |
|
| 1121 | - |
|
| 1122 | - } |
|
| 1123 | - |
|
| 1124 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1125 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1126 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1127 | - |
|
| 1128 | - if ($fix) {
|
|
| 1129 | - // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run; |
|
| 1130 | - delete_option('geodirlocation_db_version');
|
|
| 1131 | - delete_option('geodirevents_db_version');
|
|
| 1132 | - delete_option('geodir_reviewrating_db_version');
|
|
| 1133 | - delete_option('gdevents_db_version');
|
|
| 1134 | - delete_option('geodirectory_db_version');
|
|
| 1135 | - delete_option('geodirclaim_db_version');
|
|
| 1136 | - delete_option('geodir_custom_posts_db_version');
|
|
| 1137 | - delete_option('geodir_reviewratings_db_version');
|
|
| 1138 | - delete_option('geodiradvancesearch_db_version');
|
|
| 1139 | - $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1140 | - } |
|
| 1141 | - |
|
| 1142 | - } else {
|
|
| 1143 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1144 | - } |
|
| 1145 | - return $filter_arr; |
|
| 1025 | + global $wpdb; |
|
| 1026 | + //$filter_arr['output_str'] .='###'.$table.'###'; |
|
| 1027 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1028 | + $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1029 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1030 | + |
|
| 1031 | + } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1032 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1033 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1034 | + $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1035 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1036 | + |
|
| 1037 | + if ($fix) {
|
|
| 1038 | + $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1039 | + $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1040 | + |
|
| 1041 | + if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
|
| 1042 | + //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
|
| 1043 | + |
|
| 1044 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1045 | + |
|
| 1046 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1047 | + $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1048 | + } else {
|
|
| 1049 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1050 | + } |
|
| 1051 | + |
|
| 1052 | + } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
|
| 1053 | + |
|
| 1054 | + $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1055 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1056 | + |
|
| 1057 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1058 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1059 | + } else {
|
|
| 1060 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1061 | + } |
|
| 1062 | + |
|
| 1063 | + } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
|
| 1064 | + |
|
| 1065 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1066 | + |
|
| 1067 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1068 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1069 | + } else {
|
|
| 1070 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1071 | + } |
|
| 1072 | + |
|
| 1073 | + } |
|
| 1074 | + |
|
| 1075 | + } |
|
| 1076 | + |
|
| 1077 | + |
|
| 1078 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1079 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1080 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1081 | + |
|
| 1082 | + if ($fix) {
|
|
| 1083 | + if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
|
| 1084 | + if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
|
| 1085 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1086 | + } else {
|
|
| 1087 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1088 | + } |
|
| 1089 | + |
|
| 1090 | + } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1091 | + if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1092 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1093 | + } else {
|
|
| 1094 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1095 | + } |
|
| 1096 | + if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1097 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1098 | + } else {
|
|
| 1099 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1100 | + } |
|
| 1101 | + } else {// else rename the original table to _ms_bak
|
|
| 1102 | + if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1103 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1104 | + } else {
|
|
| 1105 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1106 | + } |
|
| 1107 | + } |
|
| 1108 | + } |
|
| 1109 | + |
|
| 1110 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1111 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1112 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1113 | + |
|
| 1114 | + if ($fix) {
|
|
| 1115 | + // if original table exists but new does not, rename |
|
| 1116 | + if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1117 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1118 | + } else {
|
|
| 1119 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1120 | + } |
|
| 1121 | + |
|
| 1122 | + } |
|
| 1123 | + |
|
| 1124 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1125 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1126 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1127 | + |
|
| 1128 | + if ($fix) {
|
|
| 1129 | + // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run; |
|
| 1130 | + delete_option('geodirlocation_db_version');
|
|
| 1131 | + delete_option('geodirevents_db_version');
|
|
| 1132 | + delete_option('geodir_reviewrating_db_version');
|
|
| 1133 | + delete_option('gdevents_db_version');
|
|
| 1134 | + delete_option('geodirectory_db_version');
|
|
| 1135 | + delete_option('geodirclaim_db_version');
|
|
| 1136 | + delete_option('geodir_custom_posts_db_version');
|
|
| 1137 | + delete_option('geodir_reviewratings_db_version');
|
|
| 1138 | + delete_option('geodiradvancesearch_db_version');
|
|
| 1139 | + $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1140 | + } |
|
| 1141 | + |
|
| 1142 | + } else {
|
|
| 1143 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1144 | + } |
|
| 1145 | + return $filter_arr; |
|
| 1146 | 1146 | } |
| 1147 | 1147 | |
| 1148 | 1148 | |
@@ -1156,111 +1156,111 @@ discard block |
||
| 1156 | 1156 | */ |
| 1157 | 1157 | function geodir_diagnose_tags_sync() |
| 1158 | 1158 | {
|
| 1159 | - global $wpdb, $plugin_prefix; |
|
| 1160 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1161 | - $step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0; |
|
| 1162 | - $step_max_items = geodir_get_diagnose_step_max_items(); |
|
| 1163 | - $offset = (int) $step * $step_max_items; |
|
| 1164 | - $ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false; |
|
| 1165 | - |
|
| 1166 | - $total_listings = geodir_total_listings_count(); |
|
| 1167 | - $total_ptype_listings = 0; |
|
| 1168 | - if ($ptype) {
|
|
| 1169 | - $total_ptype_listings = geodir_total_listings_count($ptype); |
|
| 1170 | - } |
|
| 1171 | - $max_step = ceil($total_ptype_listings / $step_max_items) - 1; |
|
| 1159 | + global $wpdb, $plugin_prefix; |
|
| 1160 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1161 | + $step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0; |
|
| 1162 | + $step_max_items = geodir_get_diagnose_step_max_items(); |
|
| 1163 | + $offset = (int) $step * $step_max_items; |
|
| 1164 | + $ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false; |
|
| 1165 | + |
|
| 1166 | + $total_listings = geodir_total_listings_count(); |
|
| 1167 | + $total_ptype_listings = 0; |
|
| 1168 | + if ($ptype) {
|
|
| 1169 | + $total_ptype_listings = geodir_total_listings_count($ptype); |
|
| 1170 | + } |
|
| 1171 | + $max_step = ceil($total_ptype_listings / $step_max_items) - 1; |
|
| 1172 | 1172 | |
| 1173 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1174 | - $is_error_during_diagnose = false; |
|
| 1175 | - $output_str = ''; |
|
| 1173 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1174 | + $is_error_during_diagnose = false; |
|
| 1175 | + $output_str = ''; |
|
| 1176 | 1176 | |
| 1177 | - if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {
|
|
| 1178 | - $stepped_process = true; |
|
| 1179 | - } else {
|
|
| 1180 | - $stepped_process = false; |
|
| 1181 | - } |
|
| 1182 | - |
|
| 1183 | - if ($stepped_process) {
|
|
| 1184 | - $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1185 | - $posts = $wpdb->get_results( $sql ); |
|
| 1186 | - |
|
| 1187 | - if (!empty($posts)) {
|
|
| 1188 | - |
|
| 1189 | - foreach ($posts as $p) {
|
|
| 1190 | - $p->post_type = $ptype; |
|
| 1191 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1192 | - if (empty($raw_tags)) {
|
|
| 1193 | - $post_tags = ''; |
|
| 1194 | - } else {
|
|
| 1195 | - $post_tags = implode(",", $raw_tags);
|
|
| 1196 | - } |
|
| 1197 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1198 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1199 | - |
|
| 1200 | - } |
|
| 1201 | - if ($step >= $max_step) {
|
|
| 1202 | - $output_str = "done"; |
|
| 1203 | - } else {
|
|
| 1204 | - $output_str = $step + 1; |
|
| 1205 | - } |
|
| 1206 | - } |
|
| 1207 | - |
|
| 1208 | - } else {
|
|
| 1209 | - $all_postypes = geodir_get_posttypes(); |
|
| 1210 | - |
|
| 1211 | - if (!empty($all_postypes)) {
|
|
| 1212 | - foreach ($all_postypes as $key) {
|
|
| 1213 | - // update each GD CPT |
|
| 1214 | - $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1215 | - |
|
| 1216 | - if (!empty($posts)) {
|
|
| 1217 | - |
|
| 1218 | - foreach ($posts as $p) {
|
|
| 1219 | - $p->post_type = $key; |
|
| 1220 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1221 | - if (empty($raw_tags)) {
|
|
| 1222 | - $post_tags = ''; |
|
| 1223 | - } else {
|
|
| 1224 | - $post_tags = implode(",", $raw_tags);
|
|
| 1225 | - } |
|
| 1226 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1227 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1228 | - |
|
| 1229 | - } |
|
| 1230 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1231 | - } |
|
| 1232 | - |
|
| 1233 | - } |
|
| 1234 | - |
|
| 1235 | - } |
|
| 1236 | - } |
|
| 1237 | - |
|
| 1238 | - |
|
| 1239 | - if ($is_error_during_diagnose) {
|
|
| 1240 | - $info_div_class = "geodir_problem_info"; |
|
| 1241 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1242 | - } else {
|
|
| 1243 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1244 | - $fix_button_txt = ''; |
|
| 1245 | - } |
|
| 1246 | - |
|
| 1247 | - if ($stepped_process) {
|
|
| 1248 | - $percent = ($step/$max_step) * 100; |
|
| 1249 | - if ($output_str == 'done') {
|
|
| 1250 | - echo $output_str; |
|
| 1251 | - } else {
|
|
| 1252 | - $output = array( |
|
| 1253 | - 'step' => $output_str, |
|
| 1254 | - 'percent' => $percent |
|
| 1255 | - ); |
|
| 1256 | - echo json_encode($output); |
|
| 1257 | - } |
|
| 1258 | - } else {
|
|
| 1259 | - echo "<ul class='$info_div_class'>"; |
|
| 1260 | - echo $output_str; |
|
| 1261 | - echo $fix_button_txt; |
|
| 1262 | - echo "</ul>"; |
|
| 1263 | - } |
|
| 1177 | + if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {
|
|
| 1178 | + $stepped_process = true; |
|
| 1179 | + } else {
|
|
| 1180 | + $stepped_process = false; |
|
| 1181 | + } |
|
| 1182 | + |
|
| 1183 | + if ($stepped_process) {
|
|
| 1184 | + $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1185 | + $posts = $wpdb->get_results( $sql ); |
|
| 1186 | + |
|
| 1187 | + if (!empty($posts)) {
|
|
| 1188 | + |
|
| 1189 | + foreach ($posts as $p) {
|
|
| 1190 | + $p->post_type = $ptype; |
|
| 1191 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1192 | + if (empty($raw_tags)) {
|
|
| 1193 | + $post_tags = ''; |
|
| 1194 | + } else {
|
|
| 1195 | + $post_tags = implode(",", $raw_tags);
|
|
| 1196 | + } |
|
| 1197 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1198 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1199 | + |
|
| 1200 | + } |
|
| 1201 | + if ($step >= $max_step) {
|
|
| 1202 | + $output_str = "done"; |
|
| 1203 | + } else {
|
|
| 1204 | + $output_str = $step + 1; |
|
| 1205 | + } |
|
| 1206 | + } |
|
| 1207 | + |
|
| 1208 | + } else {
|
|
| 1209 | + $all_postypes = geodir_get_posttypes(); |
|
| 1210 | + |
|
| 1211 | + if (!empty($all_postypes)) {
|
|
| 1212 | + foreach ($all_postypes as $key) {
|
|
| 1213 | + // update each GD CPT |
|
| 1214 | + $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1215 | + |
|
| 1216 | + if (!empty($posts)) {
|
|
| 1217 | + |
|
| 1218 | + foreach ($posts as $p) {
|
|
| 1219 | + $p->post_type = $key; |
|
| 1220 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1221 | + if (empty($raw_tags)) {
|
|
| 1222 | + $post_tags = ''; |
|
| 1223 | + } else {
|
|
| 1224 | + $post_tags = implode(",", $raw_tags);
|
|
| 1225 | + } |
|
| 1226 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1227 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1228 | + |
|
| 1229 | + } |
|
| 1230 | + $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1231 | + } |
|
| 1232 | + |
|
| 1233 | + } |
|
| 1234 | + |
|
| 1235 | + } |
|
| 1236 | + } |
|
| 1237 | + |
|
| 1238 | + |
|
| 1239 | + if ($is_error_during_diagnose) {
|
|
| 1240 | + $info_div_class = "geodir_problem_info"; |
|
| 1241 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1242 | + } else {
|
|
| 1243 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1244 | + $fix_button_txt = ''; |
|
| 1245 | + } |
|
| 1246 | + |
|
| 1247 | + if ($stepped_process) {
|
|
| 1248 | + $percent = ($step/$max_step) * 100; |
|
| 1249 | + if ($output_str == 'done') {
|
|
| 1250 | + echo $output_str; |
|
| 1251 | + } else {
|
|
| 1252 | + $output = array( |
|
| 1253 | + 'step' => $output_str, |
|
| 1254 | + 'percent' => $percent |
|
| 1255 | + ); |
|
| 1256 | + echo json_encode($output); |
|
| 1257 | + } |
|
| 1258 | + } else {
|
|
| 1259 | + echo "<ul class='$info_div_class'>"; |
|
| 1260 | + echo $output_str; |
|
| 1261 | + echo $fix_button_txt; |
|
| 1262 | + echo "</ul>"; |
|
| 1263 | + } |
|
| 1264 | 1264 | } |
| 1265 | 1265 | |
| 1266 | 1266 | /** |
@@ -1275,75 +1275,75 @@ discard block |
||
| 1275 | 1275 | */ |
| 1276 | 1276 | function geodir_diagnose_cats_sync() |
| 1277 | 1277 | {
|
| 1278 | - global $wpdb, $plugin_prefix; |
|
| 1279 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1278 | + global $wpdb, $plugin_prefix; |
|
| 1279 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1280 | 1280 | |
| 1281 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1282 | - $is_error_during_diagnose = false; |
|
| 1283 | - $output_str = ''; |
|
| 1281 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1282 | + $is_error_during_diagnose = false; |
|
| 1283 | + $output_str = ''; |
|
| 1284 | 1284 | |
| 1285 | 1285 | |
| 1286 | - $all_postypes = geodir_get_posttypes(); |
|
| 1286 | + $all_postypes = geodir_get_posttypes(); |
|
| 1287 | 1287 | |
| 1288 | - if (!empty($all_postypes)) {
|
|
| 1289 | - foreach ($all_postypes as $key) {
|
|
| 1290 | - // update each GD CTP |
|
| 1291 | - $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1288 | + if (!empty($all_postypes)) {
|
|
| 1289 | + foreach ($all_postypes as $key) {
|
|
| 1290 | + // update each GD CTP |
|
| 1291 | + $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1292 | 1292 | |
| 1293 | - if (!empty($posts)) {
|
|
| 1293 | + if (!empty($posts)) {
|
|
| 1294 | 1294 | |
| 1295 | - foreach ($posts as $p) {
|
|
| 1296 | - $p->post_type = $key; |
|
| 1297 | - $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1295 | + foreach ($posts as $p) {
|
|
| 1296 | + $p->post_type = $key; |
|
| 1297 | + $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1298 | 1298 | |
| 1299 | - if (empty($raw_cats)) {
|
|
| 1300 | - $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
|
| 1299 | + if (empty($raw_cats)) {
|
|
| 1300 | + $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
|
| 1301 | 1301 | |
| 1302 | - if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1303 | - $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1304 | - foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1305 | - if (is_numeric($cat_part)) {
|
|
| 1306 | - $raw_cats[] = (int)$cat_part; |
|
| 1307 | - } |
|
| 1308 | - } |
|
| 1302 | + if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1303 | + $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1304 | + foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1305 | + if (is_numeric($cat_part)) {
|
|
| 1306 | + $raw_cats[] = (int)$cat_part; |
|
| 1307 | + } |
|
| 1308 | + } |
|
| 1309 | 1309 | |
| 1310 | - } |
|
| 1310 | + } |
|
| 1311 | 1311 | |
| 1312 | - if (!empty($raw_cats)) {
|
|
| 1313 | - $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1312 | + if (!empty($raw_cats)) {
|
|
| 1313 | + $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1314 | 1314 | |
| 1315 | - } |
|
| 1315 | + } |
|
| 1316 | 1316 | |
| 1317 | - } |
|
| 1317 | + } |
|
| 1318 | 1318 | |
| 1319 | 1319 | |
| 1320 | - if (empty($raw_cats)) {
|
|
| 1321 | - $post_cats = ''; |
|
| 1322 | - } else {
|
|
| 1323 | - $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1324 | - } |
|
| 1325 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1326 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1327 | - } |
|
| 1320 | + if (empty($raw_cats)) {
|
|
| 1321 | + $post_cats = ''; |
|
| 1322 | + } else {
|
|
| 1323 | + $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1324 | + } |
|
| 1325 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1326 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1327 | + } |
|
| 1328 | 1328 | |
| 1329 | - } |
|
| 1330 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1329 | + } |
|
| 1330 | + $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1331 | 1331 | |
| 1332 | - } |
|
| 1332 | + } |
|
| 1333 | 1333 | |
| 1334 | - } |
|
| 1334 | + } |
|
| 1335 | 1335 | |
| 1336 | - if ($is_error_during_diagnose) {
|
|
| 1337 | - $info_div_class = "geodir_problem_info"; |
|
| 1338 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1339 | - } else {
|
|
| 1340 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1341 | - $fix_button_txt = ''; |
|
| 1342 | - } |
|
| 1343 | - echo "<ul class='$info_div_class'>"; |
|
| 1344 | - echo $output_str; |
|
| 1345 | - echo $fix_button_txt; |
|
| 1346 | - echo "</ul>"; |
|
| 1336 | + if ($is_error_during_diagnose) {
|
|
| 1337 | + $info_div_class = "geodir_problem_info"; |
|
| 1338 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1339 | + } else {
|
|
| 1340 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1341 | + $fix_button_txt = ''; |
|
| 1342 | + } |
|
| 1343 | + echo "<ul class='$info_div_class'>"; |
|
| 1344 | + echo $output_str; |
|
| 1345 | + echo $fix_button_txt; |
|
| 1346 | + echo "</ul>"; |
|
| 1347 | 1347 | |
| 1348 | 1348 | } |
| 1349 | 1349 | |
@@ -1357,61 +1357,61 @@ discard block |
||
| 1357 | 1357 | */ |
| 1358 | 1358 | function geodir_diagnose_version_clear() |
| 1359 | 1359 | {
|
| 1360 | - global $wpdb, $plugin_prefix; |
|
| 1361 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1362 | - |
|
| 1363 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1364 | - $is_error_during_diagnose = false; |
|
| 1365 | - $output_str = ''; |
|
| 1366 | - |
|
| 1367 | - |
|
| 1368 | - $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
|
|
| 1369 | - 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1370 | - 'GeoDirectory Framework' => 'gdf_db_version', |
|
| 1371 | - 'Advanced Search' => 'geodiradvancesearch_db_version', |
|
| 1372 | - 'Review Rating Manager' => 'geodir_reviewratings_db_version', |
|
| 1373 | - 'Claim Manager' => 'geodirclaim_db_version', |
|
| 1374 | - 'CPT Manager' => 'geodir_custom_posts_db_version', |
|
| 1375 | - 'Location Manager' => 'geodirlocation_db_version', |
|
| 1376 | - 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1377 | - 'Events Manager' => 'geodirevents_db_version', |
|
| 1378 | - ); |
|
| 1379 | - |
|
| 1380 | - /** |
|
| 1381 | - * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers. |
|
| 1382 | - * |
|
| 1383 | - * @since 1.0.0 |
|
| 1384 | - * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
|
|
| 1385 | - */ |
|
| 1386 | - $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
|
|
| 1387 | - |
|
| 1388 | - if (!empty($ver_arr)) {
|
|
| 1389 | - foreach ($ver_arr as $key => $val) {
|
|
| 1390 | - if (delete_option($val)) {
|
|
| 1391 | - $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1392 | - } else {
|
|
| 1393 | - $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1394 | - } |
|
| 1395 | - |
|
| 1396 | - } |
|
| 1397 | - |
|
| 1398 | - if ($output_str) {
|
|
| 1399 | - $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1400 | - } |
|
| 1401 | - |
|
| 1402 | - } |
|
| 1403 | - |
|
| 1404 | - if ($is_error_during_diagnose) {
|
|
| 1405 | - $info_div_class = "geodir_problem_info"; |
|
| 1406 | - $fix_button_txt = ""; |
|
| 1407 | - } else {
|
|
| 1408 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1409 | - $fix_button_txt = ''; |
|
| 1410 | - } |
|
| 1411 | - echo "<ul class='$info_div_class'>"; |
|
| 1412 | - echo $output_str; |
|
| 1413 | - echo $fix_button_txt; |
|
| 1414 | - echo "</ul>"; |
|
| 1360 | + global $wpdb, $plugin_prefix; |
|
| 1361 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1362 | + |
|
| 1363 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1364 | + $is_error_during_diagnose = false; |
|
| 1365 | + $output_str = ''; |
|
| 1366 | + |
|
| 1367 | + |
|
| 1368 | + $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
|
|
| 1369 | + 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1370 | + 'GeoDirectory Framework' => 'gdf_db_version', |
|
| 1371 | + 'Advanced Search' => 'geodiradvancesearch_db_version', |
|
| 1372 | + 'Review Rating Manager' => 'geodir_reviewratings_db_version', |
|
| 1373 | + 'Claim Manager' => 'geodirclaim_db_version', |
|
| 1374 | + 'CPT Manager' => 'geodir_custom_posts_db_version', |
|
| 1375 | + 'Location Manager' => 'geodirlocation_db_version', |
|
| 1376 | + 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1377 | + 'Events Manager' => 'geodirevents_db_version', |
|
| 1378 | + ); |
|
| 1379 | + |
|
| 1380 | + /** |
|
| 1381 | + * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers. |
|
| 1382 | + * |
|
| 1383 | + * @since 1.0.0 |
|
| 1384 | + * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
|
|
| 1385 | + */ |
|
| 1386 | + $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
|
|
| 1387 | + |
|
| 1388 | + if (!empty($ver_arr)) {
|
|
| 1389 | + foreach ($ver_arr as $key => $val) {
|
|
| 1390 | + if (delete_option($val)) {
|
|
| 1391 | + $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1392 | + } else {
|
|
| 1393 | + $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1394 | + } |
|
| 1395 | + |
|
| 1396 | + } |
|
| 1397 | + |
|
| 1398 | + if ($output_str) {
|
|
| 1399 | + $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1400 | + } |
|
| 1401 | + |
|
| 1402 | + } |
|
| 1403 | + |
|
| 1404 | + if ($is_error_during_diagnose) {
|
|
| 1405 | + $info_div_class = "geodir_problem_info"; |
|
| 1406 | + $fix_button_txt = ""; |
|
| 1407 | + } else {
|
|
| 1408 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1409 | + $fix_button_txt = ''; |
|
| 1410 | + } |
|
| 1411 | + echo "<ul class='$info_div_class'>"; |
|
| 1412 | + echo $output_str; |
|
| 1413 | + echo $fix_button_txt; |
|
| 1414 | + echo "</ul>"; |
|
| 1415 | 1415 | |
| 1416 | 1416 | } |
| 1417 | 1417 | |
@@ -1425,59 +1425,59 @@ discard block |
||
| 1425 | 1425 | */ |
| 1426 | 1426 | function geodir_diagnose_ratings() |
| 1427 | 1427 | {
|
| 1428 | - global $wpdb; |
|
| 1429 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1430 | - |
|
| 1431 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1432 | - $is_error_during_diagnose = false; |
|
| 1433 | - $output_str = ''; |
|
| 1434 | - |
|
| 1435 | - // check review locations |
|
| 1436 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1437 | - $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1438 | - $is_error_during_diagnose = true; |
|
| 1439 | - |
|
| 1440 | - if ($fix) {
|
|
| 1441 | - if (geodir_fix_review_location()) {
|
|
| 1442 | - $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1443 | - } else {
|
|
| 1444 | - $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1445 | - } |
|
| 1446 | - } |
|
| 1447 | - |
|
| 1448 | - } else {
|
|
| 1449 | - $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1450 | - } |
|
| 1451 | - |
|
| 1452 | - // check review content |
|
| 1453 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1454 | - $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1455 | - $is_error_during_diagnose = true; |
|
| 1456 | - |
|
| 1457 | - if ($fix) {
|
|
| 1458 | - if (geodir_fix_review_content()) {
|
|
| 1459 | - $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1460 | - } else {
|
|
| 1461 | - $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1462 | - } |
|
| 1463 | - } |
|
| 1464 | - |
|
| 1465 | - } else {
|
|
| 1466 | - $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1467 | - } |
|
| 1468 | - |
|
| 1469 | - |
|
| 1470 | - if ($is_error_during_diagnose) {
|
|
| 1471 | - $info_div_class = "geodir_problem_info"; |
|
| 1472 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1473 | - } else {
|
|
| 1474 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1475 | - $fix_button_txt = ''; |
|
| 1476 | - } |
|
| 1477 | - echo "<ul class='$info_div_class'>"; |
|
| 1478 | - echo $output_str; |
|
| 1479 | - echo $fix_button_txt; |
|
| 1480 | - echo "</ul>"; |
|
| 1428 | + global $wpdb; |
|
| 1429 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1430 | + |
|
| 1431 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1432 | + $is_error_during_diagnose = false; |
|
| 1433 | + $output_str = ''; |
|
| 1434 | + |
|
| 1435 | + // check review locations |
|
| 1436 | + if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1437 | + $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1438 | + $is_error_during_diagnose = true; |
|
| 1439 | + |
|
| 1440 | + if ($fix) {
|
|
| 1441 | + if (geodir_fix_review_location()) {
|
|
| 1442 | + $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1443 | + } else {
|
|
| 1444 | + $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1445 | + } |
|
| 1446 | + } |
|
| 1447 | + |
|
| 1448 | + } else {
|
|
| 1449 | + $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1450 | + } |
|
| 1451 | + |
|
| 1452 | + // check review content |
|
| 1453 | + if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1454 | + $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1455 | + $is_error_during_diagnose = true; |
|
| 1456 | + |
|
| 1457 | + if ($fix) {
|
|
| 1458 | + if (geodir_fix_review_content()) {
|
|
| 1459 | + $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1460 | + } else {
|
|
| 1461 | + $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1462 | + } |
|
| 1463 | + } |
|
| 1464 | + |
|
| 1465 | + } else {
|
|
| 1466 | + $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1467 | + } |
|
| 1468 | + |
|
| 1469 | + |
|
| 1470 | + if ($is_error_during_diagnose) {
|
|
| 1471 | + $info_div_class = "geodir_problem_info"; |
|
| 1472 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1473 | + } else {
|
|
| 1474 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1475 | + $fix_button_txt = ''; |
|
| 1476 | + } |
|
| 1477 | + echo "<ul class='$info_div_class'>"; |
|
| 1478 | + echo $output_str; |
|
| 1479 | + echo $fix_button_txt; |
|
| 1480 | + echo "</ul>"; |
|
| 1481 | 1481 | |
| 1482 | 1482 | } |
| 1483 | 1483 | |
@@ -1491,57 +1491,57 @@ discard block |
||
| 1491 | 1491 | */ |
| 1492 | 1492 | function geodir_diagnose_multisite_conversion() |
| 1493 | 1493 | {
|
| 1494 | - global $wpdb; |
|
| 1495 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1496 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1497 | - $is_error_during_diagnose = false; |
|
| 1498 | - $output_str = ''; |
|
| 1499 | - |
|
| 1500 | - $filter_arr = array(); |
|
| 1501 | - $filter_arr['output_str'] = $output_str; |
|
| 1502 | - $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose; |
|
| 1503 | - $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
|
|
| 1504 | - 'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
|
|
| 1505 | - 'geodir_post_icon' => __('Post icon', 'geodirectory'),
|
|
| 1506 | - 'geodir_attachments' => __('Attachments', 'geodirectory'),
|
|
| 1507 | - 'geodir_post_review' => __('Reviews', 'geodirectory'),
|
|
| 1508 | - 'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
|
|
| 1509 | - 'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
|
|
| 1510 | - ); |
|
| 1511 | - |
|
| 1512 | - // allow other addons to hook in and add their checks |
|
| 1513 | - |
|
| 1514 | - /** |
|
| 1515 | - * Filter the array of tables. |
|
| 1516 | - * |
|
| 1517 | - * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks. |
|
| 1518 | - * |
|
| 1519 | - * @since 1.0.0 |
|
| 1520 | - * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
|
|
| 1521 | - */ |
|
| 1522 | - $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
|
|
| 1523 | - |
|
| 1524 | - foreach ($table_arr as $table => $table_name) {
|
|
| 1525 | - // Diagnose table |
|
| 1526 | - $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix); |
|
| 1527 | - } |
|
| 1528 | - |
|
| 1529 | - |
|
| 1530 | - $output_str = $filter_arr['output_str']; |
|
| 1531 | - $is_error_during_diagnose = $filter_arr['is_error_during_diagnose']; |
|
| 1532 | - |
|
| 1533 | - |
|
| 1534 | - if ($is_error_during_diagnose) {
|
|
| 1535 | - $info_div_class = "geodir_problem_info"; |
|
| 1536 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1537 | - } else {
|
|
| 1538 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1539 | - $fix_button_txt = ''; |
|
| 1540 | - } |
|
| 1541 | - echo "<ul class='$info_div_class'>"; |
|
| 1542 | - echo $output_str; |
|
| 1543 | - echo $fix_button_txt; |
|
| 1544 | - echo "</ul>"; |
|
| 1494 | + global $wpdb; |
|
| 1495 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1496 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1497 | + $is_error_during_diagnose = false; |
|
| 1498 | + $output_str = ''; |
|
| 1499 | + |
|
| 1500 | + $filter_arr = array(); |
|
| 1501 | + $filter_arr['output_str'] = $output_str; |
|
| 1502 | + $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose; |
|
| 1503 | + $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
|
|
| 1504 | + 'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
|
|
| 1505 | + 'geodir_post_icon' => __('Post icon', 'geodirectory'),
|
|
| 1506 | + 'geodir_attachments' => __('Attachments', 'geodirectory'),
|
|
| 1507 | + 'geodir_post_review' => __('Reviews', 'geodirectory'),
|
|
| 1508 | + 'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
|
|
| 1509 | + 'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
|
|
| 1510 | + ); |
|
| 1511 | + |
|
| 1512 | + // allow other addons to hook in and add their checks |
|
| 1513 | + |
|
| 1514 | + /** |
|
| 1515 | + * Filter the array of tables. |
|
| 1516 | + * |
|
| 1517 | + * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks. |
|
| 1518 | + * |
|
| 1519 | + * @since 1.0.0 |
|
| 1520 | + * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
|
|
| 1521 | + */ |
|
| 1522 | + $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
|
|
| 1523 | + |
|
| 1524 | + foreach ($table_arr as $table => $table_name) {
|
|
| 1525 | + // Diagnose table |
|
| 1526 | + $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix); |
|
| 1527 | + } |
|
| 1528 | + |
|
| 1529 | + |
|
| 1530 | + $output_str = $filter_arr['output_str']; |
|
| 1531 | + $is_error_during_diagnose = $filter_arr['is_error_during_diagnose']; |
|
| 1532 | + |
|
| 1533 | + |
|
| 1534 | + if ($is_error_during_diagnose) {
|
|
| 1535 | + $info_div_class = "geodir_problem_info"; |
|
| 1536 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1537 | + } else {
|
|
| 1538 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1539 | + $fix_button_txt = ''; |
|
| 1540 | + } |
|
| 1541 | + echo "<ul class='$info_div_class'>"; |
|
| 1542 | + echo $output_str; |
|
| 1543 | + echo $fix_button_txt; |
|
| 1544 | + echo "</ul>"; |
|
| 1545 | 1545 | } |
| 1546 | 1546 | |
| 1547 | 1547 | /** |
@@ -1559,39 +1559,39 @@ discard block |
||
| 1559 | 1559 | */ |
| 1560 | 1560 | function geodir_fix_virtual_page($slug, $page_title, $old_id, $option) |
| 1561 | 1561 | {
|
| 1562 | - global $wpdb, $current_user; |
|
| 1563 | - |
|
| 1564 | - if (!empty($old_id)) {
|
|
| 1565 | - wp_delete_post($old_id, true); |
|
| 1566 | - }//delete post if already there |
|
| 1567 | - else {
|
|
| 1568 | - $page_found = $wpdb->get_var( |
|
| 1569 | - $wpdb->prepare( |
|
| 1570 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1571 | - array($slug) |
|
| 1572 | - ) |
|
| 1573 | - ); |
|
| 1574 | - wp_delete_post($page_found, true); |
|
| 1575 | - |
|
| 1576 | - } |
|
| 1577 | - |
|
| 1578 | - $page_data = array( |
|
| 1579 | - 'post_status' => 'publish', |
|
| 1580 | - 'post_type' => 'page', |
|
| 1581 | - 'post_author' => $current_user->ID, |
|
| 1582 | - 'post_name' => $slug, |
|
| 1583 | - 'post_title' => $page_title, |
|
| 1584 | - 'post_content' => '', |
|
| 1585 | - 'post_parent' => 0, |
|
| 1586 | - 'comment_status' => 'closed' |
|
| 1587 | - ); |
|
| 1588 | - $page_id = wp_insert_post($page_data); |
|
| 1589 | - update_option($option, $page_id); |
|
| 1590 | - if ($page_id) {
|
|
| 1591 | - return true; |
|
| 1592 | - } else {
|
|
| 1593 | - return false; |
|
| 1594 | - } |
|
| 1562 | + global $wpdb, $current_user; |
|
| 1563 | + |
|
| 1564 | + if (!empty($old_id)) {
|
|
| 1565 | + wp_delete_post($old_id, true); |
|
| 1566 | + }//delete post if already there |
|
| 1567 | + else {
|
|
| 1568 | + $page_found = $wpdb->get_var( |
|
| 1569 | + $wpdb->prepare( |
|
| 1570 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1571 | + array($slug) |
|
| 1572 | + ) |
|
| 1573 | + ); |
|
| 1574 | + wp_delete_post($page_found, true); |
|
| 1575 | + |
|
| 1576 | + } |
|
| 1577 | + |
|
| 1578 | + $page_data = array( |
|
| 1579 | + 'post_status' => 'publish', |
|
| 1580 | + 'post_type' => 'page', |
|
| 1581 | + 'post_author' => $current_user->ID, |
|
| 1582 | + 'post_name' => $slug, |
|
| 1583 | + 'post_title' => $page_title, |
|
| 1584 | + 'post_content' => '', |
|
| 1585 | + 'post_parent' => 0, |
|
| 1586 | + 'comment_status' => 'closed' |
|
| 1587 | + ); |
|
| 1588 | + $page_id = wp_insert_post($page_data); |
|
| 1589 | + update_option($option, $page_id); |
|
| 1590 | + if ($page_id) {
|
|
| 1591 | + return true; |
|
| 1592 | + } else {
|
|
| 1593 | + return false; |
|
| 1594 | + } |
|
| 1595 | 1595 | } |
| 1596 | 1596 | |
| 1597 | 1597 | /** |
@@ -1603,212 +1603,212 @@ discard block |
||
| 1603 | 1603 | */ |
| 1604 | 1604 | function geodir_diagnose_default_pages() |
| 1605 | 1605 | {
|
| 1606 | - global $wpdb; |
|
| 1607 | - $is_error_during_diagnose = false; |
|
| 1608 | - $output_str = ''; |
|
| 1609 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1610 | - |
|
| 1611 | - ////////////////////////////////// |
|
| 1612 | - /* Diagnose GD Home Page Starts */ |
|
| 1613 | - ////////////////////////////////// |
|
| 1614 | - $option_value = get_option('geodir_home_page');
|
|
| 1615 | - $page = get_post($option_value); |
|
| 1616 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1617 | - |
|
| 1618 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1619 | - $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1620 | - else {
|
|
| 1621 | - $is_error_during_diagnose = true; |
|
| 1622 | - $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1623 | - if ($fix) {
|
|
| 1624 | - if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
|
| 1625 | - $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1626 | - } else {
|
|
| 1627 | - $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1628 | - } |
|
| 1629 | - } |
|
| 1630 | - } |
|
| 1631 | - |
|
| 1632 | - //////////////////////////////// |
|
| 1633 | - /* Diagnose GD Home Page Ends */ |
|
| 1634 | - //////////////////////////////// |
|
| 1635 | - |
|
| 1636 | - ////////////////////////////////// |
|
| 1637 | - /* Diagnose Add Listing Page Starts */ |
|
| 1638 | - ////////////////////////////////// |
|
| 1639 | - $option_value = get_option('geodir_add_listing_page');
|
|
| 1640 | - $page = get_post($option_value); |
|
| 1641 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1642 | - |
|
| 1643 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1644 | - $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1645 | - else {
|
|
| 1646 | - $is_error_during_diagnose = true; |
|
| 1647 | - $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1648 | - if ($fix) {
|
|
| 1649 | - if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
|
| 1650 | - $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1651 | - } else {
|
|
| 1652 | - $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1653 | - } |
|
| 1654 | - } |
|
| 1655 | - } |
|
| 1656 | - |
|
| 1657 | - //////////////////////////////// |
|
| 1658 | - /* Diagnose Add Listing Page Ends */ |
|
| 1659 | - //////////////////////////////// |
|
| 1660 | - |
|
| 1661 | - |
|
| 1662 | - ////////////////////////////////// |
|
| 1663 | - /* Diagnose Listing Preview Page Starts */ |
|
| 1664 | - ////////////////////////////////// |
|
| 1665 | - $option_value = get_option('geodir_preview_page');
|
|
| 1666 | - $page = get_post($option_value); |
|
| 1667 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1668 | - |
|
| 1669 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1670 | - $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1671 | - else {
|
|
| 1672 | - $is_error_during_diagnose = true; |
|
| 1673 | - $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1674 | - if ($fix) {
|
|
| 1675 | - if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
|
| 1676 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1677 | - } else {
|
|
| 1678 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1679 | - } |
|
| 1680 | - } |
|
| 1681 | - } |
|
| 1682 | - |
|
| 1683 | - //////////////////////////////// |
|
| 1684 | - /* Diagnose Listing Preview Page Ends */ |
|
| 1685 | - //////////////////////////////// |
|
| 1686 | - |
|
| 1687 | - ////////////////////////////////// |
|
| 1688 | - /* Diagnose Listing Success Page Starts */ |
|
| 1689 | - ////////////////////////////////// |
|
| 1690 | - $option_value = get_option('geodir_success_page');
|
|
| 1691 | - $page = get_post($option_value); |
|
| 1692 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1693 | - |
|
| 1694 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1695 | - $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1696 | - else {
|
|
| 1697 | - $is_error_during_diagnose = true; |
|
| 1698 | - $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1699 | - if ($fix) {
|
|
| 1700 | - if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
|
| 1701 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1702 | - } else {
|
|
| 1703 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1704 | - } |
|
| 1705 | - } |
|
| 1706 | - } |
|
| 1707 | - |
|
| 1708 | - //////////////////////////////// |
|
| 1709 | - /* Diagnose Listing Sucess Page Ends */ |
|
| 1710 | - //////////////////////////////// |
|
| 1711 | - |
|
| 1712 | - ////////////////////////////////// |
|
| 1713 | - /* Diagnose Info Page Starts */ |
|
| 1714 | - ////////////////////////////////// |
|
| 1715 | - $option_value = get_option('geodir_info_page');
|
|
| 1716 | - $page = get_post($option_value); |
|
| 1717 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1718 | - |
|
| 1719 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1720 | - $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1721 | - else {
|
|
| 1722 | - $is_error_during_diagnose = true; |
|
| 1723 | - $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1724 | - if ($fix) {
|
|
| 1725 | - if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
|
| 1726 | - $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1727 | - } else {
|
|
| 1728 | - $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1729 | - } |
|
| 1730 | - } |
|
| 1731 | - } |
|
| 1732 | - |
|
| 1733 | - //////////////////////////////// |
|
| 1734 | - /* Diagnose Info Page Ends */ |
|
| 1735 | - //////////////////////////////// |
|
| 1736 | - |
|
| 1737 | - ////////////////////////////////// |
|
| 1738 | - /* Diagnose Login Page Starts */ |
|
| 1739 | - ////////////////////////////////// |
|
| 1740 | - $option_value = get_option('geodir_login_page');
|
|
| 1741 | - $page = get_post($option_value); |
|
| 1742 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1743 | - |
|
| 1744 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1745 | - $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1746 | - else {
|
|
| 1747 | - $is_error_during_diagnose = true; |
|
| 1748 | - $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1749 | - if ($fix) {
|
|
| 1750 | - if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
|
| 1751 | - $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1752 | - } else {
|
|
| 1753 | - $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1754 | - } |
|
| 1755 | - } |
|
| 1756 | - } |
|
| 1757 | - |
|
| 1758 | - //////////////////////////////// |
|
| 1759 | - /* Diagnose Info Page Ends */ |
|
| 1760 | - //////////////////////////////// |
|
| 1761 | - |
|
| 1762 | - ////////////////////////////////// |
|
| 1763 | - /* Diagnose Location Page Starts */ |
|
| 1764 | - ////////////////////////////////// |
|
| 1765 | - $option_value = get_option('geodir_location_page');
|
|
| 1766 | - $page = get_post($option_value); |
|
| 1767 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1768 | - |
|
| 1769 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1770 | - $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1771 | - else {
|
|
| 1772 | - $is_error_during_diagnose = true; |
|
| 1773 | - $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1774 | - if ($fix) {
|
|
| 1775 | - if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
|
| 1776 | - $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1777 | - } else {
|
|
| 1778 | - $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1779 | - } |
|
| 1780 | - } |
|
| 1781 | - } |
|
| 1782 | - |
|
| 1783 | - //////////////////////////////// |
|
| 1784 | - /* Diagnose Location Page Ends */ |
|
| 1785 | - //////////////////////////////// |
|
| 1786 | - |
|
| 1787 | - $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1788 | - /** |
|
| 1789 | - * This action is called at the end of the GD Tools page check function. |
|
| 1790 | - * |
|
| 1791 | - * @since 1.5.2 |
|
| 1792 | - */ |
|
| 1793 | - $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1794 | - |
|
| 1795 | - $output_str = $page_chk_arr['output_str']; |
|
| 1796 | - $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
|
| 1797 | - |
|
| 1798 | - if ($is_error_during_diagnose) {
|
|
| 1799 | - if ($fix) {
|
|
| 1800 | - flush_rewrite_rules(); |
|
| 1801 | - } |
|
| 1802 | - $info_div_class = "geodir_problem_info"; |
|
| 1803 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1804 | - } else {
|
|
| 1805 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1806 | - $fix_button_txt = ''; |
|
| 1807 | - } |
|
| 1808 | - echo "<ul class='$info_div_class'>"; |
|
| 1809 | - echo $output_str; |
|
| 1810 | - echo $fix_button_txt; |
|
| 1811 | - echo "</ul>"; |
|
| 1606 | + global $wpdb; |
|
| 1607 | + $is_error_during_diagnose = false; |
|
| 1608 | + $output_str = ''; |
|
| 1609 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1610 | + |
|
| 1611 | + ////////////////////////////////// |
|
| 1612 | + /* Diagnose GD Home Page Starts */ |
|
| 1613 | + ////////////////////////////////// |
|
| 1614 | + $option_value = get_option('geodir_home_page');
|
|
| 1615 | + $page = get_post($option_value); |
|
| 1616 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1617 | + |
|
| 1618 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1619 | + $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1620 | + else {
|
|
| 1621 | + $is_error_during_diagnose = true; |
|
| 1622 | + $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1623 | + if ($fix) {
|
|
| 1624 | + if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
|
| 1625 | + $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1626 | + } else {
|
|
| 1627 | + $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1628 | + } |
|
| 1629 | + } |
|
| 1630 | + } |
|
| 1631 | + |
|
| 1632 | + //////////////////////////////// |
|
| 1633 | + /* Diagnose GD Home Page Ends */ |
|
| 1634 | + //////////////////////////////// |
|
| 1635 | + |
|
| 1636 | + ////////////////////////////////// |
|
| 1637 | + /* Diagnose Add Listing Page Starts */ |
|
| 1638 | + ////////////////////////////////// |
|
| 1639 | + $option_value = get_option('geodir_add_listing_page');
|
|
| 1640 | + $page = get_post($option_value); |
|
| 1641 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1642 | + |
|
| 1643 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1644 | + $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1645 | + else {
|
|
| 1646 | + $is_error_during_diagnose = true; |
|
| 1647 | + $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1648 | + if ($fix) {
|
|
| 1649 | + if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
|
| 1650 | + $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1651 | + } else {
|
|
| 1652 | + $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1653 | + } |
|
| 1654 | + } |
|
| 1655 | + } |
|
| 1656 | + |
|
| 1657 | + //////////////////////////////// |
|
| 1658 | + /* Diagnose Add Listing Page Ends */ |
|
| 1659 | + //////////////////////////////// |
|
| 1660 | + |
|
| 1661 | + |
|
| 1662 | + ////////////////////////////////// |
|
| 1663 | + /* Diagnose Listing Preview Page Starts */ |
|
| 1664 | + ////////////////////////////////// |
|
| 1665 | + $option_value = get_option('geodir_preview_page');
|
|
| 1666 | + $page = get_post($option_value); |
|
| 1667 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1668 | + |
|
| 1669 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1670 | + $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1671 | + else {
|
|
| 1672 | + $is_error_during_diagnose = true; |
|
| 1673 | + $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1674 | + if ($fix) {
|
|
| 1675 | + if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
|
| 1676 | + $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1677 | + } else {
|
|
| 1678 | + $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1679 | + } |
|
| 1680 | + } |
|
| 1681 | + } |
|
| 1682 | + |
|
| 1683 | + //////////////////////////////// |
|
| 1684 | + /* Diagnose Listing Preview Page Ends */ |
|
| 1685 | + //////////////////////////////// |
|
| 1686 | + |
|
| 1687 | + ////////////////////////////////// |
|
| 1688 | + /* Diagnose Listing Success Page Starts */ |
|
| 1689 | + ////////////////////////////////// |
|
| 1690 | + $option_value = get_option('geodir_success_page');
|
|
| 1691 | + $page = get_post($option_value); |
|
| 1692 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1693 | + |
|
| 1694 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1695 | + $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1696 | + else {
|
|
| 1697 | + $is_error_during_diagnose = true; |
|
| 1698 | + $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1699 | + if ($fix) {
|
|
| 1700 | + if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
|
| 1701 | + $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1702 | + } else {
|
|
| 1703 | + $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1704 | + } |
|
| 1705 | + } |
|
| 1706 | + } |
|
| 1707 | + |
|
| 1708 | + //////////////////////////////// |
|
| 1709 | + /* Diagnose Listing Sucess Page Ends */ |
|
| 1710 | + //////////////////////////////// |
|
| 1711 | + |
|
| 1712 | + ////////////////////////////////// |
|
| 1713 | + /* Diagnose Info Page Starts */ |
|
| 1714 | + ////////////////////////////////// |
|
| 1715 | + $option_value = get_option('geodir_info_page');
|
|
| 1716 | + $page = get_post($option_value); |
|
| 1717 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1718 | + |
|
| 1719 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1720 | + $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1721 | + else {
|
|
| 1722 | + $is_error_during_diagnose = true; |
|
| 1723 | + $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1724 | + if ($fix) {
|
|
| 1725 | + if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
|
| 1726 | + $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1727 | + } else {
|
|
| 1728 | + $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1729 | + } |
|
| 1730 | + } |
|
| 1731 | + } |
|
| 1732 | + |
|
| 1733 | + //////////////////////////////// |
|
| 1734 | + /* Diagnose Info Page Ends */ |
|
| 1735 | + //////////////////////////////// |
|
| 1736 | + |
|
| 1737 | + ////////////////////////////////// |
|
| 1738 | + /* Diagnose Login Page Starts */ |
|
| 1739 | + ////////////////////////////////// |
|
| 1740 | + $option_value = get_option('geodir_login_page');
|
|
| 1741 | + $page = get_post($option_value); |
|
| 1742 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1743 | + |
|
| 1744 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1745 | + $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1746 | + else {
|
|
| 1747 | + $is_error_during_diagnose = true; |
|
| 1748 | + $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1749 | + if ($fix) {
|
|
| 1750 | + if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
|
| 1751 | + $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1752 | + } else {
|
|
| 1753 | + $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1754 | + } |
|
| 1755 | + } |
|
| 1756 | + } |
|
| 1757 | + |
|
| 1758 | + //////////////////////////////// |
|
| 1759 | + /* Diagnose Info Page Ends */ |
|
| 1760 | + //////////////////////////////// |
|
| 1761 | + |
|
| 1762 | + ////////////////////////////////// |
|
| 1763 | + /* Diagnose Location Page Starts */ |
|
| 1764 | + ////////////////////////////////// |
|
| 1765 | + $option_value = get_option('geodir_location_page');
|
|
| 1766 | + $page = get_post($option_value); |
|
| 1767 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1768 | + |
|
| 1769 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1770 | + $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1771 | + else {
|
|
| 1772 | + $is_error_during_diagnose = true; |
|
| 1773 | + $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1774 | + if ($fix) {
|
|
| 1775 | + if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
|
| 1776 | + $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1777 | + } else {
|
|
| 1778 | + $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1779 | + } |
|
| 1780 | + } |
|
| 1781 | + } |
|
| 1782 | + |
|
| 1783 | + //////////////////////////////// |
|
| 1784 | + /* Diagnose Location Page Ends */ |
|
| 1785 | + //////////////////////////////// |
|
| 1786 | + |
|
| 1787 | + $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1788 | + /** |
|
| 1789 | + * This action is called at the end of the GD Tools page check function. |
|
| 1790 | + * |
|
| 1791 | + * @since 1.5.2 |
|
| 1792 | + */ |
|
| 1793 | + $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1794 | + |
|
| 1795 | + $output_str = $page_chk_arr['output_str']; |
|
| 1796 | + $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
|
| 1797 | + |
|
| 1798 | + if ($is_error_during_diagnose) {
|
|
| 1799 | + if ($fix) {
|
|
| 1800 | + flush_rewrite_rules(); |
|
| 1801 | + } |
|
| 1802 | + $info_div_class = "geodir_problem_info"; |
|
| 1803 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1804 | + } else {
|
|
| 1805 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1806 | + $fix_button_txt = ''; |
|
| 1807 | + } |
|
| 1808 | + echo "<ul class='$info_div_class'>"; |
|
| 1809 | + echo $output_str; |
|
| 1810 | + echo $fix_button_txt; |
|
| 1811 | + echo "</ul>"; |
|
| 1812 | 1812 | |
| 1813 | 1813 | } |
| 1814 | 1814 | |
@@ -1820,26 +1820,26 @@ discard block |
||
| 1820 | 1820 | * @global object $wpdb WordPress Database object. |
| 1821 | 1821 | */ |
| 1822 | 1822 | function geodir_diagnose_load_db_language() {
|
| 1823 | - global $wpdb; |
|
| 1823 | + global $wpdb; |
|
| 1824 | 1824 | |
| 1825 | 1825 | $is_error_during_diagnose = geodirectory_load_db_language(); |
| 1826 | 1826 | |
| 1827 | - $output_str = ''; |
|
| 1828 | - $fix_button_txt = ''; |
|
| 1827 | + $output_str = ''; |
|
| 1828 | + $fix_button_txt = ''; |
|
| 1829 | 1829 | |
| 1830 | - if ($is_error_during_diagnose) {
|
|
| 1831 | - $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1830 | + if ($is_error_during_diagnose) {
|
|
| 1831 | + $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1832 | 1832 | $info_div_class = "geodir_problem_info"; |
| 1833 | - } else {
|
|
| 1834 | - $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1833 | + } else {
|
|
| 1834 | + $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1835 | 1835 | $info_div_class = "geodir_noproblem_info"; |
| 1836 | - $fix_button_txt = ''; |
|
| 1837 | - } |
|
| 1836 | + $fix_button_txt = ''; |
|
| 1837 | + } |
|
| 1838 | 1838 | |
| 1839 | 1839 | echo "<ul class='$info_div_class'>"; |
| 1840 | - echo $output_str; |
|
| 1841 | - echo $fix_button_txt; |
|
| 1842 | - echo "</ul>"; |
|
| 1840 | + echo $output_str; |
|
| 1841 | + echo $fix_button_txt; |
|
| 1842 | + echo "</ul>"; |
|
| 1843 | 1843 | |
| 1844 | 1844 | } |
| 1845 | 1845 | |
@@ -1870,23 +1870,23 @@ discard block |
||
| 1870 | 1870 | */ |
| 1871 | 1871 | function geodir_posts_clauses_request($clauses) |
| 1872 | 1872 | {
|
| 1873 | - global $wpdb, $wp_query, $plugin_prefix; |
|
| 1873 | + global $wpdb, $wp_query, $plugin_prefix; |
|
| 1874 | 1874 | |
| 1875 | - if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
|
| 1876 | - $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1875 | + if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
|
| 1876 | + $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1877 | 1877 | |
| 1878 | - $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1879 | - $clauses['join'] = $join; |
|
| 1878 | + $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1879 | + $clauses['join'] = $join; |
|
| 1880 | 1880 | |
| 1881 | - $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1882 | - $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
|
| 1883 | - $clauses['fields'] = $fields; |
|
| 1881 | + $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1882 | + $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
|
| 1883 | + $clauses['fields'] = $fields; |
|
| 1884 | 1884 | |
| 1885 | - $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
|
| 1886 | - $orderby = 'gd_expire ' . $order; |
|
| 1887 | - $clauses['orderby'] = $orderby; |
|
| 1888 | - } |
|
| 1889 | - return $clauses; |
|
| 1885 | + $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
|
| 1886 | + $orderby = 'gd_expire ' . $order; |
|
| 1887 | + $clauses['orderby'] = $orderby; |
|
| 1888 | + } |
|
| 1889 | + return $clauses; |
|
| 1890 | 1890 | } |
| 1891 | 1891 | |
| 1892 | 1892 | |
@@ -1907,7 +1907,7 @@ discard block |
||
| 1907 | 1907 | */ |
| 1908 | 1908 | function gd_theme_switch_compat_check() |
| 1909 | 1909 | {
|
| 1910 | - gd_set_theme_compat(); |
|
| 1910 | + gd_set_theme_compat(); |
|
| 1911 | 1911 | } |
| 1912 | 1912 | |
| 1913 | 1913 | /** |
@@ -1920,27 +1920,27 @@ discard block |
||
| 1920 | 1920 | */ |
| 1921 | 1921 | function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\") |
| 1922 | 1922 | {
|
| 1923 | - if (function_exists('str_getcsv')) {
|
|
| 1924 | - $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape); |
|
| 1925 | - } else {
|
|
| 1926 | - global $current_user; |
|
| 1927 | - $upload_dir = wp_upload_dir(); |
|
| 1928 | - |
|
| 1929 | - $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1930 | - $handle = fopen($file, 'w'); |
|
| 1931 | - |
|
| 1932 | - fwrite($handle, $input); |
|
| 1933 | - fclose($handle); |
|
| 1934 | - |
|
| 1935 | - $handle = fopen($file, 'rt'); |
|
| 1936 | - if (PHP_VERSION >= '5.3.0') {
|
|
| 1937 | - $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape); |
|
| 1938 | - } else {
|
|
| 1939 | - $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure); |
|
| 1940 | - } |
|
| 1941 | - fclose($handle); |
|
| 1942 | - } |
|
| 1943 | - return $fgetcsv; |
|
| 1923 | + if (function_exists('str_getcsv')) {
|
|
| 1924 | + $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape); |
|
| 1925 | + } else {
|
|
| 1926 | + global $current_user; |
|
| 1927 | + $upload_dir = wp_upload_dir(); |
|
| 1928 | + |
|
| 1929 | + $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1930 | + $handle = fopen($file, 'w'); |
|
| 1931 | + |
|
| 1932 | + fwrite($handle, $input); |
|
| 1933 | + fclose($handle); |
|
| 1934 | + |
|
| 1935 | + $handle = fopen($file, 'rt'); |
|
| 1936 | + if (PHP_VERSION >= '5.3.0') {
|
|
| 1937 | + $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape); |
|
| 1938 | + } else {
|
|
| 1939 | + $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure); |
|
| 1940 | + } |
|
| 1941 | + fclose($handle); |
|
| 1942 | + } |
|
| 1943 | + return $fgetcsv; |
|
| 1944 | 1944 | } |
| 1945 | 1945 | |
| 1946 | 1946 | add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');
|
@@ -1955,375 +1955,375 @@ discard block |
||
| 1955 | 1955 | */ |
| 1956 | 1956 | function geodir_ajax_import_csv() |
| 1957 | 1957 | {
|
| 1958 | - error_reporting(0); // hide error to get clean json response |
|
| 1958 | + error_reporting(0); // hide error to get clean json response |
|
| 1959 | 1959 | |
| 1960 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 1961 | - $uploads = wp_upload_dir(); |
|
| 1962 | - @ini_set('auto_detect_line_endings', true);
|
|
| 1960 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 1961 | + $uploads = wp_upload_dir(); |
|
| 1962 | + @ini_set('auto_detect_line_endings', true);
|
|
| 1963 | 1963 | |
| 1964 | 1964 | $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
| 1965 | 1965 | |
| 1966 | - $task = isset($_POST['task']) ? $_POST['task'] : ''; |
|
| 1967 | - $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL; |
|
| 1968 | - $filename = $uploadedFile; |
|
| 1969 | - |
|
| 1970 | - $uploads = wp_upload_dir(); |
|
| 1971 | - $uploads_dir = $uploads['path']; |
|
| 1972 | - $image_name_arr = explode('/', $filename);
|
|
| 1973 | - $filename = end($image_name_arr); |
|
| 1974 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1975 | - $return = array(); |
|
| 1976 | - $return['file'] = $uploadedFile; |
|
| 1977 | - $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 1978 | - |
|
| 1979 | - if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
|
|
| 1980 | - $wp_filetype = wp_check_filetype_and_ext($target_path, $filename); |
|
| 1981 | - |
|
| 1982 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 1983 | - $return['error'] = NULL; |
|
| 1984 | - |
|
| 1985 | - $return['rows'] = 0; |
|
| 1986 | - |
|
| 1987 | - |
|
| 1988 | - |
|
| 1989 | - if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 1990 | - while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
|
| 1991 | - if(is_array($data) && !empty($data)) {
|
|
| 1992 | - $file[] = '"' . implode('","', $data) . '"';
|
|
| 1993 | - } |
|
| 1994 | - } |
|
| 1995 | - fclose($handle); |
|
| 1996 | - $file = $file; |
|
| 1997 | - } |
|
| 1998 | - |
|
| 1999 | - |
|
| 2000 | - |
|
| 2001 | - $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 2002 | - |
|
| 2003 | - |
|
| 2004 | - if (!$return['rows'] > 0) {
|
|
| 2005 | - $return['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 2006 | - } |
|
| 2007 | - } |
|
| 2008 | - } |
|
| 2009 | - if ($task == 'prepare' || !empty($return['error'])) {
|
|
| 2010 | - echo json_encode($return); |
|
| 2011 | - exit; |
|
| 2012 | - } |
|
| 2013 | - |
|
| 2014 | - $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL; |
|
| 2015 | - $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1; |
|
| 2016 | - $count = $importlimit; |
|
| 2017 | - $requested_limit = $importlimit; |
|
| 2018 | - $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0; |
|
| 2019 | - |
|
| 2020 | - if ($count < $totRecords) {
|
|
| 2021 | - $count = $tmpCnt + $count; |
|
| 2022 | - if ($count > $totRecords) {
|
|
| 2023 | - $count = $totRecords; |
|
| 2024 | - } |
|
| 2025 | - } else {
|
|
| 2026 | - $count = $totRecords; |
|
| 2027 | - } |
|
| 2028 | - |
|
| 2029 | - $total_records = 0; |
|
| 2030 | - $rowcount = 0; |
|
| 2031 | - $address_invalid = 0; |
|
| 2032 | - $blank_address = 0; |
|
| 2033 | - $upload_files = 0; |
|
| 2034 | - $invalid_post_type = 0; |
|
| 2035 | - $invalid_title = 0; |
|
| 2036 | - $customKeyarray = array(); |
|
| 2037 | - $gd_post_info = array(); |
|
| 2038 | - $post_location = array(); |
|
| 2039 | - $countpost = 0; |
|
| 2040 | - |
|
| 2041 | - if (!empty($file)) {
|
|
| 2042 | - $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL; |
|
| 2043 | - $customKeyarray = $columns; |
|
| 2044 | - |
|
| 2045 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 2046 | - $return['error'] = CSV_INVAILD_FILE; |
|
| 2047 | - echo json_encode($return); |
|
| 2048 | - exit; |
|
| 2049 | - } |
|
| 2050 | - |
|
| 2051 | - for ($i = 1; $i <= $importlimit; $i++) {
|
|
| 2052 | - $current_index = $tmpCnt + $i; |
|
| 2053 | - if (isset($file[$current_index])) {
|
|
| 2054 | - $total_records++; |
|
| 2055 | - |
|
| 2056 | - $buffer = geodir_str_getcsv($file[$current_index]); |
|
| 2057 | - $post_title = addslashes($buffer[0]); |
|
| 2058 | - $current_post_author = $buffer[1]; |
|
| 2059 | - $post_desc = addslashes($buffer[2]); |
|
| 2060 | - $post_cat = array(); |
|
| 2061 | - $catids_arr = array(); |
|
| 2062 | - $post_cat = trim($buffer[3]); // comma seperated category name |
|
| 2063 | - |
|
| 2064 | - if ($post_cat) {
|
|
| 2065 | - $post_cat_arr = explode(',', $post_cat);
|
|
| 2066 | - |
|
| 2067 | - for ($c = 0; $c < count($post_cat_arr); $c++) {
|
|
| 2068 | - $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c])); |
|
| 2069 | - |
|
| 2070 | - if (!empty($buffer[5])) {
|
|
| 2071 | - if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2072 | - |
|
| 2073 | - $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5])); |
|
| 2074 | - |
|
| 2075 | - if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2076 | - $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2077 | - $catids_arr[] = $cat->slug; |
|
| 2078 | - } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2079 | - $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2080 | - $catids_arr[] = $cat->slug; |
|
| 2081 | - } else {
|
|
| 2082 | - $ret = wp_insert_term($catid, $p_taxonomy[0]); |
|
| 2083 | - if ($ret && !is_wp_error($ret)) {
|
|
| 2084 | - if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2085 | - $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2086 | - $catids_arr[] = $cat->slug; |
|
| 2087 | - } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2088 | - $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2089 | - $catids_arr[] = $cat->slug; |
|
| 2090 | - } |
|
| 2091 | - } |
|
| 2092 | - } |
|
| 2093 | - } |
|
| 2094 | - } |
|
| 2095 | - } |
|
| 2096 | - } |
|
| 2097 | - |
|
| 2098 | - if (!$catids_arr) {
|
|
| 2099 | - $catids_arr[] = 1; |
|
| 2100 | - } |
|
| 2101 | - |
|
| 2102 | - $post_tags = trim($buffer[4]); // comma seperated tags |
|
| 2103 | - |
|
| 2104 | - $tag_arr = ''; |
|
| 2105 | - if ($post_tags) {
|
|
| 2106 | - $tag_arr = explode(',', $post_tags);
|
|
| 2107 | - } |
|
| 2108 | - |
|
| 2109 | - $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2110 | - |
|
| 2111 | - $error = ''; |
|
| 2112 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2113 | - $invalid_post_type++; |
|
| 2114 | - continue; |
|
| 2115 | - } |
|
| 2116 | - |
|
| 2117 | - if ($post_title != '') {
|
|
| 2118 | - $menu_order = 0; |
|
| 2119 | - $image_folder_name = 'uplaod/'; |
|
| 2120 | - |
|
| 2121 | - $image_names = array(); |
|
| 2122 | - |
|
| 2123 | - for ($c = 5; $c < count($customKeyarray); $c++) {
|
|
| 2124 | - $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]); |
|
| 2125 | - |
|
| 2126 | - if ($customKeyarray[$c] == 'IMAGE') {
|
|
| 2127 | - $buffer[$c] = trim($buffer[$c]); |
|
| 2128 | - |
|
| 2129 | - if (!empty($buffer[$c])) {
|
|
| 2130 | - $image_names[] = $buffer[$c]; |
|
| 2131 | - } |
|
| 2132 | - } |
|
| 2133 | - |
|
| 2134 | - if ($customKeyarray[$c] == 'alive_days') {
|
|
| 2135 | - if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
|
| 2136 | - $submitdata = date('Y-m-d');
|
|
| 2137 | - |
|
| 2138 | - $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2139 | - } else {
|
|
| 2140 | - $gd_post_info['expire_date'] = 'Never'; |
|
| 2141 | - } |
|
| 2142 | - } |
|
| 2143 | - |
|
| 2144 | - if ($customKeyarray[$c] == 'post_city') {
|
|
| 2145 | - $post_city = addslashes($buffer[$c]); |
|
| 2146 | - } |
|
| 2147 | - |
|
| 2148 | - if ($customKeyarray[$c] == 'post_region') {
|
|
| 2149 | - $post_region = addslashes($buffer[$c]); |
|
| 2150 | - } |
|
| 2151 | - |
|
| 2152 | - if ($customKeyarray[$c] == 'post_country') {
|
|
| 2153 | - $post_country = addslashes($buffer[$c]); |
|
| 2154 | - } |
|
| 2155 | - |
|
| 2156 | - if ($customKeyarray[$c] == 'post_latitude') {
|
|
| 2157 | - $post_latitude = addslashes($buffer[$c]); |
|
| 2158 | - } |
|
| 2159 | - |
|
| 2160 | - if ($customKeyarray[$c] == 'post_longitude') {
|
|
| 2161 | - $post_longitude = addslashes($buffer[$c]); |
|
| 2162 | - } |
|
| 1966 | + $task = isset($_POST['task']) ? $_POST['task'] : ''; |
|
| 1967 | + $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL; |
|
| 1968 | + $filename = $uploadedFile; |
|
| 1969 | + |
|
| 1970 | + $uploads = wp_upload_dir(); |
|
| 1971 | + $uploads_dir = $uploads['path']; |
|
| 1972 | + $image_name_arr = explode('/', $filename);
|
|
| 1973 | + $filename = end($image_name_arr); |
|
| 1974 | + $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1975 | + $return = array(); |
|
| 1976 | + $return['file'] = $uploadedFile; |
|
| 1977 | + $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 1978 | + |
|
| 1979 | + if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
|
|
| 1980 | + $wp_filetype = wp_check_filetype_and_ext($target_path, $filename); |
|
| 1981 | + |
|
| 1982 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 1983 | + $return['error'] = NULL; |
|
| 1984 | + |
|
| 1985 | + $return['rows'] = 0; |
|
| 1986 | + |
|
| 1987 | + |
|
| 1988 | + |
|
| 1989 | + if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 1990 | + while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
|
| 1991 | + if(is_array($data) && !empty($data)) {
|
|
| 1992 | + $file[] = '"' . implode('","', $data) . '"';
|
|
| 1993 | + } |
|
| 1994 | + } |
|
| 1995 | + fclose($handle); |
|
| 1996 | + $file = $file; |
|
| 1997 | + } |
|
| 1998 | + |
|
| 1999 | + |
|
| 2000 | + |
|
| 2001 | + $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 2002 | + |
|
| 2003 | + |
|
| 2004 | + if (!$return['rows'] > 0) {
|
|
| 2005 | + $return['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 2006 | + } |
|
| 2007 | + } |
|
| 2008 | + } |
|
| 2009 | + if ($task == 'prepare' || !empty($return['error'])) {
|
|
| 2010 | + echo json_encode($return); |
|
| 2011 | + exit; |
|
| 2012 | + } |
|
| 2013 | + |
|
| 2014 | + $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL; |
|
| 2015 | + $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1; |
|
| 2016 | + $count = $importlimit; |
|
| 2017 | + $requested_limit = $importlimit; |
|
| 2018 | + $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0; |
|
| 2019 | + |
|
| 2020 | + if ($count < $totRecords) {
|
|
| 2021 | + $count = $tmpCnt + $count; |
|
| 2022 | + if ($count > $totRecords) {
|
|
| 2023 | + $count = $totRecords; |
|
| 2024 | + } |
|
| 2025 | + } else {
|
|
| 2026 | + $count = $totRecords; |
|
| 2027 | + } |
|
| 2028 | + |
|
| 2029 | + $total_records = 0; |
|
| 2030 | + $rowcount = 0; |
|
| 2031 | + $address_invalid = 0; |
|
| 2032 | + $blank_address = 0; |
|
| 2033 | + $upload_files = 0; |
|
| 2034 | + $invalid_post_type = 0; |
|
| 2035 | + $invalid_title = 0; |
|
| 2036 | + $customKeyarray = array(); |
|
| 2037 | + $gd_post_info = array(); |
|
| 2038 | + $post_location = array(); |
|
| 2039 | + $countpost = 0; |
|
| 2040 | + |
|
| 2041 | + if (!empty($file)) {
|
|
| 2042 | + $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL; |
|
| 2043 | + $customKeyarray = $columns; |
|
| 2044 | + |
|
| 2045 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 2046 | + $return['error'] = CSV_INVAILD_FILE; |
|
| 2047 | + echo json_encode($return); |
|
| 2048 | + exit; |
|
| 2049 | + } |
|
| 2050 | + |
|
| 2051 | + for ($i = 1; $i <= $importlimit; $i++) {
|
|
| 2052 | + $current_index = $tmpCnt + $i; |
|
| 2053 | + if (isset($file[$current_index])) {
|
|
| 2054 | + $total_records++; |
|
| 2055 | + |
|
| 2056 | + $buffer = geodir_str_getcsv($file[$current_index]); |
|
| 2057 | + $post_title = addslashes($buffer[0]); |
|
| 2058 | + $current_post_author = $buffer[1]; |
|
| 2059 | + $post_desc = addslashes($buffer[2]); |
|
| 2060 | + $post_cat = array(); |
|
| 2061 | + $catids_arr = array(); |
|
| 2062 | + $post_cat = trim($buffer[3]); // comma seperated category name |
|
| 2063 | + |
|
| 2064 | + if ($post_cat) {
|
|
| 2065 | + $post_cat_arr = explode(',', $post_cat);
|
|
| 2066 | + |
|
| 2067 | + for ($c = 0; $c < count($post_cat_arr); $c++) {
|
|
| 2068 | + $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c])); |
|
| 2069 | + |
|
| 2070 | + if (!empty($buffer[5])) {
|
|
| 2071 | + if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2072 | + |
|
| 2073 | + $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5])); |
|
| 2074 | + |
|
| 2075 | + if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2076 | + $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2077 | + $catids_arr[] = $cat->slug; |
|
| 2078 | + } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2079 | + $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2080 | + $catids_arr[] = $cat->slug; |
|
| 2081 | + } else {
|
|
| 2082 | + $ret = wp_insert_term($catid, $p_taxonomy[0]); |
|
| 2083 | + if ($ret && !is_wp_error($ret)) {
|
|
| 2084 | + if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2085 | + $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2086 | + $catids_arr[] = $cat->slug; |
|
| 2087 | + } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2088 | + $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2089 | + $catids_arr[] = $cat->slug; |
|
| 2090 | + } |
|
| 2091 | + } |
|
| 2092 | + } |
|
| 2093 | + } |
|
| 2094 | + } |
|
| 2095 | + } |
|
| 2096 | + } |
|
| 2097 | + |
|
| 2098 | + if (!$catids_arr) {
|
|
| 2099 | + $catids_arr[] = 1; |
|
| 2100 | + } |
|
| 2101 | + |
|
| 2102 | + $post_tags = trim($buffer[4]); // comma seperated tags |
|
| 2103 | + |
|
| 2104 | + $tag_arr = ''; |
|
| 2105 | + if ($post_tags) {
|
|
| 2106 | + $tag_arr = explode(',', $post_tags);
|
|
| 2107 | + } |
|
| 2108 | + |
|
| 2109 | + $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2110 | + |
|
| 2111 | + $error = ''; |
|
| 2112 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2113 | + $invalid_post_type++; |
|
| 2114 | + continue; |
|
| 2115 | + } |
|
| 2116 | + |
|
| 2117 | + if ($post_title != '') {
|
|
| 2118 | + $menu_order = 0; |
|
| 2119 | + $image_folder_name = 'uplaod/'; |
|
| 2120 | + |
|
| 2121 | + $image_names = array(); |
|
| 2122 | + |
|
| 2123 | + for ($c = 5; $c < count($customKeyarray); $c++) {
|
|
| 2124 | + $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]); |
|
| 2125 | + |
|
| 2126 | + if ($customKeyarray[$c] == 'IMAGE') {
|
|
| 2127 | + $buffer[$c] = trim($buffer[$c]); |
|
| 2128 | + |
|
| 2129 | + if (!empty($buffer[$c])) {
|
|
| 2130 | + $image_names[] = $buffer[$c]; |
|
| 2131 | + } |
|
| 2132 | + } |
|
| 2133 | + |
|
| 2134 | + if ($customKeyarray[$c] == 'alive_days') {
|
|
| 2135 | + if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
|
| 2136 | + $submitdata = date('Y-m-d');
|
|
| 2137 | + |
|
| 2138 | + $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2139 | + } else {
|
|
| 2140 | + $gd_post_info['expire_date'] = 'Never'; |
|
| 2141 | + } |
|
| 2142 | + } |
|
| 2143 | + |
|
| 2144 | + if ($customKeyarray[$c] == 'post_city') {
|
|
| 2145 | + $post_city = addslashes($buffer[$c]); |
|
| 2146 | + } |
|
| 2147 | + |
|
| 2148 | + if ($customKeyarray[$c] == 'post_region') {
|
|
| 2149 | + $post_region = addslashes($buffer[$c]); |
|
| 2150 | + } |
|
| 2151 | + |
|
| 2152 | + if ($customKeyarray[$c] == 'post_country') {
|
|
| 2153 | + $post_country = addslashes($buffer[$c]); |
|
| 2154 | + } |
|
| 2155 | + |
|
| 2156 | + if ($customKeyarray[$c] == 'post_latitude') {
|
|
| 2157 | + $post_latitude = addslashes($buffer[$c]); |
|
| 2158 | + } |
|
| 2159 | + |
|
| 2160 | + if ($customKeyarray[$c] == 'post_longitude') {
|
|
| 2161 | + $post_longitude = addslashes($buffer[$c]); |
|
| 2162 | + } |
|
| 2163 | 2163 | |
| 2164 | 2164 | // Post status |
| 2165 | 2165 | if ($customKeyarray[$c] == 'post_status') {
|
| 2166 | - $post_status = sanitize_key( $buffer[$c] ); |
|
| 2167 | - } |
|
| 2168 | - } |
|
| 2169 | - |
|
| 2170 | - /* ================ before array create ============== */ |
|
| 2171 | - $location_result = geodir_get_default_location(); |
|
| 2172 | - if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
|
|
| 2173 | - $blank_address++; |
|
| 2174 | - continue; |
|
| 2175 | - } else if ($location_result->location_id == 0) {
|
|
| 2176 | - if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
|
|
| 2177 | - $address_invalid++; |
|
| 2178 | - continue; |
|
| 2179 | - } |
|
| 2180 | - } |
|
| 2166 | + $post_status = sanitize_key( $buffer[$c] ); |
|
| 2167 | + } |
|
| 2168 | + } |
|
| 2169 | + |
|
| 2170 | + /* ================ before array create ============== */ |
|
| 2171 | + $location_result = geodir_get_default_location(); |
|
| 2172 | + if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
|
|
| 2173 | + $blank_address++; |
|
| 2174 | + continue; |
|
| 2175 | + } else if ($location_result->location_id == 0) {
|
|
| 2176 | + if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
|
|
| 2177 | + $address_invalid++; |
|
| 2178 | + continue; |
|
| 2179 | + } |
|
| 2180 | + } |
|
| 2181 | 2181 | |
| 2182 | 2182 | // Default post status |
| 2183 | 2183 | $default_status = 'publish'; |
| 2184 | 2184 | $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
| 2185 | 2185 | $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
| 2186 | 2186 | |
| 2187 | - $my_post['post_title'] = $post_title; |
|
| 2188 | - $my_post['post_content'] = $post_desc; |
|
| 2189 | - $my_post['post_type'] = addslashes($buffer[5]); |
|
| 2190 | - $my_post['post_author'] = $current_post_author; |
|
| 2191 | - $my_post['post_status'] = $post_status; |
|
| 2192 | - $my_post['post_category'] = $catids_arr; |
|
| 2193 | - $my_post['post_tags'] = $tag_arr; |
|
| 2194 | - |
|
| 2195 | - $gd_post_info['post_tags'] = $tag_arr; |
|
| 2196 | - $gd_post_info['post_title'] = $post_title; |
|
| 2197 | - $gd_post_info['post_status'] = $post_status; |
|
| 2198 | - $gd_post_info['submit_time'] = time(); |
|
| 2199 | - $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 2200 | - |
|
| 2201 | - $last_postid = wp_insert_post($my_post); |
|
| 2202 | - $countpost++; |
|
| 2203 | - |
|
| 2204 | - // Check if we need to save post location as new location |
|
| 2205 | - if ($location_result->location_id > 0) {
|
|
| 2206 | - if (isset($post_city) && isset($post_region)) {
|
|
| 2207 | - $request_info['post_location'] = array( |
|
| 2208 | - 'city' => $post_city, |
|
| 2209 | - 'region' => $post_region, |
|
| 2210 | - 'country' => $post_country, |
|
| 2211 | - 'geo_lat' => $post_latitude, |
|
| 2212 | - 'geo_lng' => $post_longitude |
|
| 2213 | - ); |
|
| 2214 | - |
|
| 2215 | - $post_location_info = $request_info['post_location']; |
|
| 2216 | - if ($location_id = geodir_add_new_location($post_location_info)) |
|
| 2217 | - $post_location_id = $location_id; |
|
| 2218 | - } else {
|
|
| 2219 | - $post_location_id = 0; |
|
| 2220 | - } |
|
| 2221 | - } else {
|
|
| 2222 | - $post_location_id = 0; |
|
| 2223 | - } |
|
| 2224 | - |
|
| 2225 | - /* ------- get default package info ----- */ |
|
| 2226 | - $payment_info = array(); |
|
| 2227 | - $package_info = array(); |
|
| 2228 | - |
|
| 2229 | - $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2230 | - $package_id = ''; |
|
| 2231 | - if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
|
| 2232 | - $package_id = $gd_post_info['package_id']; |
|
| 2233 | - } |
|
| 2234 | - |
|
| 2235 | - if (!empty($package_info)) {
|
|
| 2236 | - $payment_info['package_id'] = $package_info['pid']; |
|
| 2237 | - |
|
| 2238 | - if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
|
| 2239 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2240 | - } else {
|
|
| 2241 | - $payment_info['expire_date'] = 'Never'; |
|
| 2242 | - } |
|
| 2243 | - |
|
| 2244 | - $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 2245 | - } |
|
| 2246 | - |
|
| 2247 | - $gd_post_info['post_location_id'] = $post_location_id; |
|
| 2248 | - |
|
| 2249 | - $post_type = get_post_type($last_postid); |
|
| 2250 | - |
|
| 2251 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2252 | - |
|
| 2253 | - geodir_save_post_info($last_postid, $gd_post_info); |
|
| 2254 | - |
|
| 2255 | - if (!empty($image_names)) {
|
|
| 2256 | - $upload_files++; |
|
| 2257 | - $menu_order = 1; |
|
| 2258 | - |
|
| 2259 | - foreach ($image_names as $image_name) {
|
|
| 2260 | - $img_name_arr = explode('.', $image_name);
|
|
| 2261 | - |
|
| 2262 | - $uploads = wp_upload_dir(); |
|
| 2263 | - $sub_dir = $uploads['subdir']; |
|
| 2264 | - |
|
| 2265 | - $arr_file_type = wp_check_filetype($image_name); |
|
| 2266 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 2267 | - |
|
| 2268 | - $attachment = array(); |
|
| 2269 | - $attachment['post_id'] = $last_postid; |
|
| 2270 | - $attachment['title'] = $img_name_arr[0]; |
|
| 2271 | - $attachment['content'] = ''; |
|
| 2272 | - $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2273 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 2274 | - $attachment['menu_order'] = $menu_order; |
|
| 2275 | - $attachment['is_featured'] = 0; |
|
| 2276 | - |
|
| 2277 | - $attachment_set = ''; |
|
| 2278 | - |
|
| 2279 | - foreach ($attachment as $key => $val) {
|
|
| 2280 | - if ($val != '') |
|
| 2281 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2282 | - } |
|
| 2283 | - $attachment_set = trim($attachment_set, ", "); |
|
| 2284 | - |
|
| 2285 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2286 | - |
|
| 2287 | - if ($menu_order == 1) {
|
|
| 2288 | - $post_type = get_post_type($last_postid); |
|
| 2289 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2290 | - } |
|
| 2291 | - $menu_order++; |
|
| 2292 | - } |
|
| 2293 | - } |
|
| 2294 | - |
|
| 2295 | - $gd_post_info['package_id'] = $package_id; |
|
| 2296 | - |
|
| 2297 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 2298 | - do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
|
|
| 2299 | - |
|
| 2300 | - if (!empty($buffer[5])) {
|
|
| 2301 | - if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2302 | - $taxonomies = geodir_get_posttype_info(addslashes($buffer[5])); |
|
| 2303 | - wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]); |
|
| 2304 | - wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]); |
|
| 2305 | - |
|
| 2306 | - $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : ''; |
|
| 2307 | - $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : ''; |
|
| 2308 | - geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str); |
|
| 2309 | - } |
|
| 2310 | - } |
|
| 2311 | - } else {
|
|
| 2312 | - $invalid_title++; |
|
| 2313 | - } |
|
| 2314 | - } |
|
| 2315 | - } |
|
| 2316 | - } |
|
| 2317 | - $return['rowcount'] = $countpost; |
|
| 2318 | - $return['invalidcount'] = $address_invalid; |
|
| 2319 | - $return['blank_address'] = $blank_address; |
|
| 2320 | - $return['upload_files'] = $upload_files; |
|
| 2321 | - $return['invalid_post_type'] = $invalid_post_type; |
|
| 2322 | - $return['invalid_title'] = $invalid_title; |
|
| 2323 | - $return['total_records'] = $total_records; |
|
| 2324 | - |
|
| 2325 | - echo json_encode($return); |
|
| 2326 | - exit; |
|
| 2187 | + $my_post['post_title'] = $post_title; |
|
| 2188 | + $my_post['post_content'] = $post_desc; |
|
| 2189 | + $my_post['post_type'] = addslashes($buffer[5]); |
|
| 2190 | + $my_post['post_author'] = $current_post_author; |
|
| 2191 | + $my_post['post_status'] = $post_status; |
|
| 2192 | + $my_post['post_category'] = $catids_arr; |
|
| 2193 | + $my_post['post_tags'] = $tag_arr; |
|
| 2194 | + |
|
| 2195 | + $gd_post_info['post_tags'] = $tag_arr; |
|
| 2196 | + $gd_post_info['post_title'] = $post_title; |
|
| 2197 | + $gd_post_info['post_status'] = $post_status; |
|
| 2198 | + $gd_post_info['submit_time'] = time(); |
|
| 2199 | + $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 2200 | + |
|
| 2201 | + $last_postid = wp_insert_post($my_post); |
|
| 2202 | + $countpost++; |
|
| 2203 | + |
|
| 2204 | + // Check if we need to save post location as new location |
|
| 2205 | + if ($location_result->location_id > 0) {
|
|
| 2206 | + if (isset($post_city) && isset($post_region)) {
|
|
| 2207 | + $request_info['post_location'] = array( |
|
| 2208 | + 'city' => $post_city, |
|
| 2209 | + 'region' => $post_region, |
|
| 2210 | + 'country' => $post_country, |
|
| 2211 | + 'geo_lat' => $post_latitude, |
|
| 2212 | + 'geo_lng' => $post_longitude |
|
| 2213 | + ); |
|
| 2214 | + |
|
| 2215 | + $post_location_info = $request_info['post_location']; |
|
| 2216 | + if ($location_id = geodir_add_new_location($post_location_info)) |
|
| 2217 | + $post_location_id = $location_id; |
|
| 2218 | + } else {
|
|
| 2219 | + $post_location_id = 0; |
|
| 2220 | + } |
|
| 2221 | + } else {
|
|
| 2222 | + $post_location_id = 0; |
|
| 2223 | + } |
|
| 2224 | + |
|
| 2225 | + /* ------- get default package info ----- */ |
|
| 2226 | + $payment_info = array(); |
|
| 2227 | + $package_info = array(); |
|
| 2228 | + |
|
| 2229 | + $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2230 | + $package_id = ''; |
|
| 2231 | + if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
|
| 2232 | + $package_id = $gd_post_info['package_id']; |
|
| 2233 | + } |
|
| 2234 | + |
|
| 2235 | + if (!empty($package_info)) {
|
|
| 2236 | + $payment_info['package_id'] = $package_info['pid']; |
|
| 2237 | + |
|
| 2238 | + if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
|
| 2239 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2240 | + } else {
|
|
| 2241 | + $payment_info['expire_date'] = 'Never'; |
|
| 2242 | + } |
|
| 2243 | + |
|
| 2244 | + $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 2245 | + } |
|
| 2246 | + |
|
| 2247 | + $gd_post_info['post_location_id'] = $post_location_id; |
|
| 2248 | + |
|
| 2249 | + $post_type = get_post_type($last_postid); |
|
| 2250 | + |
|
| 2251 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2252 | + |
|
| 2253 | + geodir_save_post_info($last_postid, $gd_post_info); |
|
| 2254 | + |
|
| 2255 | + if (!empty($image_names)) {
|
|
| 2256 | + $upload_files++; |
|
| 2257 | + $menu_order = 1; |
|
| 2258 | + |
|
| 2259 | + foreach ($image_names as $image_name) {
|
|
| 2260 | + $img_name_arr = explode('.', $image_name);
|
|
| 2261 | + |
|
| 2262 | + $uploads = wp_upload_dir(); |
|
| 2263 | + $sub_dir = $uploads['subdir']; |
|
| 2264 | + |
|
| 2265 | + $arr_file_type = wp_check_filetype($image_name); |
|
| 2266 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 2267 | + |
|
| 2268 | + $attachment = array(); |
|
| 2269 | + $attachment['post_id'] = $last_postid; |
|
| 2270 | + $attachment['title'] = $img_name_arr[0]; |
|
| 2271 | + $attachment['content'] = ''; |
|
| 2272 | + $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2273 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 2274 | + $attachment['menu_order'] = $menu_order; |
|
| 2275 | + $attachment['is_featured'] = 0; |
|
| 2276 | + |
|
| 2277 | + $attachment_set = ''; |
|
| 2278 | + |
|
| 2279 | + foreach ($attachment as $key => $val) {
|
|
| 2280 | + if ($val != '') |
|
| 2281 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2282 | + } |
|
| 2283 | + $attachment_set = trim($attachment_set, ", "); |
|
| 2284 | + |
|
| 2285 | + $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2286 | + |
|
| 2287 | + if ($menu_order == 1) {
|
|
| 2288 | + $post_type = get_post_type($last_postid); |
|
| 2289 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2290 | + } |
|
| 2291 | + $menu_order++; |
|
| 2292 | + } |
|
| 2293 | + } |
|
| 2294 | + |
|
| 2295 | + $gd_post_info['package_id'] = $package_id; |
|
| 2296 | + |
|
| 2297 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 2298 | + do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
|
|
| 2299 | + |
|
| 2300 | + if (!empty($buffer[5])) {
|
|
| 2301 | + if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2302 | + $taxonomies = geodir_get_posttype_info(addslashes($buffer[5])); |
|
| 2303 | + wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]); |
|
| 2304 | + wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]); |
|
| 2305 | + |
|
| 2306 | + $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : ''; |
|
| 2307 | + $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : ''; |
|
| 2308 | + geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str); |
|
| 2309 | + } |
|
| 2310 | + } |
|
| 2311 | + } else {
|
|
| 2312 | + $invalid_title++; |
|
| 2313 | + } |
|
| 2314 | + } |
|
| 2315 | + } |
|
| 2316 | + } |
|
| 2317 | + $return['rowcount'] = $countpost; |
|
| 2318 | + $return['invalidcount'] = $address_invalid; |
|
| 2319 | + $return['blank_address'] = $blank_address; |
|
| 2320 | + $return['upload_files'] = $upload_files; |
|
| 2321 | + $return['invalid_post_type'] = $invalid_post_type; |
|
| 2322 | + $return['invalid_title'] = $invalid_title; |
|
| 2323 | + $return['total_records'] = $total_records; |
|
| 2324 | + |
|
| 2325 | + echo json_encode($return); |
|
| 2326 | + exit; |
|
| 2327 | 2327 | } |
| 2328 | 2328 | |
| 2329 | 2329 | // Add the tab in left sidebar menu fro import & export page. |
@@ -2343,9 +2343,9 @@ discard block |
||
| 2343 | 2343 | * @param $post object $post The post object of the post being saved. |
| 2344 | 2344 | */ |
| 2345 | 2345 | function geodir_update_location_prefix($post_id,$post){
|
| 2346 | - if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2347 | - update_option('geodir_location_prefix',$post->post_name);
|
|
| 2348 | - } |
|
| 2346 | + if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2347 | + update_option('geodir_location_prefix',$post->post_name);
|
|
| 2348 | + } |
|
| 2349 | 2349 | |
| 2350 | 2350 | } |
| 2351 | 2351 | |
@@ -2356,50 +2356,50 @@ discard block |
||
| 2356 | 2356 | function geodir_ga_callback(){
|
| 2357 | 2357 | |
| 2358 | 2358 | if(isset($_REQUEST['code']) && $_REQUEST['code']) {
|
| 2359 | - $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 2360 | - $code = "code=".$_REQUEST['code']; |
|
| 2361 | - $grant_type = "&grant_type=authorization_code"; |
|
| 2362 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2363 | - $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 2364 | - $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 2359 | + $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 2360 | + $code = "code=".$_REQUEST['code']; |
|
| 2361 | + $grant_type = "&grant_type=authorization_code"; |
|
| 2362 | + $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2363 | + $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 2364 | + $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 2365 | 2365 | |
| 2366 | - $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2366 | + $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2367 | 2367 | |
| 2368 | - $response = wp_remote_post($auth_url, array('timeout' => 15));
|
|
| 2368 | + $response = wp_remote_post($auth_url, array('timeout' => 15));
|
|
| 2369 | 2369 | |
| 2370 | - //print_r($response); |
|
| 2370 | + //print_r($response); |
|
| 2371 | 2371 | |
| 2372 | - $error_msg = __('Something went wrong','geodirectory');
|
|
| 2373 | - if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2372 | + $error_msg = __('Something went wrong','geodirectory');
|
|
| 2373 | + if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2374 | 2374 | |
| 2375 | - $parts = json_decode($response['body']); |
|
| 2376 | - //print_r($parts); |
|
| 2377 | - if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2378 | - else{
|
|
| 2375 | + $parts = json_decode($response['body']); |
|
| 2376 | + //print_r($parts); |
|
| 2377 | + if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2378 | + else{
|
|
| 2379 | 2379 | |
| 2380 | - update_option('gd_ga_access_token', $parts->access_token);
|
|
| 2381 | - update_option('gd_ga_refresh_token', $parts->refresh_token);
|
|
| 2382 | - ?><script>window.close();</script><?php |
|
| 2383 | - } |
|
| 2380 | + update_option('gd_ga_access_token', $parts->access_token);
|
|
| 2381 | + update_option('gd_ga_refresh_token', $parts->refresh_token);
|
|
| 2382 | + ?><script>window.close();</script><?php |
|
| 2383 | + } |
|
| 2384 | 2384 | |
| 2385 | 2385 | |
| 2386 | - } |
|
| 2387 | - elseif(!empty($response['response']['code'])) {
|
|
| 2388 | - $parts = json_decode($response['body']); |
|
| 2386 | + } |
|
| 2387 | + elseif(!empty($response['response']['code'])) {
|
|
| 2388 | + $parts = json_decode($response['body']); |
|
| 2389 | 2389 | |
| 2390 | - if(isset($parts->error)){
|
|
| 2391 | - echo $parts->error.": ".$parts->error_description;exit; |
|
| 2392 | - }else{
|
|
| 2393 | - echo $error_msg." - #2";exit; |
|
| 2394 | - } |
|
| 2390 | + if(isset($parts->error)){
|
|
| 2391 | + echo $parts->error.": ".$parts->error_description;exit; |
|
| 2392 | + }else{
|
|
| 2393 | + echo $error_msg." - #2";exit; |
|
| 2394 | + } |
|
| 2395 | 2395 | |
| 2396 | - }else{
|
|
| 2396 | + }else{
|
|
| 2397 | 2397 | |
| 2398 | - echo $error_msg." - #3";exit; |
|
| 2398 | + echo $error_msg." - #3";exit; |
|
| 2399 | 2399 | |
| 2400 | - } |
|
| 2400 | + } |
|
| 2401 | 2401 | } |
| 2402 | - exit; |
|
| 2402 | + exit; |
|
| 2403 | 2403 | } |
| 2404 | 2404 | |
| 2405 | 2405 | if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
|
@@ -2415,45 +2415,45 @@ discard block |
||
| 2415 | 2415 | * @return array Array of settings. |
| 2416 | 2416 | */ |
| 2417 | 2417 | function geodir_uninstall_settings($general_settings) {
|
| 2418 | - $settings = array(); |
|
| 2419 | - $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
|
| 2420 | - $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2418 | + $settings = array(); |
|
| 2419 | + $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
|
| 2420 | + $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2421 | 2421 | |
| 2422 | - $plugins = get_plugins(); |
|
| 2423 | - $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
|
| 2422 | + $plugins = get_plugins(); |
|
| 2423 | + $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
|
| 2424 | 2424 | |
| 2425 | - if (!empty($plugins) && !empty($un_plugins)) {
|
|
| 2426 | - foreach ($plugins as $plugin => $data) {
|
|
| 2427 | - $plugin_name = plugin_basename(dirname($plugin)); |
|
| 2425 | + if (!empty($plugins) && !empty($un_plugins)) {
|
|
| 2426 | + foreach ($plugins as $plugin => $data) {
|
|
| 2427 | + $plugin_name = plugin_basename(dirname($plugin)); |
|
| 2428 | 2428 | |
| 2429 | - if (in_array($plugin_name, $un_plugins)) {
|
|
| 2430 | - $settings[] = array( |
|
| 2431 | - 'type' => 'checkbox', |
|
| 2432 | - 'id' => 'geodir_un_' . $plugin_name, |
|
| 2433 | - 'name' => $data['Name'], |
|
| 2434 | - 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
|
| 2435 | - 'std' => '0' |
|
| 2436 | - ); |
|
| 2437 | - } |
|
| 2438 | - } |
|
| 2439 | - } |
|
| 2429 | + if (in_array($plugin_name, $un_plugins)) {
|
|
| 2430 | + $settings[] = array( |
|
| 2431 | + 'type' => 'checkbox', |
|
| 2432 | + 'id' => 'geodir_un_' . $plugin_name, |
|
| 2433 | + 'name' => $data['Name'], |
|
| 2434 | + 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
|
| 2435 | + 'std' => '0' |
|
| 2436 | + ); |
|
| 2437 | + } |
|
| 2438 | + } |
|
| 2439 | + } |
|
| 2440 | 2440 | |
| 2441 | - $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
|
|
| 2441 | + $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
|
|
| 2442 | 2442 | |
| 2443 | - /** |
|
| 2444 | - * Filter the uninstall settings array. |
|
| 2445 | - * |
|
| 2446 | - * @since 1.6.9 |
|
| 2447 | - * |
|
| 2448 | - * @param array $settings The settings array. |
|
| 2449 | - */ |
|
| 2450 | - $settings = apply_filters('geodir_uninstall_settings', $settings);
|
|
| 2443 | + /** |
|
| 2444 | + * Filter the uninstall settings array. |
|
| 2445 | + * |
|
| 2446 | + * @since 1.6.9 |
|
| 2447 | + * |
|
| 2448 | + * @param array $settings The settings array. |
|
| 2449 | + */ |
|
| 2450 | + $settings = apply_filters('geodir_uninstall_settings', $settings);
|
|
| 2451 | 2451 | |
| 2452 | - if (!empty($settings) && count($settings) > 3) {
|
|
| 2453 | - return array_merge($general_settings, $settings); |
|
| 2454 | - } |
|
| 2452 | + if (!empty($settings) && count($settings) > 3) {
|
|
| 2453 | + return array_merge($general_settings, $settings); |
|
| 2454 | + } |
|
| 2455 | 2455 | |
| 2456 | - return $general_settings; |
|
| 2456 | + return $general_settings; |
|
| 2457 | 2457 | } |
| 2458 | 2458 | add_filter('geodir_general_settings', 'geodir_uninstall_settings', 100, 1);
|
| 2459 | 2459 | |
@@ -2463,7 +2463,7 @@ discard block |
||
| 2463 | 2463 | * @since 1.6.9 |
| 2464 | 2464 | */ |
| 2465 | 2465 | function geodir_uninstall_settings_desc() {
|
| 2466 | - echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2466 | + echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2467 | 2467 | } |
| 2468 | 2468 | add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
|
| 2469 | 2469 | |
@@ -2479,18 +2479,18 @@ discard block |
||
| 2479 | 2479 | * @return array The settings array. |
| 2480 | 2480 | */ |
| 2481 | 2481 | function geodir_resave_settings($settings = array()) {
|
| 2482 | - if (!empty($settings) && is_array($settings)) {
|
|
| 2483 | - $c = 0; |
|
| 2482 | + if (!empty($settings) && is_array($settings)) {
|
|
| 2483 | + $c = 0; |
|
| 2484 | 2484 | |
| 2485 | - foreach ($settings as $setting) {
|
|
| 2486 | - if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
|
|
| 2487 | - $settings[$c]['std'] = $value; |
|
| 2488 | - } |
|
| 2489 | - $c++; |
|
| 2490 | - } |
|
| 2491 | - } |
|
| 2492 | - |
|
| 2493 | - return $settings; |
|
| 2485 | + foreach ($settings as $setting) {
|
|
| 2486 | + if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
|
|
| 2487 | + $settings[$c]['std'] = $value; |
|
| 2488 | + } |
|
| 2489 | + $c++; |
|
| 2490 | + } |
|
| 2491 | + } |
|
| 2492 | + |
|
| 2493 | + return $settings; |
|
| 2494 | 2494 | } |
| 2495 | 2495 | |
| 2496 | 2496 | /** |
@@ -2502,9 +2502,9 @@ discard block |
||
| 2502 | 2502 | * @return array The modified settings. |
| 2503 | 2503 | */ |
| 2504 | 2504 | function geodir_core_uninstall_settings($settings) {
|
| 2505 | - $settings[] = plugin_basename(dirname(dirname(__FILE__))); |
|
| 2505 | + $settings[] = plugin_basename(dirname(dirname(__FILE__))); |
|
| 2506 | 2506 | |
| 2507 | - return $settings; |
|
| 2507 | + return $settings; |
|
| 2508 | 2508 | } |
| 2509 | 2509 | add_filter('geodir_plugins_uninstall_settings', 'geodir_core_uninstall_settings', 10, 1);
|
| 2510 | 2510 | |
@@ -2518,34 +2518,34 @@ discard block |
||
| 2518 | 2518 | */ |
| 2519 | 2519 | function geodir_diagnose_reload_db_countries() |
| 2520 | 2520 | {
|
| 2521 | - global $wpdb, $plugin_prefix; |
|
| 2522 | - |
|
| 2523 | - $is_error_during_diagnose = false; |
|
| 2524 | - $output_str = ''; |
|
| 2525 | - |
|
| 2526 | - $delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);
|
|
| 2527 | - |
|
| 2528 | - |
|
| 2529 | - if ($delete) {
|
|
| 2530 | - $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2531 | - ob_start(); |
|
| 2532 | - geodir_diagnose_version_clear(); |
|
| 2533 | - ob_end_clean(); |
|
| 2534 | - }else{
|
|
| 2535 | - $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2536 | - } |
|
| 2537 | - |
|
| 2538 | - if ($is_error_during_diagnose) {
|
|
| 2539 | - $info_div_class = "geodir_problem_info"; |
|
| 2540 | - $fix_button_txt = ""; |
|
| 2541 | - } else {
|
|
| 2542 | - $info_div_class = "geodir_noproblem_info"; |
|
| 2543 | - $fix_button_txt = ''; |
|
| 2544 | - } |
|
| 2545 | - echo "<ul class='$info_div_class'>"; |
|
| 2546 | - echo $output_str; |
|
| 2547 | - echo $fix_button_txt; |
|
| 2548 | - echo "</ul>"; |
|
| 2521 | + global $wpdb, $plugin_prefix; |
|
| 2522 | + |
|
| 2523 | + $is_error_during_diagnose = false; |
|
| 2524 | + $output_str = ''; |
|
| 2525 | + |
|
| 2526 | + $delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);
|
|
| 2527 | + |
|
| 2528 | + |
|
| 2529 | + if ($delete) {
|
|
| 2530 | + $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2531 | + ob_start(); |
|
| 2532 | + geodir_diagnose_version_clear(); |
|
| 2533 | + ob_end_clean(); |
|
| 2534 | + }else{
|
|
| 2535 | + $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2536 | + } |
|
| 2537 | + |
|
| 2538 | + if ($is_error_during_diagnose) {
|
|
| 2539 | + $info_div_class = "geodir_problem_info"; |
|
| 2540 | + $fix_button_txt = ""; |
|
| 2541 | + } else {
|
|
| 2542 | + $info_div_class = "geodir_noproblem_info"; |
|
| 2543 | + $fix_button_txt = ''; |
|
| 2544 | + } |
|
| 2545 | + echo "<ul class='$info_div_class'>"; |
|
| 2546 | + echo $output_str; |
|
| 2547 | + echo $fix_button_txt; |
|
| 2548 | + echo "</ul>"; |
|
| 2549 | 2549 | } |
| 2550 | 2550 | |
| 2551 | 2551 | /** |
@@ -2558,11 +2558,11 @@ discard block |
||
| 2558 | 2558 | * @return array Filtered actions. |
| 2559 | 2559 | */ |
| 2560 | 2560 | function geodir_disable_quick_edit( $actions = array(), $row = null ) {
|
| 2561 | - if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2562 | - unset( $actions['inline hide-if-no-js'] ); |
|
| 2563 | - } |
|
| 2561 | + if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2562 | + unset( $actions['inline hide-if-no-js'] ); |
|
| 2563 | + } |
|
| 2564 | 2564 | |
| 2565 | - return $actions; |
|
| 2565 | + return $actions; |
|
| 2566 | 2566 | } |
| 2567 | 2567 | |
| 2568 | 2568 | /** |
@@ -2576,26 +2576,26 @@ discard block |
||
| 2576 | 2576 | * @global bool $gd_cpt_screen True if current scrrrn has GD post type. |
| 2577 | 2577 | */ |
| 2578 | 2578 | function geodir_check_quick_edit() {
|
| 2579 | - global $pagenow, $current_screen, $gd_cpt_screen; |
|
| 2580 | - |
|
| 2581 | - if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2582 | - if ( empty( $gd_cpt_screen ) ) {
|
|
| 2583 | - if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2584 | - $gd_cpt_screen = 'y'; |
|
| 2585 | - } else {
|
|
| 2586 | - $gd_cpt_screen = 'n'; |
|
| 2587 | - } |
|
| 2588 | - } |
|
| 2589 | - |
|
| 2590 | - if ( $gd_cpt_screen == 'y' ) {
|
|
| 2591 | - if ( $pagenow == 'edit.php' ) {
|
|
| 2592 | - add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2593 | - add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2594 | - } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2595 | - add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2596 | - } |
|
| 2597 | - } |
|
| 2598 | - } |
|
| 2579 | + global $pagenow, $current_screen, $gd_cpt_screen; |
|
| 2580 | + |
|
| 2581 | + if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2582 | + if ( empty( $gd_cpt_screen ) ) {
|
|
| 2583 | + if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2584 | + $gd_cpt_screen = 'y'; |
|
| 2585 | + } else {
|
|
| 2586 | + $gd_cpt_screen = 'n'; |
|
| 2587 | + } |
|
| 2588 | + } |
|
| 2589 | + |
|
| 2590 | + if ( $gd_cpt_screen == 'y' ) {
|
|
| 2591 | + if ( $pagenow == 'edit.php' ) {
|
|
| 2592 | + add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2593 | + add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2594 | + } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2595 | + add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2596 | + } |
|
| 2597 | + } |
|
| 2598 | + } |
|
| 2599 | 2599 | } |
| 2600 | 2600 | add_action( 'admin_head', 'geodir_check_quick_edit', 10 ); |
| 2601 | 2601 | |
@@ -2609,11 +2609,11 @@ discard block |
||
| 2609 | 2609 | * @return array Filtered bulk actions. |
| 2610 | 2610 | */ |
| 2611 | 2611 | function geodir_filter_bulk_actions( $actions ) {
|
| 2612 | - if ( isset( $actions['edit'] ) ) {
|
|
| 2613 | - unset( $actions['edit'] ); |
|
| 2614 | - } |
|
| 2612 | + if ( isset( $actions['edit'] ) ) {
|
|
| 2613 | + unset( $actions['edit'] ); |
|
| 2614 | + } |
|
| 2615 | 2615 | |
| 2616 | - return $actions; |
|
| 2616 | + return $actions; |
|
| 2617 | 2617 | } |
| 2618 | 2618 | |
| 2619 | 2619 | /** |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | /** |
| 11 | 11 | * Get All Plugin functions from WordPress |
| 12 | 12 | */ |
| 13 | -include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); |
|
| 13 | +include_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
| 14 | 14 | |
| 15 | 15 | /*-----------------------------------------------------------------------------------*/ |
| 16 | 16 | /* Helper functions */ |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @return string example url eg: http://wpgeo.directory/wp-content/plugins/geodirectory |
| 28 | 28 | */ |
| 29 | 29 | function geodir_plugin_url() {
|
| 30 | - return plugins_url( '', dirname( __FILE__ ) ); |
|
| 30 | + return plugins_url('', dirname(__FILE__));
|
|
| 31 | 31 | /* |
| 32 | 32 | if ( is_ssl() ) : |
| 33 | 33 | return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory |
| 48 | 48 | */ |
| 49 | 49 | function geodir_plugin_path() {
|
| 50 | - if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {
|
|
| 51 | - return dirname( dirname( __FILE__ ) ); |
|
| 50 | + if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {
|
|
| 51 | + return dirname(dirname(__FILE__)); |
|
| 52 | 52 | } else {
|
| 53 | - return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
|
| 53 | + return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__))); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
@@ -65,10 +65,10 @@ discard block |
||
| 65 | 65 | * @return bool true or false. |
| 66 | 66 | * @todo check if this is faster than normal WP check and remove if not. |
| 67 | 67 | */ |
| 68 | -function geodir_is_plugin_active( $plugin ) {
|
|
| 69 | - $active_plugins = get_option( 'active_plugins' ); |
|
| 70 | - foreach ( $active_plugins as $key => $active_plugin ) {
|
|
| 71 | - if ( strstr( $active_plugin, $plugin ) ) {
|
|
| 68 | +function geodir_is_plugin_active($plugin) {
|
|
| 69 | + $active_plugins = get_option('active_plugins');
|
|
| 70 | + foreach ($active_plugins as $key => $active_plugin) {
|
|
| 71 | + if (strstr($active_plugin, $plugin)) {
|
|
| 72 | 72 | return true; |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @return bool|int|string the formatted date. |
| 92 | 92 | */ |
| 93 | -function geodir_get_formated_date( $date ) {
|
|
| 94 | - return mysql2date( get_option( 'date_format' ), $date ); |
|
| 93 | +function geodir_get_formated_date($date) {
|
|
| 94 | + return mysql2date(get_option('date_format'), $date);
|
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | * |
| 108 | 108 | * @return bool|int|string the formatted time. |
| 109 | 109 | */ |
| 110 | -function geodir_get_formated_time( $time ) {
|
|
| 111 | - return mysql2date( get_option( 'time_format' ), $time, $translate = true ); |
|
| 110 | +function geodir_get_formated_time($time) {
|
|
| 111 | + return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
@@ -126,35 +126,35 @@ discard block |
||
| 126 | 126 | * |
| 127 | 127 | * @return string Formatted link. |
| 128 | 128 | */ |
| 129 | -function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {
|
|
| 130 | - if ( $use_existing_arguments ) {
|
|
| 129 | +function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {
|
|
| 130 | + if ($use_existing_arguments) {
|
|
| 131 | 131 | $params = $params + $_GET; |
| 132 | 132 | } |
| 133 | - if ( ! $params ) {
|
|
| 133 | + if (!$params) {
|
|
| 134 | 134 | return $url; |
| 135 | 135 | } |
| 136 | 136 | $link = $url; |
| 137 | - if ( strpos( $link, '?' ) === false ) {
|
|
| 137 | + if (strpos($link, '?') === false) {
|
|
| 138 | 138 | $link .= '?'; |
| 139 | 139 | } //If there is no '?' add one at the end |
| 140 | - elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {
|
|
| 140 | + elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {
|
|
| 141 | 141 | $link .= '&'; |
| 142 | 142 | } //If there is no '&' at the END, add one. |
| 143 | - elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {
|
|
| 143 | + elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {
|
|
| 144 | 144 | $link .= '&'; |
| 145 | 145 | } //If there is no '&' at the END, add one. |
| 146 | 146 | |
| 147 | 147 | $params_arr = array(); |
| 148 | - foreach ( $params as $key => $value ) {
|
|
| 149 | - if ( gettype( $value ) == 'array' ) { //Handle array data properly
|
|
| 150 | - foreach ( $value as $val ) {
|
|
| 151 | - $params_arr[] = $key . '[]=' . urlencode( $val ); |
|
| 148 | + foreach ($params as $key => $value) {
|
|
| 149 | + if (gettype($value) == 'array') { //Handle array data properly
|
|
| 150 | + foreach ($value as $val) {
|
|
| 151 | + $params_arr[] = $key.'[]='.urlencode($val); |
|
| 152 | 152 | } |
| 153 | 153 | } else {
|
| 154 | - $params_arr[] = $key . '=' . urlencode( $value ); |
|
| 154 | + $params_arr[] = $key.'='.urlencode($value); |
|
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | - $link .= implode( '&', $params_arr ); |
|
| 157 | + $link .= implode('&', $params_arr);
|
|
| 158 | 158 | |
| 159 | 159 | return $link; |
| 160 | 160 | } |
@@ -171,18 +171,18 @@ discard block |
||
| 171 | 171 | * |
| 172 | 172 | * @return string Listing page url if valid. Otherwise home url will be returned. |
| 173 | 173 | */ |
| 174 | -function geodir_get_addlisting_link( $post_type = '' ) {
|
|
| 174 | +function geodir_get_addlisting_link($post_type = '') {
|
|
| 175 | 175 | global $wpdb; |
| 176 | 176 | |
| 177 | 177 | //$check_pkg = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");
|
| 178 | 178 | $check_pkg = 1; |
| 179 | - if ( post_type_exists( $post_type ) && $check_pkg ) {
|
|
| 179 | + if (post_type_exists($post_type) && $check_pkg) {
|
|
| 180 | 180 | |
| 181 | - $add_listing_link = get_page_link( geodir_add_listing_page_id() ); |
|
| 181 | + $add_listing_link = get_page_link(geodir_add_listing_page_id()); |
|
| 182 | 182 | |
| 183 | - return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) ); |
|
| 183 | + return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));
|
|
| 184 | 184 | } else {
|
| 185 | - return get_bloginfo( 'url' ); |
|
| 185 | + return get_bloginfo('url');
|
|
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {
|
| 211 | 211 | // To build the entire URI we need to prepend the protocol, and the http host |
| 212 | 212 | // to the URI string. |
| 213 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 213 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; |
|
| 214 | 214 | } else {
|
| 215 | 215 | /* |
| 216 | 216 | * Since we do not have REQUEST_URI to work with, we will assume we are |
@@ -219,11 +219,11 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS |
| 221 | 221 | */ |
| 222 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; |
|
| 222 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']; |
|
| 223 | 223 | |
| 224 | 224 | // If the query string exists append it to the URI string |
| 225 | 225 | if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
|
| 226 | - $pageURL .= '?' . $_SERVER['QUERY_STRING']; |
|
| 226 | + $pageURL .= '?'.$_SERVER['QUERY_STRING']; |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * |
| 235 | 235 | * @param string $pageURL The URL of the current page. |
| 236 | 236 | */ |
| 237 | - return apply_filters( 'geodir_curPageURL', $pageURL ); |
|
| 237 | + return apply_filters('geodir_curPageURL', $pageURL);
|
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
@@ -249,12 +249,12 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * @return string Cleaned variable. |
| 251 | 251 | */ |
| 252 | -function geodir_clean( $string ) {
|
|
| 252 | +function geodir_clean($string) {
|
|
| 253 | 253 | |
| 254 | - $string = trim( strip_tags( stripslashes( $string ) ) ); |
|
| 255 | - $string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens. |
|
| 256 | - $string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars. |
|
| 257 | - $string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one. |
|
| 254 | + $string = trim(strip_tags(stripslashes($string))); |
|
| 255 | + $string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.
|
|
| 256 | + $string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.
|
|
| 257 | + $string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.
|
|
| 258 | 258 | |
| 259 | 259 | return $string; |
| 260 | 260 | } |
@@ -268,13 +268,13 @@ discard block |
||
| 268 | 268 | */ |
| 269 | 269 | function geodir_get_weekday() {
|
| 270 | 270 | return array( |
| 271 | - __( 'Sunday', 'geodirectory' ), |
|
| 272 | - __( 'Monday', 'geodirectory' ), |
|
| 273 | - __( 'Tuesday', 'geodirectory' ), |
|
| 274 | - __( 'Wednesday', 'geodirectory' ), |
|
| 275 | - __( 'Thursday', 'geodirectory' ), |
|
| 276 | - __( 'Friday', 'geodirectory' ), |
|
| 277 | - __( 'Saturday', 'geodirectory' ) |
|
| 271 | + __('Sunday', 'geodirectory'),
|
|
| 272 | + __('Monday', 'geodirectory'),
|
|
| 273 | + __('Tuesday', 'geodirectory'),
|
|
| 274 | + __('Wednesday', 'geodirectory'),
|
|
| 275 | + __('Thursday', 'geodirectory'),
|
|
| 276 | + __('Friday', 'geodirectory'),
|
|
| 277 | + __('Saturday', 'geodirectory')
|
|
| 278 | 278 | ); |
| 279 | 279 | } |
| 280 | 280 | |
@@ -287,11 +287,11 @@ discard block |
||
| 287 | 287 | */ |
| 288 | 288 | function geodir_get_weeks() {
|
| 289 | 289 | return array( |
| 290 | - __( 'First', 'geodirectory' ), |
|
| 291 | - __( 'Second', 'geodirectory' ), |
|
| 292 | - __( 'Third', 'geodirectory' ), |
|
| 293 | - __( 'Fourth', 'geodirectory' ), |
|
| 294 | - __( 'Last', 'geodirectory' ) |
|
| 290 | + __('First', 'geodirectory'),
|
|
| 291 | + __('Second', 'geodirectory'),
|
|
| 292 | + __('Third', 'geodirectory'),
|
|
| 293 | + __('Fourth', 'geodirectory'),
|
|
| 294 | + __('Last', 'geodirectory')
|
|
| 295 | 295 | ); |
| 296 | 296 | } |
| 297 | 297 | |
@@ -310,112 +310,112 @@ discard block |
||
| 310 | 310 | * |
| 311 | 311 | * @return bool If valid returns true. Otherwise false. |
| 312 | 312 | */ |
| 313 | -function geodir_is_page( $gdpage = '' ) {
|
|
| 313 | +function geodir_is_page($gdpage = '') {
|
|
| 314 | 314 | |
| 315 | 315 | global $wp_query, $post, $wp; |
| 316 | 316 | //if(!is_admin()): |
| 317 | 317 | |
| 318 | - switch ( $gdpage ): |
|
| 318 | + switch ($gdpage): |
|
| 319 | 319 | case 'add-listing': |
| 320 | 320 | |
| 321 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {
|
|
| 321 | + if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {
|
|
| 322 | 322 | return true; |
| 323 | - } elseif ( is_page() && isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 323 | + } elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 324 | 324 | return true; |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | break; |
| 328 | 328 | case 'preview': |
| 329 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] ) |
|
| 330 | - && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) |
|
| 329 | + if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])
|
|
| 330 | + && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) |
|
| 331 | 331 | ) {
|
| 332 | 332 | return true; |
| 333 | 333 | } |
| 334 | 334 | break; |
| 335 | 335 | case 'listing-success': |
| 336 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {
|
|
| 336 | + if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {
|
|
| 337 | 337 | return true; |
| 338 | 338 | } |
| 339 | 339 | break; |
| 340 | 340 | case 'detail': |
| 341 | - $post_type = get_query_var( 'post_type' ); |
|
| 342 | - if ( is_array( $post_type ) ) {
|
|
| 343 | - $post_type = reset( $post_type ); |
|
| 341 | + $post_type = get_query_var('post_type');
|
|
| 342 | + if (is_array($post_type)) {
|
|
| 343 | + $post_type = reset($post_type); |
|
| 344 | 344 | } |
| 345 | - if ( is_single() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 345 | + if (is_single() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 346 | 346 | return true; |
| 347 | 347 | } |
| 348 | 348 | break; |
| 349 | 349 | case 'pt': |
| 350 | - $post_type = get_query_var( 'post_type' ); |
|
| 351 | - if ( is_array( $post_type ) ) {
|
|
| 352 | - $post_type = reset( $post_type ); |
|
| 350 | + $post_type = get_query_var('post_type');
|
|
| 351 | + if (is_array($post_type)) {
|
|
| 352 | + $post_type = reset($post_type); |
|
| 353 | 353 | } |
| 354 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {
|
|
| 354 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {
|
|
| 355 | 355 | return true; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | break; |
| 359 | 359 | case 'listing': |
| 360 | - if ( is_tax() && geodir_get_taxonomy_posttype() ) {
|
|
| 360 | + if (is_tax() && geodir_get_taxonomy_posttype()) {
|
|
| 361 | 361 | global $current_term, $taxonomy, $term; |
| 362 | 362 | |
| 363 | 363 | return true; |
| 364 | 364 | } |
| 365 | - $post_type = get_query_var( 'post_type' ); |
|
| 366 | - if ( is_array( $post_type ) ) {
|
|
| 367 | - $post_type = reset( $post_type ); |
|
| 365 | + $post_type = get_query_var('post_type');
|
|
| 366 | + if (is_array($post_type)) {
|
|
| 367 | + $post_type = reset($post_type); |
|
| 368 | 368 | } |
| 369 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 369 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 370 | 370 | return true; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | break; |
| 374 | 374 | case 'home': |
| 375 | 375 | |
| 376 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {
|
|
| 376 | + if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {
|
|
| 377 | 377 | return true; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | break; |
| 381 | 381 | case 'location': |
| 382 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {
|
|
| 382 | + if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {
|
|
| 383 | 383 | return true; |
| 384 | 384 | } |
| 385 | 385 | break; |
| 386 | 386 | case 'author': |
| 387 | - if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 387 | + if (is_author() && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 388 | 388 | return true; |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {
|
|
| 392 | - if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {
|
|
| 391 | + if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {
|
|
| 392 | + if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {
|
|
| 393 | 393 | return true; |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | break; |
| 397 | 397 | case 'search': |
| 398 | - if ( is_search() && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 398 | + if (is_search() && isset($_REQUEST['geodir_search'])) {
|
|
| 399 | 399 | return true; |
| 400 | 400 | } |
| 401 | 401 | break; |
| 402 | 402 | case 'info': |
| 403 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {
|
|
| 403 | + if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {
|
|
| 404 | 404 | return true; |
| 405 | 405 | } |
| 406 | 406 | break; |
| 407 | 407 | case 'login': |
| 408 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {
|
|
| 408 | + if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {
|
|
| 409 | 409 | return true; |
| 410 | 410 | } |
| 411 | 411 | break; |
| 412 | 412 | case 'checkout': |
| 413 | - if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {
|
|
| 413 | + if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {
|
|
| 414 | 414 | return true; |
| 415 | 415 | } |
| 416 | 416 | break; |
| 417 | 417 | case 'invoices': |
| 418 | - if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {
|
|
| 418 | + if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {
|
|
| 419 | 419 | return true; |
| 420 | 420 | } |
| 421 | 421 | break; |
@@ -440,25 +440,25 @@ discard block |
||
| 440 | 440 | * |
| 441 | 441 | * @param object $wp WordPress object. |
| 442 | 442 | */ |
| 443 | -function geodir_set_is_geodir_page( $wp ) {
|
|
| 444 | - if ( ! is_admin() ) {
|
|
| 443 | +function geodir_set_is_geodir_page($wp) {
|
|
| 444 | + if (!is_admin()) {
|
|
| 445 | 445 | //$wp->query_vars['gd_is_geodir_page'] = false; |
| 446 | 446 | //print_r() |
| 447 | - if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array( |
|
| 447 | + if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array( |
|
| 448 | 448 | 'preview', |
| 449 | 449 | 'page', |
| 450 | 450 | 'paged', |
| 451 | 451 | 'cpage' |
| 452 | - ) ) |
|
| 452 | + )) |
|
| 453 | 453 | ) {
|
| 454 | - if ( geodir_is_page( 'home' ) ) {
|
|
| 454 | + if (geodir_is_page('home')) {
|
|
| 455 | 455 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | 458 | |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {
|
|
| 461 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {
|
|
| 462 | 462 | if ( |
| 463 | 463 | $wp->query_vars['page_id'] == geodir_add_listing_page_id() |
| 464 | 464 | || $wp->query_vars['page_id'] == geodir_preview_page_id() |
@@ -467,26 +467,26 @@ discard block |
||
| 467 | 467 | || $wp->query_vars['page_id'] == geodir_home_page_id() |
| 468 | 468 | || $wp->query_vars['page_id'] == geodir_info_page_id() |
| 469 | 469 | || $wp->query_vars['page_id'] == geodir_login_page_id() |
| 470 | - || ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 471 | - || ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 470 | + || (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 471 | + || (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 472 | 472 | ) {
|
| 473 | 473 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {
|
|
| 478 | - $page = get_page_by_path( $wp->query_vars['pagename'] ); |
|
| 477 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {
|
|
| 478 | + $page = get_page_by_path($wp->query_vars['pagename']); |
|
| 479 | 479 | |
| 480 | - if ( ! empty( $page ) && ( |
|
| 480 | + if (!empty($page) && ( |
|
| 481 | 481 | $page->ID == geodir_add_listing_page_id() |
| 482 | 482 | || $page->ID == geodir_preview_page_id() |
| 483 | 483 | || $page->ID == geodir_success_page_id() |
| 484 | 484 | || $page->ID == geodir_location_page_id() |
| 485 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() ) |
|
| 486 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() ) |
|
| 487 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() ) |
|
| 488 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 489 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 485 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id()) |
|
| 486 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id()) |
|
| 487 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id()) |
|
| 488 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 489 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 490 | 490 | ) |
| 491 | 491 | ) {
|
| 492 | 492 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -494,20 +494,20 @@ discard block |
||
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | |
| 497 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {
|
|
| 497 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
|
|
| 498 | 498 | $requested_post_type = $wp->query_vars['post_type']; |
| 499 | 499 | // check if this post type is geodirectory post types |
| 500 | 500 | $post_type_array = geodir_get_posttypes(); |
| 501 | - if ( in_array( $requested_post_type, $post_type_array ) ) {
|
|
| 501 | + if (in_array($requested_post_type, $post_type_array)) {
|
|
| 502 | 502 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 503 | 503 | } |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {
|
|
| 507 | - $geodir_taxonomis = geodir_get_taxonomies( '', true ); |
|
| 508 | - if ( ! empty( $geodir_taxonomis ) ) {
|
|
| 509 | - foreach ( $geodir_taxonomis as $taxonomy ) {
|
|
| 510 | - if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {
|
|
| 506 | + if (!isset($wp->query_vars['gd_is_geodir_page'])) {
|
|
| 507 | + $geodir_taxonomis = geodir_get_taxonomies('', true);
|
|
| 508 | + if (!empty($geodir_taxonomis)) {
|
|
| 509 | + foreach ($geodir_taxonomis as $taxonomy) {
|
|
| 510 | + if (array_key_exists($taxonomy, $wp->query_vars)) {
|
|
| 511 | 511 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 512 | 512 | break; |
| 513 | 513 | } |
@@ -516,20 +516,20 @@ discard block |
||
| 516 | 516 | |
| 517 | 517 | } |
| 518 | 518 | |
| 519 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 519 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 520 | 520 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | 523 | |
| 524 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 524 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {
|
|
| 525 | 525 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | 528 | |
| 529 | 529 | //check if homepage |
| 530 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) |
|
| 531 | - && ! isset( $wp->query_vars['page_id'] ) |
|
| 532 | - && ! isset( $wp->query_vars['pagename'] ) |
|
| 530 | + if (!isset($wp->query_vars['gd_is_geodir_page']) |
|
| 531 | + && !isset($wp->query_vars['page_id']) |
|
| 532 | + && !isset($wp->query_vars['pagename']) |
|
| 533 | 533 | && is_page_geodir_home() |
| 534 | 534 | ) {
|
| 535 | 535 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -553,14 +553,14 @@ discard block |
||
| 553 | 553 | */ |
| 554 | 554 | function geodir_is_geodir_page() {
|
| 555 | 555 | global $wp; |
| 556 | - if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {
|
|
| 556 | + if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {
|
|
| 557 | 557 | return true; |
| 558 | 558 | } else {
|
| 559 | 559 | return false; |
| 560 | 560 | } |
| 561 | 561 | } |
| 562 | 562 | |
| 563 | -if ( ! function_exists( 'geodir_get_imagesize' ) ) {
|
|
| 563 | +if (!function_exists('geodir_get_imagesize')) {
|
|
| 564 | 564 | /** |
| 565 | 565 | * Get image size using the size key . |
| 566 | 566 | * |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | * |
| 572 | 572 | * @return array|mixed|void|WP_Error If valid returns image size. Else returns error. |
| 573 | 573 | */ |
| 574 | - function geodir_get_imagesize( $size = '' ) {
|
|
| 574 | + function geodir_get_imagesize($size = '') {
|
|
| 575 | 575 | |
| 576 | 576 | $imagesizes = array( |
| 577 | - 'list-thumb' => array( 'w' => 283, 'h' => 188 ), |
|
| 578 | - 'thumbnail' => array( 'w' => 125, 'h' => 125 ), |
|
| 579 | - 'widget-thumb' => array( 'w' => 50, 'h' => 50 ), |
|
| 580 | - 'slider-thumb' => array( 'w' => 100, 'h' => 100 ) |
|
| 577 | + 'list-thumb' => array('w' => 283, 'h' => 188),
|
|
| 578 | + 'thumbnail' => array('w' => 125, 'h' => 125),
|
|
| 579 | + 'widget-thumb' => array('w' => 50, 'h' => 50),
|
|
| 580 | + 'slider-thumb' => array('w' => 100, 'h' => 100)
|
|
| 581 | 581 | ); |
| 582 | 582 | |
| 583 | 583 | /** |
@@ -587,9 +587,9 @@ discard block |
||
| 587 | 587 | * |
| 588 | 588 | * @param array $imagesizes Image size array. |
| 589 | 589 | */ |
| 590 | - $imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes ); |
|
| 590 | + $imagesizes = apply_filters('geodir_imagesizes', $imagesizes);
|
|
| 591 | 591 | |
| 592 | - if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {
|
|
| 592 | + if (!empty($size) && array_key_exists($size, $imagesizes)) {
|
|
| 593 | 593 | /** |
| 594 | 594 | * Filters image size of the passed key. |
| 595 | 595 | * |
@@ -597,11 +597,11 @@ discard block |
||
| 597 | 597 | * |
| 598 | 598 | * @param array $imagesizes [$size] Image size array of the passed key. |
| 599 | 599 | */ |
| 600 | - return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] ); |
|
| 600 | + return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);
|
|
| 601 | 601 | |
| 602 | - } elseif ( ! empty( $size ) ) {
|
|
| 602 | + } elseif (!empty($size)) {
|
|
| 603 | 603 | |
| 604 | - return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) ); |
|
| 604 | + return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));
|
|
| 605 | 605 | |
| 606 | 606 | } |
| 607 | 607 | |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | */ |
| 626 | 626 | |
| 627 | 627 | |
| 628 | -if ( ! function_exists( 'createRandomString' ) ) {
|
|
| 628 | +if (!function_exists('createRandomString')) {
|
|
| 629 | 629 | /** |
| 630 | 630 | * Creates random string. |
| 631 | 631 | * |
@@ -635,21 +635,21 @@ discard block |
||
| 635 | 635 | */ |
| 636 | 636 | function createRandomString() {
|
| 637 | 637 | $chars = "abcdefghijkmlnopqrstuvwxyz1023456789"; |
| 638 | - srand( (double) microtime() * 1000000 ); |
|
| 638 | + srand((double) microtime() * 1000000); |
|
| 639 | 639 | $i = 0; |
| 640 | 640 | $rstring = ''; |
| 641 | - while ( $i <= 25 ) {
|
|
| 641 | + while ($i <= 25) {
|
|
| 642 | 642 | $num = rand() % 33; |
| 643 | - $tmp = substr( $chars, $num, 1 ); |
|
| 644 | - $rstring = $rstring . $tmp; |
|
| 645 | - $i ++; |
|
| 643 | + $tmp = substr($chars, $num, 1); |
|
| 644 | + $rstring = $rstring.$tmp; |
|
| 645 | + $i++; |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | return $rstring; |
| 649 | 649 | } |
| 650 | 650 | } |
| 651 | 651 | |
| 652 | -if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {
|
|
| 652 | +if (!function_exists('geodir_getDistanceRadius')) {
|
|
| 653 | 653 | /** |
| 654 | 654 | * Calculates the distance radius. |
| 655 | 655 | * |
@@ -660,9 +660,9 @@ discard block |
||
| 660 | 660 | * |
| 661 | 661 | * @return float The mean radius. |
| 662 | 662 | */ |
| 663 | - function geodir_getDistanceRadius( $uom = 'km' ) {
|
|
| 663 | + function geodir_getDistanceRadius($uom = 'km') {
|
|
| 664 | 664 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 665 | - switch ( geodir_strtolower( $uom ) ): |
|
| 665 | + switch (geodir_strtolower($uom)): |
|
| 666 | 666 | case 'km' : |
| 667 | 667 | $earthMeanRadius = 6371.009; // km |
| 668 | 668 | break; |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | } |
| 695 | 695 | |
| 696 | 696 | |
| 697 | -if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {
|
|
| 697 | +if (!function_exists('geodir_calculateDistanceFromLatLong')) {
|
|
| 698 | 698 | /** |
| 699 | 699 | * Calculate the great circle distance between two points identified by longitude and latitude. |
| 700 | 700 | * |
@@ -707,17 +707,17 @@ discard block |
||
| 707 | 707 | * |
| 708 | 708 | * @return float The distance. |
| 709 | 709 | */ |
| 710 | - function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {
|
|
| 710 | + function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {
|
|
| 711 | 711 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 712 | 712 | |
| 713 | - $earthMeanRadius = geodir_getDistanceRadius( $uom ); |
|
| 713 | + $earthMeanRadius = geodir_getDistanceRadius($uom); |
|
| 714 | 714 | |
| 715 | - $deltaLatitude = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] ); |
|
| 716 | - $deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] ); |
|
| 717 | - $a = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) + |
|
| 718 | - cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * |
|
| 719 | - sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); |
|
| 720 | - $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) ); |
|
| 715 | + $deltaLatitude = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']); |
|
| 716 | + $deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']); |
|
| 717 | + $a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) + |
|
| 718 | + cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) * |
|
| 719 | + sin($deltaLongitude / 2) * sin($deltaLongitude / 2); |
|
| 720 | + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); |
|
| 721 | 721 | $distance = $earthMeanRadius * $c; |
| 722 | 722 | |
| 723 | 723 | return $distance; |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | |
| 729 | -if ( ! function_exists( 'geodir_sendEmail' ) ) {
|
|
| 729 | +if (!function_exists('geodir_sendEmail')) {
|
|
| 730 | 730 | /** |
| 731 | 731 | * The main function that send transactional emails using the args provided. |
| 732 | 732 | * |
@@ -745,92 +745,92 @@ discard block |
||
| 745 | 745 | * @param string $post_id The post ID. |
| 746 | 746 | * @param string $user_id The user ID. |
| 747 | 747 | */ |
| 748 | - function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {
|
|
| 748 | + function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {
|
|
| 749 | 749 | $login_details = ''; |
| 750 | 750 | |
| 751 | 751 | // strip slashes from subject & message text |
| 752 | - $to_subject = stripslashes_deep( $to_subject ); |
|
| 753 | - $to_message = stripslashes_deep( $to_message ); |
|
| 752 | + $to_subject = stripslashes_deep($to_subject); |
|
| 753 | + $to_message = stripslashes_deep($to_message); |
|
| 754 | 754 | |
| 755 | - if ( $message_type == 'send_enquiry' ) {
|
|
| 756 | - $subject = get_option( 'geodir_email_enquiry_subject' ); |
|
| 757 | - $message = get_option( 'geodir_email_enquiry_content' ); |
|
| 755 | + if ($message_type == 'send_enquiry') {
|
|
| 756 | + $subject = get_option('geodir_email_enquiry_subject');
|
|
| 757 | + $message = get_option('geodir_email_enquiry_content');
|
|
| 758 | 758 | |
| 759 | 759 | // change to name in some cases |
| 760 | - $post_author = get_post_field( 'post_author', $post_id ); |
|
| 761 | - if(is_super_admin( $post_author )){// if admin probably not the post author so change name
|
|
| 762 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 763 | - }elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed
|
|
| 764 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 760 | + $post_author = get_post_field('post_author', $post_id);
|
|
| 761 | + if (is_super_admin($post_author)) {// if admin probably not the post author so change name
|
|
| 762 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 763 | + }elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed
|
|
| 764 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | |
| 768 | - } elseif ( $message_type == 'forgot_password' ) {
|
|
| 769 | - $subject = get_option( 'geodir_forgot_password_subject' ); |
|
| 770 | - $message = get_option( 'geodir_forgot_password_content' ); |
|
| 768 | + } elseif ($message_type == 'forgot_password') {
|
|
| 769 | + $subject = get_option('geodir_forgot_password_subject');
|
|
| 770 | + $message = get_option('geodir_forgot_password_content');
|
|
| 771 | 771 | $login_details = $to_message; |
| 772 | - } elseif ( $message_type == 'registration' ) {
|
|
| 773 | - $subject = get_option( 'geodir_registration_success_email_subject' ); |
|
| 774 | - $message = get_option( 'geodir_registration_success_email_content' ); |
|
| 772 | + } elseif ($message_type == 'registration') {
|
|
| 773 | + $subject = get_option('geodir_registration_success_email_subject');
|
|
| 774 | + $message = get_option('geodir_registration_success_email_content');
|
|
| 775 | 775 | $login_details = $to_message; |
| 776 | - } elseif ( $message_type == 'post_submit' ) {
|
|
| 777 | - $subject = get_option( 'geodir_post_submited_success_email_subject' ); |
|
| 778 | - $message = get_option( 'geodir_post_submited_success_email_content' ); |
|
| 779 | - } elseif ( $message_type == 'listing_published' ) {
|
|
| 780 | - $subject = get_option( 'geodir_post_published_email_subject' ); |
|
| 781 | - $message = get_option( 'geodir_post_published_email_content' ); |
|
| 782 | - } elseif ( $message_type == 'listing_edited' ) {
|
|
| 783 | - $subject = get_option( 'geodir_post_edited_email_subject_admin' ); |
|
| 784 | - $message = get_option( 'geodir_post_edited_email_content_admin' ); |
|
| 776 | + } elseif ($message_type == 'post_submit') {
|
|
| 777 | + $subject = get_option('geodir_post_submited_success_email_subject');
|
|
| 778 | + $message = get_option('geodir_post_submited_success_email_content');
|
|
| 779 | + } elseif ($message_type == 'listing_published') {
|
|
| 780 | + $subject = get_option('geodir_post_published_email_subject');
|
|
| 781 | + $message = get_option('geodir_post_published_email_content');
|
|
| 782 | + } elseif ($message_type == 'listing_edited') {
|
|
| 783 | + $subject = get_option('geodir_post_edited_email_subject_admin');
|
|
| 784 | + $message = get_option('geodir_post_edited_email_content_admin');
|
|
| 785 | 785 | } |
| 786 | 786 | |
| 787 | - if ( ! empty( $subject ) ) {
|
|
| 788 | - $subject = __( stripslashes_deep( $subject ), 'geodirectory' ); |
|
| 787 | + if (!empty($subject)) {
|
|
| 788 | + $subject = __(stripslashes_deep($subject), 'geodirectory'); |
|
| 789 | 789 | } |
| 790 | 790 | |
| 791 | - if ( ! empty( $message ) ) {
|
|
| 792 | - $message = __( stripslashes_deep( $message ), 'geodirectory' ); |
|
| 791 | + if (!empty($message)) {
|
|
| 792 | + $message = __(stripslashes_deep($message), 'geodirectory'); |
|
| 793 | 793 | } |
| 794 | 794 | |
| 795 | - $to_message = nl2br( $to_message ); |
|
| 796 | - $sitefromEmail = get_option( 'site_email' ); |
|
| 795 | + $to_message = nl2br($to_message); |
|
| 796 | + $sitefromEmail = get_option('site_email');
|
|
| 797 | 797 | $sitefromEmailName = get_site_emailName(); |
| 798 | - $productlink = get_permalink( $post_id ); |
|
| 798 | + $productlink = get_permalink($post_id); |
|
| 799 | 799 | |
| 800 | 800 | $user_login = ''; |
| 801 | - if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {
|
|
| 801 | + if ($user_id > 0 && $user_info = get_userdata($user_id)) {
|
|
| 802 | 802 | $user_login = $user_info->user_login; |
| 803 | 803 | } |
| 804 | 804 | |
| 805 | 805 | $posted_date = ''; |
| 806 | 806 | $listingLink = ''; |
| 807 | 807 | |
| 808 | - $post_info = get_post( $post_id ); |
|
| 808 | + $post_info = get_post($post_id); |
|
| 809 | 809 | |
| 810 | - if ( $post_info ) {
|
|
| 810 | + if ($post_info) {
|
|
| 811 | 811 | $posted_date = $post_info->post_date; |
| 812 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 812 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 813 | 813 | } |
| 814 | 814 | $siteurl = home_url(); |
| 815 | - $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>'; |
|
| 815 | + $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>'; |
|
| 816 | 816 | $loginurl = geodir_login_url(); |
| 817 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 817 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 818 | 818 | |
| 819 | - $post_author_id = ! empty( $post_info ) ? $post_info->post_author : 0; |
|
| 820 | - $post_author_data = $post_author_id ? get_userdata( $post_author_id ) : NULL; |
|
| 821 | - $post_author_name = geodir_get_client_name( $post_author_id ); |
|
| 822 | - $post_author_email = !empty( $post_author_data->user_email ) ? $post_author_data->user_email : ''; |
|
| 823 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); |
|
| 824 | - |
|
| 825 | - if ( $fromEmail == '' ) {
|
|
| 826 | - $fromEmail = get_option( 'site_email' ); |
|
| 819 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; |
|
| 820 | + $post_author_data = $post_author_id ? get_userdata($post_author_id) : NULL; |
|
| 821 | + $post_author_name = geodir_get_client_name($post_author_id); |
|
| 822 | + $post_author_email = !empty($post_author_data->user_email) ? $post_author_data->user_email : ''; |
|
| 823 | + $current_date = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
|
|
| 824 | + |
|
| 825 | + if ($fromEmail == '') {
|
|
| 826 | + $fromEmail = get_option('site_email');
|
|
| 827 | 827 | } |
| 828 | 828 | |
| 829 | - if ( $fromEmailName == '' ) {
|
|
| 830 | - $fromEmailName = get_option( 'site_email_name' ); |
|
| 829 | + if ($fromEmailName == '') {
|
|
| 830 | + $fromEmailName = get_option('site_email_name');
|
|
| 831 | 831 | } |
| 832 | 832 | |
| 833 | - $search_array = array( |
|
| 833 | + $search_array = array( |
|
| 834 | 834 | '[#listing_link#]', |
| 835 | 835 | '[#site_name_url#]', |
| 836 | 836 | '[#post_id#]', |
@@ -872,7 +872,7 @@ discard block |
||
| 872 | 872 | $post_author_email, |
| 873 | 873 | $current_date, |
| 874 | 874 | ); |
| 875 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 875 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 876 | 876 | |
| 877 | 877 | $search_array = array( |
| 878 | 878 | '[#listing_link#]', |
@@ -910,12 +910,12 @@ discard block |
||
| 910 | 910 | $post_author_email, |
| 911 | 911 | $current_date |
| 912 | 912 | ); |
| 913 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 913 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 914 | 914 | |
| 915 | - $headers = array(); |
|
| 915 | + $headers = array(); |
|
| 916 | 916 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 917 | - $headers[] = "Reply-To: " . $fromEmail; |
|
| 918 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; |
|
| 917 | + $headers[] = "Reply-To: ".$fromEmail; |
|
| 918 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; |
|
| 919 | 919 | |
| 920 | 920 | $to = $toEmail; |
| 921 | 921 | |
@@ -937,7 +937,7 @@ discard block |
||
| 937 | 937 | * @param string $post_id The post ID. |
| 938 | 938 | * @param string $user_id The user ID. |
| 939 | 939 | */ |
| 940 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 940 | + $to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 941 | 941 | /** |
| 942 | 942 | * Filter the client email subject. |
| 943 | 943 | * |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | * @param string $post_id The post ID. |
| 957 | 957 | * @param string $user_id The user ID. |
| 958 | 958 | */ |
| 959 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 959 | + $subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 960 | 960 | /** |
| 961 | 961 | * Filter the client email message. |
| 962 | 962 | * |
@@ -975,7 +975,7 @@ discard block |
||
| 975 | 975 | * @param string $post_id The post ID. |
| 976 | 976 | * @param string $user_id The user ID. |
| 977 | 977 | */ |
| 978 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 978 | + $message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 979 | 979 | /** |
| 980 | 980 | * Filter the client email headers. |
| 981 | 981 | * |
@@ -994,39 +994,39 @@ discard block |
||
| 994 | 994 | * @param string $post_id The post ID. |
| 995 | 995 | * @param string $user_id The user ID. |
| 996 | 996 | */ |
| 997 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 997 | + $headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 998 | 998 | |
| 999 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 999 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1000 | 1000 | |
| 1001 | - if ( ! $sent ) {
|
|
| 1002 | - if ( is_array( $to ) ) {
|
|
| 1003 | - $to = implode( ',', $to ); |
|
| 1001 | + if (!$sent) {
|
|
| 1002 | + if (is_array($to)) {
|
|
| 1003 | + $to = implode(',', $to);
|
|
| 1004 | 1004 | } |
| 1005 | 1005 | $log_message = sprintf( |
| 1006 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1006 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1007 | 1007 | $message_type, |
| 1008 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1008 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1009 | 1009 | $to, |
| 1010 | 1010 | $subject |
| 1011 | 1011 | ); |
| 1012 | - geodir_error_log( $log_message ); |
|
| 1012 | + geodir_error_log($log_message); |
|
| 1013 | 1013 | } |
| 1014 | 1014 | |
| 1015 | 1015 | ///////// ADMIN BCC EMIALS |
| 1016 | - $adminEmail = get_bloginfo( 'admin_email' ); |
|
| 1016 | + $adminEmail = get_bloginfo('admin_email');
|
|
| 1017 | 1017 | $to = $adminEmail; |
| 1018 | 1018 | |
| 1019 | 1019 | $admin_bcc = false; |
| 1020 | - if ( $message_type == 'registration' ) {
|
|
| 1021 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); |
|
| 1022 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); |
|
| 1023 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; |
|
| 1020 | + if ($message_type == 'registration') {
|
|
| 1021 | + $message_raw = explode(__("Password:", 'geodirectory'), $message);
|
|
| 1022 | + $message_raw2 = explode("</p>", $message_raw[1], 2);
|
|
| 1023 | + $message = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
|
|
| 1024 | 1024 | } |
| 1025 | - if ( $message_type == 'post_submit' && ( get_option( 'geodir_notify_post_submit' ) || get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) ) {
|
|
| 1026 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); |
|
| 1027 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); |
|
| 1025 | + if ($message_type == 'post_submit' && (get_option('geodir_notify_post_submit') || get_option('geodir_notify_post_submit', '-1') == '-1')) {
|
|
| 1026 | + $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
|
|
| 1027 | + $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
|
|
| 1028 | 1028 | |
| 1029 | - $search_array = array( |
|
| 1029 | + $search_array = array( |
|
| 1030 | 1030 | '[#listing_link#]', |
| 1031 | 1031 | '[#site_name_url#]', |
| 1032 | 1032 | '[#post_id#]', |
@@ -1062,7 +1062,7 @@ discard block |
||
| 1062 | 1062 | $user_login, |
| 1063 | 1063 | $post_author_email, |
| 1064 | 1064 | ); |
| 1065 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 1065 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 1066 | 1066 | |
| 1067 | 1067 | $search_array = array( |
| 1068 | 1068 | '[#listing_link#]', |
@@ -1094,23 +1094,23 @@ discard block |
||
| 1094 | 1094 | $user_login, |
| 1095 | 1095 | $post_author_email, |
| 1096 | 1096 | ); |
| 1097 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1097 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1098 | 1098 | |
| 1099 | 1099 | $subject .= ' - ADMIN BCC COPY'; |
| 1100 | 1100 | $admin_bcc = true; |
| 1101 | 1101 | |
| 1102 | - } elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
|
|
| 1102 | + } elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
|
|
| 1103 | 1103 | $subject .= ' - ADMIN BCC COPY'; |
| 1104 | 1104 | $admin_bcc = true; |
| 1105 | - } elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
|
|
| 1105 | + } elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
|
|
| 1106 | 1106 | $subject .= ' - ADMIN BCC COPY'; |
| 1107 | 1107 | $admin_bcc = true; |
| 1108 | - } elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
|
|
| 1108 | + } elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
|
|
| 1109 | 1109 | $subject .= ' - ADMIN BCC COPY'; |
| 1110 | 1110 | $admin_bcc = true; |
| 1111 | 1111 | } |
| 1112 | 1112 | |
| 1113 | - if ( $admin_bcc === true ) {
|
|
| 1113 | + if ($admin_bcc === true) {
|
|
| 1114 | 1114 | |
| 1115 | 1115 | /** |
| 1116 | 1116 | * Filter the client email subject. |
@@ -1130,7 +1130,7 @@ discard block |
||
| 1130 | 1130 | * @param string $post_id The post ID. |
| 1131 | 1131 | * @param string $user_id The user ID. |
| 1132 | 1132 | */ |
| 1133 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1133 | + $subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1134 | 1134 | /** |
| 1135 | 1135 | * Filter the client email message. |
| 1136 | 1136 | * |
@@ -1149,23 +1149,23 @@ discard block |
||
| 1149 | 1149 | * @param string $post_id The post ID. |
| 1150 | 1150 | * @param string $user_id The user ID. |
| 1151 | 1151 | */ |
| 1152 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1152 | + $message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1153 | 1153 | |
| 1154 | 1154 | |
| 1155 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1155 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1156 | 1156 | |
| 1157 | - if ( ! $sent ) {
|
|
| 1158 | - if ( is_array( $to ) ) {
|
|
| 1159 | - $to = implode( ',', $to ); |
|
| 1157 | + if (!$sent) {
|
|
| 1158 | + if (is_array($to)) {
|
|
| 1159 | + $to = implode(',', $to);
|
|
| 1160 | 1160 | } |
| 1161 | 1161 | $log_message = sprintf( |
| 1162 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1162 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1163 | 1163 | $message_type, |
| 1164 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1164 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1165 | 1165 | $to, |
| 1166 | 1166 | $subject |
| 1167 | 1167 | ); |
| 1168 | - geodir_error_log( $log_message ); |
|
| 1168 | + geodir_error_log($log_message); |
|
| 1169 | 1169 | } |
| 1170 | 1170 | } |
| 1171 | 1171 | |
@@ -1181,51 +1181,51 @@ discard block |
||
| 1181 | 1181 | */ |
| 1182 | 1182 | function geodir_taxonomy_breadcrumb() {
|
| 1183 | 1183 | |
| 1184 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); |
|
| 1184 | + $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
|
|
| 1185 | 1185 | $parent = $term->parent; |
| 1186 | 1186 | |
| 1187 | - while ( $parent ): |
|
| 1187 | + while ($parent): |
|
| 1188 | 1188 | $parents[] = $parent; |
| 1189 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1189 | + $new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1190 | 1190 | $parent = $new_parent->parent; |
| 1191 | 1191 | endwhile; |
| 1192 | 1192 | |
| 1193 | - if ( ! empty( $parents ) ): |
|
| 1194 | - $parents = array_reverse( $parents ); |
|
| 1193 | + if (!empty($parents)): |
|
| 1194 | + $parents = array_reverse($parents); |
|
| 1195 | 1195 | |
| 1196 | - foreach ( $parents as $parent ): |
|
| 1197 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1198 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); |
|
| 1199 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; |
|
| 1196 | + foreach ($parents as $parent): |
|
| 1197 | + $item = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1198 | + $url = get_term_link($item, get_query_var('taxonomy'));
|
|
| 1199 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; |
|
| 1200 | 1200 | endforeach; |
| 1201 | 1201 | |
| 1202 | 1202 | endif; |
| 1203 | 1203 | |
| 1204 | - echo '<li> > ' . $term->name . '</li>'; |
|
| 1204 | + echo '<li> > '.$term->name.'</li>'; |
|
| 1205 | 1205 | } |
| 1206 | 1206 | |
| 1207 | -function geodir_wpml_post_type_archive_link($link, $post_type){
|
|
| 1207 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
|
|
| 1208 | 1208 | if (geodir_is_wpml()) {
|
| 1209 | - $post_types = get_option( 'geodir_post_types' ); |
|
| 1209 | + $post_types = get_option('geodir_post_types');
|
|
| 1210 | 1210 | |
| 1211 | - if ( isset( $post_types[ $post_type ] ) ) {
|
|
| 1212 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; |
|
| 1211 | + if (isset($post_types[$post_type])) {
|
|
| 1212 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1213 | 1213 | |
| 1214 | 1214 | // Alter the CPT slug if WPML is set to do so |
| 1215 | - if ( geodir_wpml_is_post_type_translated( $post_type ) ) {
|
|
| 1216 | - if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
|
|
| 1215 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 1216 | + if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
|
|
| 1217 | 1217 | |
| 1218 | 1218 | $org_slug = $slug; |
| 1219 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1219 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1220 | 1220 | $slug, |
| 1221 | 1221 | 'WordPress', |
| 1222 | - 'URL slug: ' . $slug, |
|
| 1223 | - $language_code ); |
|
| 1222 | + 'URL slug: '.$slug, |
|
| 1223 | + $language_code); |
|
| 1224 | 1224 | |
| 1225 | - if ( ! $slug ) {
|
|
| 1225 | + if (!$slug) {
|
|
| 1226 | 1226 | $slug = $org_slug; |
| 1227 | 1227 | } else {
|
| 1228 | - $link = str_replace( $org_slug, $slug, $link ); |
|
| 1228 | + $link = str_replace($org_slug, $slug, $link); |
|
| 1229 | 1229 | } |
| 1230 | 1230 | } |
| 1231 | 1231 | } |
@@ -1234,7 +1234,7 @@ discard block |
||
| 1234 | 1234 | |
| 1235 | 1235 | return $link; |
| 1236 | 1236 | } |
| 1237 | -add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2); |
|
| 1237 | +add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);
|
|
| 1238 | 1238 | |
| 1239 | 1239 | /** |
| 1240 | 1240 | * Main function that generates breadcrumb for all pages. |
@@ -1255,9 +1255,9 @@ discard block |
||
| 1255 | 1255 | * |
| 1256 | 1256 | * @since 1.0.0 |
| 1257 | 1257 | */ |
| 1258 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); |
|
| 1258 | + $separator = apply_filters('geodir_breadcrumb_separator', ' > ');
|
|
| 1259 | 1259 | |
| 1260 | - if ( ! geodir_is_page( 'home' ) ) {
|
|
| 1260 | + if (!geodir_is_page('home')) {
|
|
| 1261 | 1261 | $breadcrumb = ''; |
| 1262 | 1262 | $url_categoris = ''; |
| 1263 | 1263 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; |
@@ -1266,170 +1266,170 @@ discard block |
||
| 1266 | 1266 | * |
| 1267 | 1267 | * @since 1.0.0 |
| 1268 | 1268 | */ |
| 1269 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; |
|
| 1269 | + $breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
|
|
| 1270 | 1270 | |
| 1271 | 1271 | $gd_post_type = geodir_get_current_posttype(); |
| 1272 | - $post_type_info = get_post_type_object( $gd_post_type ); |
|
| 1272 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1273 | 1273 | |
| 1274 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); |
|
| 1274 | + remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
|
|
| 1275 | 1275 | |
| 1276 | - $listing_link = get_post_type_archive_link( $gd_post_type ); |
|
| 1276 | + $listing_link = get_post_type_archive_link($gd_post_type); |
|
| 1277 | 1277 | |
| 1278 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); |
|
| 1279 | - $listing_link = rtrim( $listing_link, '/' ); |
|
| 1278 | + add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
|
|
| 1279 | + $listing_link = rtrim($listing_link, '/'); |
|
| 1280 | 1280 | $listing_link .= '/'; |
| 1281 | 1281 | |
| 1282 | 1282 | $post_type_for_location_link = $listing_link; |
| 1283 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 1283 | + $location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 1284 | 1284 | |
| 1285 | 1285 | global $wp, $gd_session; |
| 1286 | 1286 | $location_link = $post_type_for_location_link; |
| 1287 | 1287 | |
| 1288 | - if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
|
|
| 1288 | + if (geodir_is_page('detail') || geodir_is_page('listing')) {
|
|
| 1289 | 1289 | global $post, $gd_cache_post; |
| 1290 | - if ( ! empty( $post ) && ! empty( $gd_cache_post ) && geodir_is_page( 'detail' ) && $post->ID == $gd_cache_post->ID && ! isset( $post->country_slug ) && isset( $gd_cache_post->country_slug ) && geodir_disable_yoast_seo_metas() ) {
|
|
| 1290 | + if (!empty($post) && !empty($gd_cache_post) && geodir_is_page('detail') && $post->ID == $gd_cache_post->ID && !isset($post->country_slug) && isset($gd_cache_post->country_slug) && geodir_disable_yoast_seo_metas()) {
|
|
| 1291 | 1291 | $post = $gd_cache_post; |
| 1292 | 1292 | } |
| 1293 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 1294 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; |
|
| 1293 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1294 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1295 | 1295 | |
| 1296 | - if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
|
|
| 1296 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1297 | 1297 | $location_terms = array( |
| 1298 | 1298 | 'gd_country' => $post->country_slug, |
| 1299 | 1299 | 'gd_region' => $post->region_slug, |
| 1300 | 1300 | 'gd_city' => $post->city_slug |
| 1301 | 1301 | ); |
| 1302 | 1302 | |
| 1303 | - if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
|
|
| 1303 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1304 | 1304 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
| 1305 | 1305 | } |
| 1306 | 1306 | } |
| 1307 | 1307 | |
| 1308 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 1308 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1309 | 1309 | |
| 1310 | 1310 | $hide_url_part = array(); |
| 1311 | - if ( $location_manager ) {
|
|
| 1312 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 1313 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 1314 | - |
|
| 1315 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 1316 | - $hide_url_part = array( 'gd_country', 'gd_region' ); |
|
| 1317 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 1318 | - $hide_url_part = array( 'gd_region' ); |
|
| 1319 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 1320 | - $hide_url_part = array( 'gd_country' ); |
|
| 1311 | + if ($location_manager) {
|
|
| 1312 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 1313 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 1314 | + |
|
| 1315 | + if ($hide_region_part && $hide_country_part) {
|
|
| 1316 | + $hide_url_part = array('gd_country', 'gd_region');
|
|
| 1317 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 1318 | + $hide_url_part = array('gd_region');
|
|
| 1319 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 1320 | + $hide_url_part = array('gd_country');
|
|
| 1321 | 1321 | } |
| 1322 | 1322 | } |
| 1323 | 1323 | |
| 1324 | 1324 | $hide_text_part = array(); |
| 1325 | - if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 1326 | - $hide_text_part = array( 'gd_region' ); |
|
| 1325 | + if ($geodir_show_location_url == 'country_city') {
|
|
| 1326 | + $hide_text_part = array('gd_region');
|
|
| 1327 | 1327 | |
| 1328 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1329 | - unset( $location_terms['gd_region'] ); |
|
| 1328 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1329 | + unset($location_terms['gd_region']); |
|
| 1330 | 1330 | } |
| 1331 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 1332 | - $hide_text_part = array( 'gd_country' ); |
|
| 1331 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 1332 | + $hide_text_part = array('gd_country');
|
|
| 1333 | 1333 | |
| 1334 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1335 | - unset( $location_terms['gd_country'] ); |
|
| 1334 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1335 | + unset($location_terms['gd_country']); |
|
| 1336 | 1336 | } |
| 1337 | - } else if ( $geodir_show_location_url == 'city' ) {
|
|
| 1338 | - $hide_text_part = array( 'gd_country', 'gd_region' ); |
|
| 1337 | + } else if ($geodir_show_location_url == 'city') {
|
|
| 1338 | + $hide_text_part = array('gd_country', 'gd_region');
|
|
| 1339 | 1339 | |
| 1340 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1341 | - unset( $location_terms['gd_country'] ); |
|
| 1340 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1341 | + unset($location_terms['gd_country']); |
|
| 1342 | 1342 | } |
| 1343 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1344 | - unset( $location_terms['gd_region'] ); |
|
| 1343 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1344 | + unset($location_terms['gd_region']); |
|
| 1345 | 1345 | } |
| 1346 | 1346 | } |
| 1347 | 1347 | |
| 1348 | 1348 | $is_location_last = ''; |
| 1349 | 1349 | $is_taxonomy_last = ''; |
| 1350 | 1350 | $breadcrumb .= '<li>'; |
| 1351 | - if ( get_query_var( $gd_post_type . 'category' ) ) {
|
|
| 1352 | - $gd_taxonomy = $gd_post_type . 'category'; |
|
| 1353 | - } elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1354 | - $gd_taxonomy = $gd_post_type . '_tags'; |
|
| 1351 | + if (get_query_var($gd_post_type.'category')) {
|
|
| 1352 | + $gd_taxonomy = $gd_post_type.'category'; |
|
| 1353 | + } elseif (get_query_var($gd_post_type.'_tags')) {
|
|
| 1354 | + $gd_taxonomy = $gd_post_type.'_tags'; |
|
| 1355 | 1355 | } |
| 1356 | 1356 | |
| 1357 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1358 | - if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
|
|
| 1357 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1358 | + if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
|
|
| 1359 | 1359 | $is_location_last = false; |
| 1360 | 1360 | } else {
|
| 1361 | 1361 | $is_location_last = true; |
| 1362 | 1362 | } |
| 1363 | 1363 | |
| 1364 | - if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
|
|
| 1364 | + if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
|
|
| 1365 | 1365 | $is_taxonomy_last = true; |
| 1366 | 1366 | } else {
|
| 1367 | 1367 | $is_taxonomy_last = false; |
| 1368 | 1368 | } |
| 1369 | 1369 | |
| 1370 | - if ( ! empty( $location_terms ) ) {
|
|
| 1371 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 1370 | + if (!empty($location_terms)) {
|
|
| 1371 | + $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
|
|
| 1372 | 1372 | |
| 1373 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1374 | - if ( $location_term != '' ) {
|
|
| 1375 | - if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
|
|
| 1373 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1374 | + if ($location_term != '') {
|
|
| 1375 | + if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
|
|
| 1376 | 1376 | continue; |
| 1377 | 1377 | } |
| 1378 | 1378 | |
| 1379 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); |
|
| 1380 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 1381 | - $gd_location_link_text = geodir_utf8_ucfirst( $gd_location_link_text ); |
|
| 1379 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
|
|
| 1380 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 1381 | + $gd_location_link_text = geodir_utf8_ucfirst($gd_location_link_text); |
|
| 1382 | 1382 | |
| 1383 | 1383 | $location_term_actual_country = ''; |
| 1384 | 1384 | $location_term_actual_region = ''; |
| 1385 | 1385 | $location_term_actual_city = ''; |
| 1386 | 1386 | $location_term_actual_neighbourhood = ''; |
| 1387 | - if ( $geodir_get_locations ) {
|
|
| 1388 | - if ( $key == 'gd_country' ) {
|
|
| 1389 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); |
|
| 1390 | - } else if ( $key == 'gd_region' ) {
|
|
| 1391 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); |
|
| 1392 | - } else if ( $key == 'gd_city' ) {
|
|
| 1393 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); |
|
| 1394 | - } else if ( $key == 'gd_neighbourhood' ) {
|
|
| 1395 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); |
|
| 1387 | + if ($geodir_get_locations) {
|
|
| 1388 | + if ($key == 'gd_country') {
|
|
| 1389 | + $location_term_actual_country = get_actual_location_name('country', $location_term, true);
|
|
| 1390 | + } else if ($key == 'gd_region') {
|
|
| 1391 | + $location_term_actual_region = get_actual_location_name('region', $location_term, true);
|
|
| 1392 | + } else if ($key == 'gd_city') {
|
|
| 1393 | + $location_term_actual_city = get_actual_location_name('city', $location_term, true);
|
|
| 1394 | + } else if ($key == 'gd_neighbourhood') {
|
|
| 1395 | + $location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
|
|
| 1396 | 1396 | } |
| 1397 | 1397 | } else {
|
| 1398 | 1398 | $location_info = geodir_get_location(); |
| 1399 | 1399 | |
| 1400 | - if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
|
|
| 1401 | - if ( $key == 'gd_country' ) {
|
|
| 1402 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); |
|
| 1403 | - } else if ( $key == 'gd_region' ) {
|
|
| 1404 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); |
|
| 1405 | - } else if ( $key == 'gd_city' ) {
|
|
| 1406 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); |
|
| 1400 | + if (!empty($location_info) && isset($location_info->location_id)) {
|
|
| 1401 | + if ($key == 'gd_country') {
|
|
| 1402 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); |
|
| 1403 | + } else if ($key == 'gd_region') {
|
|
| 1404 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); |
|
| 1405 | + } else if ($key == 'gd_city') {
|
|
| 1406 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); |
|
| 1407 | 1407 | } |
| 1408 | 1408 | } |
| 1409 | 1409 | } |
| 1410 | 1410 | |
| 1411 | - if ( $is_location_last && $key == 'gd_country' && ! ( isset( $location_terms['gd_region'] ) && $location_terms['gd_region'] != '' ) && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1412 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; |
|
| 1413 | - } else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1414 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; |
|
| 1415 | - } else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
|
|
| 1416 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; |
|
| 1417 | - } else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
|
|
| 1418 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; |
|
| 1411 | + if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1412 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; |
|
| 1413 | + } else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1414 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; |
|
| 1415 | + } else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
|
|
| 1416 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; |
|
| 1417 | + } else if ($is_location_last && $key == 'gd_neighbourhood') {
|
|
| 1418 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; |
|
| 1419 | 1419 | } else {
|
| 1420 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1421 | - $location_link .= $location_term . '/'; |
|
| 1420 | + if (get_option('permalink_structure') != '') {
|
|
| 1421 | + $location_link .= $location_term.'/'; |
|
| 1422 | 1422 | } else {
|
| 1423 | - $location_link .= "&$key=" . $location_term; |
|
| 1423 | + $location_link .= "&$key=".$location_term; |
|
| 1424 | 1424 | } |
| 1425 | 1425 | |
| 1426 | - if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
|
|
| 1426 | + if ($key == 'gd_country' && $location_term_actual_country != '') {
|
|
| 1427 | 1427 | $gd_location_link_text = $location_term_actual_country; |
| 1428 | - } else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
|
|
| 1428 | + } else if ($key == 'gd_region' && $location_term_actual_region != '') {
|
|
| 1429 | 1429 | $gd_location_link_text = $location_term_actual_region; |
| 1430 | - } else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
|
|
| 1430 | + } else if ($key == 'gd_city' && $location_term_actual_city != '') {
|
|
| 1431 | 1431 | $gd_location_link_text = $location_term_actual_city; |
| 1432 | - } else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
|
|
| 1432 | + } else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
|
|
| 1433 | 1433 | $gd_location_link_text = $location_term_actual_neighbourhood; |
| 1434 | 1434 | } |
| 1435 | 1435 | |
@@ -1439,77 +1439,77 @@ discard block |
||
| 1439 | 1439 | } |
| 1440 | 1440 | */ |
| 1441 | 1441 | |
| 1442 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; |
|
| 1442 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; |
|
| 1443 | 1443 | } |
| 1444 | 1444 | } |
| 1445 | 1445 | } |
| 1446 | 1446 | } |
| 1447 | 1447 | |
| 1448 | - if ( ! empty( $gd_taxonomy ) ) {
|
|
| 1448 | + if (!empty($gd_taxonomy)) {
|
|
| 1449 | 1449 | $term_index = 1; |
| 1450 | 1450 | |
| 1451 | 1451 | //if(get_option('geodir_add_categories_url'))
|
| 1452 | 1452 | {
|
| 1453 | - if ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1454 | - $cat_link = $listing_link . 'tags/'; |
|
| 1453 | + if (get_query_var($gd_post_type.'_tags')) {
|
|
| 1454 | + $cat_link = $listing_link.'tags/'; |
|
| 1455 | 1455 | } else {
|
| 1456 | 1456 | $cat_link = $listing_link; |
| 1457 | 1457 | } |
| 1458 | 1458 | |
| 1459 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1460 | - if ( $location_manager && in_array( $key, $hide_url_part ) ) {
|
|
| 1459 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1460 | + if ($location_manager && in_array($key, $hide_url_part)) {
|
|
| 1461 | 1461 | continue; |
| 1462 | 1462 | } |
| 1463 | 1463 | |
| 1464 | - if ( $location_term != '' ) {
|
|
| 1465 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1466 | - $cat_link .= $location_term . '/'; |
|
| 1464 | + if ($location_term != '') {
|
|
| 1465 | + if (get_option('permalink_structure') != '') {
|
|
| 1466 | + $cat_link .= $location_term.'/'; |
|
| 1467 | 1467 | } |
| 1468 | 1468 | } |
| 1469 | 1469 | } |
| 1470 | 1470 | |
| 1471 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); |
|
| 1472 | - foreach ( $term_array as $term ) {
|
|
| 1473 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); |
|
| 1474 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); |
|
| 1471 | + $term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
|
|
| 1472 | + foreach ($term_array as $term) {
|
|
| 1473 | + $term_link_text = preg_replace('/-(\d+)$/', '', $term);
|
|
| 1474 | + $term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
|
|
| 1475 | 1475 | |
| 1476 | 1476 | // get term actual name |
| 1477 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); |
|
| 1478 | - if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
|
|
| 1479 | - $term_link_text = urldecode( $term_info['name'] ); |
|
| 1477 | + $term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
|
|
| 1478 | + if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
|
|
| 1479 | + $term_link_text = urldecode($term_info['name']); |
|
| 1480 | 1480 | } else {
|
| 1481 | 1481 | continue; |
| 1482 | 1482 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); |
| 1483 | 1483 | } |
| 1484 | 1484 | |
| 1485 | - if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
|
|
| 1486 | - $breadcrumb .= $separator . $term_link_text; |
|
| 1485 | + if ($term_index == count($term_array) && $is_taxonomy_last) {
|
|
| 1486 | + $breadcrumb .= $separator.$term_link_text; |
|
| 1487 | 1487 | } else {
|
| 1488 | - $cat_link .= $term . '/'; |
|
| 1489 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; |
|
| 1488 | + $cat_link .= $term.'/'; |
|
| 1489 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; |
|
| 1490 | 1490 | } |
| 1491 | - $term_index ++; |
|
| 1491 | + $term_index++; |
|
| 1492 | 1492 | } |
| 1493 | 1493 | } |
| 1494 | 1494 | |
| 1495 | 1495 | |
| 1496 | 1496 | } |
| 1497 | 1497 | |
| 1498 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1499 | - $breadcrumb .= $separator . get_the_title(); |
|
| 1498 | + if (geodir_is_page('detail')) {
|
|
| 1499 | + $breadcrumb .= $separator.get_the_title(); |
|
| 1500 | 1500 | } |
| 1501 | 1501 | |
| 1502 | 1502 | $breadcrumb .= '</li>'; |
| 1503 | 1503 | |
| 1504 | 1504 | |
| 1505 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1505 | + } elseif (geodir_is_page('author')) {
|
|
| 1506 | 1506 | $dashboard_post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : $gd_post_type; |
| 1507 | 1507 | $user_id = get_current_user_id(); |
| 1508 | - $author_link = get_author_posts_url( $user_id ); |
|
| 1509 | - $default_author_link = geodir_getlink( $author_link, array( |
|
| 1508 | + $author_link = get_author_posts_url($user_id); |
|
| 1509 | + $default_author_link = geodir_getlink($author_link, array( |
|
| 1510 | 1510 | 'geodir_dashbord' => 'true', |
| 1511 | 1511 | 'stype' => $dashboard_post_type |
| 1512 | - ), false ); |
|
| 1512 | + ), false); |
|
| 1513 | 1513 | |
| 1514 | 1514 | /** |
| 1515 | 1515 | * Filter author page link. |
@@ -1519,16 +1519,16 @@ discard block |
||
| 1519 | 1519 | * @param string $default_author_link Default author link. |
| 1520 | 1520 | * @param int $user_id Author ID. |
| 1521 | 1521 | */ |
| 1522 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); |
|
| 1522 | + $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
|
|
| 1523 | 1523 | |
| 1524 | 1524 | $breadcrumb .= '<li>'; |
| 1525 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; |
|
| 1525 | + $breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
|
|
| 1526 | 1526 | |
| 1527 | - if ( isset( $_REQUEST['list'] ) ) {
|
|
| 1528 | - $author_link = geodir_getlink( $author_link, array( |
|
| 1527 | + if (isset($_REQUEST['list'])) {
|
|
| 1528 | + $author_link = geodir_getlink($author_link, array( |
|
| 1529 | 1529 | 'geodir_dashbord' => 'true', |
| 1530 | 1530 | 'stype' => $_REQUEST['stype'] |
| 1531 | - ), false ); |
|
| 1531 | + ), false); |
|
| 1532 | 1532 | |
| 1533 | 1533 | /** |
| 1534 | 1534 | * Filter author page link. |
@@ -1539,64 +1539,64 @@ discard block |
||
| 1539 | 1539 | * @param int $user_id Author ID. |
| 1540 | 1540 | * @param string $_REQUEST ['stype'] Post type. |
| 1541 | 1541 | */ |
| 1542 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); |
|
| 1542 | + $author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
|
|
| 1543 | 1543 | |
| 1544 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1545 | - if($_REQUEST['list']=='favourite'){
|
|
| 1546 | - $breadcrumb .= $separator . MY_FAVOURITE_TEXT; |
|
| 1544 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1545 | + if ($_REQUEST['list'] == 'favourite') {
|
|
| 1546 | + $breadcrumb .= $separator.MY_FAVOURITE_TEXT; |
|
| 1547 | 1547 | } |
| 1548 | 1548 | |
| 1549 | 1549 | } else {
|
| 1550 | - $breadcrumb .= $separator . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ); |
|
| 1550 | + $breadcrumb .= $separator.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory'); |
|
| 1551 | 1551 | } |
| 1552 | 1552 | |
| 1553 | 1553 | $breadcrumb .= '</li>'; |
| 1554 | - } elseif ( is_category() || is_single() ) {
|
|
| 1554 | + } elseif (is_category() || is_single()) {
|
|
| 1555 | 1555 | $category = get_the_category(); |
| 1556 | - if ( is_category() ) {
|
|
| 1557 | - $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>'; |
|
| 1556 | + if (is_category()) {
|
|
| 1557 | + $breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>'; |
|
| 1558 | 1558 | } |
| 1559 | - if ( is_single() ) {
|
|
| 1560 | - $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>'; |
|
| 1561 | - $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>'; |
|
| 1559 | + if (is_single()) {
|
|
| 1560 | + $breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>'; |
|
| 1561 | + $breadcrumb .= '<li>'.$separator.get_the_title().'</li>'; |
|
| 1562 | 1562 | } |
| 1563 | 1563 | /* End of my version ##################################################### */ |
| 1564 | - } else if ( is_page() ) {
|
|
| 1564 | + } else if (is_page()) {
|
|
| 1565 | 1565 | $page_title = get_the_title(); |
| 1566 | 1566 | |
| 1567 | - if ( geodir_is_page( 'location' ) ) {
|
|
| 1567 | + if (geodir_is_page('location')) {
|
|
| 1568 | 1568 | $location_page_id = geodir_location_page_id(); |
| 1569 | - $loc_post = get_post( $location_page_id ); |
|
| 1569 | + $loc_post = get_post($location_page_id); |
|
| 1570 | 1570 | $post_name = $loc_post->post_name; |
| 1571 | - $slug = ucwords( str_replace( '-', ' ', $post_name ) ); |
|
| 1572 | - $page_title = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' ); |
|
| 1571 | + $slug = ucwords(str_replace('-', ' ', $post_name));
|
|
| 1572 | + $page_title = !empty($slug) ? $slug : __('Location', 'geodirectory');
|
|
| 1573 | 1573 | } |
| 1574 | 1574 | |
| 1575 | - $breadcrumb .= '<li>' . $separator; |
|
| 1576 | - $breadcrumb .= stripslashes_deep( $page_title ); |
|
| 1575 | + $breadcrumb .= '<li>'.$separator; |
|
| 1576 | + $breadcrumb .= stripslashes_deep($page_title); |
|
| 1577 | 1577 | $breadcrumb .= '</li>'; |
| 1578 | - } else if ( is_tag() ) {
|
|
| 1579 | - $breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>'; |
|
| 1580 | - } else if ( is_day() ) {
|
|
| 1581 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1582 | - the_time( 'F jS, Y' ); |
|
| 1578 | + } else if (is_tag()) {
|
|
| 1579 | + $breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';
|
|
| 1580 | + } else if (is_day()) {
|
|
| 1581 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1582 | + the_time('F jS, Y');
|
|
| 1583 | 1583 | $breadcrumb .= '</li>'; |
| 1584 | - } else if ( is_month() ) {
|
|
| 1585 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1586 | - the_time( 'F, Y' ); |
|
| 1584 | + } else if (is_month()) {
|
|
| 1585 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1586 | + the_time('F, Y');
|
|
| 1587 | 1587 | $breadcrumb .= '</li>'; |
| 1588 | - } else if ( is_year() ) {
|
|
| 1589 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1590 | - the_time( 'Y' ); |
|
| 1588 | + } else if (is_year()) {
|
|
| 1589 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1590 | + the_time('Y');
|
|
| 1591 | 1591 | $breadcrumb .= '</li>'; |
| 1592 | - } else if ( is_author() ) {
|
|
| 1593 | - $breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' ); |
|
| 1592 | + } else if (is_author()) {
|
|
| 1593 | + $breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');
|
|
| 1594 | 1594 | $breadcrumb .= '</li>'; |
| 1595 | - } else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {
|
|
| 1596 | - $breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' ); |
|
| 1595 | + } else if (isset($_GET['paged']) && !empty($_GET['paged'])) {
|
|
| 1596 | + $breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');
|
|
| 1597 | 1597 | $breadcrumb .= '</li>'; |
| 1598 | - } else if ( is_search() ) {
|
|
| 1599 | - $breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' ); |
|
| 1598 | + } else if (is_search()) {
|
|
| 1599 | + $breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');
|
|
| 1600 | 1600 | $breadcrumb .= '</li>'; |
| 1601 | 1601 | } |
| 1602 | 1602 | $breadcrumb .= '</ul></div>'; |
@@ -1609,13 +1609,13 @@ discard block |
||
| 1609 | 1609 | * @param string $breadcrumb Breadcrumb HTML. |
| 1610 | 1610 | * @param string $separator Breadcrumb separator. |
| 1611 | 1611 | */ |
| 1612 | - echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator ); |
|
| 1612 | + echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);
|
|
| 1613 | 1613 | } |
| 1614 | 1614 | } |
| 1615 | 1615 | |
| 1616 | 1616 | |
| 1617 | -add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin |
|
| 1618 | -if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {
|
|
| 1617 | +add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin
|
|
| 1618 | +if (!function_exists('geodir_allow_wpadmin')) {
|
|
| 1619 | 1619 | /** |
| 1620 | 1620 | * Allow only admins to access wp-admin. |
| 1621 | 1621 | * |
@@ -1627,12 +1627,12 @@ discard block |
||
| 1627 | 1627 | */ |
| 1628 | 1628 | function geodir_allow_wpadmin() {
|
| 1629 | 1629 | global $wpdb; |
| 1630 | - if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through |
|
| 1630 | + if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through
|
|
| 1631 | 1631 | {
|
| 1632 | - if ( current_user_can( 'administrator' ) ) {
|
|
| 1632 | + if (current_user_can('administrator')) {
|
|
| 1633 | 1633 | } else {
|
| 1634 | 1634 | |
| 1635 | - wp_redirect( home_url() ); |
|
| 1635 | + wp_redirect(home_url()); |
|
| 1636 | 1636 | exit; |
| 1637 | 1637 | } |
| 1638 | 1638 | |
@@ -1651,23 +1651,23 @@ discard block |
||
| 1651 | 1651 | * |
| 1652 | 1652 | * @return array|WP_Error The uploaded data as array. When failure returns error. |
| 1653 | 1653 | */ |
| 1654 | -function fetch_remote_file( $url ) {
|
|
| 1654 | +function fetch_remote_file($url) {
|
|
| 1655 | 1655 | // extract the file name and extension from the url |
| 1656 | - require_once( ABSPATH . 'wp-includes/pluggable.php' ); |
|
| 1657 | - $file_name = basename( $url ); |
|
| 1658 | - if ( strpos( $file_name, '?' ) !== false ) {
|
|
| 1659 | - list( $file_name ) = explode( '?', $file_name ); |
|
| 1656 | + require_once(ABSPATH.'wp-includes/pluggable.php'); |
|
| 1657 | + $file_name = basename($url); |
|
| 1658 | + if (strpos($file_name, '?') !== false) {
|
|
| 1659 | + list($file_name) = explode('?', $file_name);
|
|
| 1660 | 1660 | } |
| 1661 | 1661 | $dummy = false; |
| 1662 | 1662 | $add_to_cache = false; |
| 1663 | 1663 | $key = null; |
| 1664 | - if ( strpos( $url, '/dummy/' ) !== false ) {
|
|
| 1664 | + if (strpos($url, '/dummy/') !== false) {
|
|
| 1665 | 1665 | $dummy = true; |
| 1666 | - $key = "dummy_" . str_replace( '.', '_', $file_name ); |
|
| 1667 | - $value = get_transient( 'cached_dummy_images' ); |
|
| 1668 | - if ( $value ) {
|
|
| 1669 | - if ( isset( $value[ $key ] ) ) {
|
|
| 1670 | - return $value[ $key ]; |
|
| 1666 | + $key = "dummy_".str_replace('.', '_', $file_name);
|
|
| 1667 | + $value = get_transient('cached_dummy_images');
|
|
| 1668 | + if ($value) {
|
|
| 1669 | + if (isset($value[$key])) {
|
|
| 1670 | + return $value[$key]; |
|
| 1671 | 1671 | } else {
|
| 1672 | 1672 | $add_to_cache = true; |
| 1673 | 1673 | } |
@@ -1678,62 +1678,62 @@ discard block |
||
| 1678 | 1678 | |
| 1679 | 1679 | // get placeholder file in the upload dir with a unique, sanitized filename |
| 1680 | 1680 | |
| 1681 | - $post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : ''; |
|
| 1681 | + $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : ''; |
|
| 1682 | 1682 | |
| 1683 | - $upload = wp_upload_bits( $file_name, 0, '', $post_upload_date ); |
|
| 1684 | - if ( $upload['error'] ) {
|
|
| 1685 | - return new WP_Error( 'upload_dir_error', $upload['error'] ); |
|
| 1683 | + $upload = wp_upload_bits($file_name, 0, '', $post_upload_date); |
|
| 1684 | + if ($upload['error']) {
|
|
| 1685 | + return new WP_Error('upload_dir_error', $upload['error']);
|
|
| 1686 | 1686 | } |
| 1687 | 1687 | |
| 1688 | 1688 | |
| 1689 | - sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1689 | + sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1690 | 1690 | |
| 1691 | 1691 | // fetch the remote url and write it to the placeholder file |
| 1692 | - $headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) ); |
|
| 1692 | + $headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));
|
|
| 1693 | 1693 | |
| 1694 | 1694 | $log_message = ''; |
| 1695 | - if ( is_wp_error( $headers ) ) {
|
|
| 1696 | - echo 'file: ' . $url; |
|
| 1695 | + if (is_wp_error($headers)) {
|
|
| 1696 | + echo 'file: '.$url; |
|
| 1697 | 1697 | |
| 1698 | - return new WP_Error( 'import_file_error', $headers->get_error_message() ); |
|
| 1698 | + return new WP_Error('import_file_error', $headers->get_error_message());
|
|
| 1699 | 1699 | } |
| 1700 | 1700 | |
| 1701 | 1701 | // clear cache to make compat with EWWW Image Optimizer |
| 1702 | - if(defined( 'EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')){
|
|
| 1702 | + if (defined('EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')) {
|
|
| 1703 | 1703 | clearstatcache(); |
| 1704 | 1704 | } |
| 1705 | - $filesize = filesize( $upload['file'] ); |
|
| 1705 | + $filesize = filesize($upload['file']); |
|
| 1706 | 1706 | // request failed |
| 1707 | - if ( ! $headers ) {
|
|
| 1708 | - $log_message = __( 'Remote server did not respond', 'geodirectory' ); |
|
| 1707 | + if (!$headers) {
|
|
| 1708 | + $log_message = __('Remote server did not respond', 'geodirectory');
|
|
| 1709 | 1709 | } // make sure the fetch was successful |
| 1710 | - elseif ( $headers['response']['code'] != '200' ) {
|
|
| 1711 | - $log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) ); |
|
| 1712 | - } elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {
|
|
| 1713 | - $log_message = __( 'Remote file is incorrect size', 'geodirectory' ); |
|
| 1714 | - } elseif ( 0 == $filesize ) {
|
|
| 1715 | - $log_message = __( 'Zero size file downloaded', 'geodirectory' ); |
|
| 1716 | - } |
|
| 1717 | - |
|
| 1718 | - if ( $log_message ) {
|
|
| 1719 | - $del = unlink( $upload['file'] ); |
|
| 1720 | - if ( ! $del ) {
|
|
| 1721 | - geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) ); |
|
| 1710 | + elseif ($headers['response']['code'] != '200') {
|
|
| 1711 | + $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));
|
|
| 1712 | + } elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {
|
|
| 1713 | + $log_message = __('Remote file is incorrect size', 'geodirectory');
|
|
| 1714 | + } elseif (0 == $filesize) {
|
|
| 1715 | + $log_message = __('Zero size file downloaded', 'geodirectory');
|
|
| 1716 | + } |
|
| 1717 | + |
|
| 1718 | + if ($log_message) {
|
|
| 1719 | + $del = unlink($upload['file']); |
|
| 1720 | + if (!$del) {
|
|
| 1721 | + geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));
|
|
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 1724 | - return new WP_Error( 'import_file_error', $log_message ); |
|
| 1724 | + return new WP_Error('import_file_error', $log_message);
|
|
| 1725 | 1725 | } |
| 1726 | 1726 | |
| 1727 | - if ( $dummy && $add_to_cache && is_array( $upload ) ) {
|
|
| 1728 | - $images = get_transient( 'cached_dummy_images' ); |
|
| 1729 | - if ( is_array( $images ) ) {
|
|
| 1730 | - $images[ $key ] = $upload; |
|
| 1727 | + if ($dummy && $add_to_cache && is_array($upload)) {
|
|
| 1728 | + $images = get_transient('cached_dummy_images');
|
|
| 1729 | + if (is_array($images)) {
|
|
| 1730 | + $images[$key] = $upload; |
|
| 1731 | 1731 | } else {
|
| 1732 | - $images = array( $key => $upload ); |
|
| 1732 | + $images = array($key => $upload); |
|
| 1733 | 1733 | } |
| 1734 | 1734 | |
| 1735 | 1735 | //setting the cache using the WP Transient API |
| 1736 | - set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache |
|
| 1736 | + set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache
|
|
| 1737 | 1737 | } |
| 1738 | 1738 | |
| 1739 | 1739 | return $upload; |
@@ -1747,12 +1747,12 @@ discard block |
||
| 1747 | 1747 | * @return string|void Max upload size. |
| 1748 | 1748 | */ |
| 1749 | 1749 | function geodir_max_upload_size() {
|
| 1750 | - $max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 ); |
|
| 1750 | + $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
|
|
| 1751 | 1751 | |
| 1752 | - if ( $max_filesize > 0 && $max_filesize < 1 ) {
|
|
| 1753 | - $max_filesize = (int) ( $max_filesize * 1024 ) . 'kb'; |
|
| 1752 | + if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1753 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; |
|
| 1754 | 1754 | } else {
|
| 1755 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1755 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; |
|
| 1756 | 1756 | } |
| 1757 | 1757 | |
| 1758 | 1758 | /** |
@@ -1762,7 +1762,7 @@ discard block |
||
| 1762 | 1762 | * |
| 1763 | 1763 | * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb. |
| 1764 | 1764 | */ |
| 1765 | - return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize ); |
|
| 1765 | + return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1766 | 1766 | } |
| 1767 | 1767 | |
| 1768 | 1768 | /** |
@@ -1775,8 +1775,8 @@ discard block |
||
| 1775 | 1775 | * @return bool If dummy folder exists returns true, else false. |
| 1776 | 1776 | */ |
| 1777 | 1777 | function geodir_dummy_folder_exists() {
|
| 1778 | - $path = geodir_plugin_path() . '/geodirectory-admin/dummy/'; |
|
| 1779 | - if ( ! is_dir( $path ) ) {
|
|
| 1778 | + $path = geodir_plugin_path().'/geodirectory-admin/dummy/'; |
|
| 1779 | + if (!is_dir($path)) {
|
|
| 1780 | 1780 | return false; |
| 1781 | 1781 | } else {
|
| 1782 | 1782 | return true; |
@@ -1795,17 +1795,17 @@ discard block |
||
| 1795 | 1795 | * |
| 1796 | 1796 | * @return object Author info. |
| 1797 | 1797 | */ |
| 1798 | -function geodir_get_author_info( $aid ) {
|
|
| 1798 | +function geodir_get_author_info($aid) {
|
|
| 1799 | 1799 | global $wpdb; |
| 1800 | 1800 | /*$infosql = "select * from $wpdb->users where ID=$aid";*/ |
| 1801 | - $infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) ); |
|
| 1802 | - $info = $wpdb->get_results( $infosql ); |
|
| 1803 | - if ( $info ) {
|
|
| 1801 | + $infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));
|
|
| 1802 | + $info = $wpdb->get_results($infosql); |
|
| 1803 | + if ($info) {
|
|
| 1804 | 1804 | return $info[0]; |
| 1805 | 1805 | } |
| 1806 | 1806 | } |
| 1807 | 1807 | |
| 1808 | -if ( ! function_exists( 'adminEmail' ) ) {
|
|
| 1808 | +if (!function_exists('adminEmail')) {
|
|
| 1809 | 1809 | /** |
| 1810 | 1810 | * Send emails to client on post submission, renew etc. |
| 1811 | 1811 | * |
@@ -1818,67 +1818,67 @@ discard block |
||
| 1818 | 1818 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1819 | 1819 | * @param string $custom_1 Custom data to be sent. |
| 1820 | 1820 | */ |
| 1821 | - function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {
|
|
| 1821 | + function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {
|
|
| 1822 | 1822 | global $wpdb; |
| 1823 | - if ( $message_type == 'expiration' ) {
|
|
| 1824 | - $subject = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) ); |
|
| 1825 | - $client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) ); |
|
| 1826 | - } elseif ( $message_type == 'post_submited' ) {
|
|
| 1827 | - $subject = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1828 | - $client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' ); |
|
| 1829 | - } elseif ( $message_type == 'renew' ) {
|
|
| 1830 | - $subject = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1831 | - $client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' ); |
|
| 1832 | - } elseif ( $message_type == 'upgrade' ) {
|
|
| 1833 | - $subject = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1834 | - $client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' ); |
|
| 1835 | - } elseif ( $message_type == 'claim_approved' ) {
|
|
| 1836 | - $subject = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' ); |
|
| 1837 | - $client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' ); |
|
| 1838 | - } elseif ( $message_type == 'claim_rejected' ) {
|
|
| 1839 | - $subject = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' ); |
|
| 1840 | - $client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' ); |
|
| 1841 | - } elseif ( $message_type == 'claim_requested' ) {
|
|
| 1842 | - $subject = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' ); |
|
| 1843 | - $client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' ); |
|
| 1844 | - } elseif ( $message_type == 'auto_claim' ) {
|
|
| 1845 | - $subject = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' ); |
|
| 1846 | - $client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' ); |
|
| 1847 | - } elseif ( $message_type == 'payment_success' ) {
|
|
| 1848 | - $subject = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' ); |
|
| 1849 | - $client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' ); |
|
| 1850 | - } elseif ( $message_type == 'payment_fail' ) {
|
|
| 1851 | - $subject = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' ); |
|
| 1852 | - $client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' ); |
|
| 1823 | + if ($message_type == 'expiration') {
|
|
| 1824 | + $subject = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));
|
|
| 1825 | + $client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));
|
|
| 1826 | + } elseif ($message_type == 'post_submited') {
|
|
| 1827 | + $subject = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');
|
|
| 1828 | + $client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');
|
|
| 1829 | + } elseif ($message_type == 'renew') {
|
|
| 1830 | + $subject = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');
|
|
| 1831 | + $client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');
|
|
| 1832 | + } elseif ($message_type == 'upgrade') {
|
|
| 1833 | + $subject = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');
|
|
| 1834 | + $client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');
|
|
| 1835 | + } elseif ($message_type == 'claim_approved') {
|
|
| 1836 | + $subject = __(get_option('claim_approved_email_subject'), 'geodirectory');
|
|
| 1837 | + $client_message = __(get_option('claim_approved_email_content'), 'geodirectory');
|
|
| 1838 | + } elseif ($message_type == 'claim_rejected') {
|
|
| 1839 | + $subject = __(get_option('claim_rejected_email_subject'), 'geodirectory');
|
|
| 1840 | + $client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');
|
|
| 1841 | + } elseif ($message_type == 'claim_requested') {
|
|
| 1842 | + $subject = __(get_option('claim_email_subject_admin'), 'geodirectory');
|
|
| 1843 | + $client_message = __(get_option('claim_email_content_admin'), 'geodirectory');
|
|
| 1844 | + } elseif ($message_type == 'auto_claim') {
|
|
| 1845 | + $subject = __(get_option('auto_claim_email_subject'), 'geodirectory');
|
|
| 1846 | + $client_message = __(get_option('auto_claim_email_content'), 'geodirectory');
|
|
| 1847 | + } elseif ($message_type == 'payment_success') {
|
|
| 1848 | + $subject = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');
|
|
| 1849 | + $client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');
|
|
| 1850 | + } elseif ($message_type == 'payment_fail') {
|
|
| 1851 | + $subject = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');
|
|
| 1852 | + $client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');
|
|
| 1853 | 1853 | } |
| 1854 | 1854 | $transaction_details = $custom_1; |
| 1855 | - $fromEmail = get_option( 'site_email' ); |
|
| 1855 | + $fromEmail = get_option('site_email');
|
|
| 1856 | 1856 | $fromEmailName = get_site_emailName(); |
| 1857 | 1857 | //$alivedays = get_post_meta($page_id,'alive_days',true); |
| 1858 | - $pkg_limit = get_property_price_info_listing( $page_id ); |
|
| 1858 | + $pkg_limit = get_property_price_info_listing($page_id); |
|
| 1859 | 1859 | $alivedays = $pkg_limit['days']; |
| 1860 | - $productlink = get_permalink( $page_id ); |
|
| 1861 | - $post_info = get_post( $page_id ); |
|
| 1862 | - $post_date = date( 'dS F,Y', strtotime( $post_info->post_date ) ); |
|
| 1863 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 1860 | + $productlink = get_permalink($page_id); |
|
| 1861 | + $post_info = get_post($page_id); |
|
| 1862 | + $post_date = date('dS F,Y', strtotime($post_info->post_date));
|
|
| 1863 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 1864 | 1864 | $loginurl = geodir_login_url(); |
| 1865 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 1865 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 1866 | 1866 | $siteurl = home_url(); |
| 1867 | - $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>'; |
|
| 1868 | - $user_info = get_userdata( $user_id ); |
|
| 1867 | + $siteurl_link = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>'; |
|
| 1868 | + $user_info = get_userdata($user_id); |
|
| 1869 | 1869 | $user_email = $user_info->user_email; |
| 1870 | - $display_name = geodir_get_client_name( $user_id ); |
|
| 1870 | + $display_name = geodir_get_client_name($user_id); |
|
| 1871 | 1871 | $user_login = $user_info->user_login; |
| 1872 | - $number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' ); |
|
| 1873 | - if ( $number_of_grace_days == '' ) {
|
|
| 1872 | + $number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');
|
|
| 1873 | + if ($number_of_grace_days == '') {
|
|
| 1874 | 1874 | $number_of_grace_days = 1; |
| 1875 | 1875 | } |
| 1876 | - if ( $post_info->post_type == 'event' ) {
|
|
| 1876 | + if ($post_info->post_type == 'event') {
|
|
| 1877 | 1877 | $post_type = 'event'; |
| 1878 | 1878 | } else {
|
| 1879 | 1879 | $post_type = 'listing'; |
| 1880 | 1880 | } |
| 1881 | - $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>'; |
|
| 1881 | + $renew_link = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>'; |
|
| 1882 | 1882 | $search_array = array( |
| 1883 | 1883 | '[#client_name#]', |
| 1884 | 1884 | '[#listing_link#]', |
@@ -1894,7 +1894,7 @@ discard block |
||
| 1894 | 1894 | '[#site_name#]', |
| 1895 | 1895 | '[#transaction_details#]' |
| 1896 | 1896 | ); |
| 1897 | - $replace_array = array( |
|
| 1897 | + $replace_array = array( |
|
| 1898 | 1898 | $display_name, |
| 1899 | 1899 | $listingLink, |
| 1900 | 1900 | $post_date, |
@@ -1909,13 +1909,13 @@ discard block |
||
| 1909 | 1909 | $fromEmailName, |
| 1910 | 1910 | $transaction_details |
| 1911 | 1911 | ); |
| 1912 | - $client_message = str_replace( $search_array, $replace_array, $client_message ); |
|
| 1913 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1912 | + $client_message = str_replace($search_array, $replace_array, $client_message); |
|
| 1913 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1914 | 1914 | |
| 1915 | 1915 | |
| 1916 | - $headers = array(); |
|
| 1916 | + $headers = array(); |
|
| 1917 | 1917 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 1918 | - $headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>'; |
|
| 1918 | + $headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>'; |
|
| 1919 | 1919 | |
| 1920 | 1920 | $to = $fromEmail; |
| 1921 | 1921 | $message = $client_message; |
@@ -1933,7 +1933,7 @@ discard block |
||
| 1933 | 1933 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1934 | 1934 | * @param string $custom_1 Custom data to be sent. |
| 1935 | 1935 | */ |
| 1936 | - $to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1936 | + $to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1937 | 1937 | /** |
| 1938 | 1938 | * Filter the admin email subject. |
| 1939 | 1939 | * |
@@ -1946,7 +1946,7 @@ discard block |
||
| 1946 | 1946 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1947 | 1947 | * @param string $custom_1 Custom data to be sent. |
| 1948 | 1948 | */ |
| 1949 | - $subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1949 | + $subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1950 | 1950 | /** |
| 1951 | 1951 | * Filter the admin email message. |
| 1952 | 1952 | * |
@@ -1959,7 +1959,7 @@ discard block |
||
| 1959 | 1959 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1960 | 1960 | * @param string $custom_1 Custom data to be sent. |
| 1961 | 1961 | */ |
| 1962 | - $message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1962 | + $message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1963 | 1963 | /** |
| 1964 | 1964 | * Filter the admin email headers. |
| 1965 | 1965 | * |
@@ -1972,22 +1972,22 @@ discard block |
||
| 1972 | 1972 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1973 | 1973 | * @param string $custom_1 Custom data to be sent. |
| 1974 | 1974 | */ |
| 1975 | - $headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1975 | + $headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1976 | 1976 | |
| 1977 | 1977 | |
| 1978 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1979 | - if ( ! $sent ) {
|
|
| 1980 | - if ( is_array( $to ) ) {
|
|
| 1981 | - $to = implode( ',', $to ); |
|
| 1978 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1979 | + if (!$sent) {
|
|
| 1980 | + if (is_array($to)) {
|
|
| 1981 | + $to = implode(',', $to);
|
|
| 1982 | 1982 | } |
| 1983 | 1983 | $log_message = sprintf( |
| 1984 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1984 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1985 | 1985 | $message_type, |
| 1986 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1986 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1987 | 1987 | $to, |
| 1988 | 1988 | $subject |
| 1989 | 1989 | ); |
| 1990 | - geodir_error_log( $log_message ); |
|
| 1990 | + geodir_error_log($log_message); |
|
| 1991 | 1991 | } |
| 1992 | 1992 | } |
| 1993 | 1993 | } |
@@ -2007,12 +2007,12 @@ discard block |
||
| 2007 | 2007 | * |
| 2008 | 2008 | * @return array Category IDs. |
| 2009 | 2009 | */ |
| 2010 | -function gd_lang_object_ids( $ids_array, $type ) {
|
|
| 2011 | - if ( geodir_is_wpml() ) {
|
|
| 2010 | +function gd_lang_object_ids($ids_array, $type) {
|
|
| 2011 | + if (geodir_is_wpml()) {
|
|
| 2012 | 2012 | $res = array(); |
| 2013 | - foreach ( $ids_array as $id ) {
|
|
| 2014 | - $xlat = geodir_wpml_object_id( $id, $type, false ); |
|
| 2015 | - if ( ! is_null( $xlat ) ) {
|
|
| 2013 | + foreach ($ids_array as $id) {
|
|
| 2014 | + $xlat = geodir_wpml_object_id($id, $type, false); |
|
| 2015 | + if (!is_null($xlat)) {
|
|
| 2016 | 2016 | $res[] = $xlat; |
| 2017 | 2017 | } |
| 2018 | 2018 | } |
@@ -2036,20 +2036,20 @@ discard block |
||
| 2036 | 2036 | * |
| 2037 | 2037 | * @return array Modified Body CSS classes. |
| 2038 | 2038 | */ |
| 2039 | -function geodir_custom_posts_body_class( $classes ) {
|
|
| 2039 | +function geodir_custom_posts_body_class($classes) {
|
|
| 2040 | 2040 | global $wpdb, $wp; |
| 2041 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 2042 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2041 | + $post_types = geodir_get_posttypes('object');
|
|
| 2042 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2043 | 2043 | $classes[] = 'geodir_custom_posts'; |
| 2044 | 2044 | } |
| 2045 | 2045 | |
| 2046 | 2046 | // fix body class for signup page |
| 2047 | - if ( geodir_is_page( 'login' ) ) {
|
|
| 2047 | + if (geodir_is_page('login')) {
|
|
| 2048 | 2048 | $new_classes = array(); |
| 2049 | 2049 | $new_classes[] = 'signup page-geodir-signup'; |
| 2050 | - if ( ! empty( $classes ) ) {
|
|
| 2051 | - foreach ( $classes as $class ) {
|
|
| 2052 | - if ( $class && $class != 'home' && $class != 'blog' ) {
|
|
| 2050 | + if (!empty($classes)) {
|
|
| 2051 | + foreach ($classes as $class) {
|
|
| 2052 | + if ($class && $class != 'home' && $class != 'blog') {
|
|
| 2053 | 2053 | $new_classes[] = $class; |
| 2054 | 2054 | } |
| 2055 | 2055 | } |
@@ -2057,14 +2057,14 @@ discard block |
||
| 2057 | 2057 | $classes = $new_classes; |
| 2058 | 2058 | } |
| 2059 | 2059 | |
| 2060 | - if ( geodir_is_geodir_page() ) {
|
|
| 2060 | + if (geodir_is_geodir_page()) {
|
|
| 2061 | 2061 | $classes[] = 'geodir-page'; |
| 2062 | 2062 | } |
| 2063 | 2063 | |
| 2064 | 2064 | return $classes; |
| 2065 | 2065 | } |
| 2066 | 2066 | |
| 2067 | -add_filter( 'body_class', 'geodir_custom_posts_body_class' ); // let's add a class to the body so we can style the new addition to the search |
|
| 2067 | +add_filter('body_class', 'geodir_custom_posts_body_class'); // let's add a class to the body so we can style the new addition to the search
|
|
| 2068 | 2068 | |
| 2069 | 2069 | |
| 2070 | 2070 | /** |
@@ -2080,7 +2080,7 @@ discard block |
||
| 2080 | 2080 | * |
| 2081 | 2081 | * @since 1.0.0 |
| 2082 | 2082 | */ |
| 2083 | - return apply_filters( 'geodir_map_zoom_level', array( |
|
| 2083 | + return apply_filters('geodir_map_zoom_level', array(
|
|
| 2084 | 2084 | 1, |
| 2085 | 2085 | 2, |
| 2086 | 2086 | 3, |
@@ -2100,7 +2100,7 @@ discard block |
||
| 2100 | 2100 | 17, |
| 2101 | 2101 | 18, |
| 2102 | 2102 | 19 |
| 2103 | - ) ); |
|
| 2103 | + )); |
|
| 2104 | 2104 | |
| 2105 | 2105 | } |
| 2106 | 2106 | |
@@ -2113,12 +2113,12 @@ discard block |
||
| 2113 | 2113 | * |
| 2114 | 2114 | * @param string $geodir_option_name Option key. |
| 2115 | 2115 | */ |
| 2116 | -function geodir_option_version_backup( $geodir_option_name ) {
|
|
| 2116 | +function geodir_option_version_backup($geodir_option_name) {
|
|
| 2117 | 2117 | $version_date = time(); |
| 2118 | - $geodir_option = get_option( $geodir_option_name ); |
|
| 2118 | + $geodir_option = get_option($geodir_option_name); |
|
| 2119 | 2119 | |
| 2120 | - if ( ! empty( $geodir_option ) ) {
|
|
| 2121 | - add_option( $geodir_option_name . '_' . $version_date, $geodir_option ); |
|
| 2120 | + if (!empty($geodir_option)) {
|
|
| 2121 | + add_option($geodir_option_name.'_'.$version_date, $geodir_option); |
|
| 2122 | 2122 | } |
| 2123 | 2123 | } |
| 2124 | 2124 | |
@@ -2132,10 +2132,10 @@ discard block |
||
| 2132 | 2132 | * |
| 2133 | 2133 | * @return int Page ID. |
| 2134 | 2134 | */ |
| 2135 | -function get_page_id_geodir_add_listing_page( $page_id ) {
|
|
| 2136 | - if ( geodir_wpml_multilingual_status() ) {
|
|
| 2135 | +function get_page_id_geodir_add_listing_page($page_id) {
|
|
| 2136 | + if (geodir_wpml_multilingual_status()) {
|
|
| 2137 | 2137 | $post_type = 'post_page'; |
| 2138 | - $page_id = geodir_get_wpml_element_id( $page_id, $post_type ); |
|
| 2138 | + $page_id = geodir_get_wpml_element_id($page_id, $post_type); |
|
| 2139 | 2139 | } |
| 2140 | 2140 | |
| 2141 | 2141 | return $page_id; |
@@ -2149,7 +2149,7 @@ discard block |
||
| 2149 | 2149 | * @return bool Returns true when sitepress multilingual CMS active. else returns false. |
| 2150 | 2150 | */ |
| 2151 | 2151 | function geodir_wpml_multilingual_status() {
|
| 2152 | - if ( geodir_is_wpml() ) {
|
|
| 2152 | + if (geodir_is_wpml()) {
|
|
| 2153 | 2153 | return true; |
| 2154 | 2154 | } |
| 2155 | 2155 | |
@@ -2167,19 +2167,19 @@ discard block |
||
| 2167 | 2167 | * |
| 2168 | 2168 | * @return int Element ID when exists. Else the page id. |
| 2169 | 2169 | */ |
| 2170 | -function geodir_get_wpml_element_id( $page_id, $post_type ) {
|
|
| 2170 | +function geodir_get_wpml_element_id($page_id, $post_type) {
|
|
| 2171 | 2171 | global $sitepress; |
| 2172 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2173 | - $trid = $sitepress->get_element_trid( $page_id, $post_type ); |
|
| 2172 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2173 | + $trid = $sitepress->get_element_trid($page_id, $post_type); |
|
| 2174 | 2174 | |
| 2175 | - if ( $trid > 0 ) {
|
|
| 2176 | - $translations = $sitepress->get_element_translations( $trid, $post_type ); |
|
| 2175 | + if ($trid > 0) {
|
|
| 2176 | + $translations = $sitepress->get_element_translations($trid, $post_type); |
|
| 2177 | 2177 | |
| 2178 | 2178 | $lang = $sitepress->get_current_language(); |
| 2179 | 2179 | $lang = $lang ? $lang : $sitepress->get_default_language(); |
| 2180 | 2180 | |
| 2181 | - if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {
|
|
| 2182 | - $page_id = $translations[ $lang ]->element_id; |
|
| 2181 | + if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {
|
|
| 2182 | + $page_id = $translations[$lang]->element_id; |
|
| 2183 | 2183 | } |
| 2184 | 2184 | } |
| 2185 | 2185 | } |
@@ -2196,15 +2196,15 @@ discard block |
||
| 2196 | 2196 | */ |
| 2197 | 2197 | function geodir_wpml_check_element_id() {
|
| 2198 | 2198 | global $sitepress; |
| 2199 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2199 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2200 | 2200 | $el_type = 'post_page'; |
| 2201 | - $el_id = get_option( 'geodir_add_listing_page' ); |
|
| 2201 | + $el_id = get_option('geodir_add_listing_page');
|
|
| 2202 | 2202 | $default_lang = $sitepress->get_default_language(); |
| 2203 | - $el_details = $sitepress->get_element_language_details( $el_id, $el_type ); |
|
| 2203 | + $el_details = $sitepress->get_element_language_details($el_id, $el_type); |
|
| 2204 | 2204 | |
| 2205 | - if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {
|
|
| 2206 | - if ( ! $el_details->source_language_code ) {
|
|
| 2207 | - $sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang ); |
|
| 2205 | + if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {
|
|
| 2206 | + if (!$el_details->source_language_code) {
|
|
| 2207 | + $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang); |
|
| 2208 | 2208 | $sitepress->icl_translations_cache->clear(); |
| 2209 | 2209 | } |
| 2210 | 2210 | } |
@@ -2224,44 +2224,44 @@ discard block |
||
| 2224 | 2224 | * |
| 2225 | 2225 | * @return string Orderby SQL. |
| 2226 | 2226 | */ |
| 2227 | -function geodir_widget_listings_get_order( $query_args ) {
|
|
| 2227 | +function geodir_widget_listings_get_order($query_args) {
|
|
| 2228 | 2228 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2229 | 2229 | |
| 2230 | 2230 | $query_args = $gd_query_args_widgets; |
| 2231 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2232 | - return $wpdb->posts . ".post_date DESC, "; |
|
| 2231 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2232 | + return $wpdb->posts.".post_date DESC, "; |
|
| 2233 | 2233 | } |
| 2234 | 2234 | |
| 2235 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2236 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2235 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2236 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2237 | 2237 | |
| 2238 | - $sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : ''; |
|
| 2238 | + $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : ''; |
|
| 2239 | 2239 | |
| 2240 | - switch ( $sort_by ) {
|
|
| 2240 | + switch ($sort_by) {
|
|
| 2241 | 2241 | case 'latest': |
| 2242 | 2242 | case 'newest': |
| 2243 | - $orderby = $wpdb->posts . ".post_date DESC, "; |
|
| 2243 | + $orderby = $wpdb->posts.".post_date DESC, "; |
|
| 2244 | 2244 | break; |
| 2245 | 2245 | case 'featured': |
| 2246 | - $orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, "; |
|
| 2246 | + $orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, "; |
|
| 2247 | 2247 | break; |
| 2248 | 2248 | case 'az': |
| 2249 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2249 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2250 | 2250 | break; |
| 2251 | 2251 | case 'high_review': |
| 2252 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 2252 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 2253 | 2253 | break; |
| 2254 | 2254 | case 'high_rating': |
| 2255 | - $orderby = "( " . $table . ".overall_rating ) DESC, "; |
|
| 2255 | + $orderby = "( ".$table.".overall_rating ) DESC, "; |
|
| 2256 | 2256 | break; |
| 2257 | 2257 | case 'random': |
| 2258 | 2258 | $orderby = "RAND(), "; |
| 2259 | 2259 | break; |
| 2260 | 2260 | default: |
| 2261 | - if ( $custom_orderby = geodir_prepare_custom_sorting( $sort_by, $table ) ) {
|
|
| 2262 | - $orderby = $custom_orderby . ", "; |
|
| 2261 | + if ($custom_orderby = geodir_prepare_custom_sorting($sort_by, $table)) {
|
|
| 2262 | + $orderby = $custom_orderby.", "; |
|
| 2263 | 2263 | } else {
|
| 2264 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2264 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2265 | 2265 | } |
| 2266 | 2266 | break; |
| 2267 | 2267 | } |
@@ -2286,16 +2286,16 @@ discard block |
||
| 2286 | 2286 | * |
| 2287 | 2287 | * @return mixed Result object. |
| 2288 | 2288 | */ |
| 2289 | -function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {
|
|
| 2289 | +function geodir_get_widget_listings($query_args = array(), $count_only = false) {
|
|
| 2290 | 2290 | global $wpdb, $plugin_prefix, $table_prefix; |
| 2291 | 2291 | $GLOBALS['gd_query_args_widgets'] = $query_args; |
| 2292 | 2292 | $gd_query_args_widgets = $query_args; |
| 2293 | 2293 | |
| 2294 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2295 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2296 | - $supports_wpml = geodir_wpml_is_post_type_translated( $post_type ); |
|
| 2294 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2295 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2296 | + $supports_wpml = geodir_wpml_is_post_type_translated($post_type); |
|
| 2297 | 2297 | |
| 2298 | - $fields = $wpdb->posts . ".*, " . $table . ".*"; |
|
| 2298 | + $fields = $wpdb->posts.".*, ".$table.".*"; |
|
| 2299 | 2299 | /** |
| 2300 | 2300 | * Filter widget listing fields string part that is being used for query. |
| 2301 | 2301 | * |
@@ -2305,17 +2305,17 @@ discard block |
||
| 2305 | 2305 | * @param string $table Table name. |
| 2306 | 2306 | * @param string $post_type Post type. |
| 2307 | 2307 | */ |
| 2308 | - $fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type ); |
|
| 2308 | + $fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);
|
|
| 2309 | 2309 | |
| 2310 | - $join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";
|
|
| 2310 | + $join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";
|
|
| 2311 | 2311 | |
| 2312 | 2312 | ########### WPML ########### |
| 2313 | 2313 | |
| 2314 | - if ( $supports_wpml ) {
|
|
| 2314 | + if ($supports_wpml) {
|
|
| 2315 | 2315 | global $sitepress; |
| 2316 | 2316 | $lang_code = ICL_LANGUAGE_CODE; |
| 2317 | - if ( $lang_code ) {
|
|
| 2318 | - $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 2317 | + if ($lang_code) {
|
|
| 2318 | + $join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 2319 | 2319 | } |
| 2320 | 2320 | } |
| 2321 | 2321 | |
@@ -2329,15 +2329,15 @@ discard block |
||
| 2329 | 2329 | * @param string $join Join clause string. |
| 2330 | 2330 | * @param string $post_type Post type. |
| 2331 | 2331 | */ |
| 2332 | - $join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type ); |
|
| 2332 | + $join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);
|
|
| 2333 | 2333 | |
| 2334 | - $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : ''; |
|
| 2334 | + $post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : ''; |
|
| 2335 | 2335 | |
| 2336 | - $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'"; |
|
| 2336 | + $where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'"; |
|
| 2337 | 2337 | |
| 2338 | 2338 | ########### WPML ########### |
| 2339 | - if ( $supports_wpml ) {
|
|
| 2340 | - if ( $lang_code ) {
|
|
| 2339 | + if ($supports_wpml) {
|
|
| 2340 | + if ($lang_code) {
|
|
| 2341 | 2341 | $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' "; |
| 2342 | 2342 | } |
| 2343 | 2343 | } |
@@ -2350,8 +2350,8 @@ discard block |
||
| 2350 | 2350 | * @param string $where Where clause string. |
| 2351 | 2351 | * @param string $post_type Post type. |
| 2352 | 2352 | */ |
| 2353 | - $where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type ); |
|
| 2354 | - $where = $where != '' ? " WHERE 1=1 " . $where : ''; |
|
| 2353 | + $where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);
|
|
| 2354 | + $where = $where != '' ? " WHERE 1=1 ".$where : ''; |
|
| 2355 | 2355 | |
| 2356 | 2356 | $groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster without |
| 2357 | 2357 | /** |
@@ -2362,15 +2362,15 @@ discard block |
||
| 2362 | 2362 | * @param string $groupby Group by clause string. |
| 2363 | 2363 | * @param string $post_type Post type. |
| 2364 | 2364 | */ |
| 2365 | - $groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type ); |
|
| 2365 | + $groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);
|
|
| 2366 | 2366 | |
| 2367 | - if ( $count_only ) {
|
|
| 2368 | - $sql = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . " |
|
| 2369 | - " . $join . " |
|
| 2367 | + if ($count_only) {
|
|
| 2368 | + $sql = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts." |
|
| 2369 | + " . $join." |
|
| 2370 | 2370 | " . $where; |
| 2371 | - $rows = (int) $wpdb->get_var( $sql ); |
|
| 2371 | + $rows = (int) $wpdb->get_var($sql); |
|
| 2372 | 2372 | } else {
|
| 2373 | - $orderby = geodir_widget_listings_get_order( $query_args ); |
|
| 2373 | + $orderby = geodir_widget_listings_get_order($query_args); |
|
| 2374 | 2374 | /** |
| 2375 | 2375 | * Filter widget listing orderby clause string part that is being used for query. |
| 2376 | 2376 | * |
@@ -2380,33 +2380,33 @@ discard block |
||
| 2380 | 2380 | * @param string $table Table name. |
| 2381 | 2381 | * @param string $post_type Post type. |
| 2382 | 2382 | */ |
| 2383 | - $orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type ); |
|
| 2383 | + $orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);
|
|
| 2384 | 2384 | |
| 2385 | 2385 | $second_orderby = array(); |
| 2386 | - if ( strpos( $orderby, strtolower( $table . ".is_featured" ) ) === false ) {
|
|
| 2387 | - $second_orderby[] = $table . ".is_featured ASC"; |
|
| 2386 | + if (strpos($orderby, strtolower($table.".is_featured")) === false) {
|
|
| 2387 | + $second_orderby[] = $table.".is_featured ASC"; |
|
| 2388 | 2388 | } |
| 2389 | 2389 | |
| 2390 | - if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_date" ) ) === false ) {
|
|
| 2391 | - $second_orderby[] = $wpdb->posts . ".post_date DESC"; |
|
| 2390 | + if (strpos($orderby, strtolower($wpdb->posts.".post_date")) === false) {
|
|
| 2391 | + $second_orderby[] = $wpdb->posts.".post_date DESC"; |
|
| 2392 | 2392 | } |
| 2393 | 2393 | |
| 2394 | - if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_title" ) ) === false ) {
|
|
| 2395 | - $second_orderby[] = $wpdb->posts . ".post_title ASC"; |
|
| 2394 | + if (strpos($orderby, strtolower($wpdb->posts.".post_title")) === false) {
|
|
| 2395 | + $second_orderby[] = $wpdb->posts.".post_title ASC"; |
|
| 2396 | 2396 | } |
| 2397 | 2397 | |
| 2398 | - if ( !empty( $second_orderby ) ) {
|
|
| 2399 | - $orderby .= implode( ', ', $second_orderby ); |
|
| 2398 | + if (!empty($second_orderby)) {
|
|
| 2399 | + $orderby .= implode(', ', $second_orderby);
|
|
| 2400 | 2400 | } |
| 2401 | 2401 | |
| 2402 | - if ( !empty( $orderby ) ) {
|
|
| 2403 | - $orderby = trim( $orderby ); |
|
| 2404 | - $orderby = rtrim( $orderby, "," ); |
|
| 2402 | + if (!empty($orderby)) {
|
|
| 2403 | + $orderby = trim($orderby); |
|
| 2404 | + $orderby = rtrim($orderby, ","); |
|
| 2405 | 2405 | } |
| 2406 | 2406 | |
| 2407 | - $orderby = $orderby != '' ? " ORDER BY " . $orderby : ''; |
|
| 2407 | + $orderby = $orderby != '' ? " ORDER BY ".$orderby : ''; |
|
| 2408 | 2408 | |
| 2409 | - $limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5; |
|
| 2409 | + $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5; |
|
| 2410 | 2410 | /** |
| 2411 | 2411 | * Filter widget listing limit that is being used for query. |
| 2412 | 2412 | * |
@@ -2415,27 +2415,27 @@ discard block |
||
| 2415 | 2415 | * @param int $limit Query results limit. |
| 2416 | 2416 | * @param string $post_type Post type. |
| 2417 | 2417 | */ |
| 2418 | - $limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type ); |
|
| 2418 | + $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);
|
|
| 2419 | 2419 | |
| 2420 | - $page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1; |
|
| 2421 | - if ( ! $page ) {
|
|
| 2420 | + $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1; |
|
| 2421 | + if (!$page) {
|
|
| 2422 | 2422 | $page = 1; |
| 2423 | 2423 | } |
| 2424 | 2424 | |
| 2425 | - $limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : ""; |
|
| 2425 | + $limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : ""; |
|
| 2426 | 2426 | |
| 2427 | 2427 | //@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without |
| 2428 | - $sql = "SELECT " . $fields . " FROM " . $wpdb->posts . " |
|
| 2429 | - " . $join . " |
|
| 2430 | - " . $where . " |
|
| 2431 | - " . $groupby . " |
|
| 2432 | - " . $orderby . " |
|
| 2428 | + $sql = "SELECT ".$fields." FROM ".$wpdb->posts." |
|
| 2429 | + " . $join." |
|
| 2430 | + " . $where." |
|
| 2431 | + " . $groupby." |
|
| 2432 | + " . $orderby." |
|
| 2433 | 2433 | " . $limit; |
| 2434 | - $rows = $wpdb->get_results( $sql ); |
|
| 2434 | + $rows = $wpdb->get_results($sql); |
|
| 2435 | 2435 | } |
| 2436 | 2436 | |
| 2437 | - unset( $GLOBALS['gd_query_args_widgets'] ); |
|
| 2438 | - unset( $gd_query_args_widgets ); |
|
| 2437 | + unset($GLOBALS['gd_query_args_widgets']); |
|
| 2438 | + unset($gd_query_args_widgets); |
|
| 2439 | 2439 | |
| 2440 | 2440 | return $rows; |
| 2441 | 2441 | } |
@@ -2452,11 +2452,11 @@ discard block |
||
| 2452 | 2452 | * |
| 2453 | 2453 | * @return string Modified fields SQL. |
| 2454 | 2454 | */ |
| 2455 | -function geodir_function_widget_listings_fields( $fields ) {
|
|
| 2455 | +function geodir_function_widget_listings_fields($fields) {
|
|
| 2456 | 2456 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2457 | 2457 | |
| 2458 | 2458 | $query_args = $gd_query_args_widgets; |
| 2459 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2459 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2460 | 2460 | return $fields; |
| 2461 | 2461 | } |
| 2462 | 2462 | |
@@ -2475,24 +2475,24 @@ discard block |
||
| 2475 | 2475 | * |
| 2476 | 2476 | * @return string Modified join clause SQL. |
| 2477 | 2477 | */ |
| 2478 | -function geodir_function_widget_listings_join( $join ) {
|
|
| 2478 | +function geodir_function_widget_listings_join($join) {
|
|
| 2479 | 2479 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2480 | 2480 | |
| 2481 | 2481 | $query_args = $gd_query_args_widgets; |
| 2482 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2482 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2483 | 2483 | return $join; |
| 2484 | 2484 | } |
| 2485 | 2485 | |
| 2486 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2487 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2486 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2487 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2488 | 2488 | |
| 2489 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2490 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 2489 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2490 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 2491 | 2491 | } |
| 2492 | 2492 | |
| 2493 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2494 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2495 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2493 | + if (!empty($query_args['tax_query'])) {
|
|
| 2494 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2495 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2496 | 2496 | $join .= $tax_queries['join']; |
| 2497 | 2497 | } |
| 2498 | 2498 | } |
@@ -2513,67 +2513,67 @@ discard block |
||
| 2513 | 2513 | * |
| 2514 | 2514 | * @return string Modified where clause SQL. |
| 2515 | 2515 | */ |
| 2516 | -function geodir_function_widget_listings_where( $where ) {
|
|
| 2516 | +function geodir_function_widget_listings_where($where) {
|
|
| 2517 | 2517 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2518 | 2518 | |
| 2519 | 2519 | $query_args = $gd_query_args_widgets; |
| 2520 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2520 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2521 | 2521 | return $where; |
| 2522 | 2522 | } |
| 2523 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2524 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2523 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2524 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2525 | 2525 | |
| 2526 | - if ( ! empty( $query_args ) ) {
|
|
| 2527 | - if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {
|
|
| 2528 | - $where = geodir_default_location_where( $where, $table ); |
|
| 2526 | + if (!empty($query_args)) {
|
|
| 2527 | + if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {
|
|
| 2528 | + $where = geodir_default_location_where($where, $table); |
|
| 2529 | 2529 | } |
| 2530 | 2530 | |
| 2531 | - if ( ! empty( $query_args['post_author'] ) ) {
|
|
| 2532 | - $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author']; |
|
| 2531 | + if (!empty($query_args['post_author'])) {
|
|
| 2532 | + $where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author']; |
|
| 2533 | 2533 | } |
| 2534 | 2534 | |
| 2535 | - if ( ! empty( $query_args['show_featured_only'] ) ) {
|
|
| 2536 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 2535 | + if (!empty($query_args['show_featured_only'])) {
|
|
| 2536 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 2537 | 2537 | } |
| 2538 | 2538 | |
| 2539 | - if ( ! empty( $query_args['show_special_only'] ) ) {
|
|
| 2540 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 2539 | + if (!empty($query_args['show_special_only'])) {
|
|
| 2540 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 2541 | 2541 | } |
| 2542 | 2542 | |
| 2543 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2544 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL "; |
|
| 2543 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2544 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL "; |
|
| 2545 | 2545 | } |
| 2546 | 2546 | |
| 2547 | - if ( ! empty( $query_args['featured_image_only'] ) ) {
|
|
| 2548 | - $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' "; |
|
| 2547 | + if (!empty($query_args['featured_image_only'])) {
|
|
| 2548 | + $where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' "; |
|
| 2549 | 2549 | } |
| 2550 | 2550 | |
| 2551 | - if ( ! empty( $query_args['with_videos_only'] ) ) {
|
|
| 2552 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 2551 | + if (!empty($query_args['with_videos_only'])) {
|
|
| 2552 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 2553 | 2553 | } |
| 2554 | 2554 | |
| 2555 | - if ( ! empty( $query_args['show_favorites_only'] ) ) {
|
|
| 2555 | + if (!empty($query_args['show_favorites_only'])) {
|
|
| 2556 | 2556 | $user_favorites = '-1'; |
| 2557 | 2557 | |
| 2558 | - if ( !empty( $query_args['favorites_by_user'] ) ) {
|
|
| 2558 | + if (!empty($query_args['favorites_by_user'])) {
|
|
| 2559 | 2559 | |
| 2560 | 2560 | $site_id = ''; |
| 2561 | - if ( is_multisite() ) {
|
|
| 2561 | + if (is_multisite()) {
|
|
| 2562 | 2562 | $blog_id = get_current_blog_id(); |
| 2563 | - if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;}
|
|
| 2563 | + if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
|
|
| 2564 | 2564 | } |
| 2565 | 2565 | |
| 2566 | - $user_favorites = geodir_get_user_favourites( (int)$query_args['favorites_by_user'] ); |
|
| 2566 | + $user_favorites = geodir_get_user_favourites((int) $query_args['favorites_by_user']); |
|
| 2567 | 2567 | $user_favorites = !empty($user_favorites) && is_array($user_favorites) ? implode("','", $user_favorites) : '-1';
|
| 2568 | 2568 | } |
| 2569 | 2569 | |
| 2570 | - $where .= " AND `" . $wpdb->posts . "`.`ID` IN('" . $user_favorites . "')";
|
|
| 2570 | + $where .= " AND `".$wpdb->posts."`.`ID` IN('".$user_favorites."')";
|
|
| 2571 | 2571 | } |
| 2572 | 2572 | |
| 2573 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2574 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2573 | + if (!empty($query_args['tax_query'])) {
|
|
| 2574 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2575 | 2575 | |
| 2576 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2576 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2577 | 2577 | $where .= $tax_queries['where']; |
| 2578 | 2578 | } |
| 2579 | 2579 | } |
@@ -2594,11 +2594,11 @@ discard block |
||
| 2594 | 2594 | * |
| 2595 | 2595 | * @return string Modified orderby clause SQL. |
| 2596 | 2596 | */ |
| 2597 | -function geodir_function_widget_listings_orderby( $orderby ) {
|
|
| 2597 | +function geodir_function_widget_listings_orderby($orderby) {
|
|
| 2598 | 2598 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2599 | 2599 | |
| 2600 | 2600 | $query_args = $gd_query_args_widgets; |
| 2601 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2601 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2602 | 2602 | return $orderby; |
| 2603 | 2603 | } |
| 2604 | 2604 | |
@@ -2617,15 +2617,15 @@ discard block |
||
| 2617 | 2617 | * |
| 2618 | 2618 | * @return int Query limit. |
| 2619 | 2619 | */ |
| 2620 | -function geodir_function_widget_listings_limit( $limit ) {
|
|
| 2620 | +function geodir_function_widget_listings_limit($limit) {
|
|
| 2621 | 2621 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2622 | 2622 | |
| 2623 | 2623 | $query_args = $gd_query_args_widgets; |
| 2624 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2624 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2625 | 2625 | return $limit; |
| 2626 | 2626 | } |
| 2627 | 2627 | |
| 2628 | - if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
|
|
| 2628 | + if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
|
|
| 2629 | 2629 | $limit = (int) $query_args['posts_per_page']; |
| 2630 | 2630 | } |
| 2631 | 2631 | |
@@ -2643,12 +2643,12 @@ discard block |
||
| 2643 | 2643 | * |
| 2644 | 2644 | * @return int Large size width. |
| 2645 | 2645 | */ |
| 2646 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
|
|
| 2647 | - $large_size_w = get_option( 'large_size_w' ); |
|
| 2646 | +function geodir_media_image_large_width($default = 800, $params = '') {
|
|
| 2647 | + $large_size_w = get_option('large_size_w');
|
|
| 2648 | 2648 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; |
| 2649 | - $large_size_w = absint( $large_size_w ); |
|
| 2649 | + $large_size_w = absint($large_size_w); |
|
| 2650 | 2650 | |
| 2651 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2651 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2652 | 2652 | $large_size_w = 800; |
| 2653 | 2653 | } |
| 2654 | 2654 | |
@@ -2661,7 +2661,7 @@ discard block |
||
| 2661 | 2661 | * @param int $default Default width. |
| 2662 | 2662 | * @param string|array $params Image parameters. |
| 2663 | 2663 | */ |
| 2664 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); |
|
| 2664 | + $large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
|
|
| 2665 | 2665 | |
| 2666 | 2666 | return $large_size_w; |
| 2667 | 2667 | } |
@@ -2677,12 +2677,12 @@ discard block |
||
| 2677 | 2677 | * |
| 2678 | 2678 | * @return int Large size height. |
| 2679 | 2679 | */ |
| 2680 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
|
|
| 2681 | - $large_size_h = get_option( 'large_size_h' ); |
|
| 2680 | +function geodir_media_image_large_height($default = 800, $params = '') {
|
|
| 2681 | + $large_size_h = get_option('large_size_h');
|
|
| 2682 | 2682 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; |
| 2683 | - $large_size_h = absint( $large_size_h ); |
|
| 2683 | + $large_size_h = absint($large_size_h); |
|
| 2684 | 2684 | |
| 2685 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2685 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2686 | 2686 | $large_size_h = 800; |
| 2687 | 2687 | } |
| 2688 | 2688 | |
@@ -2695,7 +2695,7 @@ discard block |
||
| 2695 | 2695 | * @param int $default Default height. |
| 2696 | 2696 | * @param string|array $params Image parameters. |
| 2697 | 2697 | */ |
| 2698 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); |
|
| 2698 | + $large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
|
|
| 2699 | 2699 | |
| 2700 | 2700 | return $large_size_h; |
| 2701 | 2701 | } |
@@ -2712,8 +2712,8 @@ discard block |
||
| 2712 | 2712 | * |
| 2713 | 2713 | * @return string Sanitized name. |
| 2714 | 2714 | */ |
| 2715 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
|
|
| 2716 | - if ( $name == '' ) {
|
|
| 2715 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
|
|
| 2716 | + if ($name == '') {
|
|
| 2717 | 2717 | return null; |
| 2718 | 2718 | } |
| 2719 | 2719 | |
@@ -2722,13 +2722,13 @@ discard block |
||
| 2722 | 2722 | $type = $type == 'gd_city' ? 'city' : $type; |
| 2723 | 2723 | |
| 2724 | 2724 | $return = $name; |
| 2725 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 2726 | - $return = get_actual_location_name( $type, $name, $translate ); |
|
| 2725 | + if (function_exists('get_actual_location_name')) {
|
|
| 2726 | + $return = get_actual_location_name($type, $name, $translate); |
|
| 2727 | 2727 | } else {
|
| 2728 | - $return = preg_replace( '/-(\d+)$/', '', $return ); |
|
| 2729 | - $return = preg_replace( '/[_-]/', ' ', $return ); |
|
| 2730 | - $return = geodir_ucwords( $return ); |
|
| 2731 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; |
|
| 2728 | + $return = preg_replace('/-(\d+)$/', '', $return);
|
|
| 2729 | + $return = preg_replace('/[_-]/', ' ', $return);
|
|
| 2730 | + $return = geodir_ucwords($return); |
|
| 2731 | + $return = $translate ? __($return, 'geodirectory') : $return; |
|
| 2732 | 2732 | } |
| 2733 | 2733 | |
| 2734 | 2734 | return $return; |
@@ -2746,26 +2746,26 @@ discard block |
||
| 2746 | 2746 | * |
| 2747 | 2747 | * @param int $number Comments number. |
| 2748 | 2748 | */ |
| 2749 | -function geodir_comments_number( $number ) {
|
|
| 2749 | +function geodir_comments_number($number) {
|
|
| 2750 | 2750 | global $post; |
| 2751 | 2751 | |
| 2752 | - if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {
|
|
| 2752 | + if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {
|
|
| 2753 | 2753 | $number = get_comments_number(); |
| 2754 | 2754 | |
| 2755 | - if ( $number > 1 ) {
|
|
| 2756 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) ); |
|
| 2757 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2758 | - $output = __( 'No Comments', 'geodirectory' ); |
|
| 2755 | + if ($number > 1) {
|
|
| 2756 | + $output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));
|
|
| 2757 | + } elseif ($number == 0 || $number == '') {
|
|
| 2758 | + $output = __('No Comments', 'geodirectory');
|
|
| 2759 | 2759 | } else { // must be one
|
| 2760 | - $output = __( '1 Comment', 'geodirectory' ); |
|
| 2760 | + $output = __('1 Comment', 'geodirectory');
|
|
| 2761 | 2761 | } |
| 2762 | 2762 | } else {
|
| 2763 | - if ( $number > 1 ) {
|
|
| 2764 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); |
|
| 2765 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2766 | - $output = __( 'No Reviews', 'geodirectory' ); |
|
| 2763 | + if ($number > 1) {
|
|
| 2764 | + $output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
|
|
| 2765 | + } elseif ($number == 0 || $number == '') {
|
|
| 2766 | + $output = __('No Reviews', 'geodirectory');
|
|
| 2767 | 2767 | } else { // must be one
|
| 2768 | - $output = __( '1 Review', 'geodirectory' ); |
|
| 2768 | + $output = __('1 Review', 'geodirectory');
|
|
| 2769 | 2769 | } |
| 2770 | 2770 | } |
| 2771 | 2771 | |
@@ -2782,18 +2782,18 @@ discard block |
||
| 2782 | 2782 | */ |
| 2783 | 2783 | function is_page_geodir_home() {
|
| 2784 | 2784 | global $wpdb; |
| 2785 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); |
|
| 2786 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2787 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 2785 | + $cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
|
|
| 2786 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2787 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 2788 | 2788 | } |
| 2789 | - $home_url = home_url( '', 'http' ); |
|
| 2790 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2791 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 2789 | + $home_url = home_url('', 'http');
|
|
| 2790 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2791 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 2792 | 2792 | } |
| 2793 | - $home_url = str_replace( "www.", "", $home_url ); |
|
| 2794 | - if ( ( strpos( $home_url, $cur_url ) !== false || strpos( $home_url . '/', $cur_url ) !== false ) && ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) ) {
|
|
| 2793 | + $home_url = str_replace("www.", "", $home_url);
|
|
| 2794 | + if ((strpos($home_url, $cur_url) !== false || strpos($home_url.'/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {
|
|
| 2795 | 2795 | return true; |
| 2796 | - } elseif ( get_query_var( 'page_id' ) == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) {
|
|
| 2796 | + } elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {
|
|
| 2797 | 2797 | return true; |
| 2798 | 2798 | } else {
|
| 2799 | 2799 | return false; |
@@ -2813,18 +2813,18 @@ discard block |
||
| 2813 | 2813 | * |
| 2814 | 2814 | * @return string The canonical URL. |
| 2815 | 2815 | */ |
| 2816 | -function geodir_wpseo_homepage_canonical( $url ) {
|
|
| 2816 | +function geodir_wpseo_homepage_canonical($url) {
|
|
| 2817 | 2817 | global $post; |
| 2818 | 2818 | |
| 2819 | - if ( is_page_geodir_home() ) {
|
|
| 2819 | + if (is_page_geodir_home()) {
|
|
| 2820 | 2820 | return home_url(); |
| 2821 | 2821 | } |
| 2822 | 2822 | |
| 2823 | 2823 | return $url; |
| 2824 | 2824 | } |
| 2825 | 2825 | |
| 2826 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2827 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2826 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2827 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2828 | 2828 | |
| 2829 | 2829 | /** |
| 2830 | 2830 | * Add extra fields to google maps script call. |
@@ -2837,20 +2837,20 @@ discard block |
||
| 2837 | 2837 | * |
| 2838 | 2838 | * @return string Modified extra string. |
| 2839 | 2839 | */ |
| 2840 | -function geodir_googlemap_script_extra_details_page( $extra ) {
|
|
| 2840 | +function geodir_googlemap_script_extra_details_page($extra) {
|
|
| 2841 | 2841 | global $post; |
| 2842 | 2842 | $add_google_places_api = false; |
| 2843 | - if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 2843 | + if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 2844 | 2844 | $add_google_places_api = true; |
| 2845 | 2845 | } |
| 2846 | - if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
|
|
| 2846 | + if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
|
|
| 2847 | 2847 | $extra .= "&libraries=places"; |
| 2848 | 2848 | } |
| 2849 | 2849 | |
| 2850 | 2850 | return $extra; |
| 2851 | 2851 | } |
| 2852 | 2852 | |
| 2853 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); |
|
| 2853 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
|
|
| 2854 | 2854 | |
| 2855 | 2855 | |
| 2856 | 2856 | /** |
@@ -2869,122 +2869,122 @@ discard block |
||
| 2869 | 2869 | * after_widget. |
| 2870 | 2870 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2871 | 2871 | */ |
| 2872 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
|
|
| 2872 | +function geodir_popular_post_category_output($args = '', $instance = '') {
|
|
| 2873 | 2873 | // prints the widget |
| 2874 | 2874 | global $wpdb, $plugin_prefix, $geodir_post_category_str; |
| 2875 | - extract( $args, EXTR_SKIP ); |
|
| 2875 | + extract($args, EXTR_SKIP); |
|
| 2876 | 2876 | |
| 2877 | 2877 | echo $before_widget; |
| 2878 | 2878 | |
| 2879 | 2879 | /** This filter is documented in geodirectory_widgets.php */ |
| 2880 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2880 | + $title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2881 | 2881 | |
| 2882 | 2882 | $gd_post_type = geodir_get_current_posttype(); |
| 2883 | 2883 | |
| 2884 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2884 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2885 | 2885 | if (!isset($category_restrict)) {
|
| 2886 | 2886 | $category_restrict = false; |
| 2887 | 2887 | } |
| 2888 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2888 | + if (!empty($gd_post_type)) {
|
|
| 2889 | 2889 | $default_post_type = $gd_post_type; |
| 2890 | - } elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
|
|
| 2890 | + } elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
|
|
| 2891 | 2891 | $default_post_type = $instance['default_post_type']; |
| 2892 | 2892 | } else {
|
| 2893 | 2893 | $all_gd_post_type = geodir_get_posttypes(); |
| 2894 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; |
|
| 2894 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; |
|
| 2895 | 2895 | } |
| 2896 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; |
|
| 2896 | + $parent_only = !empty($instance['parent_only']) ? true : false; |
|
| 2897 | 2897 | |
| 2898 | 2898 | $taxonomy = array(); |
| 2899 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2900 | - $taxonomy[] = $gd_post_type . "category"; |
|
| 2899 | + if (!empty($gd_post_type)) {
|
|
| 2900 | + $taxonomy[] = $gd_post_type."category"; |
|
| 2901 | 2901 | } else {
|
| 2902 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); |
|
| 2902 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2903 | 2903 | } |
| 2904 | 2904 | |
| 2905 | 2905 | $taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);
|
| 2906 | 2906 | |
| 2907 | - $term_args = array( 'taxonomy' => $taxonomy ); |
|
| 2908 | - if ( $parent_only ) {
|
|
| 2907 | + $term_args = array('taxonomy' => $taxonomy);
|
|
| 2908 | + if ($parent_only) {
|
|
| 2909 | 2909 | $term_args['parent'] = 0; |
| 2910 | 2910 | } |
| 2911 | 2911 | |
| 2912 | - $terms = get_terms( $term_args ); |
|
| 2912 | + $terms = get_terms($term_args); |
|
| 2913 | 2913 | $a_terms = array(); |
| 2914 | 2914 | $b_terms = array(); |
| 2915 | 2915 | |
| 2916 | - foreach ( $terms as $term ) {
|
|
| 2917 | - if ( $term->count > 0 ) {
|
|
| 2918 | - $a_terms[ $term->taxonomy ][] = $term; |
|
| 2916 | + foreach ($terms as $term) {
|
|
| 2917 | + if ($term->count > 0) {
|
|
| 2918 | + $a_terms[$term->taxonomy][] = $term; |
|
| 2919 | 2919 | } |
| 2920 | 2920 | } |
| 2921 | 2921 | |
| 2922 | - if ( ! empty( $a_terms ) ) {
|
|
| 2922 | + if (!empty($a_terms)) {
|
|
| 2923 | 2923 | // Sort CPT taxonomies in categories widget. |
| 2924 | - if ( !empty( $taxonomy ) && is_array( $taxonomy ) && count( $taxonomy ) > 1 ) {
|
|
| 2924 | + if (!empty($taxonomy) && is_array($taxonomy) && count($taxonomy) > 1) {
|
|
| 2925 | 2925 | $gd_post_types = geodir_get_posttypes(); |
| 2926 | 2926 | $sort_taxonomies = array(); |
| 2927 | 2927 | |
| 2928 | - foreach ( $gd_post_types as $gd_post_type ) {
|
|
| 2929 | - $taxonomy_name = $gd_post_type . 'category'; |
|
| 2928 | + foreach ($gd_post_types as $gd_post_type) {
|
|
| 2929 | + $taxonomy_name = $gd_post_type.'category'; |
|
| 2930 | 2930 | |
| 2931 | - if ( !empty( $a_terms[$taxonomy_name] ) ) {
|
|
| 2931 | + if (!empty($a_terms[$taxonomy_name])) {
|
|
| 2932 | 2932 | $sort_taxonomies[$taxonomy_name] = $a_terms[$taxonomy_name]; |
| 2933 | 2933 | } |
| 2934 | 2934 | } |
| 2935 | - $a_terms = !empty( $sort_taxonomies ) ? $sort_taxonomies : $a_terms; |
|
| 2935 | + $a_terms = !empty($sort_taxonomies) ? $sort_taxonomies : $a_terms; |
|
| 2936 | 2936 | } |
| 2937 | 2937 | |
| 2938 | 2938 | $sort_by = apply_filters('geodir_pp_category_sort', 'count');
|
| 2939 | - foreach ( $a_terms as $b_key => $b_val ) {
|
|
| 2940 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, $sort_by ); |
|
| 2939 | + foreach ($a_terms as $b_key => $b_val) {
|
|
| 2940 | + $b_terms[$b_key] = geodir_sort_terms($b_val, $sort_by); |
|
| 2941 | 2941 | } |
| 2942 | 2942 | |
| 2943 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; |
|
| 2943 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; |
|
| 2944 | 2944 | |
| 2945 | 2945 | $tax_change_output = ''; |
| 2946 | - if ( count( $b_terms ) > 1 ) {
|
|
| 2947 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2948 | - foreach ( $b_terms as $key => $val ) {
|
|
| 2949 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); |
|
| 2950 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); |
|
| 2951 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; |
|
| 2946 | + if (count($b_terms) > 1) {
|
|
| 2947 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2948 | + foreach ($b_terms as $key => $val) {
|
|
| 2949 | + $ptype = get_post_type_object(str_replace("category", "", $key));
|
|
| 2950 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); |
|
| 2951 | + $tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
|
|
| 2952 | 2952 | } |
| 2953 | 2953 | $tax_change_output .= "</select>"; |
| 2954 | 2954 | } |
| 2955 | 2955 | |
| 2956 | - if ( ! empty( $b_terms ) ) {
|
|
| 2957 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array |
|
| 2958 | - global $cat_count;//make global so we can change via function |
|
| 2956 | + if (!empty($b_terms)) {
|
|
| 2957 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array |
|
| 2958 | + global $cat_count; //make global so we can change via function |
|
| 2959 | 2959 | $cat_count = 0; |
| 2960 | 2960 | ?> |
| 2961 | 2961 | <div class="geodir-category-list-in clearfix"> |
| 2962 | 2962 | <div class="geodir-cat-list clearfix"> |
| 2963 | 2963 | <?php |
| 2964 | - echo $before_title . __( $title ) . $after_title; |
|
| 2964 | + echo $before_title.__($title).$after_title; |
|
| 2965 | 2965 | |
| 2966 | 2966 | echo $tax_change_output; |
| 2967 | 2967 | |
| 2968 | 2968 | echo '<ul class="geodir-popular-cat-list">'; |
| 2969 | 2969 | |
| 2970 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); |
|
| 2970 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); |
|
| 2971 | 2971 | |
| 2972 | 2972 | echo '</ul>'; |
| 2973 | 2973 | ?> |
| 2974 | 2974 | </div> |
| 2975 | 2975 | <?php |
| 2976 | - if ( empty( $category_restrict ) ) {
|
|
| 2976 | + if (empty($category_restrict)) {
|
|
| 2977 | 2977 | $hide = ''; |
| 2978 | - if ( $cat_count < $category_limit ) {
|
|
| 2978 | + if ($cat_count < $category_limit) {
|
|
| 2979 | 2979 | $hide = 'style="display:none;"'; |
| 2980 | 2980 | } |
| 2981 | 2981 | echo "<div class='geodir-cat-list-more' $hide >"; |
| 2982 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; |
|
| 2983 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; |
|
| 2982 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
|
|
| 2983 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
|
|
| 2984 | 2984 | echo "</div>"; |
| 2985 | 2985 | } |
| 2986 | 2986 | /* add scripts */ |
| 2987 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); |
|
| 2987 | + add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
|
|
| 2988 | 2988 | ?> |
| 2989 | 2989 | </div> |
| 2990 | 2990 | <?php |
@@ -3004,28 +3004,28 @@ discard block |
||
| 3004 | 3004 | * @param int $category_limit Number of categories to display by default. |
| 3005 | 3005 | * @param bool $category_restrict If the cat limit should be hidden or not shown. |
| 3006 | 3006 | */ |
| 3007 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
|
|
| 3007 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
|
|
| 3008 | 3008 | global $geodir_post_category_str, $cat_count; |
| 3009 | 3009 | $term_icons = geodir_get_term_icon(); |
| 3010 | 3010 | |
| 3011 | 3011 | $geodir_post_category_str = array(); |
| 3012 | 3012 | |
| 3013 | 3013 | |
| 3014 | - foreach ( $terms as $cat ) {
|
|
| 3015 | - $post_type = str_replace( "category", "", $cat->taxonomy ); |
|
| 3016 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; |
|
| 3014 | + foreach ($terms as $cat) {
|
|
| 3015 | + $post_type = str_replace("category", "", $cat->taxonomy);
|
|
| 3016 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; |
|
| 3017 | 3017 | |
| 3018 | - $cat_count ++; |
|
| 3018 | + $cat_count++; |
|
| 3019 | 3019 | |
| 3020 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); |
|
| 3020 | + $geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
|
|
| 3021 | 3021 | |
| 3022 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3023 | - if($category_restrict && $cat_count > $category_limit ){
|
|
| 3022 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3023 | + if ($category_restrict && $cat_count > $category_limit) {
|
|
| 3024 | 3024 | continue; |
| 3025 | 3025 | } |
| 3026 | 3026 | $total_post = $cat->count; |
| 3027 | 3027 | |
| 3028 | - $term_link = get_term_link( $cat, $cat->taxonomy ); |
|
| 3028 | + $term_link = get_term_link($cat, $cat->taxonomy); |
|
| 3029 | 3029 | /** |
| 3030 | 3030 | * Filer the category term link. |
| 3031 | 3031 | * |
@@ -3035,11 +3035,11 @@ discard block |
||
| 3035 | 3035 | * @param int $cat ->term_id The term id. |
| 3036 | 3036 | * @param string $post_type Wordpress post type. |
| 3037 | 3037 | */ |
| 3038 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); |
|
| 3038 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
|
|
| 3039 | 3039 | |
| 3040 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; |
|
| 3041 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; |
|
| 3042 | - echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
|
|
| 3040 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; |
|
| 3041 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; |
|
| 3042 | + echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
|
|
| 3043 | 3043 | echo '</a></li>'; |
| 3044 | 3044 | } |
| 3045 | 3045 | } |
@@ -3054,14 +3054,14 @@ discard block |
||
| 3054 | 3054 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3055 | 3055 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3056 | 3056 | */ |
| 3057 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
|
|
| 3057 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
|
|
| 3058 | 3058 | // prints the widget |
| 3059 | - extract( $args, EXTR_SKIP ); |
|
| 3059 | + extract($args, EXTR_SKIP); |
|
| 3060 | 3060 | |
| 3061 | 3061 | echo $before_widget; |
| 3062 | 3062 | |
| 3063 | 3063 | /** This filter is documented in geodirectory_widgets.php */ |
| 3064 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3064 | + $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3065 | 3065 | /** |
| 3066 | 3066 | * Filter the widget post type. |
| 3067 | 3067 | * |
@@ -3069,7 +3069,7 @@ discard block |
||
| 3069 | 3069 | * |
| 3070 | 3070 | * @param string $instance ['post_type'] Post type of listing. |
| 3071 | 3071 | */ |
| 3072 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3072 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3073 | 3073 | /** |
| 3074 | 3074 | * Filter the widget's term. |
| 3075 | 3075 | * |
@@ -3077,7 +3077,7 @@ discard block |
||
| 3077 | 3077 | * |
| 3078 | 3078 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3079 | 3079 | */ |
| 3080 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3080 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3081 | 3081 | /** |
| 3082 | 3082 | * Filter widget's "add_location_filter" value. |
| 3083 | 3083 | * |
@@ -3085,7 +3085,7 @@ discard block |
||
| 3085 | 3085 | * |
| 3086 | 3086 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3087 | 3087 | */ |
| 3088 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3088 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3089 | 3089 | /** |
| 3090 | 3090 | * Filter the widget listings limit. |
| 3091 | 3091 | * |
@@ -3093,7 +3093,7 @@ discard block |
||
| 3093 | 3093 | * |
| 3094 | 3094 | * @param string $instance ['post_number'] Number of listings to display. |
| 3095 | 3095 | */ |
| 3096 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3096 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3097 | 3097 | /** |
| 3098 | 3098 | * Filter the widget listings limit shown at one time. |
| 3099 | 3099 | * |
@@ -3101,7 +3101,7 @@ discard block |
||
| 3101 | 3101 | * |
| 3102 | 3102 | * @param string $instance ['max_show'] Number of listings to display on screen. |
| 3103 | 3103 | */ |
| 3104 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); |
|
| 3104 | + $max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
|
|
| 3105 | 3105 | /** |
| 3106 | 3106 | * Filter the widget slide width. |
| 3107 | 3107 | * |
@@ -3109,7 +3109,7 @@ discard block |
||
| 3109 | 3109 | * |
| 3110 | 3110 | * @param string $instance ['slide_width'] Width of the slides shown. |
| 3111 | 3111 | */ |
| 3112 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); |
|
| 3112 | + $slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
|
|
| 3113 | 3113 | /** |
| 3114 | 3114 | * Filter widget's "show title" value. |
| 3115 | 3115 | * |
@@ -3117,7 +3117,7 @@ discard block |
||
| 3117 | 3117 | * |
| 3118 | 3118 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. |
| 3119 | 3119 | */ |
| 3120 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); |
|
| 3120 | + $show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
|
|
| 3121 | 3121 | /** |
| 3122 | 3122 | * Filter widget's "slideshow" value. |
| 3123 | 3123 | * |
@@ -3125,7 +3125,7 @@ discard block |
||
| 3125 | 3125 | * |
| 3126 | 3126 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. |
| 3127 | 3127 | */ |
| 3128 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); |
|
| 3128 | + $slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
|
|
| 3129 | 3129 | /** |
| 3130 | 3130 | * Filter widget's "animationLoop" value. |
| 3131 | 3131 | * |
@@ -3133,7 +3133,7 @@ discard block |
||
| 3133 | 3133 | * |
| 3134 | 3134 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. |
| 3135 | 3135 | */ |
| 3136 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); |
|
| 3136 | + $animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
|
|
| 3137 | 3137 | /** |
| 3138 | 3138 | * Filter widget's "directionNav" value. |
| 3139 | 3139 | * |
@@ -3141,7 +3141,7 @@ discard block |
||
| 3141 | 3141 | * |
| 3142 | 3142 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. |
| 3143 | 3143 | */ |
| 3144 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); |
|
| 3144 | + $directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
|
|
| 3145 | 3145 | /** |
| 3146 | 3146 | * Filter widget's "slideshowSpeed" value. |
| 3147 | 3147 | * |
@@ -3149,7 +3149,7 @@ discard block |
||
| 3149 | 3149 | * |
| 3150 | 3150 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. |
| 3151 | 3151 | */ |
| 3152 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); |
|
| 3152 | + $slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
|
|
| 3153 | 3153 | /** |
| 3154 | 3154 | * Filter widget's "animationSpeed" value. |
| 3155 | 3155 | * |
@@ -3157,7 +3157,7 @@ discard block |
||
| 3157 | 3157 | * |
| 3158 | 3158 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. |
| 3159 | 3159 | */ |
| 3160 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); |
|
| 3160 | + $animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
|
|
| 3161 | 3161 | /** |
| 3162 | 3162 | * Filter widget's "animation" value. |
| 3163 | 3163 | * |
@@ -3165,7 +3165,7 @@ discard block |
||
| 3165 | 3165 | * |
| 3166 | 3166 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". |
| 3167 | 3167 | */ |
| 3168 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); |
|
| 3168 | + $animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
|
|
| 3169 | 3169 | /** |
| 3170 | 3170 | * Filter widget's "list_sort" type. |
| 3171 | 3171 | * |
@@ -3173,10 +3173,10 @@ discard block |
||
| 3173 | 3173 | * |
| 3174 | 3174 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3175 | 3175 | */ |
| 3176 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3177 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; |
|
| 3176 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3177 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; |
|
| 3178 | 3178 | |
| 3179 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); |
|
| 3179 | + wp_enqueue_script('geodirectory-jquery-flexslider-js');
|
|
| 3180 | 3180 | ?> |
| 3181 | 3181 | <script type="text/javascript"> |
| 3182 | 3182 | jQuery(window).load(function () {
|
@@ -3195,7 +3195,7 @@ discard block |
||
| 3195 | 3195 | itemWidth: 75, |
| 3196 | 3196 | itemMargin: 5, |
| 3197 | 3197 | asNavFor: '#geodir_widget_slider', |
| 3198 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>, |
|
| 3198 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>, |
|
| 3199 | 3199 | start: function (slider) {
|
| 3200 | 3200 | // chrome 53 introduced a bug, so we need to repaint the slider when shown. |
| 3201 | 3201 | jQuery('.geodir-slides', jQuery(slider)).removeClass('flexslider-fix-rtl');
|
@@ -3203,19 +3203,19 @@ discard block |
||
| 3203 | 3203 | }); |
| 3204 | 3204 | |
| 3205 | 3205 | jQuery('#geodir_widget_slider').flexslider({
|
| 3206 | - animation: "<?php echo $animation;?>", |
|
| 3206 | + animation: "<?php echo $animation; ?>", |
|
| 3207 | 3207 | selector: ".geodir-slides > li", |
| 3208 | 3208 | namespace: "geodir-", |
| 3209 | 3209 | controlNav: true, |
| 3210 | - animationLoop: <?php echo $animationLoop;?>, |
|
| 3211 | - slideshow: <?php echo $slideshow;?>, |
|
| 3212 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, |
|
| 3213 | - animationSpeed: <?php echo $animationSpeed;?>, |
|
| 3214 | - directionNav: <?php echo $directionNav;?>, |
|
| 3215 | - maxItems: <?php echo $max_show;?>, |
|
| 3210 | + animationLoop: <?php echo $animationLoop; ?>, |
|
| 3211 | + slideshow: <?php echo $slideshow; ?>, |
|
| 3212 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, |
|
| 3213 | + animationSpeed: <?php echo $animationSpeed; ?>, |
|
| 3214 | + directionNav: <?php echo $directionNav; ?>, |
|
| 3215 | + maxItems: <?php echo $max_show; ?>, |
|
| 3216 | 3216 | move: 1, |
| 3217 | - <?php if ( $slide_width ) {
|
|
| 3218 | - echo "itemWidth: " . $slide_width . ","; |
|
| 3217 | + <?php if ($slide_width) {
|
|
| 3218 | + echo "itemWidth: ".$slide_width.","; |
|
| 3219 | 3219 | }?> |
| 3220 | 3220 | sync: "#geodir_widget_carousel", |
| 3221 | 3221 | start: function (slider) {
|
@@ -3226,7 +3226,7 @@ discard block |
||
| 3226 | 3226 | jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
|
| 3227 | 3227 | jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
|
| 3228 | 3228 | }, |
| 3229 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3229 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3230 | 3230 | }); |
| 3231 | 3231 | }); |
| 3232 | 3232 | </script> |
@@ -3239,62 +3239,62 @@ discard block |
||
| 3239 | 3239 | 'order_by' => $list_sort |
| 3240 | 3240 | ); |
| 3241 | 3241 | |
| 3242 | - if ( $show_featured_only ) {
|
|
| 3242 | + if ($show_featured_only) {
|
|
| 3243 | 3243 | $query_args['show_featured_only'] = 1; |
| 3244 | 3244 | } |
| 3245 | 3245 | |
| 3246 | - if ( $category != 0 || $category != '' ) {
|
|
| 3247 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3246 | + if ($category != 0 || $category != '') {
|
|
| 3247 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3248 | 3248 | $tax_query = array( |
| 3249 | 3249 | 'taxonomy' => $category_taxonomy[0], |
| 3250 | 3250 | 'field' => 'id', |
| 3251 | 3251 | 'terms' => $category |
| 3252 | 3252 | ); |
| 3253 | 3253 | |
| 3254 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3254 | + $query_args['tax_query'] = array($tax_query); |
|
| 3255 | 3255 | } |
| 3256 | 3256 | |
| 3257 | 3257 | // we want listings with featured image only |
| 3258 | 3258 | $query_args['featured_image_only'] = 1; |
| 3259 | 3259 | |
| 3260 | - if ( $post_type == 'gd_event' ) {
|
|
| 3260 | + if ($post_type == 'gd_event') {
|
|
| 3261 | 3261 | $query_args['gedir_event_listing_filter'] = 'upcoming'; |
| 3262 | 3262 | }// show only upcoming events |
| 3263 | 3263 | |
| 3264 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3265 | - if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
|
|
| 3266 | - if ( $title ) {
|
|
| 3267 | - echo $before_title . $title . $after_title; |
|
| 3264 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3265 | + if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
|
|
| 3266 | + if ($title) {
|
|
| 3267 | + echo $before_title.$title.$after_title; |
|
| 3268 | 3268 | } |
| 3269 | 3269 | |
| 3270 | 3270 | global $post; |
| 3271 | 3271 | |
| 3272 | - $current_post = $post;// keep current post info |
|
| 3272 | + $current_post = $post; // keep current post info |
|
| 3273 | 3273 | |
| 3274 | 3274 | $widget_main_slides = ''; |
| 3275 | 3275 | $nav_slides = ''; |
| 3276 | 3276 | $widget_slides = 0; |
| 3277 | 3277 | |
| 3278 | - foreach ( $widget_listings as $widget_listing ) {
|
|
| 3278 | + foreach ($widget_listings as $widget_listing) {
|
|
| 3279 | 3279 | global $gd_widget_listing_type; |
| 3280 | 3280 | $post = $widget_listing; |
| 3281 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); |
|
| 3281 | + $widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 3282 | 3282 | |
| 3283 | - if ( ! empty( $widget_image ) ) {
|
|
| 3284 | - if ( $widget_image->height >= 200 ) {
|
|
| 3283 | + if (!empty($widget_image)) {
|
|
| 3284 | + if ($widget_image->height >= 200) {
|
|
| 3285 | 3285 | $widget_spacer_height = 0; |
| 3286 | 3286 | } else {
|
| 3287 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); |
|
| 3287 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); |
|
| 3288 | 3288 | } |
| 3289 | 3289 | |
| 3290 | - $widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:' . $widget_spacer_height . 'px !important;margin:0 auto;" width="100" />'; |
|
| 3290 | + $widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:'.$widget_spacer_height.'px !important;margin:0 auto;" width="100" />'; |
|
| 3291 | 3291 | |
| 3292 | 3292 | $title = ''; |
| 3293 | - if ( $show_title ) {
|
|
| 3294 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; |
|
| 3293 | + if ($show_title) {
|
|
| 3294 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; |
|
| 3295 | 3295 | $post_id = $post->ID; |
| 3296 | - $post_permalink = get_permalink( $post->ID ); |
|
| 3297 | - $post_title = get_the_title( $post->ID ); |
|
| 3296 | + $post_permalink = get_permalink($post->ID); |
|
| 3297 | + $post_title = get_the_title($post->ID); |
|
| 3298 | 3298 | /** |
| 3299 | 3299 | * Filter the listing slider widget title. |
| 3300 | 3300 | * |
@@ -3305,12 +3305,12 @@ discard block |
||
| 3305 | 3305 | * @param string $post_permalink The post permalink url. |
| 3306 | 3306 | * @param string $post_title The post title text. |
| 3307 | 3307 | */ |
| 3308 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); |
|
| 3308 | + $title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
|
|
| 3309 | 3309 | } |
| 3310 | 3310 | |
| 3311 | - $widget_main_slides .= $title . '<a href="' . get_permalink( $post->ID ) . '"><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></a></li>'; |
|
| 3312 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3313 | - $widget_slides ++; |
|
| 3311 | + $widget_main_slides .= $title.'<a href="'.get_permalink($post->ID).'"><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></a></li>'; |
|
| 3312 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3313 | + $widget_slides++; |
|
| 3314 | 3314 | } |
| 3315 | 3315 | } |
| 3316 | 3316 | ?> |
@@ -3319,7 +3319,7 @@ discard block |
||
| 3319 | 3319 | <div id="geodir_widget_slider" class="geodir_flexslider"> |
| 3320 | 3320 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> |
| 3321 | 3321 | </div> |
| 3322 | - <?php if ( $widget_slides > 1 ) { ?>
|
|
| 3322 | + <?php if ($widget_slides > 1) { ?>
|
|
| 3323 | 3323 | <div id="geodir_widget_carousel" class="geodir_flexslider"> |
| 3324 | 3324 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> |
| 3325 | 3325 | </div> |
@@ -3327,7 +3327,7 @@ discard block |
||
| 3327 | 3327 | </div> |
| 3328 | 3328 | <?php |
| 3329 | 3329 | $GLOBALS['post'] = $current_post; |
| 3330 | - setup_postdata( $current_post ); |
|
| 3330 | + setup_postdata($current_post); |
|
| 3331 | 3331 | } |
| 3332 | 3332 | echo $after_widget; |
| 3333 | 3333 | } |
@@ -3343,50 +3343,50 @@ discard block |
||
| 3343 | 3343 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3344 | 3344 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3345 | 3345 | */ |
| 3346 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
|
|
| 3346 | +function geodir_loginwidget_output($args = '', $instance = '') {
|
|
| 3347 | 3347 | //print_r($args); |
| 3348 | 3348 | //print_r($instance); |
| 3349 | 3349 | // prints the widget |
| 3350 | - extract( $args, EXTR_SKIP ); |
|
| 3350 | + extract($args, EXTR_SKIP); |
|
| 3351 | 3351 | |
| 3352 | 3352 | /** This filter is documented in geodirectory_widgets.php */ |
| 3353 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3353 | + $title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3354 | 3354 | |
| 3355 | 3355 | echo $before_widget; |
| 3356 | - echo $before_title . $title . $after_title; |
|
| 3356 | + echo $before_title.$title.$after_title; |
|
| 3357 | 3357 | |
| 3358 | 3358 | // global $gd_session; |
| 3359 | 3359 | // print_r($gd_session); |
| 3360 | 3360 | // print_r($_SESSION); |
| 3361 | 3361 | |
| 3362 | - if ( is_user_logged_in() ) {
|
|
| 3362 | + if (is_user_logged_in()) {
|
|
| 3363 | 3363 | global $current_user; |
| 3364 | 3364 | |
| 3365 | - $author_link = get_author_posts_url( $current_user->data->ID ); |
|
| 3366 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 3365 | + $author_link = get_author_posts_url($current_user->data->ID); |
|
| 3366 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
|
|
| 3367 | 3367 | |
| 3368 | 3368 | echo '<ul class="geodir-loginbox-list">'; |
| 3369 | 3369 | ob_start(); |
| 3370 | 3370 | ?> |
| 3371 | 3371 | <li><a class="signin" |
| 3372 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> |
|
| 3372 | + href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
|
|
| 3373 | 3373 | <?php |
| 3374 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 3375 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); |
|
| 3376 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); |
|
| 3374 | + $post_types = geodir_get_posttypes('object');
|
|
| 3375 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
|
|
| 3376 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 3377 | 3377 | |
| 3378 | - if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
|
|
| 3378 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 3379 | 3379 | $addlisting_links = ''; |
| 3380 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3380 | + foreach ($post_types as $key => $postobj) {
|
|
| 3381 | 3381 | |
| 3382 | - if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
|
|
| 3382 | + if (in_array($key, $show_add_listing_post_types_main_nav)) {
|
|
| 3383 | 3383 | |
| 3384 | - if ( $add_link = geodir_get_addlisting_link( $key ) ) {
|
|
| 3384 | + if ($add_link = geodir_get_addlisting_link($key)) {
|
|
| 3385 | 3385 | |
| 3386 | 3386 | $name = $postobj->labels->name; |
| 3387 | 3387 | |
| 3388 | 3388 | $selected = ''; |
| 3389 | - if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
|
|
| 3389 | + if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
|
|
| 3390 | 3390 | $selected = 'selected="selected"'; |
| 3391 | 3391 | } |
| 3392 | 3392 | |
@@ -3399,23 +3399,23 @@ discard block |
||
| 3399 | 3399 | * @param string $key Add listing array key. |
| 3400 | 3400 | * @param int $current_user ->ID Current user ID. |
| 3401 | 3401 | */ |
| 3402 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); |
|
| 3403 | - $name = apply_filters( 'geodir_dashboard_label_add_listing', $name, $key, $current_user->ID ); |
|
| 3402 | + $add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
|
|
| 3403 | + $name = apply_filters('geodir_dashboard_label_add_listing', $name, $key, $current_user->ID);
|
|
| 3404 | 3404 | |
| 3405 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3405 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3406 | 3406 | |
| 3407 | 3407 | } |
| 3408 | 3408 | } |
| 3409 | 3409 | |
| 3410 | 3410 | } |
| 3411 | 3411 | |
| 3412 | - if ( $addlisting_links != '' ) { ?>
|
|
| 3412 | + if ($addlisting_links != '') { ?>
|
|
| 3413 | 3413 | |
| 3414 | 3414 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" |
| 3415 | 3415 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" |
| 3416 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> |
|
| 3416 | + data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
|
|
| 3417 | 3417 | <option value="" disabled="disabled" selected="selected" |
| 3418 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> |
|
| 3418 | + style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
|
|
| 3419 | 3419 | <?php echo $addlisting_links; ?> |
| 3420 | 3420 | </select></li> <?php |
| 3421 | 3421 | |
@@ -3423,24 +3423,24 @@ discard block |
||
| 3423 | 3423 | |
| 3424 | 3424 | } |
| 3425 | 3425 | // My Favourites in Dashboard |
| 3426 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 3426 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
|
|
| 3427 | 3427 | $user_favourite = geodir_user_favourite_listing_count(); |
| 3428 | 3428 | |
| 3429 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
|
|
| 3429 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
|
|
| 3430 | 3430 | $favourite_links = ''; |
| 3431 | 3431 | |
| 3432 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3433 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
|
|
| 3432 | + foreach ($post_types as $key => $postobj) {
|
|
| 3433 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
|
|
| 3434 | 3434 | $name = $postobj->labels->name; |
| 3435 | 3435 | $fav_author_link = apply_filters('gd_dash_fav_author_link', $author_link, $current_user->data->ID);
|
| 3436 | - $post_type_link = geodir_getlink( $fav_author_link, array( |
|
| 3436 | + $post_type_link = geodir_getlink($fav_author_link, array( |
|
| 3437 | 3437 | 'stype' => $key, |
| 3438 | 3438 | 'list' => 'favourite' |
| 3439 | - ), false ); |
|
| 3439 | + ), false); |
|
| 3440 | 3440 | |
| 3441 | 3441 | $selected = ''; |
| 3442 | 3442 | |
| 3443 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 3443 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 3444 | 3444 | $selected = 'selected="selected"'; |
| 3445 | 3445 | } |
| 3446 | 3446 | /** |
@@ -3452,20 +3452,20 @@ discard block |
||
| 3452 | 3452 | * @param string $key Favorite listing array key. |
| 3453 | 3453 | * @param int $current_user ->ID Current user ID. |
| 3454 | 3454 | */ |
| 3455 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); |
|
| 3455 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
|
|
| 3456 | 3456 | |
| 3457 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3457 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3458 | 3458 | } |
| 3459 | 3459 | } |
| 3460 | 3460 | |
| 3461 | - if ( $favourite_links != '' ) {
|
|
| 3461 | + if ($favourite_links != '') {
|
|
| 3462 | 3462 | ?> |
| 3463 | 3463 | <li> |
| 3464 | 3464 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 3465 | 3465 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
| 3466 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> |
|
| 3466 | + data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
|
|
| 3467 | 3467 | <option value="" disabled="disabled" selected="selected" |
| 3468 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> |
|
| 3468 | + style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
|
|
| 3469 | 3469 | <?php echo $favourite_links; ?> |
| 3470 | 3470 | </select> |
| 3471 | 3471 | </li> |
@@ -3474,20 +3474,20 @@ discard block |
||
| 3474 | 3474 | } |
| 3475 | 3475 | |
| 3476 | 3476 | |
| 3477 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 3477 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
|
|
| 3478 | 3478 | $user_listing = geodir_user_post_listing_count(); |
| 3479 | 3479 | |
| 3480 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
|
|
| 3480 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
|
|
| 3481 | 3481 | $listing_links = ''; |
| 3482 | 3482 | |
| 3483 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3484 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
|
|
| 3483 | + foreach ($post_types as $key => $postobj) {
|
|
| 3484 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
|
|
| 3485 | 3485 | $name = $postobj->labels->name; |
| 3486 | 3486 | $listing_author_link = apply_filters('gd_dash_listing_author_link', $author_link, $current_user->data->ID);
|
| 3487 | - $listing_link = geodir_getlink( $listing_author_link, array( 'stype' => $key ), false ); |
|
| 3487 | + $listing_link = geodir_getlink($listing_author_link, array('stype' => $key), false);
|
|
| 3488 | 3488 | |
| 3489 | 3489 | $selected = ''; |
| 3490 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
|
|
| 3490 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
|
|
| 3491 | 3491 | $selected = 'selected="selected"'; |
| 3492 | 3492 | } |
| 3493 | 3493 | |
@@ -3500,20 +3500,20 @@ discard block |
||
| 3500 | 3500 | * @param string $key My listing array key. |
| 3501 | 3501 | * @param int $current_user ->ID Current user ID. |
| 3502 | 3502 | */ |
| 3503 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); |
|
| 3503 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
|
|
| 3504 | 3504 | |
| 3505 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3505 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3506 | 3506 | } |
| 3507 | 3507 | } |
| 3508 | 3508 | |
| 3509 | - if ( $listing_links != '' ) {
|
|
| 3509 | + if ($listing_links != '') {
|
|
| 3510 | 3510 | ?> |
| 3511 | 3511 | <li> |
| 3512 | 3512 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 3513 | 3513 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
| 3514 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> |
|
| 3514 | + data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
|
|
| 3515 | 3515 | <option value="" disabled="disabled" selected="selected" |
| 3516 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> |
|
| 3516 | + style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
|
|
| 3517 | 3517 | <?php echo $listing_links; ?> |
| 3518 | 3518 | </select> |
| 3519 | 3519 | </li> |
@@ -3529,7 +3529,7 @@ discard block |
||
| 3529 | 3529 | * |
| 3530 | 3530 | * @param string $dashboard_link Dashboard links HTML. |
| 3531 | 3531 | */ |
| 3532 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); |
|
| 3532 | + echo apply_filters('geodir_dashboard_links', $dashboard_link);
|
|
| 3533 | 3533 | echo '</ul>'; |
| 3534 | 3534 | |
| 3535 | 3535 | /** |
@@ -3537,7 +3537,7 @@ discard block |
||
| 3537 | 3537 | * |
| 3538 | 3538 | * @since 1.6.6 |
| 3539 | 3539 | */ |
| 3540 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); |
|
| 3540 | + do_action('geodir_after_loginwidget_form_logged_in');
|
|
| 3541 | 3541 | |
| 3542 | 3542 | |
| 3543 | 3543 | } else {
|
@@ -3552,18 +3552,18 @@ discard block |
||
| 3552 | 3552 | <form name="loginform" class="loginform1" |
| 3553 | 3553 | action="<?php echo geodir_login_url(); ?>" |
| 3554 | 3554 | method="post"> |
| 3555 | - <div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __( 'Email', 'geodirectory' )); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"
|
|
| 3555 | + <div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __('Email', 'geodirectory')); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"
|
|
| 3556 | 3556 | type="text" class="textfield user_login1"/> <span |
| 3557 | 3557 | class="user_loginInfo"></span></div> |
| 3558 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" |
|
| 3558 | + <div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
|
|
| 3559 | 3559 | name="<?php echo apply_filters('gd_login_wid_login_pwd', 'pwd'); ?>" type="password"
|
| 3560 | 3560 | class="textfield user_pass1 input-text"/><span |
| 3561 | 3561 | class="user_passInfo"></span></div> |
| 3562 | 3562 | |
| 3563 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> |
|
| 3563 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> |
|
| 3564 | 3564 | <input type="hidden" name="testcookie" value="1"/> |
| 3565 | 3565 | |
| 3566 | - <?php do_action( 'login_form' ); ?> |
|
| 3566 | + <?php do_action('login_form'); ?>
|
|
| 3567 | 3567 | |
| 3568 | 3568 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" |
| 3569 | 3569 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> |
@@ -3575,11 +3575,11 @@ discard block |
||
| 3575 | 3575 | * |
| 3576 | 3576 | * @since 1.0.0 |
| 3577 | 3577 | */ |
| 3578 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 3578 | + $is_enable_signup = get_option('users_can_register');
|
|
| 3579 | 3579 | |
| 3580 | - if ( $is_enable_signup ) {
|
|
| 3580 | + if ($is_enable_signup) {
|
|
| 3581 | 3581 | ?> |
| 3582 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" |
|
| 3582 | + <a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
|
|
| 3583 | 3583 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> |
| 3584 | 3584 | |
| 3585 | 3585 | <?php |
@@ -3590,7 +3590,7 @@ discard block |
||
| 3590 | 3590 | * @since 1.0.0 |
| 3591 | 3591 | */ |
| 3592 | 3592 | ?> |
| 3593 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" |
|
| 3593 | + <a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
|
|
| 3594 | 3594 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> |
| 3595 | 3595 | </form> |
| 3596 | 3596 | <?php |
@@ -3599,7 +3599,7 @@ discard block |
||
| 3599 | 3599 | * |
| 3600 | 3600 | * @since 1.6.6 |
| 3601 | 3601 | */ |
| 3602 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); |
|
| 3602 | + do_action('geodir_after_loginwidget_form_logged_out');
|
|
| 3603 | 3603 | } |
| 3604 | 3604 | |
| 3605 | 3605 | echo $after_widget; |
@@ -3622,13 +3622,13 @@ discard block |
||
| 3622 | 3622 | * after_widget. |
| 3623 | 3623 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3624 | 3624 | */ |
| 3625 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
|
|
| 3625 | +function geodir_popular_postview_output($args = '', $instance = '') {
|
|
| 3626 | 3626 | global $gd_session; |
| 3627 | 3627 | |
| 3628 | 3628 | // prints the widget |
| 3629 | - extract( $args, EXTR_SKIP ); |
|
| 3629 | + extract($args, EXTR_SKIP); |
|
| 3630 | 3630 | /** This filter is documented in geodirectory_widgets.php */ |
| 3631 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3631 | + $title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3632 | 3632 | /** |
| 3633 | 3633 | * Filter the widget post type. |
| 3634 | 3634 | * |
@@ -3636,7 +3636,7 @@ discard block |
||
| 3636 | 3636 | * |
| 3637 | 3637 | * @param string $instance ['post_type'] Post type of listing. |
| 3638 | 3638 | */ |
| 3639 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3639 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3640 | 3640 | /** |
| 3641 | 3641 | * Filter the widget's term. |
| 3642 | 3642 | * |
@@ -3644,7 +3644,7 @@ discard block |
||
| 3644 | 3644 | * |
| 3645 | 3645 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3646 | 3646 | */ |
| 3647 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3647 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3648 | 3648 | /** |
| 3649 | 3649 | * Filter the widget listings limit. |
| 3650 | 3650 | * |
@@ -3652,7 +3652,7 @@ discard block |
||
| 3652 | 3652 | * |
| 3653 | 3653 | * @param string $instance ['post_number'] Number of listings to display. |
| 3654 | 3654 | */ |
| 3655 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3655 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3656 | 3656 | /** |
| 3657 | 3657 | * Filter widget's "layout" type. |
| 3658 | 3658 | * |
@@ -3660,7 +3660,7 @@ discard block |
||
| 3660 | 3660 | * |
| 3661 | 3661 | * @param string $instance ['layout'] Widget layout type. |
| 3662 | 3662 | */ |
| 3663 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); |
|
| 3663 | + $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
|
|
| 3664 | 3664 | /** |
| 3665 | 3665 | * Filter widget's "add_location_filter" value. |
| 3666 | 3666 | * |
@@ -3668,7 +3668,7 @@ discard block |
||
| 3668 | 3668 | * |
| 3669 | 3669 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3670 | 3670 | */ |
| 3671 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3671 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3672 | 3672 | /** |
| 3673 | 3673 | * Filter widget's listing width. |
| 3674 | 3674 | * |
@@ -3676,7 +3676,7 @@ discard block |
||
| 3676 | 3676 | * |
| 3677 | 3677 | * @param string $instance ['listing_width'] Listing width. |
| 3678 | 3678 | */ |
| 3679 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); |
|
| 3679 | + $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
|
|
| 3680 | 3680 | /** |
| 3681 | 3681 | * Filter widget's "list_sort" type. |
| 3682 | 3682 | * |
@@ -3684,7 +3684,7 @@ discard block |
||
| 3684 | 3684 | * |
| 3685 | 3685 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3686 | 3686 | */ |
| 3687 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3687 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3688 | 3688 | /** |
| 3689 | 3689 | * Filter widget's "title_tag" type. |
| 3690 | 3690 | * |
@@ -3692,36 +3692,36 @@ discard block |
||
| 3692 | 3692 | * |
| 3693 | 3693 | * @param string $instance ['title_tag'] Listing title tag. |
| 3694 | 3694 | */ |
| 3695 | - $title_tag = empty( $instance['title_tag'] ) ? 'h3' : apply_filters( 'widget_title_tag', $instance['title_tag'] ); |
|
| 3696 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; |
|
| 3695 | + $title_tag = empty($instance['title_tag']) ? 'h3' : apply_filters('widget_title_tag', $instance['title_tag']);
|
|
| 3696 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; |
|
| 3697 | 3697 | |
| 3698 | 3698 | // set post type to current viewing post type |
| 3699 | - if ( $use_viewing_post_type ) {
|
|
| 3699 | + if ($use_viewing_post_type) {
|
|
| 3700 | 3700 | $current_post_type = geodir_get_current_posttype(); |
| 3701 | - if ( $current_post_type != '' && $current_post_type != $post_type ) {
|
|
| 3701 | + if ($current_post_type != '' && $current_post_type != $post_type) {
|
|
| 3702 | 3702 | $post_type = $current_post_type; |
| 3703 | 3703 | $category = array(); // old post type category will not work for current changed post type |
| 3704 | 3704 | } |
| 3705 | 3705 | } |
| 3706 | 3706 | // replace widget title dynamically |
| 3707 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3708 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); |
|
| 3707 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3708 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); |
|
| 3709 | 3709 | |
| 3710 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); |
|
| 3711 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); |
|
| 3710 | + $title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
|
|
| 3711 | + $title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
|
|
| 3712 | 3712 | |
| 3713 | 3713 | $categories = $category; |
| 3714 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3715 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3714 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3715 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3716 | 3716 | |
| 3717 | 3717 | ######### WPML ######### |
| 3718 | - if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
|
|
| 3719 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); |
|
| 3718 | + if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
|
|
| 3719 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); |
|
| 3720 | 3720 | } |
| 3721 | 3721 | ######### WPML ######### |
| 3722 | 3722 | } |
| 3723 | 3723 | |
| 3724 | - if ( isset( $instance['character_count'] ) ) {
|
|
| 3724 | + if (isset($instance['character_count'])) {
|
|
| 3725 | 3725 | /** |
| 3726 | 3726 | * Filter the widget's excerpt character count. |
| 3727 | 3727 | * |
@@ -3729,38 +3729,38 @@ discard block |
||
| 3729 | 3729 | * |
| 3730 | 3730 | * @param int $instance ['character_count'] Excerpt character count. |
| 3731 | 3731 | */ |
| 3732 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); |
|
| 3732 | + $character_count = apply_filters('widget_list_character_count', $instance['character_count']);
|
|
| 3733 | 3733 | } else {
|
| 3734 | 3734 | $character_count = ''; |
| 3735 | 3735 | } |
| 3736 | 3736 | |
| 3737 | - if ( empty( $title ) || $title == 'All' ) {
|
|
| 3738 | - $post_type_name = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3739 | - $title = !empty( $title ) ? wp_sprintf( __( 'All %s', 'geodirectory' ), $post_type_name ) : $post_type_name; |
|
| 3737 | + if (empty($title) || $title == 'All') {
|
|
| 3738 | + $post_type_name = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3739 | + $title = !empty($title) ? wp_sprintf(__('All %s', 'geodirectory'), $post_type_name) : $post_type_name;
|
|
| 3740 | 3740 | } |
| 3741 | 3741 | |
| 3742 | 3742 | $location_url = array(); |
| 3743 | - $city = get_query_var( 'gd_city' ); |
|
| 3744 | - if ( ! empty( $city ) ) {
|
|
| 3745 | - $country = get_query_var( 'gd_country' ); |
|
| 3746 | - $region = get_query_var( 'gd_region' ); |
|
| 3743 | + $city = get_query_var('gd_city');
|
|
| 3744 | + if (!empty($city)) {
|
|
| 3745 | + $country = get_query_var('gd_country');
|
|
| 3746 | + $region = get_query_var('gd_region');
|
|
| 3747 | 3747 | |
| 3748 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 3748 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 3749 | 3749 | |
| 3750 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 3751 | - if ( $country != '' ) {
|
|
| 3750 | + if ($geodir_show_location_url == 'all') {
|
|
| 3751 | + if ($country != '') {
|
|
| 3752 | 3752 | $location_url[] = $country; |
| 3753 | 3753 | } |
| 3754 | 3754 | |
| 3755 | - if ( $region != '' ) {
|
|
| 3755 | + if ($region != '') {
|
|
| 3756 | 3756 | $location_url[] = $region; |
| 3757 | 3757 | } |
| 3758 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 3759 | - if ( $country != '' ) {
|
|
| 3758 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 3759 | + if ($country != '') {
|
|
| 3760 | 3760 | $location_url[] = $country; |
| 3761 | 3761 | } |
| 3762 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 3763 | - if ( $region != '' ) {
|
|
| 3762 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 3763 | + if ($region != '') {
|
|
| 3764 | 3764 | $location_url[] = $region; |
| 3765 | 3765 | } |
| 3766 | 3766 | } |
@@ -3768,54 +3768,54 @@ discard block |
||
| 3768 | 3768 | $location_url[] = $city; |
| 3769 | 3769 | } |
| 3770 | 3770 | |
| 3771 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 3772 | - $location_url = implode( '/', $location_url ); |
|
| 3771 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 3772 | + $location_url = implode('/', $location_url);
|
|
| 3773 | 3773 | $skip_location = false; |
| 3774 | - if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 3774 | + if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
|
|
| 3775 | 3775 | $skip_location = true; |
| 3776 | - $gd_session->un_set( 'gd_multi_location' ); |
|
| 3776 | + $gd_session->un_set('gd_multi_location');
|
|
| 3777 | 3777 | } |
| 3778 | 3778 | |
| 3779 | - if ( $location_allowed && $add_location_filter && $gd_session->get( 'all_near_me' ) && geodir_is_page( 'location' ) ) {
|
|
| 3780 | - $viewall_url = add_query_arg( array( |
|
| 3779 | + if ($location_allowed && $add_location_filter && $gd_session->get('all_near_me') && geodir_is_page('location')) {
|
|
| 3780 | + $viewall_url = add_query_arg(array( |
|
| 3781 | 3781 | 'geodir_search' => 1, |
| 3782 | 3782 | 'stype' => $post_type, |
| 3783 | 3783 | 's' => '', |
| 3784 | - 'snear' => __( 'Near:', 'geodiradvancesearch' ) . ' ' . __( 'Me', 'geodiradvancesearch' ), |
|
| 3785 | - 'sgeo_lat' => $gd_session->get( 'user_lat' ), |
|
| 3786 | - 'sgeo_lon' => $gd_session->get( 'user_lon' ) |
|
| 3787 | - ), geodir_search_page_base_url() ); |
|
| 3784 | + 'snear' => __('Near:', 'geodiradvancesearch').' '.__('Me', 'geodiradvancesearch'),
|
|
| 3785 | + 'sgeo_lat' => $gd_session->get('user_lat'),
|
|
| 3786 | + 'sgeo_lon' => $gd_session->get('user_lon')
|
|
| 3787 | + ), geodir_search_page_base_url()); |
|
| 3788 | 3788 | |
| 3789 | - if ( ! empty( $category ) && !in_array( '0', $category ) ) {
|
|
| 3790 | - $viewall_url = add_query_arg( array( 's' . $post_type . 'category' => $category ), $viewall_url ); |
|
| 3789 | + if (!empty($category) && !in_array('0', $category)) {
|
|
| 3790 | + $viewall_url = add_query_arg(array('s'.$post_type.'category' => $category), $viewall_url);
|
|
| 3791 | 3791 | } |
| 3792 | 3792 | } else {
|
| 3793 | - if ( get_option( 'permalink_structure' ) ) {
|
|
| 3794 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3793 | + if (get_option('permalink_structure')) {
|
|
| 3794 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3795 | 3795 | } else {
|
| 3796 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3796 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3797 | 3797 | } |
| 3798 | 3798 | |
| 3799 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3799 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3800 | 3800 | global $geodir_add_location_url; |
| 3801 | 3801 | |
| 3802 | 3802 | $geodir_add_location_url = '0'; |
| 3803 | 3803 | |
| 3804 | - if ( $add_location_filter != '0' ) {
|
|
| 3804 | + if ($add_location_filter != '0') {
|
|
| 3805 | 3805 | $geodir_add_location_url = '1'; |
| 3806 | 3806 | } |
| 3807 | 3807 | |
| 3808 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); |
|
| 3808 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); |
|
| 3809 | 3809 | |
| 3810 | 3810 | $geodir_add_location_url = null; |
| 3811 | 3811 | } |
| 3812 | 3812 | } |
| 3813 | 3813 | |
| 3814 | - if ( $skip_location ) {
|
|
| 3815 | - $gd_session->set( 'gd_multi_location', 1 ); |
|
| 3814 | + if ($skip_location) {
|
|
| 3815 | + $gd_session->set('gd_multi_location', 1);
|
|
| 3816 | 3816 | } |
| 3817 | 3817 | |
| 3818 | - if ( is_wp_error( $viewall_url ) ) {
|
|
| 3818 | + if (is_wp_error($viewall_url)) {
|
|
| 3819 | 3819 | $viewall_url = ''; |
| 3820 | 3820 | } |
| 3821 | 3821 | |
@@ -3827,43 +3827,43 @@ discard block |
||
| 3827 | 3827 | 'order_by' => $list_sort |
| 3828 | 3828 | ); |
| 3829 | 3829 | |
| 3830 | - if ( $character_count ) {
|
|
| 3830 | + if ($character_count) {
|
|
| 3831 | 3831 | $query_args['excerpt_length'] = $character_count; |
| 3832 | 3832 | } |
| 3833 | 3833 | |
| 3834 | - if ( ! empty( $instance['show_featured_only'] ) ) {
|
|
| 3834 | + if (!empty($instance['show_featured_only'])) {
|
|
| 3835 | 3835 | $query_args['show_featured_only'] = 1; |
| 3836 | 3836 | } |
| 3837 | 3837 | |
| 3838 | - if ( ! empty( $instance['show_special_only'] ) ) {
|
|
| 3838 | + if (!empty($instance['show_special_only'])) {
|
|
| 3839 | 3839 | $query_args['show_special_only'] = 1; |
| 3840 | 3840 | } |
| 3841 | 3841 | |
| 3842 | - if ( ! empty( $instance['with_pics_only'] ) ) {
|
|
| 3842 | + if (!empty($instance['with_pics_only'])) {
|
|
| 3843 | 3843 | $query_args['with_pics_only'] = 0; |
| 3844 | 3844 | $query_args['featured_image_only'] = 1; |
| 3845 | 3845 | } |
| 3846 | 3846 | |
| 3847 | - if ( ! empty( $instance['with_videos_only'] ) ) {
|
|
| 3847 | + if (!empty($instance['with_videos_only'])) {
|
|
| 3848 | 3848 | $query_args['with_videos_only'] = 1; |
| 3849 | 3849 | } |
| 3850 | - $hide_if_empty = ! empty( $instance['hide_if_empty'] ) ? true : false; |
|
| 3850 | + $hide_if_empty = !empty($instance['hide_if_empty']) ? true : false; |
|
| 3851 | 3851 | |
| 3852 | - if ( ! empty( $categories ) && $categories[0] != '0' && !empty( $category_taxonomy ) ) {
|
|
| 3852 | + if (!empty($categories) && $categories[0] != '0' && !empty($category_taxonomy)) {
|
|
| 3853 | 3853 | $tax_query = array( |
| 3854 | 3854 | 'taxonomy' => $category_taxonomy[0], |
| 3855 | 3855 | 'field' => 'id', |
| 3856 | 3856 | 'terms' => $category |
| 3857 | 3857 | ); |
| 3858 | 3858 | |
| 3859 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3859 | + $query_args['tax_query'] = array($tax_query); |
|
| 3860 | 3860 | } |
| 3861 | 3861 | |
| 3862 | 3862 | global $gridview_columns_widget, $geodir_is_widget_listing; |
| 3863 | 3863 | |
| 3864 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3864 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3865 | 3865 | |
| 3866 | - if ( $hide_if_empty && empty( $widget_listings ) ) {
|
|
| 3866 | + if ($hide_if_empty && empty($widget_listings)) {
|
|
| 3867 | 3867 | return; |
| 3868 | 3868 | } |
| 3869 | 3869 | |
@@ -3878,11 +3878,11 @@ discard block |
||
| 3878 | 3878 | * |
| 3879 | 3879 | * @since 1.0.0 |
| 3880 | 3880 | */ |
| 3881 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> |
|
| 3881 | + do_action('geodir_before_view_all_link_in_widget'); ?>
|
|
| 3882 | 3882 | <div class="geodir_list_heading clearfix"> |
| 3883 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 3883 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 3884 | 3884 | <a href="<?php echo $viewall_url; ?>" |
| 3885 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> |
|
| 3885 | + class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
|
|
| 3886 | 3886 | </div> |
| 3887 | 3887 | <?php |
| 3888 | 3888 | /** |
@@ -3890,10 +3890,10 @@ discard block |
||
| 3890 | 3890 | * |
| 3891 | 3891 | * @since 1.0.0 |
| 3892 | 3892 | */ |
| 3893 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> |
|
| 3893 | + do_action('geodir_after_view_all_link_in_widget'); ?>
|
|
| 3894 | 3894 | <?php |
| 3895 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 3896 | - $listing_view_exp = explode( '_', $layout ); |
|
| 3895 | + if (strstr($layout, 'gridview')) {
|
|
| 3896 | + $listing_view_exp = explode('_', $layout);
|
|
| 3897 | 3897 | $gridview_columns_widget = $layout; |
| 3898 | 3898 | $layout = $listing_view_exp[0]; |
| 3899 | 3899 | } else {
|
@@ -3904,8 +3904,8 @@ discard block |
||
| 3904 | 3904 | * |
| 3905 | 3905 | * @since 1.0.0 |
| 3906 | 3906 | */ |
| 3907 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 3908 | - if ( ! isset( $character_count ) ) {
|
|
| 3907 | + $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 3908 | + if (!isset($character_count)) {
|
|
| 3909 | 3909 | /** |
| 3910 | 3910 | * Filter the widget's excerpt character count. |
| 3911 | 3911 | * |
@@ -3913,7 +3913,7 @@ discard block |
||
| 3913 | 3913 | * |
| 3914 | 3914 | * @param int $instance ['character_count'] Excerpt character count. |
| 3915 | 3915 | */ |
| 3916 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); |
|
| 3916 | + $character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
|
|
| 3917 | 3917 | } |
| 3918 | 3918 | |
| 3919 | 3919 | global $post, $map_jason, $map_canvas_arr; |
@@ -3928,13 +3928,13 @@ discard block |
||
| 3928 | 3928 | * |
| 3929 | 3929 | * @since 1.0.0 |
| 3930 | 3930 | */ |
| 3931 | - include( $template ); |
|
| 3931 | + include($template); |
|
| 3932 | 3932 | |
| 3933 | 3933 | $geodir_is_widget_listing = false; |
| 3934 | 3934 | |
| 3935 | 3935 | $GLOBALS['post'] = $current_post; |
| 3936 | - if ( ! empty( $current_post ) ) {
|
|
| 3937 | - setup_postdata( $current_post ); |
|
| 3936 | + if (!empty($current_post)) {
|
|
| 3937 | + setup_postdata($current_post); |
|
| 3938 | 3938 | } |
| 3939 | 3939 | $map_jason = $current_map_jason; |
| 3940 | 3940 | $map_canvas_arr = $current_map_canvas_arr; |
@@ -3963,12 +3963,12 @@ discard block |
||
| 3963 | 3963 | * |
| 3964 | 3964 | * @return int Reviews count. |
| 3965 | 3965 | */ |
| 3966 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
|
|
| 3966 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
|
|
| 3967 | 3967 | global $wpdb, $plugin_prefix; |
| 3968 | 3968 | |
| 3969 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 3969 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 3970 | 3970 | |
| 3971 | - $sql = "SELECT COALESCE(SUM(rating_count),0) FROM " . $detail_table . " WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(" . $term_id . ", " . $taxonomy . ")";
|
|
| 3971 | + $sql = "SELECT COALESCE(SUM(rating_count),0) FROM ".$detail_table." WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(".$term_id.", ".$taxonomy.")";
|
|
| 3972 | 3972 | |
| 3973 | 3973 | /** |
| 3974 | 3974 | * Filter count review sql query. |
@@ -3980,9 +3980,9 @@ discard block |
||
| 3980 | 3980 | * @param int $taxonomy The taxonomy Id. |
| 3981 | 3981 | * @param string $post_type The post type. |
| 3982 | 3982 | */ |
| 3983 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); |
|
| 3983 | + $sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
|
|
| 3984 | 3984 | |
| 3985 | - $count = $wpdb->get_var( $sql ); |
|
| 3985 | + $count = $wpdb->get_var($sql); |
|
| 3986 | 3986 | |
| 3987 | 3987 | return $count; |
| 3988 | 3988 | } |
@@ -4000,7 +4000,7 @@ discard block |
||
| 4000 | 4000 | * |
| 4001 | 4001 | * @return array Term array data. |
| 4002 | 4002 | */ |
| 4003 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
|
|
| 4003 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
|
|
| 4004 | 4004 | /** |
| 4005 | 4005 | * Filter review count option data. |
| 4006 | 4006 | * |
@@ -4010,78 +4010,78 @@ discard block |
||
| 4010 | 4010 | * @param bool $force_update Force update option value?. Default.false. |
| 4011 | 4011 | * @param int $post_ID The post id to update if any. |
| 4012 | 4012 | */ |
| 4013 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); |
|
| 4014 | - if ( ! empty( $option_data ) ) {
|
|
| 4013 | + $option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
|
|
| 4014 | + if (!empty($option_data)) {
|
|
| 4015 | 4015 | return $option_data; |
| 4016 | 4016 | } |
| 4017 | 4017 | |
| 4018 | - $option_data = get_option( 'geodir_global_review_count' ); |
|
| 4018 | + $option_data = get_option('geodir_global_review_count');
|
|
| 4019 | 4019 | |
| 4020 | - if ( ! $option_data || $force_update ) {
|
|
| 4021 | - if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
|
|
| 4020 | + if (!$option_data || $force_update) {
|
|
| 4021 | + if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
|
|
| 4022 | 4022 | global $gd_session; |
| 4023 | 4023 | $term_array = (array) $option_data; |
| 4024 | - $post_type = get_post_type( $post_ID ); |
|
| 4025 | - $taxonomy = $post_type . 'category'; |
|
| 4026 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); |
|
| 4027 | - |
|
| 4028 | - if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
|
|
| 4029 | - foreach ( $terms as $term_id ) {
|
|
| 4030 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 4031 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 4032 | - $term_array[ $term_id ] = $count; |
|
| 4024 | + $post_type = get_post_type($post_ID); |
|
| 4025 | + $taxonomy = $post_type.'category'; |
|
| 4026 | + $terms = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
|
|
| 4027 | + |
|
| 4028 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 4029 | + foreach ($terms as $term_id) {
|
|
| 4030 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 4031 | + $children = get_term_children($term_id, $taxonomy); |
|
| 4032 | + $term_array[$term_id] = $count; |
|
| 4033 | 4033 | } |
| 4034 | 4034 | } |
| 4035 | 4035 | |
| 4036 | - $session_listing = $gd_session->get( 'listing' ); |
|
| 4036 | + $session_listing = $gd_session->get('listing');
|
|
| 4037 | 4037 | |
| 4038 | 4038 | $terms = array(); |
| 4039 | - if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
|
|
| 4040 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; |
|
| 4041 | - } else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
|
|
| 4042 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; |
|
| 4039 | + if (isset($_POST['post_category'][$taxonomy])) {
|
|
| 4040 | + $terms = (array) $_POST['post_category'][$taxonomy]; |
|
| 4041 | + } else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
|
|
| 4042 | + $terms = (array) $session_listing['post_category'][$taxonomy]; |
|
| 4043 | 4043 | } |
| 4044 | 4044 | |
| 4045 | - if ( ! empty( $terms ) ) {
|
|
| 4046 | - foreach ( $terms as $term_id ) {
|
|
| 4047 | - if ( $term_id > 0 ) {
|
|
| 4048 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 4049 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 4050 | - $term_array[ $term_id ] = $count; |
|
| 4045 | + if (!empty($terms)) {
|
|
| 4046 | + foreach ($terms as $term_id) {
|
|
| 4047 | + if ($term_id > 0) {
|
|
| 4048 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 4049 | + $children = get_term_children($term_id, $taxonomy); |
|
| 4050 | + $term_array[$term_id] = $count; |
|
| 4051 | 4051 | } |
| 4052 | 4052 | } |
| 4053 | 4053 | } |
| 4054 | 4054 | } else { // Update reviews count for all post categories.
|
| 4055 | 4055 | $term_array = array(); |
| 4056 | 4056 | $post_types = geodir_get_posttypes(); |
| 4057 | - foreach ( $post_types as $post_type ) {
|
|
| 4057 | + foreach ($post_types as $post_type) {
|
|
| 4058 | 4058 | |
| 4059 | - $taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 4059 | + $taxonomy = geodir_get_taxonomies($post_type); |
|
| 4060 | 4060 | $taxonomy = $taxonomy[0]; |
| 4061 | 4061 | |
| 4062 | 4062 | $args = array( |
| 4063 | 4063 | 'hide_empty' => false |
| 4064 | 4064 | ); |
| 4065 | 4065 | |
| 4066 | - $terms = get_terms( $taxonomy, $args ); |
|
| 4066 | + $terms = get_terms($taxonomy, $args); |
|
| 4067 | 4067 | |
| 4068 | - foreach ( $terms as $term ) {
|
|
| 4069 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); |
|
| 4070 | - $children = get_term_children( $term->term_id, $taxonomy ); |
|
| 4068 | + foreach ($terms as $term) {
|
|
| 4069 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); |
|
| 4070 | + $children = get_term_children($term->term_id, $taxonomy); |
|
| 4071 | 4071 | /*if ( is_array( $children ) ) {
|
| 4072 | 4072 | foreach ( $children as $child_id ) {
|
| 4073 | 4073 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); |
| 4074 | 4074 | $count = $count + $child_count; |
| 4075 | 4075 | } |
| 4076 | 4076 | }*/ |
| 4077 | - $term_array[ $term->term_id ] = $count; |
|
| 4077 | + $term_array[$term->term_id] = $count; |
|
| 4078 | 4078 | } |
| 4079 | 4079 | } |
| 4080 | 4080 | } |
| 4081 | 4081 | |
| 4082 | - update_option( 'geodir_global_review_count', $term_array ); |
|
| 4082 | + update_option('geodir_global_review_count', $term_array);
|
|
| 4083 | 4083 | //clear cache |
| 4084 | - wp_cache_delete( 'geodir_global_review_count' ); |
|
| 4084 | + wp_cache_delete('geodir_global_review_count');
|
|
| 4085 | 4085 | |
| 4086 | 4086 | return $term_array; |
| 4087 | 4087 | } else {
|
@@ -4097,39 +4097,39 @@ discard block |
||
| 4097 | 4097 | * @package GeoDirectory |
| 4098 | 4098 | * @return bool |
| 4099 | 4099 | */ |
| 4100 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
|
|
| 4101 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
|
|
| 4100 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
|
|
| 4101 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
|
|
| 4102 | 4102 | return; // do not run if importing listings |
| 4103 | 4103 | } |
| 4104 | 4104 | |
| 4105 | - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
|
|
| 4105 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
|
|
| 4106 | 4106 | return; |
| 4107 | 4107 | } |
| 4108 | 4108 | |
| 4109 | 4109 | $post_ID = 0; |
| 4110 | - if ( ! empty( $post ) ) {
|
|
| 4111 | - if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
|
|
| 4110 | + if (!empty($post)) {
|
|
| 4111 | + if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
|
|
| 4112 | 4112 | return; |
| 4113 | 4113 | } |
| 4114 | 4114 | |
| 4115 | - if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
|
|
| 4115 | + if ($new_status == 'auto-draft' && $old_status == 'new') {
|
|
| 4116 | 4116 | return; |
| 4117 | 4117 | } |
| 4118 | 4118 | |
| 4119 | - if ( ! empty( $post->ID ) ) {
|
|
| 4119 | + if (!empty($post->ID)) {
|
|
| 4120 | 4120 | $post_ID = $post->ID; |
| 4121 | 4121 | } |
| 4122 | 4122 | } |
| 4123 | 4123 | |
| 4124 | - if ( $new_status != $old_status ) {
|
|
| 4125 | - geodir_count_reviews_by_terms( true, $post_ID ); |
|
| 4124 | + if ($new_status != $old_status) {
|
|
| 4125 | + geodir_count_reviews_by_terms(true, $post_ID); |
|
| 4126 | 4126 | } |
| 4127 | 4127 | |
| 4128 | 4128 | return true; |
| 4129 | 4129 | } |
| 4130 | 4130 | |
| 4131 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
|
|
| 4132 | - geodir_count_reviews_by_terms( true, $post_id ); |
|
| 4131 | +function geodir_term_review_count_force_update_single_post($post_id) {
|
|
| 4132 | + geodir_count_reviews_by_terms(true, $post_id); |
|
| 4133 | 4133 | } |
| 4134 | 4134 | |
| 4135 | 4135 | /*-----------------------------------------------------------------------------------*/ |
@@ -4146,11 +4146,11 @@ discard block |
||
| 4146 | 4146 | * |
| 4147 | 4147 | * @return int Post count. |
| 4148 | 4148 | */ |
| 4149 | -function geodir_count_posts_by_term( $data, $term ) {
|
|
| 4149 | +function geodir_count_posts_by_term($data, $term) {
|
|
| 4150 | 4150 | |
| 4151 | - if ( $data ) {
|
|
| 4152 | - if ( isset( $data[ $term->term_id ] ) ) {
|
|
| 4153 | - return $data[ $term->term_id ]; |
|
| 4151 | + if ($data) {
|
|
| 4152 | + if (isset($data[$term->term_id])) {
|
|
| 4153 | + return $data[$term->term_id]; |
|
| 4154 | 4154 | } else {
|
| 4155 | 4155 | return 0; |
| 4156 | 4156 | } |
@@ -4167,8 +4167,8 @@ discard block |
||
| 4167 | 4167 | * param array $terms An array of term objects. |
| 4168 | 4168 | * @return array Sorted terms array. |
| 4169 | 4169 | */ |
| 4170 | -function geodir_sort_terms_by_count( $terms ) {
|
|
| 4171 | - usort( $terms, "geodir_sort_by_count_obj" ); |
|
| 4170 | +function geodir_sort_terms_by_count($terms) {
|
|
| 4171 | + usort($terms, "geodir_sort_by_count_obj"); |
|
| 4172 | 4172 | |
| 4173 | 4173 | return $terms; |
| 4174 | 4174 | } |
@@ -4183,8 +4183,8 @@ discard block |
||
| 4183 | 4183 | * |
| 4184 | 4184 | * @return array Sorted terms array. |
| 4185 | 4185 | */ |
| 4186 | -function geodir_sort_terms_by_review_count( $terms ) {
|
|
| 4187 | - usort( $terms, "geodir_sort_by_review_count_obj" ); |
|
| 4186 | +function geodir_sort_terms_by_review_count($terms) {
|
|
| 4187 | + usort($terms, "geodir_sort_by_review_count_obj"); |
|
| 4188 | 4188 | |
| 4189 | 4189 | return $terms; |
| 4190 | 4190 | } |
@@ -4200,12 +4200,12 @@ discard block |
||
| 4200 | 4200 | * |
| 4201 | 4201 | * @return array Sorted terms array. |
| 4202 | 4202 | */ |
| 4203 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
|
|
| 4204 | - if ( $sort == 'count' ) {
|
|
| 4205 | - return geodir_sort_terms_by_count( $terms ); |
|
| 4203 | +function geodir_sort_terms($terms, $sort = 'count') {
|
|
| 4204 | + if ($sort == 'count') {
|
|
| 4205 | + return geodir_sort_terms_by_count($terms); |
|
| 4206 | 4206 | } |
| 4207 | - if ( $sort == 'review_count' ) {
|
|
| 4208 | - return geodir_sort_terms_by_review_count( $terms ); |
|
| 4207 | + if ($sort == 'review_count') {
|
|
| 4208 | + return geodir_sort_terms_by_review_count($terms); |
|
| 4209 | 4209 | } |
| 4210 | 4210 | return $terms; |
| 4211 | 4211 | } |
@@ -4224,7 +4224,7 @@ discard block |
||
| 4224 | 4224 | * |
| 4225 | 4225 | * @return bool |
| 4226 | 4226 | */ |
| 4227 | -function geodir_sort_by_count( $a, $b ) {
|
|
| 4227 | +function geodir_sort_by_count($a, $b) {
|
|
| 4228 | 4228 | return $a['count'] < $b['count']; |
| 4229 | 4229 | } |
| 4230 | 4230 | |
@@ -4239,7 +4239,7 @@ discard block |
||
| 4239 | 4239 | * |
| 4240 | 4240 | * @return bool |
| 4241 | 4241 | */ |
| 4242 | -function geodir_sort_by_count_obj( $a, $b ) {
|
|
| 4242 | +function geodir_sort_by_count_obj($a, $b) {
|
|
| 4243 | 4243 | return $a->count < $b->count; |
| 4244 | 4244 | } |
| 4245 | 4245 | |
@@ -4254,7 +4254,7 @@ discard block |
||
| 4254 | 4254 | * |
| 4255 | 4255 | * @return bool |
| 4256 | 4256 | */ |
| 4257 | -function geodir_sort_by_review_count_obj( $a, $b ) {
|
|
| 4257 | +function geodir_sort_by_review_count_obj($a, $b) {
|
|
| 4258 | 4258 | return $a->review_count < $b->review_count; |
| 4259 | 4259 | } |
| 4260 | 4260 | |
@@ -4271,35 +4271,35 @@ discard block |
||
| 4271 | 4271 | * @since 1.4.2 |
| 4272 | 4272 | * @package GeoDirectory |
| 4273 | 4273 | */ |
| 4274 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); |
|
| 4274 | + $locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
|
|
| 4275 | 4275 | |
| 4276 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); |
|
| 4277 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); |
|
| 4276 | + load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
|
|
| 4277 | + load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
|
|
| 4278 | 4278 | |
| 4279 | 4279 | /** |
| 4280 | 4280 | * Define language constants. |
| 4281 | 4281 | * |
| 4282 | 4282 | * @since 1.0.0 |
| 4283 | 4283 | */ |
| 4284 | - require_once( geodir_plugin_path() . '/language.php' ); |
|
| 4284 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 4285 | 4285 | |
| 4286 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4286 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4287 | 4287 | |
| 4288 | 4288 | // Load language string file if not created yet |
| 4289 | - if ( ! file_exists( $language_file ) ) {
|
|
| 4289 | + if (!file_exists($language_file)) {
|
|
| 4290 | 4290 | geodirectory_load_db_language(); |
| 4291 | 4291 | } |
| 4292 | 4292 | |
| 4293 | - if ( file_exists( $language_file ) ) {
|
|
| 4293 | + if (file_exists($language_file)) {
|
|
| 4294 | 4294 | /** |
| 4295 | 4295 | * Language strings from database. |
| 4296 | 4296 | * |
| 4297 | 4297 | * @since 1.4.2 |
| 4298 | 4298 | */ |
| 4299 | 4299 | try {
|
| 4300 | - require_once( $language_file ); |
|
| 4301 | - } catch ( Exception $e ) {
|
|
| 4302 | - error_log( 'Language Error: ' . $e->getMessage() ); |
|
| 4300 | + require_once($language_file); |
|
| 4301 | + } catch (Exception $e) {
|
|
| 4302 | + error_log('Language Error: '.$e->getMessage());
|
|
| 4303 | 4303 | } |
| 4304 | 4304 | } |
| 4305 | 4305 | } |
@@ -4316,19 +4316,19 @@ discard block |
||
| 4316 | 4316 | */ |
| 4317 | 4317 | function geodirectory_load_db_language() {
|
| 4318 | 4318 | global $wp_filesystem; |
| 4319 | - if ( empty( $wp_filesystem ) ) {
|
|
| 4320 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); |
|
| 4319 | + if (empty($wp_filesystem)) {
|
|
| 4320 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); |
|
| 4321 | 4321 | WP_Filesystem(); |
| 4322 | 4322 | global $wp_filesystem; |
| 4323 | 4323 | } |
| 4324 | 4324 | |
| 4325 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4325 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4326 | 4326 | |
| 4327 | - if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
|
|
| 4327 | + if (is_file($language_file) && !is_writable($language_file)) {
|
|
| 4328 | 4328 | return false; |
| 4329 | 4329 | } // Not possible to create. |
| 4330 | 4330 | |
| 4331 | - if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
|
|
| 4331 | + if (!is_file($language_file) && !is_writable(dirname($language_file))) {
|
|
| 4332 | 4332 | return false; |
| 4333 | 4333 | } // Not possible to create. |
| 4334 | 4334 | |
@@ -4342,9 +4342,9 @@ discard block |
||
| 4342 | 4342 | * |
| 4343 | 4343 | * @param array $contents_strings Array of strings. |
| 4344 | 4344 | */ |
| 4345 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); |
|
| 4345 | + $contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
|
|
| 4346 | 4346 | |
| 4347 | - $contents_strings = array_unique( $contents_strings ); |
|
| 4347 | + $contents_strings = array_unique($contents_strings); |
|
| 4348 | 4348 | |
| 4349 | 4349 | $contents_head = array(); |
| 4350 | 4350 | $contents_head[] = "<?php"; |
@@ -4361,21 +4361,21 @@ discard block |
||
| 4361 | 4361 | $contents_foot[] = ""; |
| 4362 | 4362 | $contents_foot[] = ""; |
| 4363 | 4363 | |
| 4364 | - $contents = implode( PHP_EOL, $contents_head ); |
|
| 4364 | + $contents = implode(PHP_EOL, $contents_head); |
|
| 4365 | 4365 | |
| 4366 | - if ( ! empty( $contents_strings ) ) {
|
|
| 4367 | - foreach ( $contents_strings as $string ) {
|
|
| 4368 | - if ( is_scalar( $string ) && $string != '' ) {
|
|
| 4369 | - $string = str_replace( "'", "\'", $string ); |
|
| 4370 | - geodir_wpml_register_string( $string ); |
|
| 4371 | - $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
|
|
| 4366 | + if (!empty($contents_strings)) {
|
|
| 4367 | + foreach ($contents_strings as $string) {
|
|
| 4368 | + if (is_scalar($string) && $string != '') {
|
|
| 4369 | + $string = str_replace("'", "\'", $string);
|
|
| 4370 | + geodir_wpml_register_string($string); |
|
| 4371 | + $contents .= PHP_EOL."__('".$string."', 'geodirectory');";
|
|
| 4372 | 4372 | } |
| 4373 | 4373 | } |
| 4374 | 4374 | } |
| 4375 | 4375 | |
| 4376 | - $contents .= implode( PHP_EOL, $contents_foot ); |
|
| 4376 | + $contents .= implode(PHP_EOL, $contents_foot); |
|
| 4377 | 4377 | |
| 4378 | - if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
|
|
| 4378 | + if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
|
|
| 4379 | 4379 | return false; |
| 4380 | 4380 | } // Failure; could not write file. |
| 4381 | 4381 | |
@@ -4396,49 +4396,49 @@ discard block |
||
| 4396 | 4396 | * |
| 4397 | 4397 | * @return array Translation texts. |
| 4398 | 4398 | */ |
| 4399 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
|
|
| 4399 | +function geodir_load_custom_field_translation($translation_texts = array()) {
|
|
| 4400 | 4400 | global $wpdb; |
| 4401 | 4401 | |
| 4402 | 4402 | // Custom fields table |
| 4403 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4404 | - $rows = $wpdb->get_results( $sql ); |
|
| 4403 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4404 | + $rows = $wpdb->get_results($sql); |
|
| 4405 | 4405 | |
| 4406 | - if ( ! empty( $rows ) ) {
|
|
| 4407 | - foreach ( $rows as $row ) {
|
|
| 4408 | - if ( ! empty( $row->admin_title ) ) {
|
|
| 4409 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); |
|
| 4406 | + if (!empty($rows)) {
|
|
| 4407 | + foreach ($rows as $row) {
|
|
| 4408 | + if (!empty($row->admin_title)) {
|
|
| 4409 | + $translation_texts[] = stripslashes_deep($row->admin_title); |
|
| 4410 | 4410 | } |
| 4411 | 4411 | |
| 4412 | - if ( ! empty( $row->admin_desc ) ) {
|
|
| 4413 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); |
|
| 4412 | + if (!empty($row->admin_desc)) {
|
|
| 4413 | + $translation_texts[] = stripslashes_deep($row->admin_desc); |
|
| 4414 | 4414 | } |
| 4415 | 4415 | |
| 4416 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4417 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4416 | + if (!empty($row->site_title)) {
|
|
| 4417 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4418 | 4418 | } |
| 4419 | 4419 | |
| 4420 | - if ( ! empty( $row->clabels ) ) {
|
|
| 4421 | - $translation_texts[] = stripslashes_deep( $row->clabels ); |
|
| 4420 | + if (!empty($row->clabels)) {
|
|
| 4421 | + $translation_texts[] = stripslashes_deep($row->clabels); |
|
| 4422 | 4422 | } |
| 4423 | 4423 | |
| 4424 | - if ( ! empty( $row->required_msg ) ) {
|
|
| 4425 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); |
|
| 4424 | + if (!empty($row->required_msg)) {
|
|
| 4425 | + $translation_texts[] = stripslashes_deep($row->required_msg); |
|
| 4426 | 4426 | } |
| 4427 | 4427 | |
| 4428 | - if ( ! empty( $row->validation_msg ) ) {
|
|
| 4429 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); |
|
| 4428 | + if (!empty($row->validation_msg)) {
|
|
| 4429 | + $translation_texts[] = stripslashes_deep($row->validation_msg); |
|
| 4430 | 4430 | } |
| 4431 | 4431 | |
| 4432 | - if ( ! empty( $row->default_value ) ) {
|
|
| 4433 | - $translation_texts[] = stripslashes_deep( $row->default_value ); |
|
| 4432 | + if (!empty($row->default_value)) {
|
|
| 4433 | + $translation_texts[] = stripslashes_deep($row->default_value); |
|
| 4434 | 4434 | } |
| 4435 | 4435 | |
| 4436 | - if ( ! empty( $row->option_values ) ) {
|
|
| 4437 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); |
|
| 4436 | + if (!empty($row->option_values)) {
|
|
| 4437 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); |
|
| 4438 | 4438 | |
| 4439 | - if ( ! empty( $option_values ) ) {
|
|
| 4440 | - foreach ( $option_values as $option_value ) {
|
|
| 4441 | - if ( ! empty( $option_value['label'] ) ) {
|
|
| 4439 | + if (!empty($option_values)) {
|
|
| 4440 | + foreach ($option_values as $option_value) {
|
|
| 4441 | + if (!empty($option_value['label'])) {
|
|
| 4442 | 4442 | $translation_texts[] = $option_value['label']; |
| 4443 | 4443 | } |
| 4444 | 4444 | } |
@@ -4448,56 +4448,56 @@ discard block |
||
| 4448 | 4448 | } |
| 4449 | 4449 | |
| 4450 | 4450 | // Custom sorting fields table |
| 4451 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4452 | - $rows = $wpdb->get_results( $sql ); |
|
| 4451 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4452 | + $rows = $wpdb->get_results($sql); |
|
| 4453 | 4453 | |
| 4454 | - if ( ! empty( $rows ) ) {
|
|
| 4455 | - foreach ( $rows as $row ) {
|
|
| 4456 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4457 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4454 | + if (!empty($rows)) {
|
|
| 4455 | + foreach ($rows as $row) {
|
|
| 4456 | + if (!empty($row->site_title)) {
|
|
| 4457 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4458 | 4458 | } |
| 4459 | 4459 | |
| 4460 | - if ( ! empty( $row->asc_title ) ) {
|
|
| 4461 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); |
|
| 4460 | + if (!empty($row->asc_title)) {
|
|
| 4461 | + $translation_texts[] = stripslashes_deep($row->asc_title); |
|
| 4462 | 4462 | } |
| 4463 | 4463 | |
| 4464 | - if ( ! empty( $row->desc_title ) ) {
|
|
| 4465 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); |
|
| 4464 | + if (!empty($row->desc_title)) {
|
|
| 4465 | + $translation_texts[] = stripslashes_deep($row->desc_title); |
|
| 4466 | 4466 | } |
| 4467 | 4467 | } |
| 4468 | 4468 | } |
| 4469 | 4469 | |
| 4470 | 4470 | // Advance search filter fields table |
| 4471 | - if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
|
|
| 4472 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4473 | - $rows = $wpdb->get_results( $sql ); |
|
| 4474 | - |
|
| 4475 | - if ( ! empty( $rows ) ) {
|
|
| 4476 | - foreach ( $rows as $row ) {
|
|
| 4477 | - if ( ! empty( $row->field_site_name ) ) {
|
|
| 4478 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); |
|
| 4471 | + if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
|
|
| 4472 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4473 | + $rows = $wpdb->get_results($sql); |
|
| 4474 | + |
|
| 4475 | + if (!empty($rows)) {
|
|
| 4476 | + foreach ($rows as $row) {
|
|
| 4477 | + if (!empty($row->field_site_name)) {
|
|
| 4478 | + $translation_texts[] = stripslashes_deep($row->field_site_name); |
|
| 4479 | 4479 | } |
| 4480 | 4480 | |
| 4481 | - if ( ! empty( $row->front_search_title ) ) {
|
|
| 4482 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); |
|
| 4481 | + if (!empty($row->front_search_title)) {
|
|
| 4482 | + $translation_texts[] = stripslashes_deep($row->front_search_title); |
|
| 4483 | 4483 | } |
| 4484 | 4484 | |
| 4485 | - if ( ! empty( $row->first_search_text ) ) {
|
|
| 4486 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); |
|
| 4485 | + if (!empty($row->first_search_text)) {
|
|
| 4486 | + $translation_texts[] = stripslashes_deep($row->first_search_text); |
|
| 4487 | 4487 | } |
| 4488 | 4488 | |
| 4489 | - if ( ! empty( $row->last_search_text ) ) {
|
|
| 4490 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); |
|
| 4489 | + if (!empty($row->last_search_text)) {
|
|
| 4490 | + $translation_texts[] = stripslashes_deep($row->last_search_text); |
|
| 4491 | 4491 | } |
| 4492 | 4492 | |
| 4493 | - if ( ! empty( $row->field_desc ) ) {
|
|
| 4494 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); |
|
| 4493 | + if (!empty($row->field_desc)) {
|
|
| 4494 | + $translation_texts[] = stripslashes_deep($row->field_desc); |
|
| 4495 | 4495 | } |
| 4496 | 4496 | } |
| 4497 | 4497 | } |
| 4498 | 4498 | } |
| 4499 | 4499 | |
| 4500 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4500 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4501 | 4501 | |
| 4502 | 4502 | return $translation_texts; |
| 4503 | 4503 | } |
@@ -4519,7 +4519,7 @@ discard block |
||
| 4519 | 4519 | * |
| 4520 | 4520 | * @param array $geodir_allowed_mime_types and file extensions. |
| 4521 | 4521 | */ |
| 4522 | - return apply_filters( 'geodir_allowed_mime_types', array( |
|
| 4522 | + return apply_filters('geodir_allowed_mime_types', array(
|
|
| 4523 | 4523 | 'Image' => array( // Image formats. |
| 4524 | 4524 | 'jpg' => 'image/jpeg', |
| 4525 | 4525 | 'jpe' => 'image/jpeg', |
@@ -4588,18 +4588,18 @@ discard block |
||
| 4588 | 4588 | * |
| 4589 | 4589 | * @return string User display name. |
| 4590 | 4590 | */ |
| 4591 | -function geodir_get_client_name( $user_id ) {
|
|
| 4591 | +function geodir_get_client_name($user_id) {
|
|
| 4592 | 4592 | $client_name = ''; |
| 4593 | 4593 | |
| 4594 | - $user_data = get_userdata( $user_id ); |
|
| 4594 | + $user_data = get_userdata($user_id); |
|
| 4595 | 4595 | |
| 4596 | - if ( ! empty( $user_data ) ) {
|
|
| 4597 | - if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
|
|
| 4598 | - $client_name = trim( $user_data->display_name ); |
|
| 4599 | - } else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
|
|
| 4600 | - $client_name = trim( $user_data->user_nicename ); |
|
| 4596 | + if (!empty($user_data)) {
|
|
| 4597 | + if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
|
|
| 4598 | + $client_name = trim($user_data->display_name); |
|
| 4599 | + } else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
|
|
| 4600 | + $client_name = trim($user_data->user_nicename); |
|
| 4601 | 4601 | } else {
|
| 4602 | - $client_name = trim( $user_data->user_login ); |
|
| 4602 | + $client_name = trim($user_data->user_login); |
|
| 4603 | 4603 | } |
| 4604 | 4604 | } |
| 4605 | 4605 | |
@@ -4607,17 +4607,17 @@ discard block |
||
| 4607 | 4607 | } |
| 4608 | 4608 | |
| 4609 | 4609 | |
| 4610 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); |
|
| 4610 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
|
|
| 4611 | 4611 | /* |
| 4612 | 4612 | * Add location variables to wpseo replacements. |
| 4613 | 4613 | * |
| 4614 | 4614 | * @since 1.5.4 |
| 4615 | 4615 | */ |
| 4616 | -function geodir_wpseo_replacements( $vars ) {
|
|
| 4616 | +function geodir_wpseo_replacements($vars) {
|
|
| 4617 | 4617 | |
| 4618 | 4618 | // location variables |
| 4619 | 4619 | $gd_post_type = geodir_get_current_posttype(); |
| 4620 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4620 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4621 | 4621 | /** |
| 4622 | 4622 | * Filter the title variables location variables array |
| 4623 | 4623 | * |
@@ -4627,7 +4627,7 @@ discard block |
||
| 4627 | 4627 | * @param array $location_array The array of location variables. |
| 4628 | 4628 | * @param array $vars The page title variables. |
| 4629 | 4629 | */ |
| 4630 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); |
|
| 4630 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
|
|
| 4631 | 4631 | |
| 4632 | 4632 | |
| 4633 | 4633 | $location_replace_vars = geodir_location_replace_vars($location_array, NULL, ''); |
@@ -4642,13 +4642,13 @@ discard block |
||
| 4642 | 4642 | * @param string $vars The title with variables. |
| 4643 | 4643 | * @param array $location_array The array of location variables. |
| 4644 | 4644 | */ |
| 4645 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); |
|
| 4645 | + return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
|
|
| 4646 | 4646 | } |
| 4647 | 4647 | |
| 4648 | 4648 | |
| 4649 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4650 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); |
|
| 4651 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4649 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
|
|
| 4650 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
|
|
| 4651 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
|
|
| 4652 | 4652 | |
| 4653 | 4653 | /** |
| 4654 | 4654 | * Filter the title variables. |
@@ -4690,14 +4690,14 @@ discard block |
||
| 4690 | 4690 | * |
| 4691 | 4691 | * @return string Title after filtered variables. |
| 4692 | 4692 | */ |
| 4693 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
|
|
| 4693 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
|
|
| 4694 | 4694 | global $wp, $post; |
| 4695 | 4695 | |
| 4696 | - if ( ! $gd_page || ! $title ) {
|
|
| 4696 | + if (!$gd_page || !$title) {
|
|
| 4697 | 4697 | return $title; // if no a GD page then bail. |
| 4698 | 4698 | } |
| 4699 | 4699 | |
| 4700 | - if ( $sep == '' ) {
|
|
| 4700 | + if ($sep == '') {
|
|
| 4701 | 4701 | /** |
| 4702 | 4702 | * Filter the page title separator. |
| 4703 | 4703 | * |
@@ -4706,100 +4706,100 @@ discard block |
||
| 4706 | 4706 | * |
| 4707 | 4707 | * @param string $sep The separator, default: `|`. |
| 4708 | 4708 | */ |
| 4709 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); |
|
| 4709 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 4710 | 4710 | } |
| 4711 | 4711 | |
| 4712 | - if ( strpos( $title, '%%title%%' ) !== false ) {
|
|
| 4713 | - $title = str_replace( "%%title%%", $post->post_title, $title ); |
|
| 4712 | + if (strpos($title, '%%title%%') !== false) {
|
|
| 4713 | + $title = str_replace("%%title%%", $post->post_title, $title);
|
|
| 4714 | 4714 | } |
| 4715 | 4715 | |
| 4716 | - if ( strpos( $title, '%%sitename%%' ) !== false ) {
|
|
| 4717 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); |
|
| 4716 | + if (strpos($title, '%%sitename%%') !== false) {
|
|
| 4717 | + $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
|
|
| 4718 | 4718 | } |
| 4719 | 4719 | |
| 4720 | - if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
|
|
| 4721 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); |
|
| 4720 | + if (strpos($title, '%%sitedesc%%') !== false) {
|
|
| 4721 | + $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
|
|
| 4722 | 4722 | } |
| 4723 | 4723 | |
| 4724 | - if ( strpos( $title, '%%excerpt%%' ) !== false ) {
|
|
| 4725 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); |
|
| 4724 | + if (strpos($title, '%%excerpt%%') !== false) {
|
|
| 4725 | + $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
|
|
| 4726 | 4726 | } |
| 4727 | 4727 | |
| 4728 | - if ( $gd_page == 'search' || $gd_page == 'author' ) {
|
|
| 4729 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; |
|
| 4730 | - } else if ( $gd_page == 'add-listing' ) {
|
|
| 4731 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; |
|
| 4732 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; |
|
| 4733 | - } else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 4728 | + if ($gd_page == 'search' || $gd_page == 'author') {
|
|
| 4729 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; |
|
| 4730 | + } else if ($gd_page == 'add-listing') {
|
|
| 4731 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 4732 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; |
|
| 4733 | + } else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 4734 | 4734 | $post_type = $post->post_type; |
| 4735 | 4735 | } else {
|
| 4736 | - $post_type = get_query_var( 'post_type' ); |
|
| 4736 | + $post_type = get_query_var('post_type');
|
|
| 4737 | 4737 | } |
| 4738 | 4738 | |
| 4739 | - if ( strpos( $title, '%%pt_single%%' ) !== false ) {
|
|
| 4739 | + if (strpos($title, '%%pt_single%%') !== false) {
|
|
| 4740 | 4740 | $singular_name = ''; |
| 4741 | - if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
|
|
| 4742 | - $singular_name = __( $singular_name, 'geodirectory' ); |
|
| 4741 | + if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
|
|
| 4742 | + $singular_name = __($singular_name, 'geodirectory'); |
|
| 4743 | 4743 | } |
| 4744 | 4744 | |
| 4745 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); |
|
| 4745 | + $title = str_replace("%%pt_single%%", $singular_name, $title);
|
|
| 4746 | 4746 | } |
| 4747 | 4747 | |
| 4748 | - if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
|
|
| 4748 | + if (strpos($title, '%%pt_plural%%') !== false) {
|
|
| 4749 | 4749 | $plural_name = ''; |
| 4750 | - if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
|
|
| 4751 | - $plural_name = __( $plural_name, 'geodirectory' ); |
|
| 4750 | + if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
|
|
| 4751 | + $plural_name = __($plural_name, 'geodirectory'); |
|
| 4752 | 4752 | } |
| 4753 | 4753 | |
| 4754 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); |
|
| 4754 | + $title = str_replace("%%pt_plural%%", $plural_name, $title);
|
|
| 4755 | 4755 | } |
| 4756 | 4756 | |
| 4757 | - if ( strpos( $title, '%%category%%' ) !== false ) {
|
|
| 4757 | + if (strpos($title, '%%category%%') !== false) {
|
|
| 4758 | 4758 | $cat_name = ''; |
| 4759 | 4759 | |
| 4760 | - if ( $gd_page == 'detail' ) {
|
|
| 4761 | - if ( $post->default_category ) {
|
|
| 4762 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4763 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4760 | + if ($gd_page == 'detail') {
|
|
| 4761 | + if ($post->default_category) {
|
|
| 4762 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4763 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4764 | 4764 | } |
| 4765 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4765 | + } else if ($gd_page == 'listing') {
|
|
| 4766 | 4766 | $queried_object = get_queried_object(); |
| 4767 | - if ( isset( $queried_object->name ) ) {
|
|
| 4767 | + if (isset($queried_object->name)) {
|
|
| 4768 | 4768 | $cat_name = $queried_object->name; |
| 4769 | 4769 | } |
| 4770 | 4770 | } |
| 4771 | - $title = str_replace( "%%category%%", $cat_name, $title ); |
|
| 4771 | + $title = str_replace("%%category%%", $cat_name, $title);
|
|
| 4772 | 4772 | } |
| 4773 | 4773 | |
| 4774 | - if ( strpos( $title, '%%tag%%' ) !== false ) {
|
|
| 4774 | + if (strpos($title, '%%tag%%') !== false) {
|
|
| 4775 | 4775 | $cat_name = ''; |
| 4776 | 4776 | |
| 4777 | - if ( $gd_page == 'detail' ) {
|
|
| 4778 | - if ( $post->default_category ) {
|
|
| 4779 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4780 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4777 | + if ($gd_page == 'detail') {
|
|
| 4778 | + if ($post->default_category) {
|
|
| 4779 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4780 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4781 | 4781 | } |
| 4782 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4782 | + } else if ($gd_page == 'listing') {
|
|
| 4783 | 4783 | $queried_object = get_queried_object(); |
| 4784 | - if ( isset( $queried_object->name ) ) {
|
|
| 4784 | + if (isset($queried_object->name)) {
|
|
| 4785 | 4785 | $cat_name = $queried_object->name; |
| 4786 | 4786 | } |
| 4787 | 4787 | } |
| 4788 | - $title = str_replace( "%%tag%%", $cat_name, $title ); |
|
| 4788 | + $title = str_replace("%%tag%%", $cat_name, $title);
|
|
| 4789 | 4789 | } |
| 4790 | 4790 | |
| 4791 | - if ( strpos( $title, '%%id%%' ) !== false ) {
|
|
| 4792 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; |
|
| 4793 | - $title = str_replace( "%%id%%", $ID, $title ); |
|
| 4791 | + if (strpos($title, '%%id%%') !== false) {
|
|
| 4792 | + $ID = (isset($post->ID)) ? $post->ID : ''; |
|
| 4793 | + $title = str_replace("%%id%%", $ID, $title);
|
|
| 4794 | 4794 | } |
| 4795 | 4795 | |
| 4796 | - if ( strpos( $title, '%%sep%%' ) !== false ) {
|
|
| 4797 | - $title = str_replace( "%%sep%%", $sep, $title ); |
|
| 4796 | + if (strpos($title, '%%sep%%') !== false) {
|
|
| 4797 | + $title = str_replace("%%sep%%", $sep, $title);
|
|
| 4798 | 4798 | } |
| 4799 | 4799 | |
| 4800 | 4800 | // location variables |
| 4801 | 4801 | $gd_post_type = geodir_get_current_posttype(); |
| 4802 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4802 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4803 | 4803 | |
| 4804 | 4804 | /** |
| 4805 | 4805 | * Filter the title variables location variables array |
@@ -4812,20 +4812,20 @@ discard block |
||
| 4812 | 4812 | * @param string $gd_page The page being filtered. |
| 4813 | 4813 | * @param string $sep The separator, default: `|`. |
| 4814 | 4814 | */ |
| 4815 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); |
|
| 4815 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
|
|
| 4816 | 4816 | |
| 4817 | - if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
|
|
| 4818 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4819 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); |
|
| 4817 | + if ($gd_page == 'location' && get_query_var('gd_country_full')) {
|
|
| 4818 | + if (get_query_var('gd_country_full')) {
|
|
| 4819 | + $location_array['gd_country'] = get_query_var('gd_country_full');
|
|
| 4820 | 4820 | } |
| 4821 | - if ( get_query_var( 'gd_region_full' ) ) {
|
|
| 4822 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); |
|
| 4821 | + if (get_query_var('gd_region_full')) {
|
|
| 4822 | + $location_array['gd_region'] = get_query_var('gd_region_full');
|
|
| 4823 | 4823 | } |
| 4824 | - if ( get_query_var( 'gd_city_full' ) ) {
|
|
| 4825 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); |
|
| 4824 | + if (get_query_var('gd_city_full')) {
|
|
| 4825 | + $location_array['gd_city'] = get_query_var('gd_city_full');
|
|
| 4826 | 4826 | } |
| 4827 | - if ( get_query_var( 'gd_neighbourhood_full' ) ) {
|
|
| 4828 | - $location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' ); |
|
| 4827 | + if (get_query_var('gd_neighbourhood_full')) {
|
|
| 4828 | + $location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');
|
|
| 4829 | 4829 | } |
| 4830 | 4830 | } |
| 4831 | 4831 | |
@@ -4840,57 +4840,57 @@ discard block |
||
| 4840 | 4840 | * @param string $gd_page The page being filtered. |
| 4841 | 4841 | * @param string $sep The separator, default: `|`. |
| 4842 | 4842 | */ |
| 4843 | - $title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep ); |
|
| 4843 | + $title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);
|
|
| 4844 | 4844 | |
| 4845 | - if ( strpos( $title, '%%search_term%%' ) !== false ) {
|
|
| 4845 | + if (strpos($title, '%%search_term%%') !== false) {
|
|
| 4846 | 4846 | $search_term = ''; |
| 4847 | - if ( isset( $_REQUEST['s'] ) ) {
|
|
| 4848 | - $search_term = esc_attr( $_REQUEST['s'] ); |
|
| 4847 | + if (isset($_REQUEST['s'])) {
|
|
| 4848 | + $search_term = esc_attr($_REQUEST['s']); |
|
| 4849 | 4849 | } |
| 4850 | - $title = str_replace( "%%search_term%%", $search_term, $title ); |
|
| 4850 | + $title = str_replace("%%search_term%%", $search_term, $title);
|
|
| 4851 | 4851 | } |
| 4852 | 4852 | |
| 4853 | - if ( strpos( $title, '%%search_near%%' ) !== false ) {
|
|
| 4853 | + if (strpos($title, '%%search_near%%') !== false) {
|
|
| 4854 | 4854 | $search_term = ''; |
| 4855 | - if ( isset( $_REQUEST['snear'] ) ) {
|
|
| 4856 | - $search_term = esc_attr( $_REQUEST['snear'] ); |
|
| 4855 | + if (isset($_REQUEST['snear'])) {
|
|
| 4856 | + $search_term = esc_attr($_REQUEST['snear']); |
|
| 4857 | 4857 | } |
| 4858 | - $title = str_replace( "%%search_near%%", $search_term, $title ); |
|
| 4858 | + $title = str_replace("%%search_near%%", $search_term, $title);
|
|
| 4859 | 4859 | } |
| 4860 | 4860 | |
| 4861 | - if ( strpos( $title, '%%name%%' ) !== false ) {
|
|
| 4862 | - if ( is_author() ) {
|
|
| 4863 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); |
|
| 4861 | + if (strpos($title, '%%name%%') !== false) {
|
|
| 4862 | + if (is_author()) {
|
|
| 4863 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 4864 | 4864 | $author_name = $curauth->display_name; |
| 4865 | 4865 | } else {
|
| 4866 | 4866 | $author_name = get_the_author(); |
| 4867 | 4867 | } |
| 4868 | - if ( ! $author_name || $author_name === '' ) {
|
|
| 4868 | + if (!$author_name || $author_name === '') {
|
|
| 4869 | 4869 | $queried_object = get_queried_object(); |
| 4870 | 4870 | |
| 4871 | - if ( isset( $queried_object->data->user_nicename ) ) {
|
|
| 4871 | + if (isset($queried_object->data->user_nicename)) {
|
|
| 4872 | 4872 | $author_name = $queried_object->data->display_name; |
| 4873 | 4873 | } |
| 4874 | 4874 | } |
| 4875 | - $title = str_replace( "%%name%%", $author_name, $title ); |
|
| 4875 | + $title = str_replace("%%name%%", $author_name, $title);
|
|
| 4876 | 4876 | } |
| 4877 | 4877 | |
| 4878 | - if ( strpos( $title, '%%page%%' ) !== false ) {
|
|
| 4879 | - $page = geodir_title_meta_page( $sep ); |
|
| 4880 | - $title = str_replace( "%%page%%", $page, $title ); |
|
| 4878 | + if (strpos($title, '%%page%%') !== false) {
|
|
| 4879 | + $page = geodir_title_meta_page($sep); |
|
| 4880 | + $title = str_replace("%%page%%", $page, $title);
|
|
| 4881 | 4881 | } |
| 4882 | - if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
|
|
| 4882 | + if (strpos($title, '%%pagenumber%%') !== false) {
|
|
| 4883 | 4883 | $pagenumber = geodir_title_meta_pagenumber(); |
| 4884 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); |
|
| 4884 | + $title = str_replace("%%pagenumber%%", $pagenumber, $title);
|
|
| 4885 | 4885 | } |
| 4886 | - if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
|
|
| 4886 | + if (strpos($title, '%%pagetotal%%') !== false) {
|
|
| 4887 | 4887 | $pagetotal = geodir_title_meta_pagetotal(); |
| 4888 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); |
|
| 4888 | + $title = str_replace("%%pagetotal%%", $pagetotal, $title);
|
|
| 4889 | 4889 | } |
| 4890 | 4890 | |
| 4891 | - $title = wptexturize( $title ); |
|
| 4892 | - $title = convert_chars( $title ); |
|
| 4893 | - $title = esc_html( $title ); |
|
| 4891 | + $title = wptexturize($title); |
|
| 4892 | + $title = convert_chars($title); |
|
| 4893 | + $title = esc_html($title); |
|
| 4894 | 4894 | |
| 4895 | 4895 | /** |
| 4896 | 4896 | * Filter the title variables after standard ones have been filtered. |
@@ -4904,7 +4904,7 @@ discard block |
||
| 4904 | 4904 | * @param string $sep The separator, default: `|`. |
| 4905 | 4905 | */ |
| 4906 | 4906 | |
| 4907 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); |
|
| 4907 | + return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
|
|
| 4908 | 4908 | } |
| 4909 | 4909 | |
| 4910 | 4910 | /** |
@@ -4917,82 +4917,82 @@ discard block |
||
| 4917 | 4917 | * |
| 4918 | 4918 | * @return array Translation texts. |
| 4919 | 4919 | */ |
| 4920 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
|
|
| 4921 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 4920 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
|
|
| 4921 | + $gd_post_types = geodir_get_posttypes('array');
|
|
| 4922 | 4922 | |
| 4923 | - if ( ! empty( $gd_post_types ) ) {
|
|
| 4924 | - foreach ( $gd_post_types as $post_type => $cpt_info ) {
|
|
| 4925 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; |
|
| 4926 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; |
|
| 4927 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; |
|
| 4923 | + if (!empty($gd_post_types)) {
|
|
| 4924 | + foreach ($gd_post_types as $post_type => $cpt_info) {
|
|
| 4925 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; |
|
| 4926 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; |
|
| 4927 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; |
|
| 4928 | 4928 | |
| 4929 | - if ( ! empty( $labels ) ) {
|
|
| 4930 | - if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
|
|
| 4929 | + if (!empty($labels)) {
|
|
| 4930 | + if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
|
|
| 4931 | 4931 | $translation_texts[] = $labels['name']; |
| 4932 | 4932 | } |
| 4933 | - if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
|
|
| 4933 | + if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
|
|
| 4934 | 4934 | $translation_texts[] = $labels['singular_name']; |
| 4935 | 4935 | } |
| 4936 | - if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
|
|
| 4936 | + if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
|
|
| 4937 | 4937 | $translation_texts[] = $labels['add_new']; |
| 4938 | 4938 | } |
| 4939 | - if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
|
|
| 4939 | + if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
|
|
| 4940 | 4940 | $translation_texts[] = $labels['add_new_item']; |
| 4941 | 4941 | } |
| 4942 | - if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
|
|
| 4942 | + if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
|
|
| 4943 | 4943 | $translation_texts[] = $labels['edit_item']; |
| 4944 | 4944 | } |
| 4945 | - if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
|
|
| 4945 | + if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
|
|
| 4946 | 4946 | $translation_texts[] = $labels['new_item']; |
| 4947 | 4947 | } |
| 4948 | - if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
|
|
| 4948 | + if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
|
|
| 4949 | 4949 | $translation_texts[] = $labels['view_item']; |
| 4950 | 4950 | } |
| 4951 | - if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
|
|
| 4951 | + if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
|
|
| 4952 | 4952 | $translation_texts[] = $labels['search_items']; |
| 4953 | 4953 | } |
| 4954 | - if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
|
|
| 4954 | + if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
|
|
| 4955 | 4955 | $translation_texts[] = $labels['not_found']; |
| 4956 | 4956 | } |
| 4957 | - if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
|
|
| 4957 | + if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
|
|
| 4958 | 4958 | $translation_texts[] = $labels['not_found_in_trash']; |
| 4959 | 4959 | } |
| 4960 | - if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
|
|
| 4960 | + if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
|
|
| 4961 | 4961 | $translation_texts[] = $labels['label_post_profile']; |
| 4962 | 4962 | } |
| 4963 | - if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
|
|
| 4963 | + if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
|
|
| 4964 | 4964 | $translation_texts[] = $labels['label_post_info']; |
| 4965 | 4965 | } |
| 4966 | - if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
|
|
| 4966 | + if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
|
|
| 4967 | 4967 | $translation_texts[] = $labels['label_post_images']; |
| 4968 | 4968 | } |
| 4969 | - if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
|
|
| 4969 | + if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
|
|
| 4970 | 4970 | $translation_texts[] = $labels['label_post_map']; |
| 4971 | 4971 | } |
| 4972 | - if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
|
|
| 4972 | + if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
|
|
| 4973 | 4973 | $translation_texts[] = $labels['label_reviews']; |
| 4974 | 4974 | } |
| 4975 | - if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
|
|
| 4975 | + if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
|
|
| 4976 | 4976 | $translation_texts[] = $labels['label_related_listing']; |
| 4977 | 4977 | } |
| 4978 | 4978 | } |
| 4979 | 4979 | |
| 4980 | - if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
|
|
| 4981 | - $translation_texts[] = normalize_whitespace( $description ); |
|
| 4980 | + if ($description != '' && !in_array($description, $translation_texts)) {
|
|
| 4981 | + $translation_texts[] = normalize_whitespace($description); |
|
| 4982 | 4982 | } |
| 4983 | 4983 | |
| 4984 | - if ( ! empty( $seo ) ) {
|
|
| 4985 | - if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
|
|
| 4986 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); |
|
| 4984 | + if (!empty($seo)) {
|
|
| 4985 | + if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
|
|
| 4986 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); |
|
| 4987 | 4987 | } |
| 4988 | 4988 | |
| 4989 | - if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
|
|
| 4990 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); |
|
| 4989 | + if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
|
|
| 4990 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); |
|
| 4991 | 4991 | } |
| 4992 | 4992 | } |
| 4993 | 4993 | } |
| 4994 | 4994 | } |
| 4995 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4995 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4996 | 4996 | |
| 4997 | 4997 | return $translation_texts; |
| 4998 | 4998 | } |
@@ -5007,27 +5007,27 @@ discard block |
||
| 5007 | 5007 | * |
| 5008 | 5008 | * @return array Location terms. |
| 5009 | 5009 | */ |
| 5010 | -function geodir_remove_location_terms( $location_terms = array() ) {
|
|
| 5011 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 5010 | +function geodir_remove_location_terms($location_terms = array()) {
|
|
| 5011 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 5012 | 5012 | |
| 5013 | - if ( ! empty( $location_terms ) && $location_manager ) {
|
|
| 5014 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 5015 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 5013 | + if (!empty($location_terms) && $location_manager) {
|
|
| 5014 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 5015 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 5016 | 5016 | |
| 5017 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 5018 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 5019 | - unset( $location_terms['gd_country'] ); |
|
| 5017 | + if ($hide_region_part && $hide_country_part) {
|
|
| 5018 | + if (isset($location_terms['gd_country'])) {
|
|
| 5019 | + unset($location_terms['gd_country']); |
|
| 5020 | 5020 | } |
| 5021 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 5022 | - unset( $location_terms['gd_region'] ); |
|
| 5021 | + if (isset($location_terms['gd_region'])) {
|
|
| 5022 | + unset($location_terms['gd_region']); |
|
| 5023 | 5023 | } |
| 5024 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 5025 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 5026 | - unset( $location_terms['gd_region'] ); |
|
| 5024 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 5025 | + if (isset($location_terms['gd_region'])) {
|
|
| 5026 | + unset($location_terms['gd_region']); |
|
| 5027 | 5027 | } |
| 5028 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 5029 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 5030 | - unset( $location_terms['gd_country'] ); |
|
| 5028 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 5029 | + if (isset($location_terms['gd_country'])) {
|
|
| 5030 | + unset($location_terms['gd_country']); |
|
| 5031 | 5031 | } |
| 5032 | 5032 | } |
| 5033 | 5033 | } |
@@ -5038,7 +5038,7 @@ discard block |
||
| 5038 | 5038 | * @since 1.6.22 |
| 5039 | 5039 | * @param array $location_terms The array of location terms. |
| 5040 | 5040 | */ |
| 5041 | - return apply_filters('geodir_remove_location_terms',$location_terms);
|
|
| 5041 | + return apply_filters('geodir_remove_location_terms', $location_terms);
|
|
| 5042 | 5042 | } |
| 5043 | 5043 | |
| 5044 | 5044 | /** |
@@ -5055,32 +5055,32 @@ discard block |
||
| 5055 | 5055 | * @param WP_Post $post Post object. |
| 5056 | 5056 | * @param bool $update Whether this is an existing listing being updated or not. |
| 5057 | 5057 | */ |
| 5058 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
|
|
| 5058 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
|
|
| 5059 | 5059 | global $gd_set_listing_edited; |
| 5060 | 5060 | |
| 5061 | - if ( ! $update ) {
|
|
| 5061 | + if (!$update) {
|
|
| 5062 | 5062 | return; |
| 5063 | 5063 | } |
| 5064 | 5064 | |
| 5065 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; |
|
| 5066 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; |
|
| 5065 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; |
|
| 5066 | + $is_admin = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
|
|
| 5067 | 5067 | $inline_save = $action == 'inline-save' ? true : false; |
| 5068 | 5068 | |
| 5069 | - if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
|
|
| 5069 | + if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
|
|
| 5070 | 5070 | return; |
| 5071 | 5071 | } |
| 5072 | 5072 | |
| 5073 | - if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
|
|
| 5073 | + if ($action != '' && in_array($action, array('geodir_import_export'))) {
|
|
| 5074 | 5074 | return; |
| 5075 | 5075 | } |
| 5076 | 5076 | |
| 5077 | 5077 | $user_id = (int) get_current_user_id(); |
| 5078 | 5078 | |
| 5079 | - if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 5080 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; |
|
| 5079 | + if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 5080 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; |
|
| 5081 | 5081 | |
| 5082 | - if ( $user_id == $author_id && ! is_super_admin() && empty( $gd_set_listing_edited[$post_ID] ) ) {
|
|
| 5083 | - if ( !empty( $gd_set_listing_edited ) ) {
|
|
| 5082 | + if ($user_id == $author_id && !is_super_admin() && empty($gd_set_listing_edited[$post_ID])) {
|
|
| 5083 | + if (!empty($gd_set_listing_edited)) {
|
|
| 5084 | 5084 | $gd_set_listing_edited = array(); |
| 5085 | 5085 | } |
| 5086 | 5086 | $gd_set_listing_edited[$post_ID] = true; |
@@ -5098,14 +5098,14 @@ discard block |
||
| 5098 | 5098 | * |
| 5099 | 5099 | * @return string|null The current page start & end numbering. |
| 5100 | 5100 | */ |
| 5101 | -function geodir_title_meta_page( $sep ) {
|
|
| 5101 | +function geodir_title_meta_page($sep) {
|
|
| 5102 | 5102 | $replacement = null; |
| 5103 | 5103 | |
| 5104 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5105 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5104 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5105 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5106 | 5106 | |
| 5107 | - if ( $max > 1 && $nr > 1 ) {
|
|
| 5108 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); |
|
| 5107 | + if ($max > 1 && $nr > 1) {
|
|
| 5108 | + $replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
|
|
| 5109 | 5109 | } |
| 5110 | 5110 | |
| 5111 | 5111 | return $replacement; |
@@ -5122,8 +5122,8 @@ discard block |
||
| 5122 | 5122 | function geodir_title_meta_pagenumber() {
|
| 5123 | 5123 | $replacement = null; |
| 5124 | 5124 | |
| 5125 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5126 | - if ( isset( $nr ) && $nr > 0 ) {
|
|
| 5125 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5126 | + if (isset($nr) && $nr > 0) {
|
|
| 5127 | 5127 | $replacement = (string) $nr; |
| 5128 | 5128 | } |
| 5129 | 5129 | |
@@ -5141,8 +5141,8 @@ discard block |
||
| 5141 | 5141 | function geodir_title_meta_pagetotal() {
|
| 5142 | 5142 | $replacement = null; |
| 5143 | 5143 | |
| 5144 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5145 | - if ( isset( $max ) && $max > 0 ) {
|
|
| 5144 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5145 | + if (isset($max) && $max > 0) {
|
|
| 5146 | 5146 | $replacement = (string) $max; |
| 5147 | 5147 | } |
| 5148 | 5148 | |
@@ -5162,36 +5162,36 @@ discard block |
||
| 5162 | 5162 | * |
| 5163 | 5163 | * @return int|null The current page numbering. |
| 5164 | 5164 | */ |
| 5165 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
|
|
| 5165 | +function geodir_title_meta_pagenumbering($request = 'nr') {
|
|
| 5166 | 5166 | global $wp_query, $post; |
| 5167 | 5167 | $max_num_pages = null; |
| 5168 | 5168 | $page_number = null; |
| 5169 | 5169 | |
| 5170 | 5170 | $max_num_pages = 1; |
| 5171 | 5171 | |
| 5172 | - if ( ! is_singular() ) {
|
|
| 5173 | - $page_number = get_query_var( 'paged' ); |
|
| 5174 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5172 | + if (!is_singular()) {
|
|
| 5173 | + $page_number = get_query_var('paged');
|
|
| 5174 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5175 | 5175 | $page_number = 1; |
| 5176 | 5176 | } |
| 5177 | 5177 | |
| 5178 | - if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
|
|
| 5178 | + if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
|
|
| 5179 | 5179 | $max_num_pages = $wp_query->max_num_pages; |
| 5180 | 5180 | } |
| 5181 | 5181 | } else {
|
| 5182 | - $page_number = get_query_var( 'page' ); |
|
| 5183 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5182 | + $page_number = get_query_var('page');
|
|
| 5183 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5184 | 5184 | $page_number = 1; |
| 5185 | 5185 | } |
| 5186 | 5186 | |
| 5187 | - if ( isset( $post->post_content ) ) {
|
|
| 5188 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); |
|
| 5187 | + if (isset($post->post_content)) {
|
|
| 5188 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); |
|
| 5189 | 5189 | } |
| 5190 | 5190 | } |
| 5191 | 5191 | |
| 5192 | 5192 | $return = null; |
| 5193 | 5193 | |
| 5194 | - switch ( $request ) {
|
|
| 5194 | + switch ($request) {
|
|
| 5195 | 5195 | case 'nr': |
| 5196 | 5196 | $return = $page_number; |
| 5197 | 5197 | break; |
@@ -5212,14 +5212,14 @@ discard block |
||
| 5212 | 5212 | * |
| 5213 | 5213 | * @return array Terms. |
| 5214 | 5214 | */ |
| 5215 | -function geodir_filter_empty_terms( $terms ) {
|
|
| 5216 | - if ( empty( $terms ) ) {
|
|
| 5215 | +function geodir_filter_empty_terms($terms) {
|
|
| 5216 | + if (empty($terms)) {
|
|
| 5217 | 5217 | return $terms; |
| 5218 | 5218 | } |
| 5219 | 5219 | |
| 5220 | 5220 | $return = array(); |
| 5221 | - foreach ( $terms as $term ) {
|
|
| 5222 | - if ( isset( $term->count ) && $term->count > 0 ) {
|
|
| 5221 | + foreach ($terms as $term) {
|
|
| 5222 | + if (isset($term->count) && $term->count > 0) {
|
|
| 5223 | 5223 | $return[] = $term; |
| 5224 | 5224 | } else {
|
| 5225 | 5225 | /** |
@@ -5230,7 +5230,7 @@ discard block |
||
| 5230 | 5230 | * @param array $return The array of terms to return. |
| 5231 | 5231 | * @param object $term The term object. |
| 5232 | 5232 | */ |
| 5233 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); |
|
| 5233 | + $return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
|
|
| 5234 | 5234 | } |
| 5235 | 5235 | } |
| 5236 | 5236 | |
@@ -5247,15 +5247,15 @@ discard block |
||
| 5247 | 5247 | * |
| 5248 | 5248 | * @return array |
| 5249 | 5249 | */ |
| 5250 | -function geodir_remove_hentry( $class ) {
|
|
| 5251 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 5252 | - $class = array_diff( $class, array( 'hentry' ) ); |
|
| 5250 | +function geodir_remove_hentry($class) {
|
|
| 5251 | + if (geodir_is_page('detail')) {
|
|
| 5252 | + $class = array_diff($class, array('hentry'));
|
|
| 5253 | 5253 | } |
| 5254 | 5254 | |
| 5255 | 5255 | return $class; |
| 5256 | 5256 | } |
| 5257 | 5257 | |
| 5258 | -add_filter( 'post_class', 'geodir_remove_hentry' ); |
|
| 5258 | +add_filter('post_class', 'geodir_remove_hentry');
|
|
| 5259 | 5259 | |
| 5260 | 5260 | /** |
| 5261 | 5261 | * Registers a individual text string for WPML translation. |
@@ -5267,8 +5267,8 @@ discard block |
||
| 5267 | 5267 | * @param string $domain The plugin domain. Default geodirectory. |
| 5268 | 5268 | * @param string $name The name of the string which helps to know what's being translated. |
| 5269 | 5269 | */ |
| 5270 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
|
|
| 5271 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5270 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
|
|
| 5271 | + do_action('wpml_register_single_string', $domain, $name, $string);
|
|
| 5272 | 5272 | } |
| 5273 | 5273 | |
| 5274 | 5274 | /** |
@@ -5283,8 +5283,8 @@ discard block |
||
| 5283 | 5283 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. |
| 5284 | 5284 | * @return string The translated string. |
| 5285 | 5285 | */ |
| 5286 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
|
|
| 5287 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5286 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
|
|
| 5287 | + return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
|
|
| 5288 | 5288 | } |
| 5289 | 5289 | |
| 5290 | 5290 | /** |
@@ -5299,19 +5299,19 @@ discard block |
||
| 5299 | 5299 | * @param int $post_ID Post ID. |
| 5300 | 5300 | * @param array $data Post data. |
| 5301 | 5301 | */ |
| 5302 | -function geodir_send_listing_edited_notification( $post_ID, $data ) {
|
|
| 5302 | +function geodir_send_listing_edited_notification($post_ID, $data) {
|
|
| 5303 | 5303 | global $gd_notified_edited, $gd_set_listing_edited; |
| 5304 | 5304 | |
| 5305 | - if ( !empty( $gd_set_listing_edited[ $post_ID ] ) && empty( $gd_notified_edited[ $post_ID ] ) ) {
|
|
| 5306 | - if ( !empty( $gd_notified_edited ) ) {
|
|
| 5305 | + if (!empty($gd_set_listing_edited[$post_ID]) && empty($gd_notified_edited[$post_ID])) {
|
|
| 5306 | + if (!empty($gd_notified_edited)) {
|
|
| 5307 | 5307 | $gd_notified_edited = array(); |
| 5308 | 5308 | } |
| 5309 | - $gd_notified_edited[ $post_ID ] = true; |
|
| 5309 | + $gd_notified_edited[$post_ID] = true; |
|
| 5310 | 5310 | |
| 5311 | - $from_email = get_option( 'site_email' ); |
|
| 5311 | + $from_email = get_option('site_email');
|
|
| 5312 | 5312 | $from_name = get_site_emailName(); |
| 5313 | - $to_email = get_option( 'admin_email' ); |
|
| 5314 | - $to_name = get_option( 'name' ); |
|
| 5313 | + $to_email = get_option('admin_email');
|
|
| 5314 | + $to_name = get_option('name');
|
|
| 5315 | 5315 | $message_type = 'listing_edited'; |
| 5316 | 5316 | |
| 5317 | 5317 | $notify_edited = true; |
@@ -5323,11 +5323,11 @@ discard block |
||
| 5323 | 5323 | * @param bool $notify_edited Notify on listing edited by author? |
| 5324 | 5324 | * @param object $post The current post object. |
| 5325 | 5325 | */ |
| 5326 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post_ID ); |
|
| 5326 | + $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post_ID);
|
|
| 5327 | 5327 | |
| 5328 | - if ( $notify_edited ) {
|
|
| 5329 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); |
|
| 5328 | + if ($notify_edited) {
|
|
| 5329 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 5330 | 5330 | } |
| 5331 | 5331 | } |
| 5332 | 5332 | } |
| 5333 | -add_action( 'geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2 ); |
|
| 5334 | 5333 | \ No newline at end of file |
| 5334 | +add_action('geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2); |
|
| 5335 | 5335 | \ No newline at end of file |
@@ -2389,11 +2389,11 @@ |
||
| 2389 | 2389 | ?> |
| 2390 | 2390 | <input class="search_text" name="s" |
| 2391 | 2391 | value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {
|
| 2392 | - $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) ); |
|
| 2393 | - echo $search_term; |
|
| 2394 | - } else {
|
|
| 2395 | - echo $default_search_for_text; |
|
| 2396 | - } ?>" type="text" |
|
| 2392 | + $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) ); |
|
| 2393 | + echo $search_term; |
|
| 2394 | + } else {
|
|
| 2395 | + echo $default_search_for_text; |
|
| 2396 | + } ?>" type="text" |
|
| 2397 | 2397 | onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"
|
| 2398 | 2398 | onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"
|
| 2399 | 2399 | onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);"> |
@@ -52,31 +52,31 @@ discard block |
||
| 52 | 52 | jQuery(listSel).children('li').switchClass('gridview_onehalf gridview_onethird gridview_onefourth', 'gridview_onefifth', 600);
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - jQuery.post("<?php echo geodir_get_ajax_url();?>&gd_listing_view=" + val, function (data) {
|
|
| 55 | + jQuery.post("<?php echo geodir_get_ajax_url(); ?>&gd_listing_view=" + val, function (data) {
|
|
| 56 | 56 | //alert(data ); |
| 57 | 57 | }); |
| 58 | 58 | } |
| 59 | 59 | </script> |
| 60 | 60 | <div class="geodir-list-view-select"> |
| 61 | 61 | <select name="gd_list_view" id="gd_list_view" onchange="geodir_list_view_select(this);"> |
| 62 | - <?php $listing_view = (int) $gd_session->get( 'gd_listing_view' ); ?> |
|
| 63 | - <option value=""><?php _e( 'View:', 'geodirectory' ); ?></option> |
|
| 62 | + <?php $listing_view = (int) $gd_session->get('gd_listing_view'); ?>
|
|
| 63 | + <option value=""><?php _e('View:', 'geodirectory'); ?></option>
|
|
| 64 | 64 | <option |
| 65 | - value="1" <?php selected( 1, $listing_view ); ?>><?php _e( 'View: List', 'geodirectory' ); ?></option> |
|
| 65 | + value="1" <?php selected(1, $listing_view); ?>><?php _e('View: List', 'geodirectory'); ?></option>
|
|
| 66 | 66 | <option |
| 67 | - value="2" <?php selected( 2, $listing_view ); ?>><?php _e( 'View: Grid 2', 'geodirectory' ); ?></option> |
|
| 67 | + value="2" <?php selected(2, $listing_view); ?>><?php _e('View: Grid 2', 'geodirectory'); ?></option>
|
|
| 68 | 68 | <option |
| 69 | - value="3" <?php selected( 3, $listing_view ); ?>><?php _e( 'View: Grid 3', 'geodirectory' ); ?></option> |
|
| 69 | + value="3" <?php selected(3, $listing_view); ?>><?php _e('View: Grid 3', 'geodirectory'); ?></option>
|
|
| 70 | 70 | <option |
| 71 | - value="4" <?php selected( 4, $listing_view ); ?>><?php _e( 'View: Grid 4', 'geodirectory' ); ?></option> |
|
| 71 | + value="4" <?php selected(4, $listing_view); ?>><?php _e('View: Grid 4', 'geodirectory'); ?></option>
|
|
| 72 | 72 | <option |
| 73 | - value="5" <?php selected( 5, $listing_view ); ?>><?php _e( 'View: Grid 5', 'geodirectory' ); ?></option> |
|
| 73 | + value="5" <?php selected(5, $listing_view); ?>><?php _e('View: Grid 5', 'geodirectory'); ?></option>
|
|
| 74 | 74 | </select> |
| 75 | 75 | </div> |
| 76 | 76 | <?php |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | -add_action( 'geodir_before_listing', 'geodir_list_view_select', 100 ); |
|
| 79 | +add_action('geodir_before_listing', 'geodir_list_view_select', 100);
|
|
| 80 | 80 | |
| 81 | 81 | /** |
| 82 | 82 | * Limit the listing excerpt. |
@@ -91,9 +91,9 @@ discard block |
||
| 91 | 91 | * @global object $post The current post object. |
| 92 | 92 | * @return string The modified excerpt. |
| 93 | 93 | */ |
| 94 | -function geodir_max_excerpt( $charlength ) {
|
|
| 94 | +function geodir_max_excerpt($charlength) {
|
|
| 95 | 95 | global $post; |
| 96 | - if ( $charlength == '0' ) {
|
|
| 96 | + if ($charlength == '0') {
|
|
| 97 | 97 | return; |
| 98 | 98 | } |
| 99 | 99 | $out = ''; |
@@ -101,46 +101,46 @@ discard block |
||
| 101 | 101 | $temp_post = $post; |
| 102 | 102 | $excerpt = get_the_excerpt(); |
| 103 | 103 | |
| 104 | - $charlength ++; |
|
| 105 | - $excerpt_more = function_exists( 'geodirf_excerpt_more' ) ? geodirf_excerpt_more( '' ) : geodir_excerpt_more( '' ); |
|
| 106 | - if ( geodir_utf8_strlen( $excerpt ) > $charlength ) {
|
|
| 107 | - if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {
|
|
| 108 | - $excut = - ( geodir_utf8_strlen( $excerpt_more ) ); |
|
| 109 | - $subex = geodir_utf8_substr( $excerpt, 0, $excut ); |
|
| 110 | - if ( $charlength > 0 && geodir_utf8_strlen( $subex ) > $charlength ) {
|
|
| 111 | - $subex = geodir_utf8_substr( $subex, 0, $charlength ); |
|
| 104 | + $charlength++; |
|
| 105 | + $excerpt_more = function_exists('geodirf_excerpt_more') ? geodirf_excerpt_more('') : geodir_excerpt_more('');
|
|
| 106 | + if (geodir_utf8_strlen($excerpt) > $charlength) {
|
|
| 107 | + if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {
|
|
| 108 | + $excut = - (geodir_utf8_strlen($excerpt_more)); |
|
| 109 | + $subex = geodir_utf8_substr($excerpt, 0, $excut); |
|
| 110 | + if ($charlength > 0 && geodir_utf8_strlen($subex) > $charlength) {
|
|
| 111 | + $subex = geodir_utf8_substr($subex, 0, $charlength); |
|
| 112 | 112 | } |
| 113 | 113 | $out .= $subex; |
| 114 | 114 | } else {
|
| 115 | - $subex = geodir_utf8_substr( $excerpt, 0, $charlength - 5 ); |
|
| 116 | - $exwords = explode( ' ', $subex ); |
|
| 117 | - $excut = - ( geodir_utf8_strlen( $exwords[ count( $exwords ) - 1 ] ) ); |
|
| 118 | - if ( $excut < 0 ) {
|
|
| 119 | - $out .= geodir_utf8_substr( $subex, 0, $excut ); |
|
| 115 | + $subex = geodir_utf8_substr($excerpt, 0, $charlength - 5); |
|
| 116 | + $exwords = explode(' ', $subex);
|
|
| 117 | + $excut = - (geodir_utf8_strlen($exwords[count($exwords) - 1])); |
|
| 118 | + if ($excut < 0) {
|
|
| 119 | + $out .= geodir_utf8_substr($subex, 0, $excut); |
|
| 120 | 120 | } else {
|
| 121 | 121 | $out .= $subex; |
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | - $out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">'; |
|
| 124 | + $out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">'; |
|
| 125 | 125 | /** |
| 126 | 126 | * Filter excerpt read more text. |
| 127 | 127 | * |
| 128 | 128 | * @since 1.0.0 |
| 129 | 129 | */ |
| 130 | - $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) ); |
|
| 130 | + $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
|
|
| 131 | 131 | $out .= '</a>'; |
| 132 | 132 | |
| 133 | 133 | } else {
|
| 134 | - if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {
|
|
| 135 | - $excut = - ( geodir_utf8_strlen( $excerpt_more ) ); |
|
| 136 | - $out .= geodir_utf8_substr( $excerpt, 0, $excut ); |
|
| 137 | - $out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">'; |
|
| 134 | + if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {
|
|
| 135 | + $excut = - (geodir_utf8_strlen($excerpt_more)); |
|
| 136 | + $out .= geodir_utf8_substr($excerpt, 0, $excut); |
|
| 137 | + $out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">'; |
|
| 138 | 138 | /** |
| 139 | 139 | * Filter excerpt read more text. |
| 140 | 140 | * |
| 141 | 141 | * @since 1.0.0 |
| 142 | 142 | */ |
| 143 | - $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) ); |
|
| 143 | + $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
|
|
| 144 | 144 | $out .= '</a>'; |
| 145 | 145 | } else {
|
| 146 | 146 | $out .= $excerpt; |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | * |
| 164 | 164 | * @return object Returns filtered package info as an object. |
| 165 | 165 | */ |
| 166 | -function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {
|
|
| 166 | +function geodir_post_package_info($package_info, $post = '', $post_type = '') {
|
|
| 167 | 167 | $package_info['pid'] = 0; |
| 168 | 168 | $package_info['days'] = 0; |
| 169 | 169 | $package_info['amount'] = 0; |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | * @param object|string $post The post object. |
| 193 | 193 | * @param string $post_type The post type. |
| 194 | 194 | */ |
| 195 | - return (object) apply_filters( 'geodir_post_package_info', $package_info, $post, $post_type ); |
|
| 195 | + return (object) apply_filters('geodir_post_package_info', $package_info, $post, $post_type);
|
|
| 196 | 196 | |
| 197 | 197 | } |
| 198 | 198 | |
@@ -220,11 +220,11 @@ discard block |
||
| 220 | 220 | * |
| 221 | 221 | * } |
| 222 | 222 | */ |
| 223 | -function geodir_send_inquiry( $request ) {
|
|
| 223 | +function geodir_send_inquiry($request) {
|
|
| 224 | 224 | global $wpdb; |
| 225 | 225 | |
| 226 | 226 | // strip slashes from text |
| 227 | - $request = ! empty( $request ) ? stripslashes_deep( $request ) : $request; |
|
| 227 | + $request = !empty($request) ? stripslashes_deep($request) : $request; |
|
| 228 | 228 | |
| 229 | 229 | $yourname = sanitize_text_field($request['inq_name']); |
| 230 | 230 | $youremail = sanitize_email($request['inq_email']); |
@@ -232,25 +232,25 @@ discard block |
||
| 232 | 232 | $frnd_comments = sanitize_text_field($request['inq_msg']); |
| 233 | 233 | $pid = absint($request['pid']); |
| 234 | 234 | |
| 235 | - $author_id = ''; |
|
| 235 | + $author_id = ''; |
|
| 236 | 236 | |
| 237 | - if ( $pid && 'publish' == get_post_status ( $pid ) ) {
|
|
| 237 | + if ($pid && 'publish' == get_post_status($pid)) {
|
|
| 238 | 238 | |
| 239 | - check_ajax_referer( 'send_inquiry_'.$pid ); |
|
| 239 | + check_ajax_referer('send_inquiry_'.$pid);
|
|
| 240 | 240 | |
| 241 | 241 | $p_post = get_post($pid); |
| 242 | 242 | |
| 243 | - $author_id = $p_post->post_author; |
|
| 243 | + $author_id = $p_post->post_author; |
|
| 244 | 244 | |
| 245 | - }else{
|
|
| 245 | + } else {
|
|
| 246 | 246 | gd_die(); |
| 247 | 247 | } |
| 248 | 248 | |
| 249 | - $to_email = geodir_get_post_meta( $pid, 'geodir_email', true ); |
|
| 250 | - $to_name = geodir_get_client_name( $author_id ); |
|
| 249 | + $to_email = geodir_get_post_meta($pid, 'geodir_email', true); |
|
| 250 | + $to_name = geodir_get_client_name($author_id); |
|
| 251 | 251 | |
| 252 | - if ( $to_email == '' ) {
|
|
| 253 | - $to_email = get_option( 'admin_email' ); |
|
| 252 | + if ($to_email == '') {
|
|
| 253 | + $to_email = get_option('admin_email');
|
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | /** |
@@ -271,10 +271,10 @@ discard block |
||
| 271 | 271 | * } |
| 272 | 272 | * @param string $type The form type, default: `Enquiry`. |
| 273 | 273 | */ |
| 274 | - do_action( 'geodir_after_send_enquiry', $request, 'Enquiry' ); |
|
| 274 | + do_action('geodir_after_send_enquiry', $request, 'Enquiry');
|
|
| 275 | 275 | |
| 276 | 276 | $client_message = $frnd_comments; |
| 277 | - $client_message .= '<br>' . __( 'From :', 'geodirectory' ) . ' ' . $yourname . '<br>' . __( 'Phone :', 'geodirectory' ) . ' ' . $inq_phone . '<br>' . __( 'Email :', 'geodirectory' ) . ' ' . $youremail . '<br><br>' . __( 'Sent from', 'geodirectory' ) . ' - <b><a href="' . trailingslashit( home_url() ) . '">' . get_option( 'blogname' ) . '</a></b>.'; |
|
| 277 | + $client_message .= '<br>'.__('From :', 'geodirectory').' '.$yourname.'<br>'.__('Phone :', 'geodirectory').' '.$inq_phone.'<br>'.__('Email :', 'geodirectory').' '.$youremail.'<br><br>'.__('Sent from', 'geodirectory').' - <b><a href="'.trailingslashit(home_url()).'">'.get_option('blogname').'</a></b>.';
|
|
| 278 | 278 | /** |
| 279 | 279 | * Filter client message text. |
| 280 | 280 | * |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | * |
| 283 | 283 | * @param string $client_message Client message text. |
| 284 | 284 | */ |
| 285 | - $client_message = apply_filters( 'geodir_inquiry_email_msg', $client_message ); |
|
| 285 | + $client_message = apply_filters('geodir_inquiry_email_msg', $client_message);
|
|
| 286 | 286 | |
| 287 | 287 | /** |
| 288 | 288 | * Called before the send enquiry email is sent. |
@@ -301,12 +301,12 @@ discard block |
||
| 301 | 301 | * |
| 302 | 302 | * } |
| 303 | 303 | */ |
| 304 | - do_action( 'geodir_before_send_enquiry_email', $request ); |
|
| 305 | - if ( $to_email ) {
|
|
| 304 | + do_action('geodir_before_send_enquiry_email', $request);
|
|
| 305 | + if ($to_email) {
|
|
| 306 | 306 | // strip slashes message |
| 307 | - $client_message = stripslashes_deep( $client_message ); |
|
| 307 | + $client_message = stripslashes_deep($client_message); |
|
| 308 | 308 | |
| 309 | - geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid'] );//To client email |
|
| 309 | + geodir_sendEmail($youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid']); //To client email |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | /** |
@@ -326,12 +326,12 @@ discard block |
||
| 326 | 326 | * |
| 327 | 327 | * } |
| 328 | 328 | */ |
| 329 | - do_action( 'geodir_after_send_enquiry_email', $request ); |
|
| 330 | - $url = get_permalink( $pid ); |
|
| 331 | - if ( strstr( $url, '?' ) ) {
|
|
| 332 | - $url = $url . "&send_inquiry=success"; |
|
| 329 | + do_action('geodir_after_send_enquiry_email', $request);
|
|
| 330 | + $url = get_permalink($pid); |
|
| 331 | + if (strstr($url, '?')) {
|
|
| 332 | + $url = $url."&send_inquiry=success"; |
|
| 333 | 333 | } else {
|
| 334 | - $url = $url . "?send_inquiry=success"; |
|
| 334 | + $url = $url."?send_inquiry=success"; |
|
| 335 | 335 | } |
| 336 | 336 | /** |
| 337 | 337 | * Filter redirect url after the send enquiry email is sent. |
@@ -340,8 +340,8 @@ discard block |
||
| 340 | 340 | * |
| 341 | 341 | * @param string $url Redirect url. |
| 342 | 342 | */ |
| 343 | - $url = apply_filters( 'geodir_send_enquiry_after_submit_redirect', $url ); |
|
| 344 | - wp_redirect( $url ); |
|
| 343 | + $url = apply_filters('geodir_send_enquiry_after_submit_redirect', $url);
|
|
| 344 | + wp_redirect($url); |
|
| 345 | 345 | gd_die(); |
| 346 | 346 | |
| 347 | 347 | } |
@@ -372,11 +372,11 @@ discard block |
||
| 372 | 372 | * |
| 373 | 373 | * @deprecated 1.6.26 |
| 374 | 374 | */ |
| 375 | -function geodir_send_friend( $request ) {
|
|
| 375 | +function geodir_send_friend($request) {
|
|
| 376 | 376 | global $wpdb; |
| 377 | 377 | |
| 378 | 378 | // strip slashes from text |
| 379 | - $request = ! empty( $request ) ? stripslashes_deep( $request ) : $request; |
|
| 379 | + $request = !empty($request) ? stripslashes_deep($request) : $request; |
|
| 380 | 380 | |
| 381 | 381 | $yourname = sanitize_text_field($request['yourname']); |
| 382 | 382 | $youremail = sanitize_email($request['youremail']); |
@@ -385,11 +385,11 @@ discard block |
||
| 385 | 385 | $pid = absint($request['pid']); |
| 386 | 386 | $to_email = sanitize_email($request['to_email']); |
| 387 | 387 | $to_name = sanitize_text_field($request['to_name']); |
| 388 | - if ( $pid && 'publish' == get_post_status ( $pid ) ) {
|
|
| 388 | + if ($pid && 'publish' == get_post_status($pid)) {
|
|
| 389 | 389 | |
| 390 | - check_ajax_referer( 'send_to_frnd_'.$pid ); |
|
| 390 | + check_ajax_referer('send_to_frnd_'.$pid);
|
|
| 391 | 391 | |
| 392 | - }else{
|
|
| 392 | + } else {
|
|
| 393 | 393 | gd_die(); |
| 394 | 394 | } |
| 395 | 395 | |
@@ -412,8 +412,8 @@ discard block |
||
| 412 | 412 | * |
| 413 | 413 | * } |
| 414 | 414 | */ |
| 415 | - do_action( 'geodir_before_send_to_friend_email', $request ); |
|
| 416 | - geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid'] );//To client email |
|
| 415 | + do_action('geodir_before_send_to_friend_email', $request);
|
|
| 416 | + geodir_sendEmail($youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid']); //To client email |
|
| 417 | 417 | |
| 418 | 418 | /** |
| 419 | 419 | * Called after the send to friend email is sent. |
@@ -434,13 +434,13 @@ discard block |
||
| 434 | 434 | * |
| 435 | 435 | * } |
| 436 | 436 | */ |
| 437 | - do_action( 'geodir_after_send_to_friend_email', $request ); |
|
| 437 | + do_action('geodir_after_send_to_friend_email', $request);
|
|
| 438 | 438 | |
| 439 | - $url = get_permalink( $pid ); |
|
| 440 | - if ( strstr( $url, '?' ) ) {
|
|
| 441 | - $url = $url . "&sendtofrnd=success"; |
|
| 439 | + $url = get_permalink($pid); |
|
| 440 | + if (strstr($url, '?')) {
|
|
| 441 | + $url = $url."&sendtofrnd=success"; |
|
| 442 | 442 | } else {
|
| 443 | - $url = $url . "?sendtofrnd=success"; |
|
| 443 | + $url = $url."?sendtofrnd=success"; |
|
| 444 | 444 | } |
| 445 | 445 | /** |
| 446 | 446 | * Filter redirect url after the send to friend email is sent. |
@@ -449,8 +449,8 @@ discard block |
||
| 449 | 449 | * |
| 450 | 450 | * @param string $url Redirect url. |
| 451 | 451 | */ |
| 452 | - $url = apply_filters( 'geodir_send_to_friend_after_submit_redirect', $url ); |
|
| 453 | - wp_redirect( $url ); |
|
| 452 | + $url = apply_filters('geodir_send_to_friend_after_submit_redirect', $url);
|
|
| 453 | + wp_redirect($url); |
|
| 454 | 454 | gd_die(); |
| 455 | 455 | } |
| 456 | 456 | |
@@ -464,8 +464,8 @@ discard block |
||
| 464 | 464 | * |
| 465 | 465 | * @param string $hash_key |
| 466 | 466 | */ |
| 467 | -function geodir_before_tab_content( $hash_key ) {
|
|
| 468 | - switch ( $hash_key ) {
|
|
| 467 | +function geodir_before_tab_content($hash_key) {
|
|
| 468 | + switch ($hash_key) {
|
|
| 469 | 469 | case 'post_info' : |
| 470 | 470 | echo '<div class="geodir-company_info field-group">'; |
| 471 | 471 | break; |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | * |
| 476 | 476 | * @since 1.0.0 |
| 477 | 477 | */ |
| 478 | - echo ' <div id="' . apply_filters( 'geodir_post_gallery_id', 'geodir-post-gallery' ) . '" class="clearfix" >'; |
|
| 478 | + echo ' <div id="'.apply_filters('geodir_post_gallery_id', 'geodir-post-gallery').'" class="clearfix" >';
|
|
| 479 | 479 | break; |
| 480 | 480 | case 'reviews' : |
| 481 | 481 | echo '<div id="reviews-wrap" class="clearfix"> '; |
@@ -499,8 +499,8 @@ discard block |
||
| 499 | 499 | * |
| 500 | 500 | * @param string $hash_key |
| 501 | 501 | */ |
| 502 | -function geodir_after_tab_content( $hash_key ) {
|
|
| 503 | - switch ( $hash_key ) {
|
|
| 502 | +function geodir_after_tab_content($hash_key) {
|
|
| 503 | + switch ($hash_key) {
|
|
| 504 | 504 | case 'post_info' : |
| 505 | 505 | echo '</div>'; |
| 506 | 506 | break; |
@@ -531,25 +531,25 @@ discard block |
||
| 531 | 531 | * @global object $wpdb WordPress Database object. |
| 532 | 532 | * @return bool|null|string Returns default sort results, when the post type is valid. Otherwise returns false. |
| 533 | 533 | */ |
| 534 | -function geodir_get_posts_default_sort( $post_type ) {
|
|
| 534 | +function geodir_get_posts_default_sort($post_type) {
|
|
| 535 | 535 | |
| 536 | 536 | global $wpdb; |
| 537 | 537 | |
| 538 | - if ( $post_type != '' ) {
|
|
| 538 | + if ($post_type != '') {
|
|
| 539 | 539 | |
| 540 | 540 | $all_postypes = geodir_get_posttypes(); |
| 541 | 541 | |
| 542 | - if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
| 542 | + if (!in_array($post_type, $all_postypes)) {
|
|
| 543 | 543 | return false; |
| 544 | 544 | } |
| 545 | 545 | |
| 546 | - $sort_field_info = $wpdb->get_var( $wpdb->prepare( "select default_order from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type= %s and is_active=%d and is_default=%d", array( |
|
| 546 | + $sort_field_info = $wpdb->get_var($wpdb->prepare("select default_order from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type= %s and is_active=%d and is_default=%d", array(
|
|
| 547 | 547 | $post_type, |
| 548 | 548 | 1, |
| 549 | 549 | 1 |
| 550 | - ) ) ); |
|
| 550 | + ))); |
|
| 551 | 551 | |
| 552 | - if ( ! empty( $sort_field_info ) ) {
|
|
| 552 | + if (!empty($sort_field_info)) {
|
|
| 553 | 553 | return $sort_field_info; |
| 554 | 554 | } |
| 555 | 555 | |
@@ -569,20 +569,20 @@ discard block |
||
| 569 | 569 | * @global object $wpdb WordPress Database object. |
| 570 | 570 | * @return bool|mixed|void Returns sort results, when the post type is valid. Otherwise returns false. |
| 571 | 571 | */ |
| 572 | -function geodir_get_sort_options( $post_type ) {
|
|
| 572 | +function geodir_get_sort_options($post_type) {
|
|
| 573 | 573 | global $wpdb; |
| 574 | 574 | |
| 575 | - if ( $post_type != '' ) {
|
|
| 575 | + if ($post_type != '') {
|
|
| 576 | 576 | $all_postypes = geodir_get_posttypes(); |
| 577 | 577 | |
| 578 | - if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
| 578 | + if (!in_array($post_type, $all_postypes)) {
|
|
| 579 | 579 | return false; |
| 580 | 580 | } |
| 581 | 581 | |
| 582 | - $sort_field_info = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array( |
|
| 582 | + $sort_field_info = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(
|
|
| 583 | 583 | $post_type, |
| 584 | 584 | 1 |
| 585 | - ) ) ); |
|
| 585 | + ))); |
|
| 586 | 586 | |
| 587 | 587 | /** |
| 588 | 588 | * Filter post sort options. |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | * @param array $sort_field_info Unfiltered sort field array. |
| 593 | 593 | * @param string $post_type Post type. |
| 594 | 594 | */ |
| 595 | - return apply_filters( 'geodir_get_sort_options', $sort_field_info, $post_type ); |
|
| 595 | + return apply_filters('geodir_get_sort_options', $sort_field_info, $post_type);
|
|
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | } |
@@ -613,63 +613,63 @@ discard block |
||
| 613 | 613 | * |
| 614 | 614 | * @since 1.4.4 |
| 615 | 615 | */ |
| 616 | - if ( is_search() ) {
|
|
| 616 | + if (is_search()) {
|
|
| 617 | 617 | return; |
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | $sort_by = ''; |
| 621 | 621 | |
| 622 | - if ( isset( $_REQUEST['sort_by'] ) ) {
|
|
| 622 | + if (isset($_REQUEST['sort_by'])) {
|
|
| 623 | 623 | $sort_by = $_REQUEST['sort_by']; |
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | $gd_post_type = geodir_get_current_posttype(); |
| 627 | 627 | |
| 628 | - $sort_options = geodir_get_sort_options( $gd_post_type ); |
|
| 628 | + $sort_options = geodir_get_sort_options($gd_post_type); |
|
| 629 | 629 | |
| 630 | 630 | |
| 631 | 631 | $sort_field_options = ''; |
| 632 | 632 | |
| 633 | - if ( ! empty( $sort_options ) ) {
|
|
| 634 | - foreach ( $sort_options as $sort ) {
|
|
| 635 | - $sort = stripslashes_deep( $sort ); // strip slashes |
|
| 633 | + if (!empty($sort_options)) {
|
|
| 634 | + foreach ($sort_options as $sort) {
|
|
| 635 | + $sort = stripslashes_deep($sort); // strip slashes |
|
| 636 | 636 | |
| 637 | - $label = __( $sort->site_title, 'geodirectory' ); |
|
| 637 | + $label = __($sort->site_title, 'geodirectory'); |
|
| 638 | 638 | |
| 639 | - if ( $sort->field_type == 'random' ) {
|
|
| 639 | + if ($sort->field_type == 'random') {
|
|
| 640 | 640 | $key = $sort->field_type; |
| 641 | - ( $sort_by == $key || ( $sort->is_default == '1' && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 642 | - $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>'; |
|
| 641 | + ($sort_by == $key || ($sort->is_default == '1' && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 642 | + $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | - if ( $sort->htmlvar_name == 'comment_count' ) {
|
|
| 645 | + if ($sort->htmlvar_name == 'comment_count') {
|
|
| 646 | 646 | $sort->htmlvar_name = 'rating_count'; |
| 647 | 647 | } |
| 648 | 648 | |
| 649 | - if ( $sort->sort_asc ) {
|
|
| 650 | - $key = $sort->htmlvar_name . '_asc'; |
|
| 649 | + if ($sort->sort_asc) {
|
|
| 650 | + $key = $sort->htmlvar_name.'_asc'; |
|
| 651 | 651 | $label = $sort->site_title; |
| 652 | - if ( $sort->asc_title ) {
|
|
| 652 | + if ($sort->asc_title) {
|
|
| 653 | 653 | $label = $sort->asc_title; |
| 654 | 654 | } |
| 655 | - ( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 656 | - $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>'; |
|
| 655 | + ($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 656 | + $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
| 657 | 657 | } |
| 658 | 658 | |
| 659 | - if ( $sort->sort_desc ) {
|
|
| 660 | - $key = $sort->htmlvar_name . '_desc'; |
|
| 659 | + if ($sort->sort_desc) {
|
|
| 660 | + $key = $sort->htmlvar_name.'_desc'; |
|
| 661 | 661 | $label = $sort->site_title; |
| 662 | - if ( $sort->desc_title ) {
|
|
| 662 | + if ($sort->desc_title) {
|
|
| 663 | 663 | $label = $sort->desc_title; |
| 664 | 664 | } |
| 665 | - ( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 666 | - $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>'; |
|
| 665 | + ($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 666 | + $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | |
| 672 | - if ( $sort_field_options != '' ) {
|
|
| 672 | + if ($sort_field_options != '') {
|
|
| 673 | 673 | |
| 674 | 674 | ?> |
| 675 | 675 | |
@@ -678,9 +678,9 @@ discard block |
||
| 678 | 678 | <select name="sort_by" id="sort_by" onchange="javascript:window.location=this.value;"> |
| 679 | 679 | |
| 680 | 680 | <option |
| 681 | - value="<?php echo esc_url( add_query_arg( 'sort_by', '' ) ); ?>" <?php if ( $sort_by == '' ) {
|
|
| 681 | + value="<?php echo esc_url(add_query_arg('sort_by', '')); ?>" <?php if ($sort_by == '') {
|
|
| 682 | 682 | echo 'selected="selected"'; |
| 683 | - } ?>><?php _e( 'Sort By', 'geodirectory' ); ?></option><?php |
|
| 683 | + } ?>><?php _e('Sort By', 'geodirectory'); ?></option><?php
|
|
| 684 | 684 | |
| 685 | 685 | echo $sort_field_options; ?> |
| 686 | 686 | |
@@ -708,9 +708,9 @@ discard block |
||
| 708 | 708 | * |
| 709 | 709 | * @return string Returns the section title. |
| 710 | 710 | */ |
| 711 | -function geodir_advance_customfields_heading( $title, $field_type ) {
|
|
| 711 | +function geodir_advance_customfields_heading($title, $field_type) {
|
|
| 712 | 712 | |
| 713 | - if ( in_array( $field_type, array( 'multiselect', 'textarea', 'taxonomy' ) ) ) {
|
|
| 713 | + if (in_array($field_type, array('multiselect', 'textarea', 'taxonomy'))) {
|
|
| 714 | 714 | $title = ''; |
| 715 | 715 | } |
| 716 | 716 | |
@@ -732,30 +732,30 @@ discard block |
||
| 732 | 732 | * @global object $gd_session GeoDirectory Session object. |
| 733 | 733 | * @return string Returns related posts html. |
| 734 | 734 | */ |
| 735 | -function geodir_related_posts_display( $request ) {
|
|
| 736 | - if ( ! empty( $request ) ) {
|
|
| 737 | - $before_title = ( isset( $request['before_title'] ) && ! empty( $request['before_title'] ) ) ? $request['before_title'] : ''; |
|
| 738 | - $after_title = ( isset( $request['after_title'] ) && ! empty( $request['after_title'] ) ) ? $request['after_title'] : ''; |
|
| 739 | - |
|
| 740 | - $title = ( isset( $request['title'] ) && ! empty( $request['title'] ) ) ? $request['title'] : __( 'Related Listings', 'geodirectory' ); |
|
| 741 | - $post_number = ( isset( $request['post_number'] ) && ! empty( $request['post_number'] ) ) ? $request['post_number'] : '5'; |
|
| 742 | - $relate_to = ( isset( $request['relate_to'] ) && ! empty( $request['relate_to'] ) ) ? $request['relate_to'] : 'category'; |
|
| 743 | - $layout = ( isset( $request['layout'] ) && ! empty( $request['layout'] ) ) ? $request['layout'] : 'gridview_onehalf'; |
|
| 744 | - $add_location_filter = ( isset( $request['add_location_filter'] ) && ! empty( $request['add_location_filter'] ) ) ? $request['add_location_filter'] : '0'; |
|
| 745 | - $listing_width = ( isset( $request['listing_width'] ) && ! empty( $request['listing_width'] ) ) ? $request['listing_width'] : ''; |
|
| 746 | - $list_sort = ( isset( $request['list_sort'] ) && ! empty( $request['list_sort'] ) ) ? $request['list_sort'] : 'latest'; |
|
| 747 | - $character_count = ( isset( $request['character_count'] ) && ! empty( $request['character_count'] ) ) ? $request['character_count'] : ''; |
|
| 735 | +function geodir_related_posts_display($request) {
|
|
| 736 | + if (!empty($request)) {
|
|
| 737 | + $before_title = (isset($request['before_title']) && !empty($request['before_title'])) ? $request['before_title'] : ''; |
|
| 738 | + $after_title = (isset($request['after_title']) && !empty($request['after_title'])) ? $request['after_title'] : ''; |
|
| 739 | + |
|
| 740 | + $title = (isset($request['title']) && !empty($request['title'])) ? $request['title'] : __('Related Listings', 'geodirectory');
|
|
| 741 | + $post_number = (isset($request['post_number']) && !empty($request['post_number'])) ? $request['post_number'] : '5'; |
|
| 742 | + $relate_to = (isset($request['relate_to']) && !empty($request['relate_to'])) ? $request['relate_to'] : 'category'; |
|
| 743 | + $layout = (isset($request['layout']) && !empty($request['layout'])) ? $request['layout'] : 'gridview_onehalf'; |
|
| 744 | + $add_location_filter = (isset($request['add_location_filter']) && !empty($request['add_location_filter'])) ? $request['add_location_filter'] : '0'; |
|
| 745 | + $listing_width = (isset($request['listing_width']) && !empty($request['listing_width'])) ? $request['listing_width'] : ''; |
|
| 746 | + $list_sort = (isset($request['list_sort']) && !empty($request['list_sort'])) ? $request['list_sort'] : 'latest'; |
|
| 747 | + $character_count = (isset($request['character_count']) && !empty($request['character_count'])) ? $request['character_count'] : ''; |
|
| 748 | 748 | |
| 749 | 749 | global $wpdb, $post, $gd_session, $related_nearest, $related_parent_lat, $related_parent_lon; |
| 750 | - $related_parent_lat = !empty($post->post_latitude) && geodir_is_page( 'detail' ) ? $post->post_latitude : ''; |
|
| 751 | - $related_parent_lon = !empty($post->post_longitude) && geodir_is_page( 'detail' ) ? $post->post_longitude : ''; |
|
| 750 | + $related_parent_lat = !empty($post->post_latitude) && geodir_is_page('detail') ? $post->post_latitude : '';
|
|
| 751 | + $related_parent_lon = !empty($post->post_longitude) && geodir_is_page('detail') ? $post->post_longitude : '';
|
|
| 752 | 752 | $arr_detail_page_tabs = geodir_detail_page_tabs_list(); |
| 753 | 753 | |
| 754 | 754 | $related_listing_array = array(); |
| 755 | - if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {
|
|
| 756 | - $related_listing_array = get_option( 'geodir_add_related_listing_posttypes' ); |
|
| 755 | + if (get_option('geodir_add_related_listing_posttypes')) {
|
|
| 756 | + $related_listing_array = get_option('geodir_add_related_listing_posttypes');
|
|
| 757 | 757 | } |
| 758 | - if ( isset($post->post_type) && in_array( $post->post_type, $related_listing_array ) ) {
|
|
| 758 | + if (isset($post->post_type) && in_array($post->post_type, $related_listing_array)) {
|
|
| 759 | 759 | $arr_detail_page_tabs['related_listing']['is_display'] = true; |
| 760 | 760 | } |
| 761 | 761 | |
@@ -767,90 +767,90 @@ discard block |
||
| 767 | 767 | $tax_field = 'id'; |
| 768 | 768 | $category = array(); |
| 769 | 769 | |
| 770 | - if ( isset( $_REQUEST['backandedit'] ) ) {
|
|
| 771 | - $post = (object) $gd_session->get( 'listing' ); |
|
| 770 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 771 | + $post = (object) $gd_session->get('listing');
|
|
| 772 | 772 | $post_type = $post->listing_type; |
| 773 | - if ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {
|
|
| 773 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 774 | 774 | $post_id = $_REQUEST['pid']; |
| 775 | 775 | } |
| 776 | - } elseif ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {
|
|
| 777 | - $post = geodir_get_post_info( $_REQUEST['pid'] ); |
|
| 776 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 777 | + $post = geodir_get_post_info($_REQUEST['pid']); |
|
| 778 | 778 | $post_type = $post->post_type; |
| 779 | 779 | $post_id = $_REQUEST['pid']; |
| 780 | - } elseif ( isset( $post->post_type ) && $post->post_type != '' ) {
|
|
| 780 | + } elseif (isset($post->post_type) && $post->post_type != '') {
|
|
| 781 | 781 | $post_type = $post->post_type; |
| 782 | 782 | $post_id = $post->ID; |
| 783 | 783 | } |
| 784 | 784 | |
| 785 | - if ( $relate_to == 'category' ) {
|
|
| 785 | + if ($relate_to == 'category') {
|
|
| 786 | 786 | |
| 787 | - $category_taxonomy = $post_type . $relate_to; |
|
| 788 | - if ( isset( $post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '' ) {
|
|
| 789 | - $category = explode( ',', trim( $post->{$category_taxonomy}, ',' ) );
|
|
| 787 | + $category_taxonomy = $post_type.$relate_to; |
|
| 788 | + if (isset($post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '') {
|
|
| 789 | + $category = explode(',', trim($post->{$category_taxonomy}, ','));
|
|
| 790 | 790 | } |
| 791 | 791 | |
| 792 | - } elseif ( $relate_to == 'tags' ) {
|
|
| 792 | + } elseif ($relate_to == 'tags') {
|
|
| 793 | 793 | |
| 794 | - $category_taxonomy = $post_type . '_' . $relate_to; |
|
| 795 | - if ( $post->post_tags != '' ) {
|
|
| 796 | - $category = explode( ',', trim( $post->post_tags, ',' ) ); |
|
| 794 | + $category_taxonomy = $post_type.'_'.$relate_to; |
|
| 795 | + if ($post->post_tags != '') {
|
|
| 796 | + $category = explode(',', trim($post->post_tags, ','));
|
|
| 797 | 797 | } |
| 798 | 798 | $tax_field = 'name'; |
| 799 | 799 | } |
| 800 | 800 | |
| 801 | 801 | /* --- return false in invalid request --- */ |
| 802 | - if ( empty( $category ) ) {
|
|
| 802 | + if (empty($category)) {
|
|
| 803 | 803 | return false; |
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | $all_postypes = geodir_get_posttypes(); |
| 807 | 807 | |
| 808 | - if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
| 808 | + if (!in_array($post_type, $all_postypes)) {
|
|
| 809 | 809 | return false; |
| 810 | 810 | } |
| 811 | 811 | |
| 812 | 812 | /* --- return false in invalid request --- */ |
| 813 | 813 | |
| 814 | 814 | $location_url = ''; |
| 815 | - if ( $add_location_filter != '0' ) {
|
|
| 815 | + if ($add_location_filter != '0') {
|
|
| 816 | 816 | $location_url = array(); |
| 817 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 817 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 818 | 818 | |
| 819 | - $gd_city = get_query_var( 'gd_city' ); |
|
| 819 | + $gd_city = get_query_var('gd_city');
|
|
| 820 | 820 | |
| 821 | - if ( $gd_city ) {
|
|
| 822 | - $gd_country = get_query_var( 'gd_country' ); |
|
| 823 | - $gd_region = get_query_var( 'gd_region' ); |
|
| 821 | + if ($gd_city) {
|
|
| 822 | + $gd_country = get_query_var('gd_country');
|
|
| 823 | + $gd_region = get_query_var('gd_region');
|
|
| 824 | 824 | } else {
|
| 825 | 825 | $location = geodir_get_default_location(); |
| 826 | 826 | |
| 827 | - $gd_country = isset( $location->country_slug ) ? $location->country_slug : ''; |
|
| 828 | - $gd_region = isset( $location->region_slug ) ? $location->region_slug : ''; |
|
| 829 | - $gd_city = isset( $location->city_slug ) ? $location->city_slug : ''; |
|
| 827 | + $gd_country = isset($location->country_slug) ? $location->country_slug : ''; |
|
| 828 | + $gd_region = isset($location->region_slug) ? $location->region_slug : ''; |
|
| 829 | + $gd_city = isset($location->city_slug) ? $location->city_slug : ''; |
|
| 830 | 830 | } |
| 831 | 831 | |
| 832 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 832 | + if ($geodir_show_location_url == 'all') {
|
|
| 833 | 833 | $location_url[] = $gd_country; |
| 834 | 834 | $location_url[] = $gd_region; |
| 835 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 835 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 836 | 836 | $location_url[] = $gd_country; |
| 837 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 837 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 838 | 838 | $location_url[] = $gd_region; |
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | $location_url[] = $gd_city; |
| 842 | 842 | |
| 843 | - $location_url = implode( '/', $location_url ); |
|
| 843 | + $location_url = implode('/', $location_url);
|
|
| 844 | 844 | } |
| 845 | 845 | |
| 846 | 846 | |
| 847 | - if ( ! empty( $category ) ) {
|
|
| 847 | + if (!empty($category)) {
|
|
| 848 | 848 | global $geodir_add_location_url; |
| 849 | 849 | $geodir_add_location_url = '0'; |
| 850 | - if ( $add_location_filter != '0' ) {
|
|
| 850 | + if ($add_location_filter != '0') {
|
|
| 851 | 851 | $geodir_add_location_url = '1'; |
| 852 | 852 | } |
| 853 | - $viewall_url = get_term_link( (int) $category[0], $post_type . $category_taxonomy ); |
|
| 853 | + $viewall_url = get_term_link((int) $category[0], $post_type.$category_taxonomy); |
|
| 854 | 854 | $geodir_add_location_url = null; |
| 855 | 855 | } |
| 856 | 856 | ob_start(); |
@@ -860,24 +860,24 @@ discard block |
||
| 860 | 860 | <div class="geodir_locations geodir_location_listing"> |
| 861 | 861 | |
| 862 | 862 | <?php |
| 863 | - if ( isset( $request['is_widget'] ) && $request['is_widget'] == '1' ) {
|
|
| 863 | + if (isset($request['is_widget']) && $request['is_widget'] == '1') {
|
|
| 864 | 864 | /** geodir_before_title filter Documented in geodirectory_widgets.php */ |
| 865 | - $before_title = isset( $before_title ) ? $before_title : apply_filters( 'geodir_before_title', '<h3 class="widget-title">' ); |
|
| 865 | + $before_title = isset($before_title) ? $before_title : apply_filters('geodir_before_title', '<h3 class="widget-title">');
|
|
| 866 | 866 | /** geodir_after_title filter Documented in geodirectory_widgets.php */ |
| 867 | - $after_title = isset( $after_title ) ? $after_title : apply_filters( 'geodir_after_title', '</h3>' ); |
|
| 867 | + $after_title = isset($after_title) ? $after_title : apply_filters('geodir_after_title', '</h3>');
|
|
| 868 | 868 | ?> |
| 869 | 869 | <div class="location_list_heading clearfix"> |
| 870 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 870 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 871 | 871 | </div> |
| 872 | 872 | <?php |
| 873 | 873 | } |
| 874 | 874 | $query_args = array( |
| 875 | 875 | 'posts_per_page' => $post_number, |
| 876 | 876 | 'is_geodir_loop' => true, |
| 877 | - 'gd_location' => ( $add_location_filter ) ? true : false, |
|
| 877 | + 'gd_location' => ($add_location_filter) ? true : false, |
|
| 878 | 878 | 'post_type' => $post_type, |
| 879 | 879 | 'order_by' => $list_sort, |
| 880 | - 'post__not_in' => array( $post_id ), |
|
| 880 | + 'post__not_in' => array($post_id), |
|
| 881 | 881 | 'excerpt_length' => $character_count, |
| 882 | 882 | 'related_listings' => $is_display |
| 883 | 883 | ); |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | 'terms' => $category |
| 889 | 889 | ); |
| 890 | 890 | |
| 891 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 891 | + $query_args['tax_query'] = array($tax_query); |
|
| 892 | 892 | |
| 893 | 893 | global $gridview_columns_widget, $post; |
| 894 | 894 | |
@@ -900,21 +900,21 @@ discard block |
||
| 900 | 900 | * @param array $query_args The query array. |
| 901 | 901 | * @param array $request Related posts request array. |
| 902 | 902 | */ |
| 903 | - $query_args = apply_filters( 'geodir_related_posts_widget_query_args', $query_args, $request ); |
|
| 903 | + $query_args = apply_filters('geodir_related_posts_widget_query_args', $query_args, $request);
|
|
| 904 | 904 | |
| 905 | - query_posts( $query_args ); |
|
| 905 | + query_posts($query_args); |
|
| 906 | 906 | |
| 907 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 908 | - $listing_view_exp = explode( '_', $layout ); |
|
| 907 | + if (strstr($layout, 'gridview')) {
|
|
| 908 | + $listing_view_exp = explode('_', $layout);
|
|
| 909 | 909 | $gridview_columns_widget = $layout; |
| 910 | 910 | $layout = $listing_view_exp[0]; |
| 911 | - } else if ( $layout == 'list' ) {
|
|
| 911 | + } else if ($layout == 'list') {
|
|
| 912 | 912 | $gridview_columns_widget = ''; |
| 913 | 913 | } |
| 914 | 914 | $related_posts = true; |
| 915 | 915 | |
| 916 | 916 | $related_nearest = false; |
| 917 | - if ( $list_sort == 'nearest' ) {
|
|
| 917 | + if ($list_sort == 'nearest') {
|
|
| 918 | 918 | $related_nearest = true; |
| 919 | 919 | } |
| 920 | 920 | |
@@ -931,14 +931,14 @@ discard block |
||
| 931 | 931 | * |
| 932 | 932 | * @since 1.0.0 |
| 933 | 933 | */ |
| 934 | - $template = apply_filters( "geodir_template_part-related-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 934 | + $template = apply_filters("geodir_template_part-related-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 935 | 935 | |
| 936 | 936 | /** |
| 937 | 937 | * Includes related listing listview template. |
| 938 | 938 | * |
| 939 | 939 | * @since 1.0.0 |
| 940 | 940 | */ |
| 941 | - include( $template ); |
|
| 941 | + include($template); |
|
| 942 | 942 | |
| 943 | 943 | wp_reset_query(); |
| 944 | 944 | $post = $origi_post; |
@@ -966,12 +966,12 @@ discard block |
||
| 966 | 966 | function geodir_category_count_script() {
|
| 967 | 967 | global $geodir_post_category_str; |
| 968 | 968 | |
| 969 | - if ( ! empty( $geodir_post_category_str ) ) {
|
|
| 970 | - $geodir_post_category_str = serialize( $geodir_post_category_str ); |
|
| 969 | + if (!empty($geodir_post_category_str)) {
|
|
| 970 | + $geodir_post_category_str = serialize($geodir_post_category_str); |
|
| 971 | 971 | } |
| 972 | 972 | |
| 973 | - $all_var['post_category_array'] = html_entity_decode( (string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8' ); |
|
| 974 | - $script = "var post_category_array = " . json_encode( $all_var ) . ';'; |
|
| 973 | + $all_var['post_category_array'] = html_entity_decode((string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8'); |
|
| 974 | + $script = "var post_category_array = ".json_encode($all_var).';'; |
|
| 975 | 975 | echo '<script>'; |
| 976 | 976 | echo $script; |
| 977 | 977 | echo '</script>'; |
@@ -986,8 +986,8 @@ discard block |
||
| 986 | 986 | * @return string Returns the default language. |
| 987 | 987 | */ |
| 988 | 988 | function geodir_get_map_default_language() {
|
| 989 | - $geodir_default_map_language = get_option( 'geodir_default_map_language' ); |
|
| 990 | - if ( empty( $geodir_default_map_language ) ) {
|
|
| 989 | + $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 990 | + if (empty($geodir_default_map_language)) {
|
|
| 991 | 991 | $geodir_default_map_language = 'en'; |
| 992 | 992 | } |
| 993 | 993 | |
@@ -998,7 +998,7 @@ discard block |
||
| 998 | 998 | * |
| 999 | 999 | * @param string $geodir_default_map_language Default map language. |
| 1000 | 1000 | */ |
| 1001 | - return apply_filters( 'geodir_default_map_language', $geodir_default_map_language ); |
|
| 1001 | + return apply_filters('geodir_default_map_language', $geodir_default_map_language);
|
|
| 1002 | 1002 | } |
| 1003 | 1003 | |
| 1004 | 1004 | /** |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | * @return string Returns the api key. |
| 1010 | 1010 | */ |
| 1011 | 1011 | function geodir_get_map_api_key() {
|
| 1012 | - $key = get_option( 'geodir_google_api_key' ); |
|
| 1012 | + $key = get_option('geodir_google_api_key');
|
|
| 1013 | 1013 | |
| 1014 | 1014 | /** |
| 1015 | 1015 | * Filter Google maps api key. |
@@ -1018,7 +1018,7 @@ discard block |
||
| 1018 | 1018 | * |
| 1019 | 1019 | * @param string $key Google maps api key. |
| 1020 | 1020 | */ |
| 1021 | - return apply_filters( 'geodir_google_api_key', $key ); |
|
| 1021 | + return apply_filters('geodir_google_api_key', $key);
|
|
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | 1024 | |
@@ -1038,20 +1038,20 @@ discard block |
||
| 1038 | 1038 | global $wp, $post, $wp_query, $wpdb, $geodir_addon_list; |
| 1039 | 1039 | |
| 1040 | 1040 | $is_geodir_page = geodir_is_geodir_page(); |
| 1041 | - if ( ! $is_geodir_page ) {
|
|
| 1041 | + if (!$is_geodir_page) {
|
|
| 1042 | 1042 | return; |
| 1043 | 1043 | }// if non GD page, bail |
| 1044 | 1044 | |
| 1045 | 1045 | $use_gd_meta = true; |
| 1046 | - if ( ( class_exists( 'WPSEO_Frontend' ) || class_exists( 'All_in_One_SEO_Pack' ) ) && !geodir_disable_yoast_seo_metas() ) {
|
|
| 1046 | + if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1047 | 1047 | $use_gd_meta = false; |
| 1048 | 1048 | |
| 1049 | - if ( geodir_is_page( 'search' ) ) {
|
|
| 1049 | + if (geodir_is_page('search')) {
|
|
| 1050 | 1050 | $use_gd_meta = true; |
| 1051 | 1051 | } |
| 1052 | 1052 | } |
| 1053 | 1053 | |
| 1054 | - if ( ! $use_gd_meta ) {
|
|
| 1054 | + if (!$use_gd_meta) {
|
|
| 1055 | 1055 | return; |
| 1056 | 1056 | }// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active. |
| 1057 | 1057 | |
@@ -1059,68 +1059,68 @@ discard block |
||
| 1059 | 1059 | |
| 1060 | 1060 | $all_postypes = geodir_get_posttypes(); |
| 1061 | 1061 | |
| 1062 | - $geodir_taxonomies = geodir_get_taxonomies( '', true ); |
|
| 1062 | + $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1063 | 1063 | |
| 1064 | 1064 | $meta_desc = ''; |
| 1065 | 1065 | $meta_key = ''; |
| 1066 | - if ( isset( $current_term->ID ) && $current_term->ID == geodir_location_page_id() ) {
|
|
| 1066 | + if (isset($current_term->ID) && $current_term->ID == geodir_location_page_id()) {
|
|
| 1067 | 1067 | /** |
| 1068 | 1068 | * Filter SEO meta location description. |
| 1069 | 1069 | * |
| 1070 | 1070 | * @since 1.0.0 |
| 1071 | 1071 | */ |
| 1072 | - $meta_desc = apply_filters( 'geodir_seo_meta_location_description', '' ); |
|
| 1072 | + $meta_desc = apply_filters('geodir_seo_meta_location_description', '');
|
|
| 1073 | 1073 | $meta_desc .= ''; |
| 1074 | 1074 | } |
| 1075 | - if ( have_posts() && is_single() OR is_page() ) {
|
|
| 1076 | - while ( have_posts() ) {
|
|
| 1075 | + if (have_posts() && is_single() OR is_page()) {
|
|
| 1076 | + while (have_posts()) {
|
|
| 1077 | 1077 | the_post(); |
| 1078 | 1078 | |
| 1079 | - if ( has_excerpt() ) {
|
|
| 1080 | - $out_excerpt = strip_tags( strip_shortcodes( get_the_excerpt() ) ); |
|
| 1081 | - if ( empty( $out_excerpt ) ) {
|
|
| 1082 | - $out_excerpt = strip_tags( do_shortcode( get_the_excerpt() ) ); |
|
| 1079 | + if (has_excerpt()) {
|
|
| 1080 | + $out_excerpt = strip_tags(strip_shortcodes(get_the_excerpt())); |
|
| 1081 | + if (empty($out_excerpt)) {
|
|
| 1082 | + $out_excerpt = strip_tags(do_shortcode(get_the_excerpt())); |
|
| 1083 | 1083 | } |
| 1084 | - $out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $out_excerpt ); |
|
| 1084 | + $out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $out_excerpt);
|
|
| 1085 | 1085 | } else {
|
| 1086 | - $out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $post->post_content ); |
|
| 1087 | - $out_excerpt = strip_tags( strip_shortcodes( $out_excerpt ) ); |
|
| 1088 | - if ( empty( $out_excerpt ) ) {
|
|
| 1089 | - $out_excerpt = strip_tags( do_shortcode( $out_excerpt ) ); // parse short code from content |
|
| 1086 | + $out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $post->post_content);
|
|
| 1087 | + $out_excerpt = strip_tags(strip_shortcodes($out_excerpt)); |
|
| 1088 | + if (empty($out_excerpt)) {
|
|
| 1089 | + $out_excerpt = strip_tags(do_shortcode($out_excerpt)); // parse short code from content |
|
| 1090 | 1090 | } |
| 1091 | - $out_excerpt = trim( wp_trim_words( $out_excerpt, 35, '' ), '.!?,;:-' ); |
|
| 1091 | + $out_excerpt = trim(wp_trim_words($out_excerpt, 35, ''), '.!?,;:-'); |
|
| 1092 | 1092 | } |
| 1093 | 1093 | |
| 1094 | 1094 | $meta_desc .= $out_excerpt; |
| 1095 | 1095 | } |
| 1096 | - } elseif ( ( is_category() || is_tag() ) && isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {
|
|
| 1097 | - if ( is_category() ) {
|
|
| 1098 | - $meta_desc .= __( "Posts related to Category:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) ); |
|
| 1099 | - } elseif ( is_tag() ) {
|
|
| 1100 | - $meta_desc .= __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) ); |
|
| 1096 | + } elseif ((is_category() || is_tag()) && isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {
|
|
| 1097 | + if (is_category()) {
|
|
| 1098 | + $meta_desc .= __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false));
|
|
| 1099 | + } elseif (is_tag()) {
|
|
| 1100 | + $meta_desc .= __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_ucfirst(single_tag_title("", false));
|
|
| 1101 | 1101 | } |
| 1102 | - } elseif ( isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {
|
|
| 1103 | - $meta_desc .= isset( $current_term->description ) ? $current_term->description : ''; |
|
| 1102 | + } elseif (isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {
|
|
| 1103 | + $meta_desc .= isset($current_term->description) ? $current_term->description : ''; |
|
| 1104 | 1104 | } |
| 1105 | 1105 | |
| 1106 | 1106 | |
| 1107 | 1107 | $geodir_post_type = geodir_get_current_posttype(); |
| 1108 | - $geodir_post_type_info = get_post_type_object( $geodir_post_type ); |
|
| 1109 | - $geodir_is_page_listing = geodir_is_page( 'listing' ) ? true : false; |
|
| 1110 | - |
|
| 1111 | - $category_taxonomy = geodir_get_taxonomies( $geodir_post_type ); |
|
| 1112 | - $tag_taxonomy = geodir_get_taxonomies( $geodir_post_type, true ); |
|
| 1113 | - |
|
| 1114 | - $geodir_is_category = isset( $category_taxonomy[0] ) && get_query_var( $category_taxonomy[0] ) ? get_query_var( $category_taxonomy[0] ) : false; |
|
| 1115 | - $geodir_is_tag = isset( $tag_taxonomy[0] ) && get_query_var( $tag_taxonomy[0] ) ? true : false; |
|
| 1116 | - |
|
| 1117 | - $geodir_is_search = geodir_is_page( 'search' ) ? true : false; |
|
| 1118 | - $geodir_is_location = geodir_is_page( 'location' ) ? true : false; |
|
| 1119 | - $geodir_location_manager = isset( $geodir_addon_list['geodir_location_manager'] ) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false; |
|
| 1120 | - $godir_location_terms = geodir_get_current_location_terms( 'query_vars' ); |
|
| 1121 | - $gd_city = $geodir_location_manager && isset( $godir_location_terms['gd_city'] ) ? $godir_location_terms['gd_city'] : null; |
|
| 1122 | - $gd_region = $geodir_location_manager && isset( $godir_location_terms['gd_region'] ) ? $godir_location_terms['gd_region'] : null; |
|
| 1123 | - $gd_country = $geodir_location_manager && isset( $godir_location_terms['gd_country'] ) ? $godir_location_terms['gd_country'] : null; |
|
| 1108 | + $geodir_post_type_info = get_post_type_object($geodir_post_type); |
|
| 1109 | + $geodir_is_page_listing = geodir_is_page('listing') ? true : false;
|
|
| 1110 | + |
|
| 1111 | + $category_taxonomy = geodir_get_taxonomies($geodir_post_type); |
|
| 1112 | + $tag_taxonomy = geodir_get_taxonomies($geodir_post_type, true); |
|
| 1113 | + |
|
| 1114 | + $geodir_is_category = isset($category_taxonomy[0]) && get_query_var($category_taxonomy[0]) ? get_query_var($category_taxonomy[0]) : false; |
|
| 1115 | + $geodir_is_tag = isset($tag_taxonomy[0]) && get_query_var($tag_taxonomy[0]) ? true : false; |
|
| 1116 | + |
|
| 1117 | + $geodir_is_search = geodir_is_page('search') ? true : false;
|
|
| 1118 | + $geodir_is_location = geodir_is_page('location') ? true : false;
|
|
| 1119 | + $geodir_location_manager = isset($geodir_addon_list['geodir_location_manager']) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false; |
|
| 1120 | + $godir_location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1121 | + $gd_city = $geodir_location_manager && isset($godir_location_terms['gd_city']) ? $godir_location_terms['gd_city'] : null; |
|
| 1122 | + $gd_region = $geodir_location_manager && isset($godir_location_terms['gd_region']) ? $godir_location_terms['gd_region'] : null; |
|
| 1123 | + $gd_country = $geodir_location_manager && isset($godir_location_terms['gd_country']) ? $godir_location_terms['gd_country'] : null; |
|
| 1124 | 1124 | /** |
| 1125 | 1125 | * Filter the Everywhere text in location description. |
| 1126 | 1126 | * |
@@ -1128,108 +1128,108 @@ discard block |
||
| 1128 | 1128 | * |
| 1129 | 1129 | * @param string $replace_location Everywhere text. |
| 1130 | 1130 | */ |
| 1131 | - $replace_location = apply_filters( 'geodir_location_description_everywhere_text', __( 'Everywhere', 'geodirectory' ) ); |
|
| 1131 | + $replace_location = apply_filters('geodir_location_description_everywhere_text', __('Everywhere', 'geodirectory'));
|
|
| 1132 | 1132 | $location_id = null; |
| 1133 | - if ( $geodir_location_manager ) {
|
|
| 1134 | - $sql = $wpdb->prepare( "SELECT location_id FROM " . POST_LOCATION_TABLE . " WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array( $gd_city ) ); |
|
| 1135 | - $location_id = (int) $wpdb->get_var( $sql ); |
|
| 1133 | + if ($geodir_location_manager) {
|
|
| 1134 | + $sql = $wpdb->prepare("SELECT location_id FROM ".POST_LOCATION_TABLE." WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array($gd_city));
|
|
| 1135 | + $location_id = (int) $wpdb->get_var($sql); |
|
| 1136 | 1136 | $location_type = geodir_what_is_current_location(); |
| 1137 | - if ( $location_type == 'city' ) {
|
|
| 1138 | - $replace_location = geodir_get_current_location( array( 'what' => 'city', 'echo' => false ) ); |
|
| 1139 | - } elseif ( $location_type == 'region' ) {
|
|
| 1140 | - $replace_location = geodir_get_current_location( array( 'what' => 'region', 'echo' => false ) ); |
|
| 1141 | - } elseif ( $location_type == 'country' ) {
|
|
| 1142 | - $replace_location = geodir_get_current_location( array( 'what' => 'country', 'echo' => false ) ); |
|
| 1143 | - $replace_location = __( $replace_location, 'geodirectory' ); |
|
| 1144 | - } |
|
| 1145 | - $country = get_query_var( 'gd_country' ); |
|
| 1146 | - $region = get_query_var( 'gd_region' ); |
|
| 1147 | - $city = get_query_var( 'gd_city' ); |
|
| 1137 | + if ($location_type == 'city') {
|
|
| 1138 | + $replace_location = geodir_get_current_location(array('what' => 'city', 'echo' => false));
|
|
| 1139 | + } elseif ($location_type == 'region') {
|
|
| 1140 | + $replace_location = geodir_get_current_location(array('what' => 'region', 'echo' => false));
|
|
| 1141 | + } elseif ($location_type == 'country') {
|
|
| 1142 | + $replace_location = geodir_get_current_location(array('what' => 'country', 'echo' => false));
|
|
| 1143 | + $replace_location = __($replace_location, 'geodirectory'); |
|
| 1144 | + } |
|
| 1145 | + $country = get_query_var('gd_country');
|
|
| 1146 | + $region = get_query_var('gd_region');
|
|
| 1147 | + $city = get_query_var('gd_city');
|
|
| 1148 | 1148 | $current_location = ''; |
| 1149 | - if ( $country != '' ) {
|
|
| 1150 | - $current_location = get_actual_location_name( 'country', $country, true ); |
|
| 1149 | + if ($country != '') {
|
|
| 1150 | + $current_location = get_actual_location_name('country', $country, true);
|
|
| 1151 | 1151 | } |
| 1152 | - if ( $region != '' ) {
|
|
| 1153 | - $current_location = get_actual_location_name( 'region', $region ); |
|
| 1152 | + if ($region != '') {
|
|
| 1153 | + $current_location = get_actual_location_name('region', $region);
|
|
| 1154 | 1154 | } |
| 1155 | - if ( $city != '' ) {
|
|
| 1156 | - $current_location = get_actual_location_name( 'city', $city ); |
|
| 1155 | + if ($city != '') {
|
|
| 1156 | + $current_location = get_actual_location_name('city', $city);
|
|
| 1157 | 1157 | } |
| 1158 | 1158 | $replace_location = $current_location != '' ? $current_location : $replace_location; |
| 1159 | 1159 | } |
| 1160 | 1160 | |
| 1161 | 1161 | $geodir_meta_keys = ''; |
| 1162 | 1162 | $geodir_meta_desc = ''; |
| 1163 | - if ( $is_geodir_page && ! empty( $geodir_post_type_info ) ) {
|
|
| 1164 | - if ( $geodir_is_page_listing || $geodir_is_search || geodir_is_page( 'add-listing' ) ) {
|
|
| 1165 | - $geodir_meta_keys = isset( $geodir_post_type_info->seo['meta_keyword'] ) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys; |
|
| 1163 | + if ($is_geodir_page && !empty($geodir_post_type_info)) {
|
|
| 1164 | + if ($geodir_is_page_listing || $geodir_is_search || geodir_is_page('add-listing')) {
|
|
| 1165 | + $geodir_meta_keys = isset($geodir_post_type_info->seo['meta_keyword']) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys; |
|
| 1166 | 1166 | |
| 1167 | - $geodir_meta_desc = isset( $geodir_post_type_info->description ) ? $geodir_post_type_info->description : $geodir_meta_desc; |
|
| 1168 | - $geodir_meta_desc = isset( $geodir_post_type_info->seo['meta_description'] ) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc; |
|
| 1167 | + $geodir_meta_desc = isset($geodir_post_type_info->description) ? $geodir_post_type_info->description : $geodir_meta_desc; |
|
| 1168 | + $geodir_meta_desc = isset($geodir_post_type_info->seo['meta_description']) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc; |
|
| 1169 | 1169 | |
| 1170 | - if ( $geodir_is_category ) {
|
|
| 1171 | - $category = $geodir_is_category ? get_term_by( 'slug', $geodir_is_category, $category_taxonomy[0] ) : null; |
|
| 1172 | - if ( isset( $category->term_id ) && ! empty( $category->term_id ) ) {
|
|
| 1170 | + if ($geodir_is_category) {
|
|
| 1171 | + $category = $geodir_is_category ? get_term_by('slug', $geodir_is_category, $category_taxonomy[0]) : null;
|
|
| 1172 | + if (isset($category->term_id) && !empty($category->term_id)) {
|
|
| 1173 | 1173 | $category_id = $category->term_id; |
| 1174 | - $category_desc = trim( $category->description ) != '' ? trim( $category->description ) : geodir_get_tax_meta( $category_id, 'ct_cat_top_desc', false, $geodir_post_type ); |
|
| 1175 | - if ( $location_id ) {
|
|
| 1176 | - $option_name = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id; |
|
| 1177 | - $cat_loc_option = get_option( $option_name ); |
|
| 1178 | - |
|
| 1179 | - $gd_cat_loc_default = ! empty( $cat_loc_option ) && isset( $cat_loc_option['gd_cat_loc_default'] ) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false; |
|
| 1180 | - if ( ! $gd_cat_loc_default ) {
|
|
| 1181 | - $option_name = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id . '_' . $location_id; |
|
| 1182 | - $option = get_option( $option_name ); |
|
| 1183 | - $category_desc = isset( $option['gd_cat_loc_desc'] ) && trim( $option['gd_cat_loc_desc'] ) != '' ? trim( $option['gd_cat_loc_desc'] ) : $category_desc; |
|
| 1174 | + $category_desc = trim($category->description) != '' ? trim($category->description) : geodir_get_tax_meta($category_id, 'ct_cat_top_desc', false, $geodir_post_type); |
|
| 1175 | + if ($location_id) {
|
|
| 1176 | + $option_name = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id; |
|
| 1177 | + $cat_loc_option = get_option($option_name); |
|
| 1178 | + |
|
| 1179 | + $gd_cat_loc_default = !empty($cat_loc_option) && isset($cat_loc_option['gd_cat_loc_default']) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false; |
|
| 1180 | + if (!$gd_cat_loc_default) {
|
|
| 1181 | + $option_name = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id.'_'.$location_id; |
|
| 1182 | + $option = get_option($option_name); |
|
| 1183 | + $category_desc = isset($option['gd_cat_loc_desc']) && trim($option['gd_cat_loc_desc']) != '' ? trim($option['gd_cat_loc_desc']) : $category_desc; |
|
| 1184 | 1184 | } |
| 1185 | 1185 | } |
| 1186 | - $geodir_meta_desc = __( "Posts related to Category:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) ) . '. ' . $category_desc; |
|
| 1186 | + $geodir_meta_desc = __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false)).'. '.$category_desc;
|
|
| 1187 | 1187 | } |
| 1188 | - } else if ( $geodir_is_tag ) {
|
|
| 1189 | - $geodir_meta_desc = __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) ) . '. ' . $geodir_meta_desc; |
|
| 1188 | + } else if ($geodir_is_tag) {
|
|
| 1189 | + $geodir_meta_desc = __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_ucfirst(single_tag_title("", false)).'. '.$geodir_meta_desc;
|
|
| 1190 | 1190 | } |
| 1191 | 1191 | } |
| 1192 | 1192 | } |
| 1193 | 1193 | |
| 1194 | 1194 | |
| 1195 | 1195 | $gd_page = ''; |
| 1196 | - if ( geodir_is_page( 'home' ) ) {
|
|
| 1196 | + if (geodir_is_page('home')) {
|
|
| 1197 | 1197 | $gd_page = 'home'; |
| 1198 | - $meta_desc = ( get_option( 'geodir_meta_desc_homepage' ) ) ? get_option( 'geodir_meta_desc_homepage' ) : $meta_desc; |
|
| 1199 | - } elseif ( geodir_is_page( 'detail' ) ) {
|
|
| 1198 | + $meta_desc = (get_option('geodir_meta_desc_homepage')) ? get_option('geodir_meta_desc_homepage') : $meta_desc;
|
|
| 1199 | + } elseif (geodir_is_page('detail')) {
|
|
| 1200 | 1200 | $gd_page = 'detail'; |
| 1201 | - $meta_desc = ( get_option( 'geodir_meta_desc_detail' ) ) ? get_option( 'geodir_meta_desc_detail' ) : $meta_desc; |
|
| 1202 | - } elseif ( geodir_is_page( 'pt' ) ) {
|
|
| 1201 | + $meta_desc = (get_option('geodir_meta_desc_detail')) ? get_option('geodir_meta_desc_detail') : $meta_desc;
|
|
| 1202 | + } elseif (geodir_is_page('pt')) {
|
|
| 1203 | 1203 | $gd_page = 'pt'; |
| 1204 | - $meta_desc = ( get_option( 'geodir_meta_desc_pt' ) ) ? get_option( 'geodir_meta_desc_pt' ) : $meta_desc; |
|
| 1205 | - } elseif ( geodir_is_page( 'listing' ) ) {
|
|
| 1204 | + $meta_desc = (get_option('geodir_meta_desc_pt')) ? get_option('geodir_meta_desc_pt') : $meta_desc;
|
|
| 1205 | + } elseif (geodir_is_page('listing')) {
|
|
| 1206 | 1206 | $gd_page = 'listing'; |
| 1207 | - $meta_desc = ( get_option( 'geodir_meta_desc_listing' ) ) ? get_option( 'geodir_meta_desc_listing' ) : $meta_desc; |
|
| 1208 | - } elseif ( geodir_is_page( 'location' ) ) {
|
|
| 1207 | + $meta_desc = (get_option('geodir_meta_desc_listing')) ? get_option('geodir_meta_desc_listing') : $meta_desc;
|
|
| 1208 | + } elseif (geodir_is_page('location')) {
|
|
| 1209 | 1209 | $gd_page = 'location'; |
| 1210 | - $meta_desc = ( get_option( 'geodir_meta_desc_location' ) ) ? get_option( 'geodir_meta_desc_location' ) : $meta_desc; |
|
| 1211 | - $meta_desc = apply_filters( 'geodir_seo_meta_location_description', $meta_desc ); |
|
| 1210 | + $meta_desc = (get_option('geodir_meta_desc_location')) ? get_option('geodir_meta_desc_location') : $meta_desc;
|
|
| 1211 | + $meta_desc = apply_filters('geodir_seo_meta_location_description', $meta_desc);
|
|
| 1212 | 1212 | |
| 1213 | - } elseif ( geodir_is_page( 'search' ) ) {
|
|
| 1213 | + } elseif (geodir_is_page('search')) {
|
|
| 1214 | 1214 | $gd_page = 'search'; |
| 1215 | - $meta_desc = ( get_option( 'geodir_meta_desc_search' ) ) ? get_option( 'geodir_meta_desc_search' ) : $meta_desc; |
|
| 1216 | - } elseif ( geodir_is_page( 'add-listing' ) ) {
|
|
| 1215 | + $meta_desc = (get_option('geodir_meta_desc_search')) ? get_option('geodir_meta_desc_search') : $meta_desc;
|
|
| 1216 | + } elseif (geodir_is_page('add-listing')) {
|
|
| 1217 | 1217 | $gd_page = 'add-listing'; |
| 1218 | - $meta_desc = ( get_option( 'geodir_meta_desc_add-listing' ) ) ? get_option( 'geodir_meta_desc_add-listing' ) : $meta_desc; |
|
| 1219 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1218 | + $meta_desc = (get_option('geodir_meta_desc_add-listing')) ? get_option('geodir_meta_desc_add-listing') : $meta_desc;
|
|
| 1219 | + } elseif (geodir_is_page('author')) {
|
|
| 1220 | 1220 | $gd_page = 'author'; |
| 1221 | - $meta_desc = ( get_option( 'geodir_meta_desc_author' ) ) ? get_option( 'geodir_meta_desc_author' ) : $meta_desc; |
|
| 1222 | - } elseif ( geodir_is_page( 'login' ) ) {
|
|
| 1221 | + $meta_desc = (get_option('geodir_meta_desc_author')) ? get_option('geodir_meta_desc_author') : $meta_desc;
|
|
| 1222 | + } elseif (geodir_is_page('login')) {
|
|
| 1223 | 1223 | $gd_page = 'login'; |
| 1224 | - $meta_desc = ( get_option( 'geodir_meta_desc_login' ) ) ? get_option( 'geodir_meta_desc_login' ) : $meta_desc; |
|
| 1225 | - } elseif ( geodir_is_page( 'listing-success' ) ) {
|
|
| 1224 | + $meta_desc = (get_option('geodir_meta_desc_login')) ? get_option('geodir_meta_desc_login') : $meta_desc;
|
|
| 1225 | + } elseif (geodir_is_page('listing-success')) {
|
|
| 1226 | 1226 | $gd_page = 'listing-success'; |
| 1227 | - $meta_desc = ( get_option( 'geodir_meta_desc_listing-success' ) ) ? get_option( 'geodir_meta_desc_listing-success' ) : $meta_desc; |
|
| 1227 | + $meta_desc = (get_option('geodir_meta_desc_listing-success')) ? get_option('geodir_meta_desc_listing-success') : $meta_desc;
|
|
| 1228 | 1228 | } |
| 1229 | 1229 | |
| 1230 | 1230 | |
| 1231 | - if ( $meta_desc ) {
|
|
| 1232 | - $meta_desc = stripslashes_deep( $meta_desc ); |
|
| 1231 | + if ($meta_desc) {
|
|
| 1232 | + $meta_desc = stripslashes_deep($meta_desc); |
|
| 1233 | 1233 | /** |
| 1234 | 1234 | * Filter page description to replace variables. |
| 1235 | 1235 | * |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | * @param string $title The page description including variables. |
| 1239 | 1239 | * @param string $gd_page The GeoDirectory page type if any. |
| 1240 | 1240 | */ |
| 1241 | - $meta_desc = apply_filters( 'geodir_seo_meta_description_pre', __( $meta_desc, 'geodirectory' ), $gd_page, '' ); |
|
| 1241 | + $meta_desc = apply_filters('geodir_seo_meta_description_pre', __($meta_desc, 'geodirectory'), $gd_page, '');
|
|
| 1242 | 1242 | |
| 1243 | 1243 | /** |
| 1244 | 1244 | * Filter SEO meta description. |
@@ -1247,20 +1247,20 @@ discard block |
||
| 1247 | 1247 | * |
| 1248 | 1248 | * @param string $meta_desc Meta description content. |
| 1249 | 1249 | */ |
| 1250 | - echo apply_filters( 'geodir_seo_meta_description', '<meta name="description" content="' . $meta_desc . '" />', $meta_desc ); |
|
| 1250 | + echo apply_filters('geodir_seo_meta_description', '<meta name="description" content="'.$meta_desc.'" />', $meta_desc);
|
|
| 1251 | 1251 | } |
| 1252 | 1252 | |
| 1253 | 1253 | // meta keywords |
| 1254 | - if ( isset( $post->post_type ) && in_array( $post->post_type, $all_postypes ) ) {
|
|
| 1255 | - $place_tags = wp_get_post_terms( $post->ID, $post->post_type . '_tags', array( "fields" => "names" ) ); |
|
| 1256 | - $place_cats = wp_get_post_terms( $post->ID, $post->post_type . 'category', array( "fields" => "names" ) ); |
|
| 1254 | + if (isset($post->post_type) && in_array($post->post_type, $all_postypes)) {
|
|
| 1255 | + $place_tags = wp_get_post_terms($post->ID, $post->post_type.'_tags', array("fields" => "names"));
|
|
| 1256 | + $place_cats = wp_get_post_terms($post->ID, $post->post_type.'category', array("fields" => "names"));
|
|
| 1257 | 1257 | |
| 1258 | - $meta_key .= implode( ", ", array_merge( (array) $place_cats, (array) $place_tags ) ); |
|
| 1258 | + $meta_key .= implode(", ", array_merge((array) $place_cats, (array) $place_tags));
|
|
| 1259 | 1259 | } else {
|
| 1260 | 1260 | $posttags = get_the_tags(); |
| 1261 | - if ( $posttags ) {
|
|
| 1262 | - foreach ( $posttags as $tag ) {
|
|
| 1263 | - $meta_key .= $tag->name . ' '; |
|
| 1261 | + if ($posttags) {
|
|
| 1262 | + foreach ($posttags as $tag) {
|
|
| 1263 | + $meta_key .= $tag->name.' '; |
|
| 1264 | 1264 | } |
| 1265 | 1265 | } else {
|
| 1266 | 1266 | // $tags = get_tags( array( 'orderby' => 'count', 'order' => 'DESC' ) ); |
@@ -1276,20 +1276,20 @@ discard block |
||
| 1276 | 1276 | } |
| 1277 | 1277 | } |
| 1278 | 1278 | |
| 1279 | - $meta_key = $meta_key != '' ? rtrim( trim( $meta_key ), "," ) : $meta_key; |
|
| 1280 | - $geodir_meta_keys = $geodir_meta_keys != '' ? ( $meta_key != '' ? $meta_key . ', ' . $geodir_meta_keys : $geodir_meta_keys ) : $meta_key; |
|
| 1281 | - if ( $geodir_meta_keys != '' ) {
|
|
| 1282 | - $geodir_meta_keys = strip_tags( $geodir_meta_keys ); |
|
| 1283 | - $geodir_meta_keys = esc_html( $geodir_meta_keys ); |
|
| 1284 | - $geodir_meta_keys = geodir_strtolower( $geodir_meta_keys ); |
|
| 1285 | - $geodir_meta_keys = wp_html_excerpt( $geodir_meta_keys, 1000, '' ); |
|
| 1286 | - $geodir_meta_keys = str_replace( '%location%', $replace_location, $geodir_meta_keys ); |
|
| 1279 | + $meta_key = $meta_key != '' ? rtrim(trim($meta_key), ",") : $meta_key; |
|
| 1280 | + $geodir_meta_keys = $geodir_meta_keys != '' ? ($meta_key != '' ? $meta_key.', '.$geodir_meta_keys : $geodir_meta_keys) : $meta_key; |
|
| 1281 | + if ($geodir_meta_keys != '') {
|
|
| 1282 | + $geodir_meta_keys = strip_tags($geodir_meta_keys); |
|
| 1283 | + $geodir_meta_keys = esc_html($geodir_meta_keys); |
|
| 1284 | + $geodir_meta_keys = geodir_strtolower($geodir_meta_keys); |
|
| 1285 | + $geodir_meta_keys = wp_html_excerpt($geodir_meta_keys, 1000, ''); |
|
| 1286 | + $geodir_meta_keys = str_replace('%location%', $replace_location, $geodir_meta_keys);
|
|
| 1287 | 1287 | |
| 1288 | - $meta_key = rtrim( trim( $geodir_meta_keys ), "," ); |
|
| 1288 | + $meta_key = rtrim(trim($geodir_meta_keys), ","); |
|
| 1289 | 1289 | } |
| 1290 | 1290 | |
| 1291 | - if ( $meta_key ) {
|
|
| 1292 | - $meta_key = stripslashes_deep( $meta_key ); |
|
| 1291 | + if ($meta_key) {
|
|
| 1292 | + $meta_key = stripslashes_deep($meta_key); |
|
| 1293 | 1293 | /** |
| 1294 | 1294 | * Filter SEO meta keywords. |
| 1295 | 1295 | * |
@@ -1297,7 +1297,7 @@ discard block |
||
| 1297 | 1297 | * |
| 1298 | 1298 | * @param string $meta_desc Meta keywords. |
| 1299 | 1299 | */ |
| 1300 | - echo apply_filters( 'geodir_seo_meta_keywords', '<meta name="keywords" content="' . $meta_key . '" />', $meta_key ); |
|
| 1300 | + echo apply_filters('geodir_seo_meta_keywords', '<meta name="keywords" content="'.$meta_key.'" />', $meta_key);
|
|
| 1301 | 1301 | } |
| 1302 | 1302 | |
| 1303 | 1303 | } |
@@ -1317,8 +1317,8 @@ discard block |
||
| 1317 | 1317 | |
| 1318 | 1318 | $geodir_detail_page_tabs_array = geodir_detail_page_tabs_array(); |
| 1319 | 1319 | |
| 1320 | - foreach ( $geodir_detail_page_tabs_array as $key => $tabs_obj ) {
|
|
| 1321 | - $geodir_detail_page_tabs_key_value_array[ $key ] = $tabs_obj['heading_text']; |
|
| 1320 | + foreach ($geodir_detail_page_tabs_array as $key => $tabs_obj) {
|
|
| 1321 | + $geodir_detail_page_tabs_key_value_array[$key] = $tabs_obj['heading_text']; |
|
| 1322 | 1322 | } |
| 1323 | 1323 | |
| 1324 | 1324 | return $geodir_detail_page_tabs_key_value_array; |
@@ -1340,57 +1340,57 @@ discard block |
||
| 1340 | 1340 | * @since 1.0.0 |
| 1341 | 1341 | */ |
| 1342 | 1342 | $arr_tabs['post_profile'] = array( |
| 1343 | - 'heading_text' => __( 'Profile', 'geodirectory' ), |
|
| 1343 | + 'heading_text' => __('Profile', 'geodirectory'),
|
|
| 1344 | 1344 | 'is_active_tab' => true, |
| 1345 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_profile' ), |
|
| 1345 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_profile'),
|
|
| 1346 | 1346 | 'tab_content' => '' |
| 1347 | 1347 | ); |
| 1348 | - $arr_tabs['post_info'] = array( |
|
| 1349 | - 'heading_text' => __( 'More Info', 'geodirectory' ), |
|
| 1348 | + $arr_tabs['post_info'] = array( |
|
| 1349 | + 'heading_text' => __('More Info', 'geodirectory'),
|
|
| 1350 | 1350 | 'is_active_tab' => false, |
| 1351 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_info' ), |
|
| 1351 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_info'),
|
|
| 1352 | 1352 | 'tab_content' => '' |
| 1353 | 1353 | ); |
| 1354 | 1354 | |
| 1355 | 1355 | $arr_tabs['post_images'] = array( |
| 1356 | - 'heading_text' => __( 'Photos', 'geodirectory' ), |
|
| 1356 | + 'heading_text' => __('Photos', 'geodirectory'),
|
|
| 1357 | 1357 | 'is_active_tab' => false, |
| 1358 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_images' ), |
|
| 1358 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_images'),
|
|
| 1359 | 1359 | 'tab_content' => '' |
| 1360 | 1360 | ); |
| 1361 | 1361 | |
| 1362 | 1362 | $arr_tabs['post_video'] = array( |
| 1363 | - 'heading_text' => __( 'Video', 'geodirectory' ), |
|
| 1363 | + 'heading_text' => __('Video', 'geodirectory'),
|
|
| 1364 | 1364 | 'is_active_tab' => false, |
| 1365 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_video' ), |
|
| 1365 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_video'),
|
|
| 1366 | 1366 | 'tab_content' => '' |
| 1367 | 1367 | ); |
| 1368 | 1368 | |
| 1369 | 1369 | $arr_tabs['special_offers'] = array( |
| 1370 | - 'heading_text' => __( 'Special Offers', 'geodirectory' ), |
|
| 1370 | + 'heading_text' => __('Special Offers', 'geodirectory'),
|
|
| 1371 | 1371 | 'is_active_tab' => false, |
| 1372 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'special_offers' ), |
|
| 1372 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'special_offers'),
|
|
| 1373 | 1373 | 'tab_content' => '' |
| 1374 | 1374 | ); |
| 1375 | 1375 | |
| 1376 | 1376 | $arr_tabs['post_map'] = array( |
| 1377 | - 'heading_text' => __( 'Map', 'geodirectory' ), |
|
| 1377 | + 'heading_text' => __('Map', 'geodirectory'),
|
|
| 1378 | 1378 | 'is_active_tab' => false, |
| 1379 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_map' ), |
|
| 1379 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_map'),
|
|
| 1380 | 1380 | 'tab_content' => '' |
| 1381 | 1381 | ); |
| 1382 | 1382 | |
| 1383 | 1383 | $arr_tabs['reviews'] = array( |
| 1384 | - 'heading_text' => __( 'Reviews', 'geodirectory' ), |
|
| 1384 | + 'heading_text' => __('Reviews', 'geodirectory'),
|
|
| 1385 | 1385 | 'is_active_tab' => false, |
| 1386 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'reviews' ), |
|
| 1386 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'reviews'),
|
|
| 1387 | 1387 | 'tab_content' => 'review display' |
| 1388 | 1388 | ); |
| 1389 | 1389 | |
| 1390 | 1390 | $arr_tabs['related_listing'] = array( |
| 1391 | - 'heading_text' => __( 'Related Listing', 'geodirectory' ), |
|
| 1391 | + 'heading_text' => __('Related Listing', 'geodirectory'),
|
|
| 1392 | 1392 | 'is_active_tab' => false, |
| 1393 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'related_listing' ), |
|
| 1393 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'related_listing'),
|
|
| 1394 | 1394 | 'tab_content' => '' |
| 1395 | 1395 | ); |
| 1396 | 1396 | |
@@ -1399,7 +1399,7 @@ discard block |
||
| 1399 | 1399 | * |
| 1400 | 1400 | * @since 1.0.0 |
| 1401 | 1401 | */ |
| 1402 | - return apply_filters( 'geodir_detail_page_tab_list_extend', $arr_tabs ); |
|
| 1402 | + return apply_filters('geodir_detail_page_tab_list_extend', $arr_tabs);
|
|
| 1403 | 1403 | |
| 1404 | 1404 | |
| 1405 | 1405 | } |
@@ -1413,13 +1413,13 @@ discard block |
||
| 1413 | 1413 | * @return mixed|array Tabs array. |
| 1414 | 1414 | */ |
| 1415 | 1415 | function geodir_detail_page_tabs_list() {
|
| 1416 | - $tabs_excluded = get_option( 'geodir_detail_page_tabs_excluded' ); |
|
| 1416 | + $tabs_excluded = get_option('geodir_detail_page_tabs_excluded');
|
|
| 1417 | 1417 | $tabs_array = geodir_detail_page_tabs_array(); |
| 1418 | 1418 | |
| 1419 | - if ( ! empty( $tabs_excluded ) ) {
|
|
| 1420 | - foreach ( $tabs_excluded as $tab ) {
|
|
| 1421 | - if ( array_key_exists( $tab, $tabs_array ) ) {
|
|
| 1422 | - unset( $tabs_array[ $tab ] ); |
|
| 1419 | + if (!empty($tabs_excluded)) {
|
|
| 1420 | + foreach ($tabs_excluded as $tab) {
|
|
| 1421 | + if (array_key_exists($tab, $tabs_array)) {
|
|
| 1422 | + unset($tabs_array[$tab]); |
|
| 1423 | 1423 | } |
| 1424 | 1424 | } |
| 1425 | 1425 | } |
@@ -1443,66 +1443,66 @@ discard block |
||
| 1443 | 1443 | function geodir_show_detail_page_tabs() {
|
| 1444 | 1444 | global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields, $preview; |
| 1445 | 1445 | |
| 1446 | - $post_id = ! empty( $post ) && isset( $post->ID ) ? (int) $post->ID : 0; |
|
| 1447 | - $request_post_id = ! empty( $_REQUEST['p'] ) ? (int) $_REQUEST['p'] : 0; |
|
| 1448 | - $is_backend_preview = ( is_single() && ! empty( $_REQUEST['post_type'] ) && ! empty( $_REQUEST['preview'] ) && ! empty( $_REQUEST['p'] ) ) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 1446 | + $post_id = !empty($post) && isset($post->ID) ? (int) $post->ID : 0; |
|
| 1447 | + $request_post_id = !empty($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0; |
|
| 1448 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 1449 | 1449 | |
| 1450 | - if ( $is_backend_preview && ! $post_id > 0 && $request_post_id > 0 ) {
|
|
| 1451 | - $post = geodir_get_post_info( $request_post_id ); |
|
| 1452 | - setup_postdata( $post ); |
|
| 1450 | + if ($is_backend_preview && !$post_id > 0 && $request_post_id > 0) {
|
|
| 1451 | + $post = geodir_get_post_info($request_post_id); |
|
| 1452 | + setup_postdata($post); |
|
| 1453 | 1453 | } |
| 1454 | 1454 | |
| 1455 | - $geodir_post_detail_fields = geodir_show_listing_info( 'moreinfo' ); |
|
| 1455 | + $geodir_post_detail_fields = geodir_show_listing_info('moreinfo');
|
|
| 1456 | 1456 | |
| 1457 | 1457 | $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : '')); |
| 1458 | 1458 | $image_limit = ''; |
| 1459 | 1459 | if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {
|
| 1460 | - $image_limit = (int)$package_info->image_limit; |
|
| 1460 | + $image_limit = (int) $package_info->image_limit; |
|
| 1461 | 1461 | } |
| 1462 | 1462 | |
| 1463 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1464 | - $video = geodir_get_video( $post->ID ); |
|
| 1465 | - $special_offers = geodir_get_special_offers( $post->ID ); |
|
| 1463 | + if (geodir_is_page('detail')) {
|
|
| 1464 | + $video = geodir_get_video($post->ID); |
|
| 1465 | + $special_offers = geodir_get_special_offers($post->ID); |
|
| 1466 | 1466 | $related_listing_array = array(); |
| 1467 | - if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {
|
|
| 1468 | - $related_listing_array = get_option( 'geodir_add_related_listing_posttypes' ); |
|
| 1467 | + if (get_option('geodir_add_related_listing_posttypes')) {
|
|
| 1468 | + $related_listing_array = get_option('geodir_add_related_listing_posttypes');
|
|
| 1469 | 1469 | } |
| 1470 | 1470 | |
| 1471 | - $excluded_tabs = get_option( 'geodir_detail_page_tabs_excluded' ); |
|
| 1472 | - if ( ! $excluded_tabs ) {
|
|
| 1471 | + $excluded_tabs = get_option('geodir_detail_page_tabs_excluded');
|
|
| 1472 | + if (!$excluded_tabs) {
|
|
| 1473 | 1473 | $excluded_tabs = array(); |
| 1474 | 1474 | } |
| 1475 | 1475 | |
| 1476 | 1476 | $related_listing = ''; |
| 1477 | - if ( in_array( $post->post_type, $related_listing_array ) && ! in_array( 'related_listing', $excluded_tabs ) ) {
|
|
| 1477 | + if (in_array($post->post_type, $related_listing_array) && !in_array('related_listing', $excluded_tabs)) {
|
|
| 1478 | 1478 | $request = array( |
| 1479 | - 'post_number' => get_option( 'geodir_related_post_count' ), |
|
| 1480 | - 'relate_to' => get_option( 'geodir_related_post_relate_to' ), |
|
| 1481 | - 'layout' => get_option( 'geodir_related_post_listing_view' ), |
|
| 1482 | - 'add_location_filter' => get_option( 'geodir_related_post_location_filter' ), |
|
| 1483 | - 'list_sort' => get_option( 'geodir_related_post_sortby' ), |
|
| 1484 | - 'character_count' => get_option( 'geodir_related_post_excerpt' ) |
|
| 1479 | + 'post_number' => get_option('geodir_related_post_count'),
|
|
| 1480 | + 'relate_to' => get_option('geodir_related_post_relate_to'),
|
|
| 1481 | + 'layout' => get_option('geodir_related_post_listing_view'),
|
|
| 1482 | + 'add_location_filter' => get_option('geodir_related_post_location_filter'),
|
|
| 1483 | + 'list_sort' => get_option('geodir_related_post_sortby'),
|
|
| 1484 | + 'character_count' => get_option('geodir_related_post_excerpt')
|
|
| 1485 | 1485 | ); |
| 1486 | 1486 | |
| 1487 | - if ( $post->post_type == 'gd_event' && defined( 'GDEVENTS_VERSION' ) ) {
|
|
| 1488 | - $related_listing = geodir_get_detail_page_related_events( $request ); |
|
| 1487 | + if ($post->post_type == 'gd_event' && defined('GDEVENTS_VERSION')) {
|
|
| 1488 | + $related_listing = geodir_get_detail_page_related_events($request); |
|
| 1489 | 1489 | } else {
|
| 1490 | - $related_listing = geodir_related_posts_display( $request ); |
|
| 1490 | + $related_listing = geodir_related_posts_display($request); |
|
| 1491 | 1491 | } |
| 1492 | 1492 | |
| 1493 | 1493 | } |
| 1494 | 1494 | |
| 1495 | - $post_images = geodir_get_images( $post->ID, 'thumbnail' ); |
|
| 1495 | + $post_images = geodir_get_images($post->ID, 'thumbnail'); |
|
| 1496 | 1496 | $thumb_image = ''; |
| 1497 | - if ( ! empty( $post_images ) ) {
|
|
| 1497 | + if (!empty($post_images)) {
|
|
| 1498 | 1498 | $count = 1; |
| 1499 | - foreach ( $post_images as $image ) {
|
|
| 1499 | + foreach ($post_images as $image) {
|
|
| 1500 | 1500 | if ($image_limit !== '' && $count > $image_limit) {
|
| 1501 | 1501 | break; |
| 1502 | 1502 | } |
| 1503 | - $caption = ( ! empty( $image->caption ) ) ? $image->caption : ''; |
|
| 1504 | - $thumb_image .= '<a href="' . $image->src . '" title="' . $caption . '">'; |
|
| 1505 | - $thumb_image .= geodir_show_image( $image, 'thumbnail', true, false ); |
|
| 1503 | + $caption = (!empty($image->caption)) ? $image->caption : ''; |
|
| 1504 | + $thumb_image .= '<a href="'.$image->src.'" title="'.$caption.'">'; |
|
| 1505 | + $thumb_image .= geodir_show_image($image, 'thumbnail', true, false); |
|
| 1506 | 1506 | $thumb_image .= '</a>'; |
| 1507 | 1507 | $count++; |
| 1508 | 1508 | } |
@@ -1512,11 +1512,11 @@ discard block |
||
| 1512 | 1512 | $map_args['map_canvas_name'] = 'detail_page_map_canvas'; |
| 1513 | 1513 | $map_args['width'] = '600'; |
| 1514 | 1514 | $map_args['height'] = '300'; |
| 1515 | - if ( $post->post_mapzoom ) {
|
|
| 1516 | - $map_args['zoom'] = '' . $post->post_mapzoom . ''; |
|
| 1515 | + if ($post->post_mapzoom) {
|
|
| 1516 | + $map_args['zoom'] = ''.$post->post_mapzoom.''; |
|
| 1517 | 1517 | } |
| 1518 | 1518 | $map_args['autozoom'] = false; |
| 1519 | - $map_args['scrollwheel'] = ( get_option( 'geodir_add_listing_mouse_scroll' ) ) ? 0 : 1; |
|
| 1519 | + $map_args['scrollwheel'] = (get_option('geodir_add_listing_mouse_scroll')) ? 0 : 1;
|
|
| 1520 | 1520 | $map_args['child_collapse'] = '0'; |
| 1521 | 1521 | $map_args['enable_cat_filters'] = false; |
| 1522 | 1522 | $map_args['enable_text_search'] = false; |
@@ -1525,29 +1525,29 @@ discard block |
||
| 1525 | 1525 | $map_args['enable_jason_on_load'] = true; |
| 1526 | 1526 | $map_args['enable_map_direction'] = true; |
| 1527 | 1527 | $map_args['map_class_name'] = 'geodir-map-detail-page'; |
| 1528 | - $map_args['maptype'] = ( ! empty( $post->post_mapview ) ) ? $post->post_mapview : 'ROADMAP'; |
|
| 1529 | - } else if ( geodir_is_page( 'preview' ) ) {
|
|
| 1530 | - $video = isset( $post->geodir_video ) ? $post->geodir_video : ''; |
|
| 1531 | - $special_offers = isset( $post->geodir_special_offers ) ? $post->geodir_special_offers : ''; |
|
| 1528 | + $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP'; |
|
| 1529 | + } else if (geodir_is_page('preview')) {
|
|
| 1530 | + $video = isset($post->geodir_video) ? $post->geodir_video : ''; |
|
| 1531 | + $special_offers = isset($post->geodir_special_offers) ? $post->geodir_special_offers : ''; |
|
| 1532 | 1532 | |
| 1533 | - if ( isset( $post->post_images ) ) {
|
|
| 1534 | - $post->post_images = trim( $post->post_images, "," ); |
|
| 1533 | + if (isset($post->post_images)) {
|
|
| 1534 | + $post->post_images = trim($post->post_images, ","); |
|
| 1535 | 1535 | } |
| 1536 | 1536 | |
| 1537 | - if ( isset( $post->post_images ) && ! empty( $post->post_images ) ) {
|
|
| 1538 | - $post_images = explode( ",", $post->post_images ); |
|
| 1537 | + if (isset($post->post_images) && !empty($post->post_images)) {
|
|
| 1538 | + $post_images = explode(",", $post->post_images);
|
|
| 1539 | 1539 | } |
| 1540 | 1540 | |
| 1541 | 1541 | $thumb_image = ''; |
| 1542 | - if ( ! empty( $post_images ) ) {
|
|
| 1542 | + if (!empty($post_images)) {
|
|
| 1543 | 1543 | $count = 1; |
| 1544 | - foreach ( $post_images as $image ) {
|
|
| 1545 | - if ( $image != '' ) {
|
|
| 1544 | + foreach ($post_images as $image) {
|
|
| 1545 | + if ($image != '') {
|
|
| 1546 | 1546 | if ($image_limit !== '' && $count > $image_limit) {
|
| 1547 | 1547 | break; |
| 1548 | 1548 | } |
| 1549 | - $thumb_image .= '<a href="' . $image . '">'; |
|
| 1550 | - $thumb_image .= geodir_show_image( array( 'src' => $image ), 'thumbnail', true, false ); |
|
| 1549 | + $thumb_image .= '<a href="'.$image.'">'; |
|
| 1550 | + $thumb_image .= geodir_show_image(array('src' => $image), 'thumbnail', true, false);
|
|
| 1551 | 1551 | $thumb_image .= '</a>'; |
| 1552 | 1552 | $count++; |
| 1553 | 1553 | } |
@@ -1555,18 +1555,18 @@ discard block |
||
| 1555 | 1555 | } |
| 1556 | 1556 | |
| 1557 | 1557 | global $map_jason; |
| 1558 | - $marker_json = $post->marker_json != '' ? json_decode( $post->marker_json, true ) : array(); |
|
| 1559 | - $marker_icon = ( ! empty( $marker_json ) && ! empty( $marker_json['i'] ) ) ? $marker_json['i'] : ''; |
|
| 1560 | - $icon_size = geodir_get_marker_size( $marker_icon ); |
|
| 1558 | + $marker_json = $post->marker_json != '' ? json_decode($post->marker_json, true) : array(); |
|
| 1559 | + $marker_icon = (!empty($marker_json) && !empty($marker_json['i'])) ? $marker_json['i'] : ''; |
|
| 1560 | + $icon_size = geodir_get_marker_size($marker_icon); |
|
| 1561 | 1561 | $marker_json['w'] = $icon_size['w']; |
| 1562 | 1562 | $marker_json['h'] = $icon_size['h']; |
| 1563 | - $map_jason[] = json_encode( $marker_json ); |
|
| 1563 | + $map_jason[] = json_encode($marker_json); |
|
| 1564 | 1564 | |
| 1565 | - $address_latitude = isset( $post->post_latitude ) ? $post->post_latitude : ''; |
|
| 1566 | - $address_longitude = isset( $post->post_longitude ) ? $post->post_longitude : ''; |
|
| 1567 | - $mapview = isset( $post->post_mapview ) ? $post->post_mapview : ''; |
|
| 1568 | - $mapzoom = isset( $post->post_mapzoom ) ? $post->post_mapzoom : ''; |
|
| 1569 | - if ( ! $mapzoom ) {
|
|
| 1565 | + $address_latitude = isset($post->post_latitude) ? $post->post_latitude : ''; |
|
| 1566 | + $address_longitude = isset($post->post_longitude) ? $post->post_longitude : ''; |
|
| 1567 | + $mapview = isset($post->post_mapview) ? $post->post_mapview : ''; |
|
| 1568 | + $mapzoom = isset($post->post_mapzoom) ? $post->post_mapzoom : ''; |
|
| 1569 | + if (!$mapzoom) {
|
|
| 1570 | 1570 | $mapzoom = 12; |
| 1571 | 1571 | } |
| 1572 | 1572 | |
@@ -1589,37 +1589,37 @@ discard block |
||
| 1589 | 1589 | $map_args['map_class_name'] = 'geodir-map-preview-page'; |
| 1590 | 1590 | } |
| 1591 | 1591 | |
| 1592 | - $arr_detail_page_tabs = geodir_detail_page_tabs_list();// get this sooner so we can get the active tab for the user |
|
| 1592 | + $arr_detail_page_tabs = geodir_detail_page_tabs_list(); // get this sooner so we can get the active tab for the user |
|
| 1593 | 1593 | |
| 1594 | 1594 | $active_tab = ''; |
| 1595 | 1595 | $active_tab_name = ''; |
| 1596 | 1596 | $default_tab = ''; |
| 1597 | 1597 | $default_tab_name = ''; |
| 1598 | - foreach ( $arr_detail_page_tabs as $tab_index => $tabs ) {
|
|
| 1599 | - if ( isset( $tabs['is_active_tab'] ) && $tabs['is_active_tab'] && ! empty( $tabs['is_display'] ) && isset( $tabs['heading_text'] ) && $tabs['heading_text'] ) {
|
|
| 1598 | + foreach ($arr_detail_page_tabs as $tab_index => $tabs) {
|
|
| 1599 | + if (isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && !empty($tabs['is_display']) && isset($tabs['heading_text']) && $tabs['heading_text']) {
|
|
| 1600 | 1600 | $active_tab = $tab_index; |
| 1601 | - $active_tab_name = __( $tabs['heading_text'], 'geodirectory' ); |
|
| 1601 | + $active_tab_name = __($tabs['heading_text'], 'geodirectory'); |
|
| 1602 | 1602 | } |
| 1603 | 1603 | |
| 1604 | - if ( $default_tab === '' && ! empty( $tabs['is_display'] ) && ! empty( $tabs['heading_text'] ) ) {
|
|
| 1604 | + if ($default_tab === '' && !empty($tabs['is_display']) && !empty($tabs['heading_text'])) {
|
|
| 1605 | 1605 | $default_tab = $tab_index; |
| 1606 | - $default_tab_name = __( $tabs['heading_text'], 'geodirectory' ); |
|
| 1606 | + $default_tab_name = __($tabs['heading_text'], 'geodirectory'); |
|
| 1607 | 1607 | } |
| 1608 | 1608 | } |
| 1609 | 1609 | |
| 1610 | - if ( $active_tab === '' && $default_tab !== '' ) { // Make first tab as a active tab if not any tab is active.
|
|
| 1611 | - if ( isset( $arr_detail_page_tabs[ $active_tab ] ) && isset( $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] ) ) {
|
|
| 1612 | - $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] = false; |
|
| 1610 | + if ($active_tab === '' && $default_tab !== '') { // Make first tab as a active tab if not any tab is active.
|
|
| 1611 | + if (isset($arr_detail_page_tabs[$active_tab]) && isset($arr_detail_page_tabs[$active_tab]['is_active_tab'])) {
|
|
| 1612 | + $arr_detail_page_tabs[$active_tab]['is_active_tab'] = false; |
|
| 1613 | 1613 | } |
| 1614 | 1614 | |
| 1615 | - $arr_detail_page_tabs[ $default_tab ]['is_active_tab'] = true; |
|
| 1615 | + $arr_detail_page_tabs[$default_tab]['is_active_tab'] = true; |
|
| 1616 | 1616 | $active_tab = $default_tab; |
| 1617 | 1617 | $active_tab_name = $default_tab_name; |
| 1618 | 1618 | } |
| 1619 | - $tab_list = ( get_option( 'geodir_disable_tabs', false ) ) ? true : false; |
|
| 1619 | + $tab_list = (get_option('geodir_disable_tabs', false)) ? true : false;
|
|
| 1620 | 1620 | ?> |
| 1621 | 1621 | <div class="geodir-tabs" id="gd-tabs" style="position:relative;"> |
| 1622 | - <?php if ( ! $tab_list ){ ?>
|
|
| 1622 | + <?php if (!$tab_list) { ?>
|
|
| 1623 | 1623 | <div id="geodir-tab-mobile-menu"> |
| 1624 | 1624 | <i class="fa fa-bars"></i> |
| 1625 | 1625 | <span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span> |
@@ -1634,26 +1634,26 @@ discard block |
||
| 1634 | 1634 | * @since 1.0.0 |
| 1635 | 1635 | * @see 'geodir_after_tab_list' |
| 1636 | 1636 | */ |
| 1637 | - do_action( 'geodir_before_tab_list' ); ?> |
|
| 1637 | + do_action('geodir_before_tab_list'); ?>
|
|
| 1638 | 1638 | <?php |
| 1639 | 1639 | |
| 1640 | - foreach ( $arr_detail_page_tabs as $tab_index => $detail_page_tab ) {
|
|
| 1641 | - if ( $detail_page_tab['is_display'] ) {
|
|
| 1640 | + foreach ($arr_detail_page_tabs as $tab_index => $detail_page_tab) {
|
|
| 1641 | + if ($detail_page_tab['is_display']) {
|
|
| 1642 | 1642 | |
| 1643 | - if ( ! $tab_list ) {
|
|
| 1643 | + if (!$tab_list) {
|
|
| 1644 | 1644 | ?> |
| 1645 | 1645 | <dt></dt> <!-- added to comply with validation --> |
| 1646 | - <dd <?php if ( $detail_page_tab['is_active_tab'] ){ ?>class="geodir-tab-active"<?php } ?> ><a
|
|
| 1646 | + <dd <?php if ($detail_page_tab['is_active_tab']) { ?>class="geodir-tab-active"<?php } ?> ><a
|
|
| 1647 | 1647 | data-tab="#<?php echo $tab_index; ?>" |
| 1648 | - data-status="enable"><?php _e( $detail_page_tab['heading_text'], 'geodirectory' ); ?></a> |
|
| 1648 | + data-status="enable"><?php _e($detail_page_tab['heading_text'], 'geodirectory'); ?></a> |
|
| 1649 | 1649 | </dd> |
| 1650 | 1650 | <?php |
| 1651 | 1651 | } |
| 1652 | 1652 | ob_start() // start tab content buffering |
| 1653 | 1653 | ?> |
| 1654 | 1654 | <li id="<?php echo $tab_index; ?>Tab"> |
| 1655 | - <?php if ( $tab_list ) {
|
|
| 1656 | - $tab_title = '<span class="gd-tab-list-title" ><a href="#' . $tab_index . '">' . __( $detail_page_tab['heading_text'], 'geodirectory' ) . '</a></span><hr />'; |
|
| 1655 | + <?php if ($tab_list) {
|
|
| 1656 | + $tab_title = '<span class="gd-tab-list-title" ><a href="#'.$tab_index.'">'.__($detail_page_tab['heading_text'], 'geodirectory').'</a></span><hr />'; |
|
| 1657 | 1657 | /** |
| 1658 | 1658 | * Filter the tab list title html. |
| 1659 | 1659 | * |
@@ -1663,7 +1663,7 @@ discard block |
||
| 1663 | 1663 | * @param string $tab_index The tab index type. |
| 1664 | 1664 | * @param array $detail_page_tab The array of values including title text. |
| 1665 | 1665 | */ |
| 1666 | - echo apply_filters( 'geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab ); |
|
| 1666 | + echo apply_filters('geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab);
|
|
| 1667 | 1667 | } ?> |
| 1668 | 1668 | <div id="<?php echo $tab_index; ?>" class="hash-offset"></div> |
| 1669 | 1669 | <?php |
@@ -1674,7 +1674,7 @@ discard block |
||
| 1674 | 1674 | * |
| 1675 | 1675 | * @param string $tab_index The tab name ID. |
| 1676 | 1676 | */ |
| 1677 | - do_action( 'geodir_before_tab_content', $tab_index ); |
|
| 1677 | + do_action('geodir_before_tab_content', $tab_index);
|
|
| 1678 | 1678 | |
| 1679 | 1679 | /** |
| 1680 | 1680 | * Called before the details tab content is output per tab. |
@@ -1684,21 +1684,21 @@ discard block |
||
| 1684 | 1684 | * @since 1.0.0 |
| 1685 | 1685 | * @todo do we need this if we have the hook above? 'geodir_before_tab_content' |
| 1686 | 1686 | */ |
| 1687 | - do_action( 'geodir_before_' . $tab_index . '_tab_content' ); |
|
| 1687 | + do_action('geodir_before_'.$tab_index.'_tab_content');
|
|
| 1688 | 1688 | /// write a code to generate content of each tab |
| 1689 | - switch ( $tab_index ) {
|
|
| 1689 | + switch ($tab_index) {
|
|
| 1690 | 1690 | case 'post_profile': |
| 1691 | 1691 | /** |
| 1692 | 1692 | * Called before the listing description content on the details page tab. |
| 1693 | 1693 | * |
| 1694 | 1694 | * @since 1.0.0 |
| 1695 | 1695 | */ |
| 1696 | - do_action( 'geodir_before_description_on_listing_detail' ); |
|
| 1697 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1696 | + do_action('geodir_before_description_on_listing_detail');
|
|
| 1697 | + if (geodir_is_page('detail')) {
|
|
| 1698 | 1698 | the_content(); |
| 1699 | 1699 | } else {
|
| 1700 | 1700 | /** This action is documented in geodirectory_template_actions.php */ |
| 1701 | - echo apply_filters( 'the_content', stripslashes( $post->post_desc ) ); |
|
| 1701 | + echo apply_filters('the_content', stripslashes($post->post_desc));
|
|
| 1702 | 1702 | } |
| 1703 | 1703 | |
| 1704 | 1704 | /** |
@@ -1706,7 +1706,7 @@ discard block |
||
| 1706 | 1706 | * |
| 1707 | 1707 | * @since 1.0.0 |
| 1708 | 1708 | */ |
| 1709 | - do_action( 'geodir_after_description_on_listing_detail' ); |
|
| 1709 | + do_action('geodir_after_description_on_listing_detail');
|
|
| 1710 | 1710 | break; |
| 1711 | 1711 | case 'post_info': |
| 1712 | 1712 | echo $geodir_post_detail_fields; |
@@ -1716,32 +1716,32 @@ discard block |
||
| 1716 | 1716 | break; |
| 1717 | 1717 | case 'post_video': |
| 1718 | 1718 | // some browsers hide $_POST data if used for embeds so we replace with a placeholder |
| 1719 | - if ( $preview ) {
|
|
| 1720 | - if ( $video ) {
|
|
| 1721 | - echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />" . __( 'Video Preview Placeholder', 'geodirectory' ) . "</p></span>"; |
|
| 1719 | + if ($preview) {
|
|
| 1720 | + if ($video) {
|
|
| 1721 | + echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />".__('Video Preview Placeholder', 'geodirectory')."</p></span>";
|
|
| 1722 | 1722 | } |
| 1723 | 1723 | } else {
|
| 1724 | 1724 | |
| 1725 | 1725 | // stop payment manager filtering content length |
| 1726 | - $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' ); |
|
| 1727 | - if ( false !== $filter_priority ) {
|
|
| 1728 | - remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1726 | + $filter_priority = has_filter('the_content', 'geodir_payments_the_content');
|
|
| 1727 | + if (false !== $filter_priority) {
|
|
| 1728 | + remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);
|
|
| 1729 | 1729 | } |
| 1730 | 1730 | |
| 1731 | 1731 | /** This action is documented in geodirectory_template_actions.php */ |
| 1732 | - echo apply_filters( 'the_content', stripslashes( $video ) );// we apply the_content filter so oembed works also; |
|
| 1732 | + echo apply_filters('the_content', stripslashes($video)); // we apply the_content filter so oembed works also;
|
|
| 1733 | 1733 | |
| 1734 | - if ( false !== $filter_priority ) {
|
|
| 1735 | - add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1734 | + if (false !== $filter_priority) {
|
|
| 1735 | + add_filter('the_content', 'geodir_payments_the_content', $filter_priority);
|
|
| 1736 | 1736 | } |
| 1737 | 1737 | } |
| 1738 | 1738 | break; |
| 1739 | 1739 | case 'special_offers': |
| 1740 | - echo apply_filters( 'gd_special_offers_content', wpautop( stripslashes( $special_offers ) ) ); |
|
| 1740 | + echo apply_filters('gd_special_offers_content', wpautop(stripslashes($special_offers)));
|
|
| 1741 | 1741 | |
| 1742 | 1742 | break; |
| 1743 | 1743 | case 'post_map': |
| 1744 | - geodir_draw_map( $map_args ); |
|
| 1744 | + geodir_draw_map($map_args); |
|
| 1745 | 1745 | break; |
| 1746 | 1746 | case 'reviews': |
| 1747 | 1747 | comments_template(); |
@@ -1750,7 +1750,7 @@ discard block |
||
| 1750 | 1750 | echo $related_listing; |
| 1751 | 1751 | break; |
| 1752 | 1752 | default: {
|
| 1753 | - if ( ( isset( $post->{$tab_index} ) || ( ! isset( $post->{$tab_index} ) && ( strpos( $tab_index, 'gd_tab_' ) !== false || $tab_index == 'link_business' ) ) ) && ! empty( $detail_page_tab['tab_content'] ) ) {
|
|
| 1753 | + if ((isset($post->{$tab_index} ) || (!isset($post->{$tab_index} ) && (strpos($tab_index, 'gd_tab_') !== false || $tab_index == 'link_business'))) && !empty($detail_page_tab['tab_content'])) {
|
|
| 1754 | 1754 | echo $detail_page_tab['tab_content']; |
| 1755 | 1755 | } |
| 1756 | 1756 | } |
@@ -1762,7 +1762,7 @@ discard block |
||
| 1762 | 1762 | * |
| 1763 | 1763 | * @since 1.0.0 |
| 1764 | 1764 | */ |
| 1765 | - do_action( 'geodir_after_tab_content', $tab_index ); |
|
| 1765 | + do_action('geodir_after_tab_content', $tab_index);
|
|
| 1766 | 1766 | |
| 1767 | 1767 | /** |
| 1768 | 1768 | * Called after the details tab content is output per tab. |
@@ -1772,7 +1772,7 @@ discard block |
||
| 1772 | 1772 | * @since 1.0.0 |
| 1773 | 1773 | * @todo do we need this if we have the hook above? 'geodir_after_tab_content' |
| 1774 | 1774 | */ |
| 1775 | - do_action( 'geodir_after_' . $tab_index . '_tab_content' ); |
|
| 1775 | + do_action('geodir_after_'.$tab_index.'_tab_content');
|
|
| 1776 | 1776 | ?> </li> |
| 1777 | 1777 | <?php |
| 1778 | 1778 | /** |
@@ -1780,7 +1780,7 @@ discard block |
||
| 1780 | 1780 | * |
| 1781 | 1781 | * @since 1.0.0 |
| 1782 | 1782 | */ |
| 1783 | - $arr_detail_page_tabs[ $tab_index ]['tab_content'] = apply_filters( "geodir_modify_" . $detail_page_tab['tab_content'] . "_tab_content", ob_get_clean() ); |
|
| 1783 | + $arr_detail_page_tabs[$tab_index]['tab_content'] = apply_filters("geodir_modify_".$detail_page_tab['tab_content']."_tab_content", ob_get_clean());
|
|
| 1784 | 1784 | } // end of if for is_display |
| 1785 | 1785 | }// end of foreach |
| 1786 | 1786 | |
@@ -1790,14 +1790,14 @@ discard block |
||
| 1790 | 1790 | * @since 1.0.0 |
| 1791 | 1791 | * @see 'geodir_before_tab_list' |
| 1792 | 1792 | */ |
| 1793 | - do_action( 'geodir_after_tab_list' ); |
|
| 1793 | + do_action('geodir_after_tab_list');
|
|
| 1794 | 1794 | ?> |
| 1795 | - <?php if ( ! $tab_list ){ ?></dl><?php } ?>
|
|
| 1796 | - <ul class="geodir-tabs-content entry-content <?php if ( $tab_list ) { ?>geodir-tabs-list<?php } ?>"
|
|
| 1795 | + <?php if (!$tab_list) { ?></dl><?php } ?>
|
|
| 1796 | + <ul class="geodir-tabs-content entry-content <?php if ($tab_list) { ?>geodir-tabs-list<?php } ?>"
|
|
| 1797 | 1797 | style="position:relative;"> |
| 1798 | 1798 | <?php |
| 1799 | - foreach ( $arr_detail_page_tabs as $detail_page_tab ) {
|
|
| 1800 | - if ( $detail_page_tab['is_display'] && ! empty( $detail_page_tab['tab_content'] ) ) {
|
|
| 1799 | + foreach ($arr_detail_page_tabs as $detail_page_tab) {
|
|
| 1800 | + if ($detail_page_tab['is_display'] && !empty($detail_page_tab['tab_content'])) {
|
|
| 1801 | 1801 | echo $detail_page_tab['tab_content']; |
| 1802 | 1802 | }// end of if |
| 1803 | 1803 | }// end of foreach |
@@ -1807,11 +1807,11 @@ discard block |
||
| 1807 | 1807 | * |
| 1808 | 1808 | * @since 1.0.0 |
| 1809 | 1809 | */ |
| 1810 | - do_action( 'geodir_add_tab_content' ); ?> |
|
| 1810 | + do_action('geodir_add_tab_content'); ?>
|
|
| 1811 | 1811 | </ul> |
| 1812 | 1812 | <!--gd-tabs-content ul end--> |
| 1813 | 1813 | </div> |
| 1814 | - <?php if ( ! $tab_list ) { ?>
|
|
| 1814 | + <?php if (!$tab_list) { ?>
|
|
| 1815 | 1815 | <script> |
| 1816 | 1816 | if (window.location.hash && window.location.hash.indexOf('&') === -1 && jQuery(window.location.hash + 'Tab').length) {
|
| 1817 | 1817 | hashVal = window.location.hash; |
@@ -1843,31 +1843,31 @@ discard block |
||
| 1843 | 1843 | * |
| 1844 | 1844 | * @return mixed Image file. |
| 1845 | 1845 | */ |
| 1846 | -function geodir_exif( $file ) {
|
|
| 1847 | - if ( empty( $file ) || ! is_array( $file ) ) {
|
|
| 1846 | +function geodir_exif($file) {
|
|
| 1847 | + if (empty($file) || !is_array($file)) {
|
|
| 1848 | 1848 | return $file; |
| 1849 | 1849 | } |
| 1850 | 1850 | |
| 1851 | - $file_path = ! empty( $file['tmp_name'] ) ? sanitize_text_field( $file['tmp_name'] ) : ''; |
|
| 1852 | - if ( ! ( $file_path && file_exists( $file_path ) ) ) {
|
|
| 1851 | + $file_path = !empty($file['tmp_name']) ? sanitize_text_field($file['tmp_name']) : ''; |
|
| 1852 | + if (!($file_path && file_exists($file_path))) {
|
|
| 1853 | 1853 | return $file; |
| 1854 | 1854 | } |
| 1855 | 1855 | $file['file'] = $file_path; |
| 1856 | 1856 | |
| 1857 | - if ( ! file_is_valid_image( $file_path ) ) {
|
|
| 1857 | + if (!file_is_valid_image($file_path)) {
|
|
| 1858 | 1858 | return $file; // Bail if file is not an image. |
| 1859 | 1859 | } |
| 1860 | 1860 | |
| 1861 | - if ( ! function_exists( 'wp_get_image_editor' ) ) {
|
|
| 1861 | + if (!function_exists('wp_get_image_editor')) {
|
|
| 1862 | 1862 | return $file; |
| 1863 | 1863 | } |
| 1864 | 1864 | |
| 1865 | 1865 | $mime_type = $file['type']; |
| 1866 | 1866 | $exif = array(); |
| 1867 | - if ( $mime_type == 'image/jpeg' && function_exists( 'exif_read_data' ) ) {
|
|
| 1867 | + if ($mime_type == 'image/jpeg' && function_exists('exif_read_data')) {
|
|
| 1868 | 1868 | try {
|
| 1869 | - $exif = exif_read_data( $file_path ); |
|
| 1870 | - } catch ( Exception $e ) {
|
|
| 1869 | + $exif = exif_read_data($file_path); |
|
| 1870 | + } catch (Exception $e) {
|
|
| 1871 | 1871 | $exif = array(); |
| 1872 | 1872 | } |
| 1873 | 1873 | } |
@@ -1876,13 +1876,13 @@ discard block |
||
| 1876 | 1876 | $flip = false; |
| 1877 | 1877 | $modify = false; |
| 1878 | 1878 | $orientation = 0; |
| 1879 | - if ( ! empty( $exif ) && isset( $exif['Orientation'] ) ) {
|
|
| 1880 | - switch ( (int) $exif['Orientation'] ) {
|
|
| 1879 | + if (!empty($exif) && isset($exif['Orientation'])) {
|
|
| 1880 | + switch ((int) $exif['Orientation']) {
|
|
| 1881 | 1881 | case 1: |
| 1882 | 1882 | // do nothing |
| 1883 | 1883 | break; |
| 1884 | 1884 | case 2: |
| 1885 | - $flip = array( false, true ); |
|
| 1885 | + $flip = array(false, true); |
|
| 1886 | 1886 | $modify = true; |
| 1887 | 1887 | break; |
| 1888 | 1888 | case 3: |
@@ -1891,13 +1891,13 @@ discard block |
||
| 1891 | 1891 | $modify = true; |
| 1892 | 1892 | break; |
| 1893 | 1893 | case 4: |
| 1894 | - $flip = array( true, false ); |
|
| 1894 | + $flip = array(true, false); |
|
| 1895 | 1895 | $modify = true; |
| 1896 | 1896 | break; |
| 1897 | 1897 | case 5: |
| 1898 | 1898 | $orientation = - 90; |
| 1899 | 1899 | $rotate = true; |
| 1900 | - $flip = array( false, true ); |
|
| 1900 | + $flip = array(false, true); |
|
| 1901 | 1901 | $modify = true; |
| 1902 | 1902 | break; |
| 1903 | 1903 | case 6: |
@@ -1908,7 +1908,7 @@ discard block |
||
| 1908 | 1908 | case 7: |
| 1909 | 1909 | $orientation = - 270; |
| 1910 | 1910 | $rotate = true; |
| 1911 | - $flip = array( false, true ); |
|
| 1911 | + $flip = array(false, true); |
|
| 1912 | 1912 | $modify = true; |
| 1913 | 1913 | break; |
| 1914 | 1914 | case 8: |
@@ -1934,31 +1934,31 @@ discard block |
||
| 1934 | 1934 | * @param int|null $quality Image Compression quality between 1-100% scale. Default null. |
| 1935 | 1935 | * @param string $quality Image mime type. |
| 1936 | 1936 | */ |
| 1937 | - $quality = apply_filters( 'geodir_image_upload_set_quality', $quality, $mime_type ); |
|
| 1938 | - if ( $quality !== null ) {
|
|
| 1937 | + $quality = apply_filters('geodir_image_upload_set_quality', $quality, $mime_type);
|
|
| 1938 | + if ($quality !== null) {
|
|
| 1939 | 1939 | $modify = true; |
| 1940 | 1940 | } |
| 1941 | 1941 | |
| 1942 | - if ( ! $modify ) {
|
|
| 1942 | + if (!$modify) {
|
|
| 1943 | 1943 | return $file; // no change |
| 1944 | 1944 | } |
| 1945 | 1945 | |
| 1946 | - $image = wp_get_image_editor( $file_path ); |
|
| 1947 | - if ( ! is_wp_error( $image ) ) {
|
|
| 1948 | - if ( $rotate ) {
|
|
| 1949 | - $image->rotate( $orientation ); |
|
| 1946 | + $image = wp_get_image_editor($file_path); |
|
| 1947 | + if (!is_wp_error($image)) {
|
|
| 1948 | + if ($rotate) {
|
|
| 1949 | + $image->rotate($orientation); |
|
| 1950 | 1950 | } |
| 1951 | 1951 | |
| 1952 | - if ( ! empty( $flip ) ) {
|
|
| 1953 | - $image->flip( $flip[0], $flip[1] ); |
|
| 1952 | + if (!empty($flip)) {
|
|
| 1953 | + $image->flip($flip[0], $flip[1]); |
|
| 1954 | 1954 | } |
| 1955 | 1955 | |
| 1956 | - if ( $quality !== null ) {
|
|
| 1957 | - $image->set_quality( (int) $quality ); |
|
| 1956 | + if ($quality !== null) {
|
|
| 1957 | + $image->set_quality((int) $quality); |
|
| 1958 | 1958 | } |
| 1959 | 1959 | |
| 1960 | - $result = $image->save( $file_path ); |
|
| 1961 | - if ( ! is_wp_error( $result ) ) {
|
|
| 1960 | + $result = $image->save($file_path); |
|
| 1961 | + if (!is_wp_error($result)) {
|
|
| 1962 | 1962 | $file['file'] = $result['path']; |
| 1963 | 1963 | $file['tmp_name'] = $result['path']; |
| 1964 | 1964 | } |
@@ -1986,7 +1986,7 @@ discard block |
||
| 1986 | 1986 | * |
| 1987 | 1987 | * @return string Returns the recent reviews html. |
| 1988 | 1988 | */ |
| 1989 | -function geodir_get_recent_reviews( $g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false ) {
|
|
| 1989 | +function geodir_get_recent_reviews($g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false) {
|
|
| 1990 | 1990 | global $wpdb, $tablecomments, $tableposts, $rating_table_name, $gd_session, $table_prefix; |
| 1991 | 1991 | $tablecomments = $wpdb->comments; |
| 1992 | 1992 | $tableposts = $wpdb->posts; |
@@ -1996,17 +1996,17 @@ discard block |
||
| 1996 | 1996 | $region_filter = ''; |
| 1997 | 1997 | $country_filter = ''; |
| 1998 | 1998 | |
| 1999 | - if ( $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 2000 | - if ( $gd_ses_country = $gd_session->get( 'gd_country' ) ) {
|
|
| 2001 | - $country_filter = $wpdb->prepare( " AND r.post_country=%s ", str_replace( "-", " ", $gd_ses_country ) ); |
|
| 1999 | + if ($gd_session->get('gd_multi_location')) {
|
|
| 2000 | + if ($gd_ses_country = $gd_session->get('gd_country')) {
|
|
| 2001 | + $country_filter = $wpdb->prepare(" AND r.post_country=%s ", str_replace("-", " ", $gd_ses_country));
|
|
| 2002 | 2002 | } |
| 2003 | 2003 | |
| 2004 | - if ( $gd_ses_region = $gd_session->get( 'gd_region' ) ) {
|
|
| 2005 | - $region_filter = $wpdb->prepare( " AND r.post_region=%s ", str_replace( "-", " ", $gd_ses_region ) ); |
|
| 2004 | + if ($gd_ses_region = $gd_session->get('gd_region')) {
|
|
| 2005 | + $region_filter = $wpdb->prepare(" AND r.post_region=%s ", str_replace("-", " ", $gd_ses_region));
|
|
| 2006 | 2006 | } |
| 2007 | 2007 | |
| 2008 | - if ( $gd_ses_city = $gd_session->get( 'gd_city' ) ) {
|
|
| 2009 | - $city_filter = $wpdb->prepare( " AND r.post_city=%s ", str_replace( "-", " ", $gd_ses_city ) ); |
|
| 2008 | + if ($gd_ses_city = $gd_session->get('gd_city')) {
|
|
| 2009 | + $city_filter = $wpdb->prepare(" AND r.post_city=%s ", str_replace("-", " ", $gd_ses_city));
|
|
| 2010 | 2010 | } |
| 2011 | 2011 | } |
| 2012 | 2012 | |
@@ -2017,84 +2017,84 @@ discard block |
||
| 2017 | 2017 | $lang_code = ICL_LANGUAGE_CODE; |
| 2018 | 2018 | |
| 2019 | 2019 | if ($lang_code) {
|
| 2020 | - $join .= " JOIN " . $table_prefix . "icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN " . $table_prefix . "icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";
|
|
| 2021 | - $where .= " AND icltr2.language_code = '" . $lang_code . "' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)"; |
|
| 2020 | + $join .= " JOIN ".$table_prefix."icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN ".$table_prefix."icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";
|
|
| 2021 | + $where .= " AND icltr2.language_code = '".$lang_code."' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)"; |
|
| 2022 | 2022 | } |
| 2023 | 2023 | } |
| 2024 | 2024 | |
| 2025 | - $request = "SELECT r.id AS ID, r.post_type, r.comment_id AS comment_ID, r.post_date AS comment_date, r.overall_rating, r.user_id, r.post_id FROM " . GEODIR_REVIEW_TABLE . " AS r JOIN " . $wpdb->comments . " AS c ON c.comment_ID = r.comment_id JOIN " . $wpdb->posts . " AS p ON p.ID = c.comment_post_ID " . $join . " WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' " . $where . " ORDER BY r.post_date DESC, r.id DESC LIMIT ". $no_comments; |
|
| 2025 | + $request = "SELECT r.id AS ID, r.post_type, r.comment_id AS comment_ID, r.post_date AS comment_date, r.overall_rating, r.user_id, r.post_id FROM ".GEODIR_REVIEW_TABLE." AS r JOIN ".$wpdb->comments." AS c ON c.comment_ID = r.comment_id JOIN ".$wpdb->posts." AS p ON p.ID = c.comment_post_ID ".$join." WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' ".$where." ORDER BY r.post_date DESC, r.id DESC LIMIT ".$no_comments; |
|
| 2026 | 2026 | |
| 2027 | - $comments = $wpdb->get_results( $request ); |
|
| 2027 | + $comments = $wpdb->get_results($request); |
|
| 2028 | 2028 | |
| 2029 | - foreach ( $comments as $comment ) {
|
|
| 2029 | + foreach ($comments as $comment) {
|
|
| 2030 | 2030 | // Set the extra comment info needed. |
| 2031 | - $comment_extra = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID" ); |
|
| 2031 | + $comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
|
|
| 2032 | 2032 | $comment->comment_content = $comment_extra->comment_content; |
| 2033 | 2033 | $comment->comment_author = $comment_extra->comment_author; |
| 2034 | 2034 | $comment->comment_author_email = $comment_extra->comment_author_email; |
| 2035 | 2035 | |
| 2036 | 2036 | $comment_id = ''; |
| 2037 | 2037 | $comment_id = $comment->comment_ID; |
| 2038 | - $comment_content = strip_tags( $comment->comment_content ); |
|
| 2038 | + $comment_content = strip_tags($comment->comment_content); |
|
| 2039 | 2039 | |
| 2040 | - $comment_content = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content ); |
|
| 2040 | + $comment_content = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content);
|
|
| 2041 | 2041 | |
| 2042 | - $permalink = get_permalink( $comment->ID ) . "#comment-" . $comment->comment_ID; |
|
| 2042 | + $permalink = get_permalink($comment->ID)."#comment-".$comment->comment_ID; |
|
| 2043 | 2043 | $comment_author_email = $comment->comment_author_email; |
| 2044 | 2044 | $comment_post_ID = $comment->post_id; |
| 2045 | 2045 | |
| 2046 | - $post_title = get_the_title( $comment_post_ID ); |
|
| 2047 | - $permalink = get_permalink( $comment_post_ID ); |
|
| 2048 | - $comment_permalink = $permalink . "#comment-" . $comment->comment_ID; |
|
| 2049 | - $read_more = '<a class="comment_excerpt" href="' . $comment_permalink . '">' . __( 'Read more', 'geodirectory' ) . '</a>'; |
|
| 2046 | + $post_title = get_the_title($comment_post_ID); |
|
| 2047 | + $permalink = get_permalink($comment_post_ID); |
|
| 2048 | + $comment_permalink = $permalink."#comment-".$comment->comment_ID; |
|
| 2049 | + $read_more = '<a class="comment_excerpt" href="'.$comment_permalink.'">'.__('Read more', 'geodirectory').'</a>';
|
|
| 2050 | 2050 | |
| 2051 | - $comment_content_length = strlen( $comment_content ); |
|
| 2052 | - if ( $comment_content_length > $comment_lenth ) {
|
|
| 2053 | - $comment_excerpt = geodir_utf8_substr( $comment_content, 0, $comment_lenth ) . '... ' . $read_more; |
|
| 2051 | + $comment_content_length = strlen($comment_content); |
|
| 2052 | + if ($comment_content_length > $comment_lenth) {
|
|
| 2053 | + $comment_excerpt = geodir_utf8_substr($comment_content, 0, $comment_lenth).'... '.$read_more; |
|
| 2054 | 2054 | } else {
|
| 2055 | 2055 | $comment_excerpt = $comment_content; |
| 2056 | 2056 | } |
| 2057 | 2057 | |
| 2058 | - if ( $comment->user_id ) {
|
|
| 2059 | - $user_profile_url = get_author_posts_url( $comment->user_id ); |
|
| 2058 | + if ($comment->user_id) {
|
|
| 2059 | + $user_profile_url = get_author_posts_url($comment->user_id); |
|
| 2060 | 2060 | } else {
|
| 2061 | 2061 | $user_profile_url = ''; |
| 2062 | 2062 | } |
| 2063 | 2063 | |
| 2064 | - if ( $comment_id ) {
|
|
| 2064 | + if ($comment_id) {
|
|
| 2065 | 2065 | $comments_echo .= '<li class="clearfix">'; |
| 2066 | - $comments_echo .= "<span class=\"li" . $comment_id . " geodir_reviewer_image\">"; |
|
| 2067 | - if ( function_exists( 'get_avatar' ) ) {
|
|
| 2068 | - if ( ! isset( $comment->comment_type ) ) {
|
|
| 2069 | - if ( $user_profile_url ) {
|
|
| 2070 | - $comments_echo .= '<a href="' . $user_profile_url . '">'; |
|
| 2066 | + $comments_echo .= "<span class=\"li".$comment_id." geodir_reviewer_image\">"; |
|
| 2067 | + if (function_exists('get_avatar')) {
|
|
| 2068 | + if (!isset($comment->comment_type)) {
|
|
| 2069 | + if ($user_profile_url) {
|
|
| 2070 | + $comments_echo .= '<a href="'.$user_profile_url.'">'; |
|
| 2071 | 2071 | } |
| 2072 | - $comments_echo .= get_avatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' ); |
|
| 2073 | - if ( $user_profile_url ) {
|
|
| 2072 | + $comments_echo .= get_avatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png'); |
|
| 2073 | + if ($user_profile_url) {
|
|
| 2074 | 2074 | $comments_echo .= '</a>'; |
| 2075 | 2075 | } |
| 2076 | - } elseif ( ( isset( $comment->comment_type ) && $comment->comment_type == 'trackback' ) || ( isset( $comment->comment_type ) && $comment->comment_type == 'pingback' ) ) {
|
|
| 2077 | - if ( $user_profile_url ) {
|
|
| 2078 | - $comments_echo .= '<a href="' . $user_profile_url . '">'; |
|
| 2076 | + } elseif ((isset($comment->comment_type) && $comment->comment_type == 'trackback') || (isset($comment->comment_type) && $comment->comment_type == 'pingback')) {
|
|
| 2077 | + if ($user_profile_url) {
|
|
| 2078 | + $comments_echo .= '<a href="'.$user_profile_url.'">'; |
|
| 2079 | 2079 | } |
| 2080 | - $comments_echo .= get_avatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' ); |
|
| 2080 | + $comments_echo .= get_avatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png'); |
|
| 2081 | 2081 | } |
| 2082 | - } elseif ( function_exists( 'gravatar' ) ) {
|
|
| 2083 | - if ( $user_profile_url ) {
|
|
| 2084 | - $comments_echo .= '<a href="' . $user_profile_url . '">'; |
|
| 2082 | + } elseif (function_exists('gravatar')) {
|
|
| 2083 | + if ($user_profile_url) {
|
|
| 2084 | + $comments_echo .= '<a href="'.$user_profile_url.'">'; |
|
| 2085 | 2085 | } |
| 2086 | 2086 | $comments_echo .= "<img src=\""; |
| 2087 | - if ( '' == $comment->comment_type ) {
|
|
| 2088 | - $comments_echo .= gravatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' ); |
|
| 2089 | - if ( $user_profile_url ) {
|
|
| 2087 | + if ('' == $comment->comment_type) {
|
|
| 2088 | + $comments_echo .= gravatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png'); |
|
| 2089 | + if ($user_profile_url) {
|
|
| 2090 | 2090 | $comments_echo .= '</a>'; |
| 2091 | 2091 | } |
| 2092 | - } elseif ( ( 'trackback' == $comment->comment_type ) || ( 'pingback' == $comment->comment_type ) ) {
|
|
| 2093 | - if ( $user_profile_url ) {
|
|
| 2094 | - $comments_echo .= '<a href="' . $user_profile_url . '">'; |
|
| 2092 | + } elseif (('trackback' == $comment->comment_type) || ('pingback' == $comment->comment_type)) {
|
|
| 2093 | + if ($user_profile_url) {
|
|
| 2094 | + $comments_echo .= '<a href="'.$user_profile_url.'">'; |
|
| 2095 | 2095 | } |
| 2096 | - $comments_echo .= gravatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' ); |
|
| 2097 | - if ( $user_profile_url ) {
|
|
| 2096 | + $comments_echo .= gravatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png'); |
|
| 2097 | + if ($user_profile_url) {
|
|
| 2098 | 2098 | $comments_echo .= '</a>'; |
| 2099 | 2099 | } |
| 2100 | 2100 | } |
@@ -2105,17 +2105,17 @@ discard block |
||
| 2105 | 2105 | |
| 2106 | 2106 | $comments_echo .= '<span class="geodir_reviewer_content">'; |
| 2107 | 2107 | $author_link = apply_filters('geodir_reviewer_content_author_link', true);
|
| 2108 | - if ( $comment->user_id && $author_link ) {
|
|
| 2109 | - $comments_echo .= '<a href="' . get_author_posts_url( $comment->user_id ) . '">'; |
|
| 2108 | + if ($comment->user_id && $author_link) {
|
|
| 2109 | + $comments_echo .= '<a href="'.get_author_posts_url($comment->user_id).'">'; |
|
| 2110 | 2110 | } |
| 2111 | - $comments_echo .= '<span class="geodir_reviewer_author">' . $comment->comment_author . '</span> '; |
|
| 2112 | - if ( $comment->user_id && $author_link ) {
|
|
| 2111 | + $comments_echo .= '<span class="geodir_reviewer_author">'.$comment->comment_author.'</span> '; |
|
| 2112 | + if ($comment->user_id && $author_link) {
|
|
| 2113 | 2113 | $comments_echo .= '</a>'; |
| 2114 | 2114 | } |
| 2115 | - $comments_echo .= '<span class="geodir_reviewer_reviewed">' . __( 'reviewed', 'geodirectory' ) . '</span> '; |
|
| 2116 | - $comments_echo .= '<a href="' . $permalink . '" class="geodir_reviewer_title">' . $post_title . '</a>'; |
|
| 2117 | - $comments_echo .= geodir_get_rating_stars( $comment->overall_rating, $comment_post_ID ); |
|
| 2118 | - $comments_echo .= '<p class="geodir_reviewer_text">' . $comment_excerpt . ''; |
|
| 2115 | + $comments_echo .= '<span class="geodir_reviewer_reviewed">'.__('reviewed', 'geodirectory').'</span> ';
|
|
| 2116 | + $comments_echo .= '<a href="'.$permalink.'" class="geodir_reviewer_title">'.$post_title.'</a>'; |
|
| 2117 | + $comments_echo .= geodir_get_rating_stars($comment->overall_rating, $comment_post_ID); |
|
| 2118 | + $comments_echo .= '<p class="geodir_reviewer_text">'.$comment_excerpt.''; |
|
| 2119 | 2119 | //echo preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_excerpt);
|
| 2120 | 2120 | $comments_echo .= '</p>'; |
| 2121 | 2121 | |
@@ -2135,25 +2135,25 @@ discard block |
||
| 2135 | 2135 | * @return array Returns post categories as an array. |
| 2136 | 2136 | */ |
| 2137 | 2137 | function geodir_home_map_cats_key_value_array() {
|
| 2138 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 2138 | + $post_types = geodir_get_posttypes('object');
|
|
| 2139 | 2139 | |
| 2140 | 2140 | $return = array(); |
| 2141 | - if ( ! empty( $post_types ) ) {
|
|
| 2142 | - foreach ( $post_types as $key => $post_type ) {
|
|
| 2143 | - $cpt_name = __( $post_type->labels->singular_name, 'geodirectory' ); |
|
| 2144 | - $post_type_name = sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ); |
|
| 2145 | - $taxonomies = geodir_get_taxonomies( $key ); |
|
| 2146 | - $cat_taxonomy = ! empty( $taxonomies[0] ) ? $taxonomies[0] : null; |
|
| 2147 | - $cat_terms = $cat_taxonomy ? get_terms( $cat_taxonomy ) : null; |
|
| 2148 | - |
|
| 2149 | - if ( ! empty( $cat_terms ) ) {
|
|
| 2150 | - $return[ 'optgroup_start-' . $key ] = $post_type_name; |
|
| 2151 | - |
|
| 2152 | - foreach ( $cat_terms as $cat_term ) {
|
|
| 2153 | - $return[ $key . '_' . $cat_term->term_id ] = $cat_term->name; |
|
| 2141 | + if (!empty($post_types)) {
|
|
| 2142 | + foreach ($post_types as $key => $post_type) {
|
|
| 2143 | + $cpt_name = __($post_type->labels->singular_name, 'geodirectory'); |
|
| 2144 | + $post_type_name = sprintf(__('%s Categories', 'geodirectory'), $cpt_name);
|
|
| 2145 | + $taxonomies = geodir_get_taxonomies($key); |
|
| 2146 | + $cat_taxonomy = !empty($taxonomies[0]) ? $taxonomies[0] : null; |
|
| 2147 | + $cat_terms = $cat_taxonomy ? get_terms($cat_taxonomy) : null; |
|
| 2148 | + |
|
| 2149 | + if (!empty($cat_terms)) {
|
|
| 2150 | + $return['optgroup_start-'.$key] = $post_type_name; |
|
| 2151 | + |
|
| 2152 | + foreach ($cat_terms as $cat_term) {
|
|
| 2153 | + $return[$key.'_'.$cat_term->term_id] = $cat_term->name; |
|
| 2154 | 2154 | } |
| 2155 | 2155 | |
| 2156 | - $return[ 'optgroup_end-' . $key ] = $post_type_name; |
|
| 2156 | + $return['optgroup_end-'.$key] = $post_type_name; |
|
| 2157 | 2157 | } |
| 2158 | 2158 | } |
| 2159 | 2159 | } |
@@ -2169,14 +2169,14 @@ discard block |
||
| 2169 | 2169 | * @package GeoDirectory |
| 2170 | 2170 | */ |
| 2171 | 2171 | function geodir_twitter_tweet_button() {
|
| 2172 | - if ( isset( $_GET['gde'] ) ) {
|
|
| 2173 | - $link = '?url=' . urlencode( geodir_curPageURL() ); |
|
| 2172 | + if (isset($_GET['gde'])) {
|
|
| 2173 | + $link = '?url='.urlencode(geodir_curPageURL()); |
|
| 2174 | 2174 | } else {
|
| 2175 | 2175 | $link = ''; |
| 2176 | 2176 | } |
| 2177 | 2177 | ?> |
| 2178 | 2178 | <a href="http://twitter.com/share<?php echo $link; ?>" |
| 2179 | - class="twitter-share-button"><?php _e( 'Tweet', 'geodirectory' ); ?></a> |
|
| 2179 | + class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>
|
|
| 2180 | 2180 | <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script> |
| 2181 | 2181 | <?php |
| 2182 | 2182 | } |
@@ -2193,10 +2193,10 @@ discard block |
||
| 2193 | 2193 | function geodir_fb_like_button() {
|
| 2194 | 2194 | global $post; |
| 2195 | 2195 | ?> |
| 2196 | - <iframe <?php if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) ) {
|
|
| 2196 | + <iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {
|
|
| 2197 | 2197 | echo 'allowtransparency="true"'; |
| 2198 | 2198 | } ?> class="facebook" |
| 2199 | - src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode( get_permalink( $post->ID ) ); ?>&layout=button_count&show_faces=false&width=100&action=like&colorscheme=light" |
|
| 2199 | + src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(get_permalink($post->ID)); ?>&layout=button_count&show_faces=false&width=100&action=like&colorscheme=light" |
|
| 2200 | 2200 | style="border:none; overflow:hidden; width:100px; height:20px"></iframe> |
| 2201 | 2201 | <?php |
| 2202 | 2202 | } |
@@ -2227,7 +2227,7 @@ discard block |
||
| 2227 | 2227 | |
| 2228 | 2228 | |
| 2229 | 2229 | function geodir_listing_bounce_map_pin_on_hover() {
|
| 2230 | - if ( get_option( 'geodir_listing_hover_bounce_map_pin', true ) ) {
|
|
| 2230 | + if (get_option('geodir_listing_hover_bounce_map_pin', true)) {
|
|
| 2231 | 2231 | ?> |
| 2232 | 2232 | <script> |
| 2233 | 2233 | jQuery(function ($) {
|
@@ -2250,44 +2250,44 @@ discard block |
||
| 2250 | 2250 | } |
| 2251 | 2251 | } |
| 2252 | 2252 | |
| 2253 | -add_action( 'geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10 ); |
|
| 2253 | +add_action('geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10);
|
|
| 2254 | 2254 | |
| 2255 | -add_action( 'geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1 ); |
|
| 2256 | -function geodir_output_favourite_html_listings( $post_id ) {
|
|
| 2257 | - geodir_favourite_html( '', $post_id ); |
|
| 2255 | +add_action('geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1);
|
|
| 2256 | +function geodir_output_favourite_html_listings($post_id) {
|
|
| 2257 | + geodir_favourite_html('', $post_id);
|
|
| 2258 | 2258 | } |
| 2259 | 2259 | |
| 2260 | -add_action( 'geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2 ); |
|
| 2261 | -function geodir_output_pinpoint_html_listings( $post_id, $post = array() ) {
|
|
| 2260 | +add_action('geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2);
|
|
| 2261 | +function geodir_output_pinpoint_html_listings($post_id, $post = array()) {
|
|
| 2262 | 2262 | global $wp_query; |
| 2263 | 2263 | |
| 2264 | 2264 | $show_pin_point = $wp_query->is_main_query(); |
| 2265 | 2265 | |
| 2266 | - if ( ! empty( $post ) && ! empty( $show_pin_point ) && is_active_widget( false, "", "geodir_map_v3_listing_map" ) ) {
|
|
| 2267 | - $term_icon_url = geodir_get_tax_meta( $post->default_category, 'ct_cat_icon', false, $post->post_type ); |
|
| 2268 | - $marker_icon = isset( $term_icon_url['src'] ) ? $term_icon_url['src'] : get_option( 'geodir_default_marker_icon' ); |
|
| 2266 | + if (!empty($post) && !empty($show_pin_point) && is_active_widget(false, "", "geodir_map_v3_listing_map")) {
|
|
| 2267 | + $term_icon_url = geodir_get_tax_meta($post->default_category, 'ct_cat_icon', false, $post->post_type); |
|
| 2268 | + $marker_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : get_option('geodir_default_marker_icon');
|
|
| 2269 | 2269 | ?> |
| 2270 | 2270 | <span class="geodir-pinpoint" |
| 2271 | - style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters( 'geodir_listing_listview_pinpoint_inner_content', '', 'listing' ); ?></span>
|
|
| 2271 | + style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters('geodir_listing_listview_pinpoint_inner_content', '', 'listing'); ?></span>
|
|
| 2272 | 2272 | <a class="geodir-pinpoint-link" href="javascript:void(0)" |
| 2273 | 2273 | onclick="if(typeof openMarker=='function'){openMarker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"
|
| 2274 | 2274 | onmouseover="if(typeof animate_marker=='function'){animate_marker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"
|
| 2275 | - onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e( 'Pinpoint', 'geodirectory' ); ?></a>
|
|
| 2275 | + onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e('Pinpoint', 'geodirectory'); ?></a>
|
|
| 2276 | 2276 | <?php |
| 2277 | 2277 | } |
| 2278 | 2278 | } |
| 2279 | 2279 | |
| 2280 | 2280 | function geodir_search_form_submit_button() {
|
| 2281 | 2281 | |
| 2282 | - $new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true; |
|
| 2282 | + $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
|
| 2283 | 2283 | |
| 2284 | - if ( $new_style ) {
|
|
| 2284 | + if ($new_style) {
|
|
| 2285 | 2285 | $default_search_button_label = '<i class="fa fa-search" aria-hidden="true"></i>'; |
| 2286 | - }else{
|
|
| 2286 | + } else {
|
|
| 2287 | 2287 | $default_search_button_label = 'Search'; |
| 2288 | 2288 | } |
| 2289 | - if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {
|
|
| 2290 | - $default_search_button_label = __( get_option( 'geodir_search_button_label' ), 'geodirectory' ); |
|
| 2289 | + if (get_option('geodir_search_button_label') && get_option('geodir_search_button_label') != 'Search') {
|
|
| 2290 | + $default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');
|
|
| 2291 | 2291 | } |
| 2292 | 2292 | |
| 2293 | 2293 | /** |
@@ -2299,78 +2299,78 @@ discard block |
||
| 2299 | 2299 | * |
| 2300 | 2300 | * @param string $default_search_button_label The current search button text. |
| 2301 | 2301 | */ |
| 2302 | - $default_search_button_label = apply_filters( 'geodir_search_default_search_button_text', $default_search_button_label ); |
|
| 2302 | + $default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);
|
|
| 2303 | 2303 | |
| 2304 | 2304 | $fa_class = ''; |
| 2305 | - if ( strpos( $default_search_button_label, '&#' ) !== false ) {
|
|
| 2305 | + if (strpos($default_search_button_label, '&#') !== false) {
|
|
| 2306 | 2306 | $fa_class = 'fa'; |
| 2307 | 2307 | } |
| 2308 | 2308 | |
| 2309 | 2309 | |
| 2310 | - if ( $new_style ) {
|
|
| 2310 | + if ($new_style) {
|
|
| 2311 | 2311 | ?> |
| 2312 | - <button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e( $default_search_button_label ,'geodirectory'); ?></button> |
|
| 2313 | - <?php }else{?>
|
|
| 2314 | - <input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>" |
|
| 2312 | + <button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e($default_search_button_label, 'geodirectory'); ?></button> |
|
| 2313 | + <?php } else {?>
|
|
| 2314 | + <input type="button" value="<?php esc_attr_e($default_search_button_label); ?>" |
|
| 2315 | 2315 | class="geodir_submit_search <?php echo $fa_class; ?>"/> |
| 2316 | 2316 | <?php } |
| 2317 | 2317 | } |
| 2318 | 2318 | |
| 2319 | -add_action( 'geodir_before_search_button', 'geodir_search_form_submit_button', 5000 ); |
|
| 2319 | +add_action('geodir_before_search_button', 'geodir_search_form_submit_button', 5000);
|
|
| 2320 | 2320 | |
| 2321 | 2321 | function geodir_search_form_post_type_input() {
|
| 2322 | 2322 | global $geodir_search_post_type; |
| 2323 | - $post_types = apply_filters( 'geodir_search_form_post_types', geodir_get_posttypes( 'object' ) ); |
|
| 2323 | + $post_types = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));
|
|
| 2324 | 2324 | $curr_post_type = $geodir_search_post_type; |
| 2325 | 2325 | |
| 2326 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2326 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2327 | 2327 | |
| 2328 | - foreach ( $post_types as $post_type => $info ){
|
|
| 2328 | + foreach ($post_types as $post_type => $info) {
|
|
| 2329 | 2329 | global $wpdb; |
| 2330 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 2331 | - if ( ! $has_posts ) {
|
|
| 2330 | + $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));
|
|
| 2331 | + if (!$has_posts) {
|
|
| 2332 | 2332 | unset($post_types->{$post_type});
|
| 2333 | 2333 | } |
| 2334 | 2334 | } |
| 2335 | 2335 | |
| 2336 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2336 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2337 | 2337 | |
| 2338 | - $new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true; |
|
| 2339 | - if ( $new_style ) {
|
|
| 2338 | + $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
|
| 2339 | + if ($new_style) {
|
|
| 2340 | 2340 | echo "<div class='gd-search-input-wrapper gd-search-field-cpt'>"; |
| 2341 | 2341 | } |
| 2342 | 2342 | ?> |
| 2343 | 2343 | <select name="stype" class="search_by_post"> |
| 2344 | - <?php foreach ( $post_types as $post_type => $info ): |
|
| 2344 | + <?php foreach ($post_types as $post_type => $info): |
|
| 2345 | 2345 | global $wpdb; |
| 2346 | 2346 | ?> |
| 2347 | 2347 | |
| 2348 | - <option data-label="<?php echo get_post_type_archive_link( $post_type ); ?>" |
|
| 2349 | - value="<?php echo $post_type; ?>" <?php if ( isset( $_REQUEST['stype'] ) ) {
|
|
| 2350 | - if ( $post_type == $_REQUEST['stype'] ) {
|
|
| 2348 | + <option data-label="<?php echo get_post_type_archive_link($post_type); ?>" |
|
| 2349 | + value="<?php echo $post_type; ?>" <?php if (isset($_REQUEST['stype'])) {
|
|
| 2350 | + if ($post_type == $_REQUEST['stype']) {
|
|
| 2351 | 2351 | echo 'selected="selected"'; |
| 2352 | 2352 | } |
| 2353 | - } elseif ( $curr_post_type == $post_type ) {
|
|
| 2353 | + } elseif ($curr_post_type == $post_type) {
|
|
| 2354 | 2354 | echo 'selected="selected"'; |
| 2355 | - } ?>><?php _e( geodir_utf8_ucfirst( $info->labels->name ), 'geodirectory' ); ?></option> |
|
| 2355 | + } ?>><?php _e(geodir_utf8_ucfirst($info->labels->name), 'geodirectory'); ?></option> |
|
| 2356 | 2356 | |
| 2357 | 2357 | <?php endforeach; ?> |
| 2358 | 2358 | </select> |
| 2359 | 2359 | <?php |
| 2360 | - if ( $new_style ) {
|
|
| 2360 | + if ($new_style) {
|
|
| 2361 | 2361 | echo "</div>"; |
| 2362 | 2362 | } |
| 2363 | - }else{
|
|
| 2364 | - if(! empty( $post_types )){
|
|
| 2365 | - $pt_arr = (array)$post_types; |
|
| 2366 | - echo '<input type="hidden" name="stype" value="' . key( $pt_arr ) . '" />'; |
|
| 2367 | - }else{
|
|
| 2363 | + } else {
|
|
| 2364 | + if (!empty($post_types)) {
|
|
| 2365 | + $pt_arr = (array) $post_types; |
|
| 2366 | + echo '<input type="hidden" name="stype" value="'.key($pt_arr).'" />'; |
|
| 2367 | + } else {
|
|
| 2368 | 2368 | echo '<input type="hidden" name="stype" value="gd_place" />'; |
| 2369 | 2369 | } |
| 2370 | 2370 | |
| 2371 | 2371 | } |
| 2372 | 2372 | |
| 2373 | - }elseif ( ! empty( $post_types ) ) {
|
|
| 2373 | + }elseif (!empty($post_types)) {
|
|
| 2374 | 2374 | echo '<input type="hidden" name="stype" value="gd_place" />'; |
| 2375 | 2375 | } |
| 2376 | 2376 | } |
@@ -2378,27 +2378,27 @@ discard block |
||
| 2378 | 2378 | function geodir_search_form_search_input() {
|
| 2379 | 2379 | |
| 2380 | 2380 | $default_search_for_text = SEARCH_FOR_TEXT; |
| 2381 | - if ( get_option( 'geodir_search_field_default_text' ) ) {
|
|
| 2382 | - $default_search_for_text = __( get_option( 'geodir_search_field_default_text' ), 'geodirectory' ); |
|
| 2381 | + if (get_option('geodir_search_field_default_text')) {
|
|
| 2382 | + $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
|
|
| 2383 | 2383 | } |
| 2384 | 2384 | |
| 2385 | 2385 | $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
| 2386 | - if($new_style){
|
|
| 2386 | + if ($new_style) {
|
|
| 2387 | 2387 | echo "<div class='gd-search-input-wrapper gd-search-field-search'>"; |
| 2388 | 2388 | } |
| 2389 | 2389 | ?> |
| 2390 | 2390 | <input class="search_text" name="s" |
| 2391 | - value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {
|
|
| 2392 | - $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) ); |
|
| 2391 | + value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {
|
|
| 2392 | + $search_term = esc_attr(stripslashes_deep($_REQUEST['s'])); |
|
| 2393 | 2393 | echo $search_term; |
| 2394 | 2394 | } else {
|
| 2395 | 2395 | echo $default_search_for_text; |
| 2396 | 2396 | } ?>" type="text" |
| 2397 | - onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"
|
|
| 2398 | - onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"
|
|
| 2397 | + onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql($default_search_for_text); ?>';}"
|
|
| 2398 | + onfocus="if (this.value == '<?php echo esc_sql($default_search_for_text); ?>') {this.value = '';}"
|
|
| 2399 | 2399 | onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);"> |
| 2400 | 2400 | <?php |
| 2401 | - if($new_style){
|
|
| 2401 | + if ($new_style) {
|
|
| 2402 | 2402 | echo "</div>"; |
| 2403 | 2403 | } |
| 2404 | 2404 | } |
@@ -2406,12 +2406,12 @@ discard block |
||
| 2406 | 2406 | function geodir_search_form_near_input() {
|
| 2407 | 2407 | |
| 2408 | 2408 | $default_near_text = NEAR_TEXT; |
| 2409 | - if ( get_option( 'geodir_near_field_default_text' ) ) {
|
|
| 2410 | - $default_near_text = __( get_option( 'geodir_near_field_default_text' ), 'geodirectory' ); |
|
| 2409 | + if (get_option('geodir_near_field_default_text')) {
|
|
| 2410 | + $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
|
|
| 2411 | 2411 | } |
| 2412 | 2412 | |
| 2413 | - if ( isset( $_REQUEST['snear'] ) && $_REQUEST['snear'] != '' ) {
|
|
| 2414 | - $near = esc_attr( stripslashes_deep( $_REQUEST['snear'] ) ); |
|
| 2413 | + if (isset($_REQUEST['snear']) && $_REQUEST['snear'] != '') {
|
|
| 2414 | + $near = esc_attr(stripslashes_deep($_REQUEST['snear'])); |
|
| 2415 | 2415 | } else {
|
| 2416 | 2416 | $near = $default_near_text; |
| 2417 | 2417 | } |
@@ -2425,7 +2425,7 @@ discard block |
||
| 2425 | 2425 | * @since 1.6.9 |
| 2426 | 2426 | * @param string $curr_post_type The current post type. |
| 2427 | 2427 | */ |
| 2428 | - $near_input_extra = apply_filters('geodir_near_input_extra','',$curr_post_type);
|
|
| 2428 | + $near_input_extra = apply_filters('geodir_near_input_extra', '', $curr_post_type);
|
|
| 2429 | 2429 | |
| 2430 | 2430 | |
| 2431 | 2431 | /** |
@@ -2438,7 +2438,7 @@ discard block |
||
| 2438 | 2438 | * @param string $near The current near value. |
| 2439 | 2439 | * @param string $default_near_text The default near value. |
| 2440 | 2440 | */ |
| 2441 | - $near = apply_filters( 'geodir_search_near_text', $near, $default_near_text ); |
|
| 2441 | + $near = apply_filters('geodir_search_near_text', $near, $default_near_text);
|
|
| 2442 | 2442 | /** |
| 2443 | 2443 | * Filter the default "Near" text value for the search form. |
| 2444 | 2444 | * |
@@ -2449,7 +2449,7 @@ discard block |
||
| 2449 | 2449 | * @param string $near The current near value. |
| 2450 | 2450 | * @param string $default_near_text The default near value. |
| 2451 | 2451 | */ |
| 2452 | - $default_near_text = apply_filters( 'geodir_search_default_near_text', $default_near_text, $near ); |
|
| 2452 | + $default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);
|
|
| 2453 | 2453 | /** |
| 2454 | 2454 | * Filter the class for the near search input. |
| 2455 | 2455 | * |
@@ -2457,10 +2457,10 @@ discard block |
||
| 2457 | 2457 | * |
| 2458 | 2458 | * @param string $class The class for the HTML near input, default is blank. |
| 2459 | 2459 | */ |
| 2460 | - $near_class = apply_filters( 'geodir_search_near_class', '' ); |
|
| 2460 | + $near_class = apply_filters('geodir_search_near_class', '');
|
|
| 2461 | 2461 | |
| 2462 | 2462 | $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
| 2463 | - if($new_style){
|
|
| 2463 | + if ($new_style) {
|
|
| 2464 | 2464 | echo "<div class='gd-search-input-wrapper gd-search-field-near' $near_input_extra>"; |
| 2465 | 2465 | |
| 2466 | 2466 | do_action('geodir_before_near_input');
|
@@ -2468,30 +2468,30 @@ discard block |
||
| 2468 | 2468 | |
| 2469 | 2469 | ?> |
| 2470 | 2470 | <input name="snear" class="snear <?php echo $near_class; ?>" type="text" value="<?php echo $near; ?>" |
| 2471 | - onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql( $near ); ?>' != '' ? '<?php echo esc_sql( $near ); ?>' : '<?php echo $default_near_text; ?>');}"
|
|
| 2472 | - onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql( $near ); ?>') {this.value = '';}"
|
|
| 2473 | - onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra;?>/> |
|
| 2471 | + onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql($near); ?>' != '' ? '<?php echo esc_sql($near); ?>' : '<?php echo $default_near_text; ?>');}"
|
|
| 2472 | + onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql($near); ?>') {this.value = '';}"
|
|
| 2473 | + onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra; ?>/> |
|
| 2474 | 2474 | <?php |
| 2475 | - if($new_style){
|
|
| 2475 | + if ($new_style) {
|
|
| 2476 | 2476 | do_action('geodir_after_near_input');
|
| 2477 | 2477 | |
| 2478 | 2478 | echo "</div>"; |
| 2479 | 2479 | } |
| 2480 | 2480 | } |
| 2481 | 2481 | |
| 2482 | -add_action( 'geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10 ); |
|
| 2483 | -add_action( 'geodir_search_form_inputs', 'geodir_search_form_search_input', 20 ); |
|
| 2484 | -add_action( 'geodir_search_form_inputs', 'geodir_search_form_near_input', 30 ); |
|
| 2482 | +add_action('geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10);
|
|
| 2483 | +add_action('geodir_search_form_inputs', 'geodir_search_form_search_input', 20);
|
|
| 2484 | +add_action('geodir_search_form_inputs', 'geodir_search_form_near_input', 30);
|
|
| 2485 | 2485 | |
| 2486 | -function geodir_get_search_post_type($pt=''){
|
|
| 2486 | +function geodir_get_search_post_type($pt = '') {
|
|
| 2487 | 2487 | global $geodir_search_post_type; |
| 2488 | 2488 | |
| 2489 | - if($pt!=''){return $geodir_search_post_type = $pt;}
|
|
| 2490 | - if(!empty($geodir_search_post_type)){ return $geodir_search_post_type;}
|
|
| 2489 | + if ($pt != '') {return $geodir_search_post_type = $pt; }
|
|
| 2490 | + if (!empty($geodir_search_post_type)) { return $geodir_search_post_type; }
|
|
| 2491 | 2491 | |
| 2492 | 2492 | $geodir_search_post_type = geodir_get_current_posttype(); |
| 2493 | 2493 | |
| 2494 | - if(!$geodir_search_post_type) {
|
|
| 2494 | + if (!$geodir_search_post_type) {
|
|
| 2495 | 2495 | $geodir_search_post_type = geodir_get_default_posttype(); |
| 2496 | 2496 | } |
| 2497 | 2497 | |
@@ -2499,7 +2499,7 @@ discard block |
||
| 2499 | 2499 | return $geodir_search_post_type; |
| 2500 | 2500 | } |
| 2501 | 2501 | |
| 2502 | -function geodir_search_form(){
|
|
| 2502 | +function geodir_search_form() {
|
|
| 2503 | 2503 | |
| 2504 | 2504 | geodir_get_search_post_type(); |
| 2505 | 2505 | |
@@ -2509,8 +2509,8 @@ discard block |
||
| 2509 | 2509 | die(); |
| 2510 | 2510 | } |
| 2511 | 2511 | |
| 2512 | -add_action( 'wp_ajax_geodir_search_form', 'geodir_search_form' ); |
|
| 2513 | -add_action( 'wp_ajax_nopriv_geodir_search_form', 'geodir_search_form' ); |
|
| 2512 | +add_action('wp_ajax_geodir_search_form', 'geodir_search_form');
|
|
| 2513 | +add_action('wp_ajax_nopriv_geodir_search_form', 'geodir_search_form');
|
|
| 2514 | 2514 | |
| 2515 | 2515 | /** |
| 2516 | 2516 | * Check wpml active or not. |
@@ -2584,7 +2584,7 @@ discard block |
||
| 2584 | 2584 | } |
| 2585 | 2585 | } |
| 2586 | 2586 | } |
| 2587 | -add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 ); |
|
| 2587 | +add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);
|
|
| 2588 | 2588 | |
| 2589 | 2589 | /** |
| 2590 | 2590 | * Duplicate post listing manually after listing saved. |
@@ -2608,7 +2608,7 @@ discard block |
||
| 2608 | 2608 | foreach ($post_duplicates as $lang => $dup_post_id) {
|
| 2609 | 2609 | geodir_icl_make_duplicate($post_id, $lang, $request_info, $dup_post_id, true); |
| 2610 | 2610 | } |
| 2611 | - do_action( 'geodir_wpml_listing_duplicated', $post_id, $request_info ); |
|
| 2611 | + do_action('geodir_wpml_listing_duplicated', $post_id, $request_info);
|
|
| 2612 | 2612 | } |
| 2613 | 2613 | } |
| 2614 | 2614 | |
@@ -2627,7 +2627,7 @@ discard block |
||
| 2627 | 2627 | function geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang) {
|
| 2628 | 2628 | global $wpdb; |
| 2629 | 2629 | |
| 2630 | - $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);
|
|
| 2630 | + $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM ".GEODIR_REVIEW_TABLE." WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);
|
|
| 2631 | 2631 | |
| 2632 | 2632 | if (!empty($reviews)) {
|
| 2633 | 2633 | foreach ($reviews as $review) {
|
@@ -2656,15 +2656,15 @@ discard block |
||
| 2656 | 2656 | global $wpdb, $plugin_prefix; |
| 2657 | 2657 | |
| 2658 | 2658 | $post_type = get_post_type($master_post_id); |
| 2659 | - $post_table = $plugin_prefix . $post_type . '_detail'; |
|
| 2659 | + $post_table = $plugin_prefix.$post_type.'_detail'; |
|
| 2660 | 2660 | |
| 2661 | - $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));
|
|
| 2662 | - $data = (array)$wpdb->get_row($query); |
|
| 2661 | + $query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));
|
|
| 2662 | + $data = (array) $wpdb->get_row($query); |
|
| 2663 | 2663 | |
| 2664 | - if ( !empty( $data ) ) {
|
|
| 2665 | - $data = apply_filters( 'geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang ); |
|
| 2664 | + if (!empty($data)) {
|
|
| 2665 | + $data = apply_filters('geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang);
|
|
| 2666 | 2666 | $data['post_id'] = $tr_post_id; |
| 2667 | - unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category']); |
|
| 2667 | + unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category']); |
|
| 2668 | 2668 | $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));
|
| 2669 | 2669 | return true; |
| 2670 | 2670 | } |
@@ -2689,7 +2689,7 @@ discard block |
||
| 2689 | 2689 | global $sitepress, $wpdb; |
| 2690 | 2690 | $post_type = get_post_type($master_post_id); |
| 2691 | 2691 | |
| 2692 | - remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language
|
|
| 2692 | + remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language
|
|
| 2693 | 2693 | |
| 2694 | 2694 | $taxonomies = get_object_taxonomies($post_type); |
| 2695 | 2695 | foreach ($taxonomies as $taxonomy) {
|
@@ -2698,9 +2698,9 @@ discard block |
||
| 2698 | 2698 | |
| 2699 | 2699 | if ($terms) {
|
| 2700 | 2700 | foreach ($terms as $term) {
|
| 2701 | - $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang); |
|
| 2701 | + $tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);
|
|
| 2702 | 2702 | |
| 2703 | - if (!is_null($tr_id)){
|
|
| 2703 | + if (!is_null($tr_id)) {
|
|
| 2704 | 2704 | // not using get_term - unfiltered get_term |
| 2705 | 2705 | $translated_term = $wpdb->get_row($wpdb->prepare("
|
| 2706 | 2706 | SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));
|
@@ -2709,14 +2709,14 @@ discard block |
||
| 2709 | 2709 | } |
| 2710 | 2710 | } |
| 2711 | 2711 | |
| 2712 | - if (!is_taxonomy_hierarchical($taxonomy)){
|
|
| 2713 | - $terms_array = array_unique( array_map( 'intval', $terms_array ) ); |
|
| 2712 | + if (!is_taxonomy_hierarchical($taxonomy)) {
|
|
| 2713 | + $terms_array = array_unique(array_map('intval', $terms_array));
|
|
| 2714 | 2714 | } |
| 2715 | 2715 | |
| 2716 | 2716 | wp_set_post_terms($tr_post_id, $terms_array, $taxonomy); |
| 2717 | 2717 | |
| 2718 | - if ($taxonomy == $post_type . 'category') {
|
|
| 2719 | - geodir_set_postcat_structure($tr_post_id, $post_type . 'category'); |
|
| 2718 | + if ($taxonomy == $post_type.'category') {
|
|
| 2719 | + geodir_set_postcat_structure($tr_post_id, $post_type.'category'); |
|
| 2720 | 2720 | } |
| 2721 | 2721 | } |
| 2722 | 2722 | } |
@@ -2737,15 +2737,15 @@ discard block |
||
| 2737 | 2737 | function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {
|
| 2738 | 2738 | global $wpdb; |
| 2739 | 2739 | |
| 2740 | - $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));
|
|
| 2740 | + $query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));
|
|
| 2741 | 2741 | $wpdb->query($query); |
| 2742 | 2742 | |
| 2743 | - $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));
|
|
| 2743 | + $query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));
|
|
| 2744 | 2744 | $post_images = $wpdb->get_results($query); |
| 2745 | 2745 | |
| 2746 | - if ( !empty( $post_images ) ) {
|
|
| 2747 | - foreach ( $post_images as $post_image) {
|
|
| 2748 | - $image_data = (array)$post_image; |
|
| 2746 | + if (!empty($post_images)) {
|
|
| 2747 | + foreach ($post_images as $post_image) {
|
|
| 2748 | + $image_data = (array) $post_image; |
|
| 2749 | 2749 | unset($image_data['ID']); |
| 2750 | 2750 | $image_data['post_id'] = $tr_post_id; |
| 2751 | 2751 | |
@@ -2778,13 +2778,13 @@ discard block |
||
| 2778 | 2778 | function geodir_wpml_duplicate_post_review($master_comment_id, $master_post_id, $tr_post_id, $lang) {
|
| 2779 | 2779 | global $wpdb, $plugin_prefix, $sitepress; |
| 2780 | 2780 | |
| 2781 | - $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);
|
|
| 2781 | + $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);
|
|
| 2782 | 2782 | |
| 2783 | 2783 | if (empty($review)) {
|
| 2784 | 2784 | return false; |
| 2785 | 2785 | } |
| 2786 | 2786 | if ($review['post_id'] != $master_post_id) {
|
| 2787 | - $wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));
|
|
| 2787 | + $wpdb->query($wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));
|
|
| 2788 | 2788 | geodir_update_postrating($master_post_id, $post_type); |
| 2789 | 2789 | } |
| 2790 | 2790 | |
@@ -2795,9 +2795,9 @@ discard block |
||
| 2795 | 2795 | } |
| 2796 | 2796 | |
| 2797 | 2797 | $post_type = get_post_type($master_post_id); |
| 2798 | - $post_table = $plugin_prefix . $post_type . '_detail'; |
|
| 2798 | + $post_table = $plugin_prefix.$post_type.'_detail'; |
|
| 2799 | 2799 | |
| 2800 | - $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);
|
|
| 2800 | + $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM ".$post_table." WHERE post_id = %d", $tr_post_id), ARRAY_A);
|
|
| 2801 | 2801 | if (empty($translated_post)) {
|
| 2802 | 2802 | return false; |
| 2803 | 2803 | } |
@@ -2815,7 +2815,7 @@ discard block |
||
| 2815 | 2815 | unset($review['id']); |
| 2816 | 2816 | } |
| 2817 | 2817 | |
| 2818 | - $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));
|
|
| 2818 | + $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));
|
|
| 2819 | 2819 | |
| 2820 | 2820 | if ($tr_review_id) { // update review
|
| 2821 | 2821 | $wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $tr_review_id));
|
@@ -2828,8 +2828,8 @@ discard block |
||
| 2828 | 2828 | geodir_update_postrating($tr_post_id, $post_type); |
| 2829 | 2829 | |
| 2830 | 2830 | if (defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_review') && $sitepress->get_setting('sync_comments_on_duplicates')) {
|
| 2831 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id = %d", array($tr_comment_id)));
|
|
| 2832 | - $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);
|
|
| 2831 | + $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id = %d", array($tr_comment_id)));
|
|
| 2832 | + $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);
|
|
| 2833 | 2833 | |
| 2834 | 2834 | if (!empty($likes)) {
|
| 2835 | 2835 | foreach ($likes as $like) {
|
@@ -2931,7 +2931,7 @@ discard block |
||
| 2931 | 2931 | * @return bool True if review star disabled, otherwise false. |
| 2932 | 2932 | */ |
| 2933 | 2933 | function geodir_rating_disabled_post_types() {
|
| 2934 | - $post_types = get_option( 'geodir_disable_rating_cpt' ); |
|
| 2934 | + $post_types = get_option('geodir_disable_rating_cpt');
|
|
| 2935 | 2935 | |
| 2936 | 2936 | /** |
| 2937 | 2937 | * Filter the post types array which have rating disabled. |
@@ -2940,7 +2940,7 @@ discard block |
||
| 2940 | 2940 | * |
| 2941 | 2941 | * @param array $post_types Array of post types which have rating starts disabled. |
| 2942 | 2942 | */ |
| 2943 | - return apply_filters( 'geodir_rating_disabled_post_types', $post_types ); |
|
| 2943 | + return apply_filters('geodir_rating_disabled_post_types', $post_types);
|
|
| 2944 | 2944 | } |
| 2945 | 2945 | |
| 2946 | 2946 | /** |
@@ -2952,30 +2952,30 @@ discard block |
||
| 2952 | 2952 | * @param bool $taxonomy Whether $post_type is taxonomy or not. |
| 2953 | 2953 | * @return bool True if review star disabled, otherwise false. |
| 2954 | 2954 | */ |
| 2955 | -function geodir_cpt_has_rating_disabled( $post_type = '', $taxonomy = false ) {
|
|
| 2955 | +function geodir_cpt_has_rating_disabled($post_type = '', $taxonomy = false) {
|
|
| 2956 | 2956 | $post_types = geodir_rating_disabled_post_types(); |
| 2957 | 2957 | |
| 2958 | - if ( empty( $post_types ) ) {
|
|
| 2958 | + if (empty($post_types)) {
|
|
| 2959 | 2959 | return false; |
| 2960 | 2960 | } |
| 2961 | 2961 | |
| 2962 | - if ( is_int( $post_type ) ) {
|
|
| 2963 | - $post_type = get_post_type( $post_type ); |
|
| 2962 | + if (is_int($post_type)) {
|
|
| 2963 | + $post_type = get_post_type($post_type); |
|
| 2964 | 2964 | } |
| 2965 | 2965 | |
| 2966 | - if ( $taxonomy && !empty( $post_types ) ) {
|
|
| 2966 | + if ($taxonomy && !empty($post_types)) {
|
|
| 2967 | 2967 | $posttypes = array(); |
| 2968 | 2968 | |
| 2969 | - foreach ( $post_types as $posttype ) {
|
|
| 2970 | - $posttypes[] = $posttype . 'category'; |
|
| 2971 | - $posttypes[] = $posttype . '_tags'; |
|
| 2969 | + foreach ($post_types as $posttype) {
|
|
| 2970 | + $posttypes[] = $posttype.'category'; |
|
| 2971 | + $posttypes[] = $posttype.'_tags'; |
|
| 2972 | 2972 | } |
| 2973 | 2973 | |
| 2974 | 2974 | $post_types = $posttypes; |
| 2975 | 2975 | } |
| 2976 | 2976 | |
| 2977 | 2977 | $return = false; |
| 2978 | - if ( $post_type != '' && !empty( $post_types ) && in_array( $post_type, $post_types ) ) {
|
|
| 2978 | + if ($post_type != '' && !empty($post_types) && in_array($post_type, $post_types)) {
|
|
| 2979 | 2979 | $return = true; |
| 2980 | 2980 | } |
| 2981 | 2981 | |
@@ -2990,7 +2990,7 @@ discard block |
||
| 2990 | 2990 | * @return bool True if Yoast SEO disabled on GD pages. |
| 2991 | 2991 | */ |
| 2992 | 2992 | function geodir_disable_yoast_seo_metas() {
|
| 2993 | - return (bool)get_option( 'geodir_disable_yoast_meta' ); |
|
| 2993 | + return (bool) get_option('geodir_disable_yoast_meta');
|
|
| 2994 | 2994 | } |
| 2995 | 2995 | |
| 2996 | 2996 | /** |
@@ -3001,30 +3001,30 @@ discard block |
||
| 3001 | 3001 | * @param int $post_id The post ID. |
| 3002 | 3002 | * @return bool True if allowed. |
| 3003 | 3003 | */ |
| 3004 | -function geodir_wpml_allowed_to_duplicate( $post_id ) {
|
|
| 3004 | +function geodir_wpml_allowed_to_duplicate($post_id) {
|
|
| 3005 | 3005 | $allowed = false; |
| 3006 | 3006 | |
| 3007 | - if ( !geodir_is_wpml() || empty( $post_id ) ) {
|
|
| 3007 | + if (!geodir_is_wpml() || empty($post_id)) {
|
|
| 3008 | 3008 | return $allowed; |
| 3009 | 3009 | } |
| 3010 | 3010 | |
| 3011 | - $user_id = (int)get_current_user_id(); |
|
| 3011 | + $user_id = (int) get_current_user_id(); |
|
| 3012 | 3012 | |
| 3013 | - if ( empty( $user_id ) ) {
|
|
| 3013 | + if (empty($user_id)) {
|
|
| 3014 | 3014 | return $allowed; |
| 3015 | 3015 | } |
| 3016 | 3016 | |
| 3017 | - $post_type = get_post_type( $post_id ); |
|
| 3018 | - if ( !geodir_wpml_is_post_type_translated( $post_type ) || get_post_meta( $post_id, '_icl_lang_duplicate_of', true ) ) {
|
|
| 3017 | + $post_type = get_post_type($post_id); |
|
| 3018 | + if (!geodir_wpml_is_post_type_translated($post_type) || get_post_meta($post_id, '_icl_lang_duplicate_of', true)) {
|
|
| 3019 | 3019 | return $allowed; |
| 3020 | 3020 | } |
| 3021 | 3021 | |
| 3022 | - if ( geodir_listing_belong_to_current_user( $post_id ) ) {
|
|
| 3022 | + if (geodir_listing_belong_to_current_user($post_id)) {
|
|
| 3023 | 3023 | $allowed = true; |
| 3024 | 3024 | } |
| 3025 | 3025 | |
| 3026 | - $disable_cpts = get_option( 'geodir_wpml_disable_duplicate' ); |
|
| 3027 | - if ( $allowed && !empty( $disable_cpts ) && in_array( $post_type, $disable_cpts ) ) {
|
|
| 3026 | + $disable_cpts = get_option('geodir_wpml_disable_duplicate');
|
|
| 3027 | + if ($allowed && !empty($disable_cpts) && in_array($post_type, $disable_cpts)) {
|
|
| 3028 | 3028 | $allowed = false; |
| 3029 | 3029 | } |
| 3030 | 3030 | |
@@ -3034,7 +3034,7 @@ discard block |
||
| 3034 | 3034 | * @param bool $allowed True if allowed. |
| 3035 | 3035 | * @param int $post_id The post ID. |
| 3036 | 3036 | */ |
| 3037 | - return apply_filters( 'geodir_wpml_allowed_to_duplicate', $allowed, $post_id ); |
|
| 3037 | + return apply_filters('geodir_wpml_allowed_to_duplicate', $allowed, $post_id);
|
|
| 3038 | 3038 | } |
| 3039 | 3039 | |
| 3040 | 3040 | /** |
@@ -3049,61 +3049,61 @@ discard block |
||
| 3049 | 3049 | * @param string $content_html The output html of the geodir_edit_post_link() function. |
| 3050 | 3050 | * @return string Filtered html of the geodir_edit_post_link() function. |
| 3051 | 3051 | */ |
| 3052 | -function geodir_wpml_frontend_duplicate_listing( $content_html ) {
|
|
| 3052 | +function geodir_wpml_frontend_duplicate_listing($content_html) {
|
|
| 3053 | 3053 | global $post, $preview, $sitepress; |
| 3054 | 3054 | |
| 3055 | - if ( !empty( $post->ID ) && !$preview && geodir_is_page( 'detail' ) && geodir_wpml_allowed_to_duplicate( $post->ID ) ) {
|
|
| 3055 | + if (!empty($post->ID) && !$preview && geodir_is_page('detail') && geodir_wpml_allowed_to_duplicate($post->ID)) {
|
|
| 3056 | 3056 | $post_id = $post->ID; |
| 3057 | - $element_type = 'post_' . get_post_type( $post_id ); |
|
| 3058 | - $original_post_id = $sitepress->get_original_element_id( $post_id, $element_type ); |
|
| 3057 | + $element_type = 'post_'.get_post_type($post_id); |
|
| 3058 | + $original_post_id = $sitepress->get_original_element_id($post_id, $element_type); |
|
| 3059 | 3059 | |
| 3060 | - if ( $original_post_id == $post_id ) {
|
|
| 3060 | + if ($original_post_id == $post_id) {
|
|
| 3061 | 3061 | $wpml_languages = $sitepress->get_active_languages(); |
| 3062 | - $post_language = $sitepress->get_language_for_element( $post_id, $element_type ); |
|
| 3062 | + $post_language = $sitepress->get_language_for_element($post_id, $element_type); |
|
| 3063 | 3063 | |
| 3064 | - if ( !empty( $wpml_languages ) && isset( $wpml_languages[ $post_language ] ) ) {
|
|
| 3065 | - unset( $wpml_languages[ $post_language ] ); |
|
| 3064 | + if (!empty($wpml_languages) && isset($wpml_languages[$post_language])) {
|
|
| 3065 | + unset($wpml_languages[$post_language]); |
|
| 3066 | 3066 | } |
| 3067 | 3067 | |
| 3068 | - if ( !empty( $wpml_languages ) ) {
|
|
| 3069 | - $trid = $sitepress->get_element_trid( $post_id, $element_type ); |
|
| 3070 | - $element_translations = $sitepress->get_element_translations( $trid, $element_type ); |
|
| 3071 | - $duplicates = $sitepress->get_duplicates( $post_id ); |
|
| 3068 | + if (!empty($wpml_languages)) {
|
|
| 3069 | + $trid = $sitepress->get_element_trid($post_id, $element_type); |
|
| 3070 | + $element_translations = $sitepress->get_element_translations($trid, $element_type); |
|
| 3071 | + $duplicates = $sitepress->get_duplicates($post_id); |
|
| 3072 | 3072 | |
| 3073 | - $wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">' . __( 'Translate Listing', 'geodirectory' ) . '</h3>'; |
|
| 3073 | + $wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">'.__('Translate Listing', 'geodirectory').'</h3>';
|
|
| 3074 | 3074 | $wpml_content .= '<table class="gd-duplicate-table" style="width:100%;margin:0"><tbody>'; |
| 3075 | - $wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">' . __( 'Language', 'geodirectory' ) . '</th><th style="width:25px;"></th><th style="width:5em;text-align:center">' . __( 'Translate', 'geodirectory' ) . '</th></tr>'; |
|
| 3075 | + $wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">'.__('Language', 'geodirectory').'</th><th style="width:25px;"></th><th style="width:5em;text-align:center">'.__('Translate', 'geodirectory').'</th></tr>';
|
|
| 3076 | 3076 | |
| 3077 | 3077 | $needs_translation = false; |
| 3078 | 3078 | |
| 3079 | - foreach ( $wpml_languages as $lang_code => $lang ) {
|
|
| 3079 | + foreach ($wpml_languages as $lang_code => $lang) {
|
|
| 3080 | 3080 | $duplicates_text = ''; |
| 3081 | 3081 | $translated = false; |
| 3082 | 3082 | |
| 3083 | - if ( !empty( $element_translations ) && isset( $element_translations[$lang_code] ) ) {
|
|
| 3083 | + if (!empty($element_translations) && isset($element_translations[$lang_code])) {
|
|
| 3084 | 3084 | $translated = true; |
| 3085 | 3085 | |
| 3086 | - if ( !empty( $duplicates ) && isset( $duplicates[$lang_code] ) ) {
|
|
| 3087 | - $duplicates_text = ' ' . __( '(duplicate)', 'geodirectory' ); |
|
| 3086 | + if (!empty($duplicates) && isset($duplicates[$lang_code])) {
|
|
| 3087 | + $duplicates_text = ' '.__('(duplicate)', 'geodirectory');
|
|
| 3088 | 3088 | } |
| 3089 | 3089 | } else {
|
| 3090 | 3090 | $needs_translation = true; |
| 3091 | 3091 | } |
| 3092 | 3092 | |
| 3093 | - $wpml_content .= '<tr><td style="padding:4px">' . $lang['english_name'] . $duplicates_text . '</td><td> </td><td style="text-align:center;">'; |
|
| 3093 | + $wpml_content .= '<tr><td style="padding:4px">'.$lang['english_name'].$duplicates_text.'</td><td> </td><td style="text-align:center;">'; |
|
| 3094 | 3094 | |
| 3095 | - if ( $translated ) {
|
|
| 3095 | + if ($translated) {
|
|
| 3096 | 3096 | $wpml_content .= '<i class="fa fa-check" style="color:orange"></i>'; |
| 3097 | 3097 | } else {
|
| 3098 | - $wpml_content .= '<input name="gd_icl_dup[]" value="' . $lang_code . '" title="' . esc_attr__( 'Create duplicate', 'geodirectory' ) . '" type="checkbox">'; |
|
| 3098 | + $wpml_content .= '<input name="gd_icl_dup[]" value="'.$lang_code.'" title="'.esc_attr__('Create duplicate', 'geodirectory').'" type="checkbox">';
|
|
| 3099 | 3099 | } |
| 3100 | 3100 | |
| 3101 | 3101 | $wpml_content .= '</td></tr>'; |
| 3102 | 3102 | } |
| 3103 | 3103 | |
| 3104 | - if ( $needs_translation ) {
|
|
| 3105 | - $nonce = wp_create_nonce( 'geodir_duplicate_nonce' ); |
|
| 3106 | - $wpml_content .= '<tr><td> </td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fa fa-spin fa-refresh"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="' . esc_attr( $nonce ) . '" data-post-id="' . $post_id . '" id="gd_make_duplicates" class="button-secondary">' . __( 'Duplicate', 'geodirectory' ) . '</button></td></tr>'; |
|
| 3104 | + if ($needs_translation) {
|
|
| 3105 | + $nonce = wp_create_nonce('geodir_duplicate_nonce');
|
|
| 3106 | + $wpml_content .= '<tr><td> </td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fa fa-spin fa-refresh"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="'.esc_attr($nonce).'" data-post-id="'.$post_id.'" id="gd_make_duplicates" class="button-secondary">'.__('Duplicate', 'geodirectory').'</button></td></tr>';
|
|
| 3107 | 3107 | } |
| 3108 | 3108 | |
| 3109 | 3109 | $wpml_content .= '</tbody></table>'; |
@@ -3125,12 +3125,12 @@ discard block |
||
| 3125 | 3125 | * @param array $settings GD design settings array. |
| 3126 | 3126 | * @return array Filtered GD design settings array.. |
| 3127 | 3127 | */ |
| 3128 | -function geodir_wpml_duplicate_settings( $settings = array() ) {
|
|
| 3128 | +function geodir_wpml_duplicate_settings($settings = array()) {
|
|
| 3129 | 3129 | $new_settings = array(); |
| 3130 | 3130 | |
| 3131 | - foreach ( $settings as $key => $setting ) {
|
|
| 3131 | + foreach ($settings as $key => $setting) {
|
|
| 3132 | 3132 | |
| 3133 | - if ( isset( $setting['type'] ) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings' ) {
|
|
| 3133 | + if (isset($setting['type']) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings') {
|
|
| 3134 | 3134 | $new_settings[] = array( |
| 3135 | 3135 | 'name' => __('Disable WPML duplicate translation', 'geodirectory'),
|
| 3136 | 3136 | 'desc' => __('Select post types to disable front end WPML duplicate translation. For selected post types the WPML duplicate option will be disabled from listing detail page sidebar.', 'geodirectory'),
|
@@ -3158,12 +3158,12 @@ discard block |
||
| 3158 | 3158 | * @param string $taxonomy name/slug of a taxonomy. |
| 3159 | 3159 | * @return bool true if the taxonomy is currently set to being translatable in WPML. |
| 3160 | 3160 | */ |
| 3161 | -function geodir_wpml_is_taxonomy_translated( $taxonomy ) {
|
|
| 3162 | - if ( empty( $taxonomy ) || !geodir_is_wpml() || !function_exists( 'is_taxonomy_translated' ) ) {
|
|
| 3161 | +function geodir_wpml_is_taxonomy_translated($taxonomy) {
|
|
| 3162 | + if (empty($taxonomy) || !geodir_is_wpml() || !function_exists('is_taxonomy_translated')) {
|
|
| 3163 | 3163 | return false; |
| 3164 | 3164 | } |
| 3165 | 3165 | |
| 3166 | - if ( is_taxonomy_translated( $taxonomy ) ) {
|
|
| 3166 | + if (is_taxonomy_translated($taxonomy)) {
|
|
| 3167 | 3167 | return true; |
| 3168 | 3168 | } |
| 3169 | 3169 | |
@@ -3178,12 +3178,12 @@ discard block |
||
| 3178 | 3178 | * @param string $post_type name/slug of a post_type. |
| 3179 | 3179 | * @return bool true if the post_type is currently set to being translatable in WPML. |
| 3180 | 3180 | */ |
| 3181 | -function geodir_wpml_is_post_type_translated( $post_type ) {
|
|
| 3182 | - if ( empty( $post_type ) || !geodir_is_wpml() || !function_exists( 'is_post_type_translated' ) ) {
|
|
| 3181 | +function geodir_wpml_is_post_type_translated($post_type) {
|
|
| 3182 | + if (empty($post_type) || !geodir_is_wpml() || !function_exists('is_post_type_translated')) {
|
|
| 3183 | 3183 | return false; |
| 3184 | 3184 | } |
| 3185 | 3185 | |
| 3186 | - if ( is_post_type_translated( $post_type ) ) {
|
|
| 3186 | + if (is_post_type_translated($post_type)) {
|
|
| 3187 | 3187 | return true; |
| 3188 | 3188 | } |
| 3189 | 3189 | |
@@ -3205,12 +3205,12 @@ discard block |
||
| 3205 | 3205 | * |
| 3206 | 3206 | * @return int|NULL |
| 3207 | 3207 | */ |
| 3208 | -function geodir_wpml_object_id( $element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null ) {
|
|
| 3209 | - if ( geodir_is_wpml() ) {
|
|
| 3210 | - if ( function_exists( 'wpml_object_id_filter' ) ) {
|
|
| 3211 | - return apply_filters( 'wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code ); |
|
| 3208 | +function geodir_wpml_object_id($element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null) {
|
|
| 3209 | + if (geodir_is_wpml()) {
|
|
| 3210 | + if (function_exists('wpml_object_id_filter')) {
|
|
| 3211 | + return apply_filters('wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code);
|
|
| 3212 | 3212 | } else {
|
| 3213 | - return icl_object_id( $element_id, $element_type, $return_original_if_missing, $ulanguage_code ); |
|
| 3213 | + return icl_object_id($element_id, $element_type, $return_original_if_missing, $ulanguage_code); |
|
| 3214 | 3214 | } |
| 3215 | 3215 | } |
| 3216 | 3216 | |
@@ -16,10 +16,10 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | function geodir_session_start() |
| 18 | 18 | {
|
| 19 | - if (!session_id()) session_start(); |
|
| 20 | - global $geodir_add_location_url; |
|
| 19 | + if (!session_id()) session_start(); |
|
| 20 | + global $geodir_add_location_url; |
|
| 21 | 21 | |
| 22 | - $geodir_add_location_url = NULL; |
|
| 22 | + $geodir_add_location_url = NULL; |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -33,18 +33,18 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function geodir_modified_query($query) |
| 35 | 35 | {
|
| 36 | - if ($query->is_main_query() && ( |
|
| 37 | - (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
|
|
| 38 | - || geodir_is_page('listing')
|
|
| 39 | - || geodir_is_page('author')
|
|
| 40 | - || geodir_is_page('search')
|
|
| 41 | - || geodir_is_page('detail'))
|
|
| 42 | - ) {
|
|
| 43 | - |
|
| 44 | - $query->set('is_geodir_loop', true);
|
|
| 45 | - } |
|
| 36 | + if ($query->is_main_query() && ( |
|
| 37 | + (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
|
|
| 38 | + || geodir_is_page('listing')
|
|
| 39 | + || geodir_is_page('author')
|
|
| 40 | + || geodir_is_page('search')
|
|
| 41 | + || geodir_is_page('detail'))
|
|
| 42 | + ) {
|
|
| 43 | + |
|
| 44 | + $query->set('is_geodir_loop', true);
|
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - return $query; |
|
| 47 | + return $query; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -67,81 +67,81 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | function set_listing_request($query ) |
| 69 | 69 | {
|
| 70 | - global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
| 70 | + global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
| 71 | 71 | |
| 72 | 72 | |
| 73 | - // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
| 74 | - if (!geodir_is_geodir_page()) {
|
|
| 75 | - return; |
|
| 76 | - } |
|
| 73 | + // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
| 74 | + if (!geodir_is_geodir_page()) {
|
|
| 75 | + return; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - /* remove all pre filters */ |
|
| 79 | - remove_all_filters('query');
|
|
| 80 | - remove_all_filters('posts_search');
|
|
| 81 | - remove_all_filters('posts_fields');
|
|
| 82 | - remove_all_filters('posts_join');
|
|
| 83 | - remove_all_filters('posts_orderby');
|
|
| 84 | - remove_all_filters('posts_where');
|
|
| 78 | + /* remove all pre filters */ |
|
| 79 | + remove_all_filters('query');
|
|
| 80 | + remove_all_filters('posts_search');
|
|
| 81 | + remove_all_filters('posts_fields');
|
|
| 82 | + remove_all_filters('posts_join');
|
|
| 83 | + remove_all_filters('posts_orderby');
|
|
| 84 | + remove_all_filters('posts_where');
|
|
| 85 | 85 | |
| 86 | 86 | |
| 87 | - if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
| 87 | + if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
| 88 | 88 | |
| 89 | - if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 90 | - //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
| 89 | + if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 90 | + //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
| 91 | 91 | |
| 92 | - if (isset($_REQUEST['sdist'])) {
|
|
| 93 | - ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
| 94 | - } elseif (get_option('geodir_search_dist') != '') {
|
|
| 95 | - $dist = get_option('geodir_search_dist');
|
|
| 92 | + if (isset($_REQUEST['sdist'])) {
|
|
| 93 | + ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
| 94 | + } elseif (get_option('geodir_search_dist') != '') {
|
|
| 95 | + $dist = get_option('geodir_search_dist');
|
|
| 96 | 96 | |
| 97 | - } else {
|
|
| 98 | - $dist = 25000; |
|
| 99 | - } // Distance |
|
| 97 | + } else {
|
|
| 98 | + $dist = 25000; |
|
| 99 | + } // Distance |
|
| 100 | 100 | |
| 101 | - if (isset($_REQUEST['sgeo_lat'])) {
|
|
| 102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | - } else {
|
|
| 104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
| 105 | - } // Latitude |
|
| 101 | + if (isset($_REQUEST['sgeo_lat'])) {
|
|
| 102 | + $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | + } else {
|
|
| 104 | + $mylat = (float)geodir_get_current_city_lat(); |
|
| 105 | + } // Latitude |
|
| 106 | 106 | |
| 107 | - if (isset($_REQUEST['sgeo_lon'])) {
|
|
| 108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | - } else {
|
|
| 110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
| 111 | - } // Distance |
|
| 107 | + if (isset($_REQUEST['sgeo_lon'])) {
|
|
| 108 | + $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | + } else {
|
|
| 110 | + $mylon = (float)geodir_get_current_city_lng(); |
|
| 111 | + } // Distance |
|
| 112 | 112 | |
| 113 | - if (isset($_REQUEST['snear'])) {
|
|
| 114 | - $snear = trim(esc_attr($_REQUEST['snear'])); |
|
| 115 | - } |
|
| 113 | + if (isset($_REQUEST['snear'])) {
|
|
| 114 | + $snear = trim(esc_attr($_REQUEST['snear'])); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - if (isset($_REQUEST['s'])) {
|
|
| 118 | - $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
| 119 | - } |
|
| 117 | + if (isset($_REQUEST['s'])) {
|
|
| 118 | + $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - if ($snear == 'NEAR ME') {
|
|
| 122 | - $ip = $_SERVER['REMOTE_ADDR']; |
|
| 123 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 124 | - $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
| 125 | - $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
|
| 126 | - } |
|
| 121 | + if ($snear == 'NEAR ME') {
|
|
| 122 | + $ip = $_SERVER['REMOTE_ADDR']; |
|
| 123 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 124 | + $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
| 125 | + $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | 128 | |
| 129 | - if (strstr($s, ',')) {
|
|
| 130 | - $s_AA = str_replace(" ", "", $s);
|
|
| 131 | - $s_A = explode(",", $s_AA);
|
|
| 132 | - $s_A = implode('","', $s_A);
|
|
| 133 | - $s_A = '"' . $s_A . '"'; |
|
| 134 | - } else {
|
|
| 135 | - $s_A = '"' . $s . '"'; |
|
| 136 | - } |
|
| 129 | + if (strstr($s, ',')) {
|
|
| 130 | + $s_AA = str_replace(" ", "", $s);
|
|
| 131 | + $s_A = explode(",", $s_AA);
|
|
| 132 | + $s_A = implode('","', $s_A);
|
|
| 133 | + $s_A = '"' . $s_A . '"'; |
|
| 134 | + } else {
|
|
| 135 | + $s_A = '"' . $s . '"'; |
|
| 136 | + } |
|
| 137 | 137 | |
| 138 | - if (strstr($s, ' ')) {
|
|
| 139 | - $s_SA = explode(" ", $s);
|
|
| 140 | - } else {
|
|
| 141 | - $s_SA = ''; |
|
| 142 | - } |
|
| 138 | + if (strstr($s, ' ')) {
|
|
| 139 | + $s_SA = explode(" ", $s);
|
|
| 140 | + } else {
|
|
| 141 | + $s_SA = ''; |
|
| 142 | + } |
|
| 143 | 143 | |
| 144 | - endif; |
|
| 144 | + endif; |
|
| 145 | 145 | |
| 146 | 146 | |
| 147 | 147 | |
@@ -162,56 +162,56 @@ discard block |
||
| 162 | 162 | */ |
| 163 | 163 | function geodir_listing_loop_filter($query) |
| 164 | 164 | {
|
| 165 | - global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
| 165 | + global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
| 166 | 166 | |
| 167 | - // fix wp_reset_query for popular post view widget |
|
| 168 | - if (!geodir_is_geodir_page()) {
|
|
| 169 | - return; |
|
| 170 | - } |
|
| 167 | + // fix wp_reset_query for popular post view widget |
|
| 168 | + if (!geodir_is_geodir_page()) {
|
|
| 169 | + return; |
|
| 170 | + } |
|
| 171 | 171 | |
| 172 | - $geodir_post_type = geodir_get_current_posttype(); |
|
| 173 | - |
|
| 174 | - if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
|
|
| 175 | - $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
| 176 | - |
|
| 177 | - if (isset($wp_query->query[$taxonomies[0]])) {
|
|
| 178 | - $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
|
|
| 179 | - $request_term = end($request_term); |
|
| 180 | - if (!term_exists($request_term)) {
|
|
| 181 | - $args = array('number' => '1',);
|
|
| 182 | - $terms_arr = get_terms($taxonomies[0], $args); |
|
| 183 | - foreach ($terms_arr as $location_term) {
|
|
| 184 | - $term_arr = $location_term; |
|
| 185 | - $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
|
|
| 186 | - } |
|
| 187 | - $wp_query->queried_object_id = 1; |
|
| 188 | - $wp_query->queried_object = $term_arr; |
|
| 189 | - //print_r($wp_query) ; |
|
| 190 | - } |
|
| 191 | - } |
|
| 172 | + $geodir_post_type = geodir_get_current_posttype(); |
|
| 173 | + |
|
| 174 | + if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
|
|
| 175 | + $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
| 176 | + |
|
| 177 | + if (isset($wp_query->query[$taxonomies[0]])) {
|
|
| 178 | + $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
|
|
| 179 | + $request_term = end($request_term); |
|
| 180 | + if (!term_exists($request_term)) {
|
|
| 181 | + $args = array('number' => '1',);
|
|
| 182 | + $terms_arr = get_terms($taxonomies[0], $args); |
|
| 183 | + foreach ($terms_arr as $location_term) {
|
|
| 184 | + $term_arr = $location_term; |
|
| 185 | + $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
|
|
| 186 | + } |
|
| 187 | + $wp_query->queried_object_id = 1; |
|
| 188 | + $wp_query->queried_object = $term_arr; |
|
| 189 | + //print_r($wp_query) ; |
|
| 190 | + } |
|
| 191 | + } |
|
| 192 | 192 | |
| 193 | - } |
|
| 194 | - if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
|
| 195 | - |
|
| 196 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 197 | - |
|
| 198 | - add_filter('posts_fields', 'geodir_posts_fields', 1);
|
|
| 199 | - add_filter('posts_join', 'geodir_posts_join', 1);
|
|
| 200 | - geodir_post_where(); |
|
| 201 | - if (!is_admin()) |
|
| 202 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 203 | - |
|
| 204 | - // advanced filter for popular post view widget |
|
| 205 | - global $wp_query; |
|
| 206 | - if (!is_admin()) {
|
|
| 207 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 208 | - add_filter('posts_join', 'geodir_filter_widget_join', 1000);
|
|
| 209 | - } |
|
| 210 | - add_filter('posts_where', 'geodir_filter_widget_where', 1000);
|
|
| 211 | - } |
|
| 193 | + } |
|
| 194 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
|
| 212 | 195 | |
| 213 | - } |
|
| 214 | - return $query; |
|
| 196 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 197 | + |
|
| 198 | + add_filter('posts_fields', 'geodir_posts_fields', 1);
|
|
| 199 | + add_filter('posts_join', 'geodir_posts_join', 1);
|
|
| 200 | + geodir_post_where(); |
|
| 201 | + if (!is_admin()) |
|
| 202 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 203 | + |
|
| 204 | + // advanced filter for popular post view widget |
|
| 205 | + global $wp_query; |
|
| 206 | + if (!is_admin()) {
|
|
| 207 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 208 | + add_filter('posts_join', 'geodir_filter_widget_join', 1000);
|
|
| 209 | + } |
|
| 210 | + add_filter('posts_where', 'geodir_filter_widget_where', 1000);
|
|
| 211 | + } |
|
| 212 | + |
|
| 213 | + } |
|
| 214 | + return $query; |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | |
@@ -230,67 +230,67 @@ discard block |
||
| 230 | 230 | * @return string Modified fields query string. |
| 231 | 231 | */ |
| 232 | 232 | function geodir_posts_fields($fields) {
|
| 233 | - global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
| 233 | + global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
| 234 | 234 | |
| 235 | - // Filter-Location-Manager to add location table. |
|
| 236 | - $fields .= ", " . $table . ".* "; |
|
| 235 | + // Filter-Location-Manager to add location table. |
|
| 236 | + $fields .= ", " . $table . ".* "; |
|
| 237 | 237 | |
| 238 | 238 | if ($snear != '' || $gd_session->get('all_near_me')) {
|
| 239 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 239 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 240 | 240 | |
| 241 | 241 | if ($gd_session->get('all_near_me')) {
|
| 242 | - $mylat = $gd_session->get('user_lat');
|
|
| 243 | - $mylon = $gd_session->get('user_lon');
|
|
| 244 | - } |
|
| 245 | - |
|
| 246 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | - } |
|
| 248 | - |
|
| 249 | - global $s; |
|
| 250 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 251 | - $keywords = explode(" ", $s);
|
|
| 252 | - |
|
| 253 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 254 | - foreach($keywords as $kkey=>$kword){
|
|
| 255 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 256 | - unset($keywords[$kkey]); |
|
| 257 | - } |
|
| 258 | - } |
|
| 259 | - } |
|
| 242 | + $mylat = $gd_session->get('user_lat');
|
|
| 243 | + $mylon = $gd_session->get('user_lon');
|
|
| 244 | + } |
|
| 260 | 245 | |
| 246 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | + } |
|
| 261 | 248 | |
| 262 | - if (count($keywords) > 1) {
|
|
| 263 | - $parts = array( |
|
| 264 | - 'AND' => 'gd_alltitlematch_part', |
|
| 265 | - 'OR' => 'gd_titlematch_part' |
|
| 266 | - ); |
|
| 267 | - $gd_titlematch_part = ""; |
|
| 268 | - foreach ($parts as $key => $part) {
|
|
| 269 | - $gd_titlematch_part .= " CASE WHEN "; |
|
| 270 | - $count = 0; |
|
| 271 | - foreach ($keywords as $keyword) {
|
|
| 272 | - $keyword = trim($keyword); |
|
| 273 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 249 | + global $s; |
|
| 250 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 251 | + $keywords = explode(" ", $s);
|
|
| 252 | + |
|
| 253 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 254 | + foreach($keywords as $kkey=>$kword){
|
|
| 255 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 256 | + unset($keywords[$kkey]); |
|
| 257 | + } |
|
| 258 | + } |
|
| 259 | + } |
|
| 260 | + |
|
| 261 | + |
|
| 262 | + if (count($keywords) > 1) {
|
|
| 263 | + $parts = array( |
|
| 264 | + 'AND' => 'gd_alltitlematch_part', |
|
| 265 | + 'OR' => 'gd_titlematch_part' |
|
| 266 | + ); |
|
| 267 | + $gd_titlematch_part = ""; |
|
| 268 | + foreach ($parts as $key => $part) {
|
|
| 269 | + $gd_titlematch_part .= " CASE WHEN "; |
|
| 270 | + $count = 0; |
|
| 271 | + foreach ($keywords as $keyword) {
|
|
| 272 | + $keyword = trim($keyword); |
|
| 273 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 274 | 274 | $count++; |
| 275 | - if ($count < count($keywords)) {
|
|
| 276 | - // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
| 275 | + if ($count < count($keywords)) {
|
|
| 276 | + // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
| 277 | 277 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
| 278 | - } else {
|
|
| 279 | - //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
| 278 | + } else {
|
|
| 279 | + //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
| 280 | 280 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
| 281 | - } |
|
| 282 | - } |
|
| 283 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 284 | - } |
|
| 285 | - } else {
|
|
| 286 | - $gd_titlematch_part = ""; |
|
| 287 | - } |
|
| 288 | - $s = stripslashes_deep( $s ); |
|
| 289 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 284 | + } |
|
| 285 | + } else {
|
|
| 286 | + $gd_titlematch_part = ""; |
|
| 287 | + } |
|
| 288 | + $s = stripslashes_deep( $s ); |
|
| 289 | + $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 290 | 290 | $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));
|
| 291 | - } |
|
| 291 | + } |
|
| 292 | 292 | |
| 293 | - return $fields; |
|
| 293 | + return $fields; |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | |
@@ -307,26 +307,26 @@ discard block |
||
| 307 | 307 | */ |
| 308 | 308 | function geodir_posts_join($join) |
| 309 | 309 | {
|
| 310 | - global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
| 310 | + global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
| 311 | 311 | |
| 312 | - ########### WPML ########### |
|
| 312 | + ########### WPML ########### |
|
| 313 | 313 | |
| 314 | - if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 315 | - global $sitepress; |
|
| 316 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 317 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 318 | - if ($lang_code) {
|
|
| 319 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 320 | - } |
|
| 314 | + if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 315 | + global $sitepress; |
|
| 316 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 317 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 318 | + if ($lang_code) {
|
|
| 319 | + $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 320 | + } |
|
| 321 | 321 | |
| 322 | - } |
|
| 323 | - ########### WPML ########### |
|
| 322 | + } |
|
| 323 | + ########### WPML ########### |
|
| 324 | 324 | |
| 325 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 326 | - //===old code start |
|
| 327 | - //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
|
| 325 | + $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 326 | + //===old code start |
|
| 327 | + //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
|
| 328 | 328 | |
| 329 | - return $join; |
|
| 329 | + return $join; |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | |
@@ -344,15 +344,15 @@ discard block |
||
| 344 | 344 | */ |
| 345 | 345 | function geodir_posts_orderby($orderby) |
| 346 | 346 | {
|
| 347 | - global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
| 347 | + global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
| 348 | 348 | |
| 349 | - $sort_by = ''; |
|
| 350 | - $orderby = ' '; |
|
| 349 | + $sort_by = ''; |
|
| 350 | + $orderby = ' '; |
|
| 351 | 351 | |
| 352 | - if (get_query_var('order_by'))
|
|
| 353 | - $sort_by = get_query_var('order_by');
|
|
| 352 | + if (get_query_var('order_by'))
|
|
| 353 | + $sort_by = get_query_var('order_by');
|
|
| 354 | 354 | |
| 355 | - /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
|
| 355 | + /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
|
| 356 | 356 | $current_term = $wp_query->get_queried_object(); |
| 357 | 357 | } |
| 358 | 358 | |
@@ -366,133 +366,133 @@ discard block |
||
| 366 | 366 | }*/ |
| 367 | 367 | |
| 368 | 368 | |
| 369 | - if ($snear != '') {
|
|
| 370 | - $orderby .= " distance,"; |
|
| 371 | - } |
|
| 369 | + if ($snear != '') {
|
|
| 370 | + $orderby .= " distance,"; |
|
| 371 | + } |
|
| 372 | 372 | |
| 373 | - if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 374 | - $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 373 | + if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 374 | + $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 375 | 375 | |
| 376 | 376 | |
| 377 | - if ($sort_by == '') {
|
|
| 378 | - $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
| 379 | - if (!empty($default_sort)) |
|
| 380 | - $sort_by = $default_sort; |
|
| 381 | - } |
|
| 377 | + if ($sort_by == '') {
|
|
| 378 | + $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
| 379 | + if (!empty($default_sort)) |
|
| 380 | + $sort_by = $default_sort; |
|
| 381 | + } |
|
| 382 | 382 | |
| 383 | - /* |
|
| 383 | + /* |
|
| 384 | 384 | if search by term & no location then order always "relevance" |
| 385 | 385 | if search by location then order always "nearest" |
| 386 | 386 | */ |
| 387 | - if (is_main_query() && geodir_is_page('search')) {
|
|
| 388 | - $search_term = get_query_var('s');
|
|
| 387 | + if (is_main_query() && geodir_is_page('search')) {
|
|
| 388 | + $search_term = get_query_var('s');
|
|
| 389 | 389 | |
| 390 | - if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 391 | - $sort_by = 'az'; |
|
| 392 | - } |
|
| 390 | + if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 391 | + $sort_by = 'az'; |
|
| 392 | + } |
|
| 393 | 393 | |
| 394 | - if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | - $sort_by = 'nearest'; |
|
| 396 | - } |
|
| 397 | - } |
|
| 398 | - |
|
| 399 | - switch ($sort_by): |
|
| 400 | - case 'newest': |
|
| 401 | - $orderby = "$wpdb->posts.post_date desc, "; |
|
| 402 | - break; |
|
| 403 | - case 'oldest': |
|
| 404 | - $orderby = "$wpdb->posts.post_date asc, "; |
|
| 405 | - break; |
|
| 406 | - case 'low_review': |
|
| 407 | - case 'rating_count_asc': |
|
| 408 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 409 | - break; |
|
| 410 | - case 'high_review': |
|
| 411 | - case 'rating_count_desc': |
|
| 412 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 413 | - break; |
|
| 414 | - case 'low_rating': |
|
| 415 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 416 | - break; |
|
| 417 | - case 'high_rating': |
|
| 418 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 419 | - break; |
|
| 420 | - case 'featured': |
|
| 421 | - $orderby = $table . ".is_featured asc, "; |
|
| 422 | - break; |
|
| 423 | - case 'nearest': |
|
| 424 | - $orderby = " distance asc, "; |
|
| 425 | - break; |
|
| 426 | - case 'farthest': |
|
| 427 | - $orderby = " distance desc, "; |
|
| 428 | - break; |
|
| 429 | - case 'random': |
|
| 430 | - $orderby = " rand(), "; |
|
| 431 | - break; |
|
| 432 | - case 'az': |
|
| 433 | - $orderby = "$wpdb->posts.post_title asc, "; |
|
| 434 | - break; |
|
| 435 | - // sort by rating |
|
| 436 | - case 'overall_rating_desc': |
|
| 437 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 438 | - break; |
|
| 439 | - case 'overall_rating_asc': |
|
| 440 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 441 | - break; |
|
| 442 | - default: |
|
| 443 | - |
|
| 444 | - break; |
|
| 445 | - endswitch; |
|
| 446 | - |
|
| 447 | - if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {
|
|
| 448 | - if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {
|
|
| 449 | - $orderby = "$wpdb->posts.comment_count DESC, "; |
|
| 450 | - $sort_by = 'comment_count_desc'; |
|
| 451 | - } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {
|
|
| 452 | - $orderby = "$wpdb->posts.comment_count ASC, "; |
|
| 453 | - $sort_by = 'comment_count_asc'; |
|
| 454 | - } |
|
| 455 | - } |
|
| 394 | + if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | + $sort_by = 'nearest'; |
|
| 396 | + } |
|
| 397 | + } |
|
| 456 | 398 | |
| 457 | - global $s; |
|
| 399 | + switch ($sort_by): |
|
| 400 | + case 'newest': |
|
| 401 | + $orderby = "$wpdb->posts.post_date desc, "; |
|
| 402 | + break; |
|
| 403 | + case 'oldest': |
|
| 404 | + $orderby = "$wpdb->posts.post_date asc, "; |
|
| 405 | + break; |
|
| 406 | + case 'low_review': |
|
| 407 | + case 'rating_count_asc': |
|
| 408 | + $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 409 | + break; |
|
| 410 | + case 'high_review': |
|
| 411 | + case 'rating_count_desc': |
|
| 412 | + $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 413 | + break; |
|
| 414 | + case 'low_rating': |
|
| 415 | + $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 416 | + break; |
|
| 417 | + case 'high_rating': |
|
| 418 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 419 | + break; |
|
| 420 | + case 'featured': |
|
| 421 | + $orderby = $table . ".is_featured asc, "; |
|
| 422 | + break; |
|
| 423 | + case 'nearest': |
|
| 424 | + $orderby = " distance asc, "; |
|
| 425 | + break; |
|
| 426 | + case 'farthest': |
|
| 427 | + $orderby = " distance desc, "; |
|
| 428 | + break; |
|
| 429 | + case 'random': |
|
| 430 | + $orderby = " rand(), "; |
|
| 431 | + break; |
|
| 432 | + case 'az': |
|
| 433 | + $orderby = "$wpdb->posts.post_title asc, "; |
|
| 434 | + break; |
|
| 435 | + // sort by rating |
|
| 436 | + case 'overall_rating_desc': |
|
| 437 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 438 | + break; |
|
| 439 | + case 'overall_rating_asc': |
|
| 440 | + $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 441 | + break; |
|
| 442 | + default: |
|
| 443 | + |
|
| 444 | + break; |
|
| 445 | + endswitch; |
|
| 446 | + |
|
| 447 | + if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {
|
|
| 448 | + if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {
|
|
| 449 | + $orderby = "$wpdb->posts.comment_count DESC, "; |
|
| 450 | + $sort_by = 'comment_count_desc'; |
|
| 451 | + } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {
|
|
| 452 | + $orderby = "$wpdb->posts.comment_count ASC, "; |
|
| 453 | + $sort_by = 'comment_count_asc'; |
|
| 454 | + } |
|
| 455 | + } |
|
| 458 | 456 | |
| 459 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 460 | - $keywords = explode(" ", $s);
|
|
| 461 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 462 | - foreach($keywords as $kkey=>$kword){
|
|
| 463 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 464 | - unset($keywords[$kkey]); |
|
| 465 | - } |
|
| 466 | - } |
|
| 467 | - } |
|
| 468 | - if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 469 | - if (count($keywords) > 1) {
|
|
| 470 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 471 | - } else {
|
|
| 472 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 473 | - } |
|
| 474 | - } else {
|
|
| 475 | - if (count($keywords) > 1) {
|
|
| 476 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 477 | - } else {
|
|
| 478 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 479 | - } |
|
| 480 | - } |
|
| 481 | - } |
|
| 457 | + global $s; |
|
| 458 | + |
|
| 459 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 460 | + $keywords = explode(" ", $s);
|
|
| 461 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 462 | + foreach($keywords as $kkey=>$kword){
|
|
| 463 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 464 | + unset($keywords[$kkey]); |
|
| 465 | + } |
|
| 466 | + } |
|
| 467 | + } |
|
| 468 | + if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 469 | + if (count($keywords) > 1) {
|
|
| 470 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 471 | + } else {
|
|
| 472 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 473 | + } |
|
| 474 | + } else {
|
|
| 475 | + if (count($keywords) > 1) {
|
|
| 476 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 477 | + } else {
|
|
| 478 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 479 | + } |
|
| 480 | + } |
|
| 481 | + } |
|
| 482 | 482 | |
| 483 | - /** |
|
| 484 | - * Filter order by SQL. |
|
| 485 | - * |
|
| 486 | - * @since 1.0.0 |
|
| 487 | - * @param string $orderby The orderby query string. |
|
| 488 | - * @param string $sort_by Sortby query string. |
|
| 489 | - * @param string $table Listing table name. |
|
| 490 | - */ |
|
| 491 | - $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 483 | + /** |
|
| 484 | + * Filter order by SQL. |
|
| 485 | + * |
|
| 486 | + * @since 1.0.0 |
|
| 487 | + * @param string $orderby The orderby query string. |
|
| 488 | + * @param string $sort_by Sortby query string. |
|
| 489 | + * @param string $table Listing table name. |
|
| 490 | + */ |
|
| 491 | + $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 492 | 492 | |
| 493 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 493 | + $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 494 | 494 | |
| 495 | - return $orderby; |
|
| 495 | + return $orderby; |
|
| 496 | 496 | } |
| 497 | 497 | |
| 498 | 498 | |
@@ -510,78 +510,78 @@ discard block |
||
| 510 | 510 | function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table) |
| 511 | 511 | {
|
| 512 | 512 | |
| 513 | - global $wpdb; |
|
| 513 | + global $wpdb; |
|
| 514 | 514 | |
| 515 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 515 | + if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 516 | 516 | |
| 517 | - $sort_array = explode('_', $sort_by);
|
|
| 517 | + $sort_array = explode('_', $sort_by);
|
|
| 518 | 518 | |
| 519 | - $sort_by_count = count($sort_array); |
|
| 519 | + $sort_by_count = count($sort_array); |
|
| 520 | 520 | |
| 521 | - $order = $sort_array[$sort_by_count - 1]; |
|
| 521 | + $order = $sort_array[$sort_by_count - 1]; |
|
| 522 | 522 | |
| 523 | - if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 523 | + if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 524 | 524 | |
| 525 | - $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 525 | + $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 526 | 526 | |
| 527 | - switch ($sort_by): |
|
| 527 | + switch ($sort_by): |
|
| 528 | 528 | |
| 529 | - case 'post_date': |
|
| 530 | - case 'comment_count': |
|
| 529 | + case 'post_date': |
|
| 530 | + case 'comment_count': |
|
| 531 | 531 | |
| 532 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 533 | - break; |
|
| 532 | + $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 533 | + break; |
|
| 534 | 534 | |
| 535 | - case 'distance': |
|
| 536 | - $orderby = $sort_by . " " . $order . ", "; |
|
| 537 | - break; |
|
| 535 | + case 'distance': |
|
| 536 | + $orderby = $sort_by . " " . $order . ", "; |
|
| 537 | + break; |
|
| 538 | 538 | |
| 539 | 539 | |
| 540 | - // sort by rating |
|
| 541 | - case 'overall_rating': |
|
| 540 | + // sort by rating |
|
| 541 | + case 'overall_rating': |
|
| 542 | 542 | |
| 543 | - $use_bayesian = apply_filters('gd_use_bayesian',true,$table);
|
|
| 544 | - $avg_rating = 0; |
|
| 545 | - if($use_bayesian){
|
|
| 546 | - $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
| 547 | - if(!$avg_num_votes){
|
|
| 548 | - $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table");
|
|
| 549 | - if($avg_num_votes){
|
|
| 543 | + $use_bayesian = apply_filters('gd_use_bayesian',true,$table);
|
|
| 544 | + $avg_rating = 0; |
|
| 545 | + if($use_bayesian){
|
|
| 546 | + $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
| 547 | + if(!$avg_num_votes){
|
|
| 548 | + $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table");
|
|
| 549 | + if($avg_num_votes){
|
|
| 550 | 550 | |
| 551 | - $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
| 552 | - if(!$avg_rating){
|
|
| 553 | - $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes;
|
|
| 554 | - } |
|
| 555 | - set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
| 556 | - set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
| 557 | - } |
|
| 558 | - } |
|
| 551 | + $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
| 552 | + if(!$avg_rating){
|
|
| 553 | + $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes;
|
|
| 554 | + } |
|
| 555 | + set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
| 556 | + set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
| 557 | + } |
|
| 558 | + } |
|
| 559 | 559 | |
| 560 | - if(!$avg_num_votes){ $avg_num_votes = 0;}
|
|
| 560 | + if(!$avg_num_votes){ $avg_num_votes = 0;}
|
|
| 561 | 561 | |
| 562 | - $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , ";
|
|
| 562 | + $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , ";
|
|
| 563 | 563 | |
| 564 | - //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads
|
|
| 565 | - }else{
|
|
| 566 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 567 | - } |
|
| 564 | + //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads
|
|
| 565 | + }else{
|
|
| 566 | + $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 567 | + } |
|
| 568 | 568 | |
| 569 | - break; |
|
| 569 | + break; |
|
| 570 | 570 | |
| 571 | 571 | |
| 572 | - default: |
|
| 573 | - if (geodir_column_exist($table, $sort_by)) {
|
|
| 572 | + default: |
|
| 573 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 574 | 574 | $orderby = $table . "." . $sort_by . " " . $order . ", "; |
| 575 | 575 | } |
| 576 | - break; |
|
| 576 | + break; |
|
| 577 | 577 | |
| 578 | - endswitch; |
|
| 578 | + endswitch; |
|
| 579 | 579 | |
| 580 | - } |
|
| 580 | + } |
|
| 581 | 581 | |
| 582 | - } |
|
| 582 | + } |
|
| 583 | 583 | |
| 584 | - return $orderby; |
|
| 584 | + return $orderby; |
|
| 585 | 585 | } |
| 586 | 586 | |
| 587 | 587 | /** |
@@ -596,34 +596,34 @@ discard block |
||
| 596 | 596 | {
|
| 597 | 597 | |
| 598 | 598 | |
| 599 | - global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 599 | + global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 600 | 600 | |
| 601 | - if (!is_admin()) {
|
|
| 601 | + if (!is_admin()) {
|
|
| 602 | 602 | |
| 603 | - if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 604 | - add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 603 | + if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 604 | + add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 605 | 605 | |
| 606 | - } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 606 | + } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 607 | 607 | |
| 608 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 608 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 609 | 609 | |
| 610 | - if ($snear != '') |
|
| 611 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 610 | + if ($snear != '') |
|
| 611 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 612 | 612 | |
| 613 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 613 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 614 | 614 | |
| 615 | - } elseif (geodir_is_page('author')) {
|
|
| 615 | + } elseif (geodir_is_page('author')) {
|
|
| 616 | 616 | |
| 617 | - add_filter('posts_where', 'author_filter_where', 1);
|
|
| 617 | + add_filter('posts_where', 'author_filter_where', 1);
|
|
| 618 | 618 | |
| 619 | - } |
|
| 619 | + } |
|
| 620 | 620 | |
| 621 | - //if (!geodir_is_page('detail'))
|
|
| 622 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 621 | + //if (!geodir_is_page('detail'))
|
|
| 622 | + add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 623 | 623 | |
| 624 | - //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 624 | + //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 625 | 625 | |
| 626 | - } |
|
| 626 | + } |
|
| 627 | 627 | } |
| 628 | 628 | |
| 629 | 629 | /** |
@@ -638,13 +638,13 @@ discard block |
||
| 638 | 638 | */ |
| 639 | 639 | function geodir_preview_post_cap($allcaps, $caps, $args) |
| 640 | 640 | {
|
| 641 | - $user_id = get_current_user_id(); |
|
| 642 | - if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 641 | + $user_id = get_current_user_id(); |
|
| 642 | + if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 643 | 643 | |
| 644 | - $allcaps['edit_posts'] = true; |
|
| 645 | - } |
|
| 646 | - //print_r($allcaps); |
|
| 647 | - return $allcaps; |
|
| 644 | + $allcaps['edit_posts'] = true; |
|
| 645 | + } |
|
| 646 | + //print_r($allcaps); |
|
| 647 | + return $allcaps; |
|
| 648 | 648 | } |
| 649 | 649 | |
| 650 | 650 | |
@@ -659,9 +659,9 @@ discard block |
||
| 659 | 659 | */ |
| 660 | 660 | function geodir_edit_listing_where($where) |
| 661 | 661 | {
|
| 662 | - global $wpdb; |
|
| 663 | - $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 664 | - return $where; |
|
| 662 | + global $wpdb; |
|
| 663 | + $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 664 | + return $where; |
|
| 665 | 665 | } |
| 666 | 666 | |
| 667 | 667 | |
@@ -678,29 +678,29 @@ discard block |
||
| 678 | 678 | */ |
| 679 | 679 | function geodir_default_where($where) |
| 680 | 680 | {
|
| 681 | - global $wp_query, $wpdb; |
|
| 682 | - |
|
| 683 | - //print_r($wp_query); |
|
| 684 | - ########### WPML ########### |
|
| 685 | - |
|
| 686 | - if (geodir_is_wpml()) {
|
|
| 687 | - global $sitepress, $table_prefix; |
|
| 688 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 689 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 690 | - $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 691 | - //echo '##########'.$q_post_type; |
|
| 692 | - if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 693 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 694 | - //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 695 | - } |
|
| 681 | + global $wp_query, $wpdb; |
|
| 696 | 682 | |
| 697 | - } |
|
| 698 | - ########### WPML ########### |
|
| 683 | + //print_r($wp_query); |
|
| 684 | + ########### WPML ########### |
|
| 699 | 685 | |
| 686 | + if (geodir_is_wpml()) {
|
|
| 687 | + global $sitepress, $table_prefix; |
|
| 688 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 689 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 690 | + $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 691 | + //echo '##########'.$q_post_type; |
|
| 692 | + if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 693 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 694 | + //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 695 | + } |
|
| 700 | 696 | |
| 701 | - return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 697 | + } |
|
| 698 | + ########### WPML ########### |
|
| 699 | + |
|
| 700 | + |
|
| 701 | + return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 702 | 702 | |
| 703 | - /* ====== old code start === |
|
| 703 | + /* ====== old code start === |
|
| 704 | 704 | $where = str_replace("0 = 1", "1=1", $where);
|
| 705 | 705 | $country = get_query_var('gd_country');
|
| 706 | 706 | $region = get_query_var('gd_region');
|
@@ -741,92 +741,92 @@ discard block |
||
| 741 | 741 | * @return string Modified where query string. |
| 742 | 742 | */ |
| 743 | 743 | function searching_filter_where($where) {
|
| 744 | - global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 744 | + global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 745 | 745 | |
| 746 | - $search_term = 'OR'; |
|
| 747 | - $search_term = 'AND'; |
|
| 748 | - $geodir_custom_search = ''; |
|
| 749 | - $category_search_range = ''; |
|
| 746 | + $search_term = 'OR'; |
|
| 747 | + $search_term = 'AND'; |
|
| 748 | + $geodir_custom_search = ''; |
|
| 749 | + $category_search_range = ''; |
|
| 750 | 750 | |
| 751 | - if (is_single() && get_query_var('post_type')) {
|
|
| 751 | + if (is_single() && get_query_var('post_type')) {
|
|
| 752 | 752 | return $where; |
| 753 | 753 | } |
| 754 | 754 | |
| 755 | - if (is_tax()) {
|
|
| 755 | + if (is_tax()) {
|
|
| 756 | 756 | return $where; |
| 757 | 757 | } |
| 758 | 758 | |
| 759 | 759 | $s = trim($s); |
| 760 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 761 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 762 | - |
|
| 763 | - $where = ''; |
|
| 764 | - $better_search_terms = ''; |
|
| 765 | - if (isset($_REQUEST['stype'])) |
|
| 766 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 767 | - else |
|
| 768 | - $post_types = 'gd_place'; |
|
| 769 | - |
|
| 770 | - if ($s != '') {
|
|
| 771 | - $keywords = explode(" ", $s);
|
|
| 772 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 773 | - foreach($keywords as $kkey=>$kword){
|
|
| 774 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 775 | - unset($keywords[$kkey]); |
|
| 776 | - } |
|
| 777 | - } |
|
| 778 | - } |
|
| 760 | + $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 761 | + $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 762 | + |
|
| 763 | + $where = ''; |
|
| 764 | + $better_search_terms = ''; |
|
| 765 | + if (isset($_REQUEST['stype'])) |
|
| 766 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 767 | + else |
|
| 768 | + $post_types = 'gd_place'; |
|
| 779 | 769 | |
| 780 | - if (!empty($keywords)) {
|
|
| 781 | - foreach ($keywords as $keyword) {
|
|
| 782 | - $keyword = trim($keyword); |
|
| 783 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 784 | - if ($keyword != '') {
|
|
| 785 | - /** |
|
| 786 | - * Filter the search query keywords SQL. |
|
| 787 | - * |
|
| 788 | - * @since 1.5.9 |
|
| 789 | - * @package GeoDirectory |
|
| 790 | - * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
| 791 | - * @param array $keywords The array of keywords for the query. |
|
| 792 | - * @param string $keyword The single keyword being searched. |
|
| 793 | - */ |
|
| 770 | + if ($s != '') {
|
|
| 771 | + $keywords = explode(" ", $s);
|
|
| 772 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 773 | + foreach($keywords as $kkey=>$kword){
|
|
| 774 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 775 | + unset($keywords[$kkey]); |
|
| 776 | + } |
|
| 777 | + } |
|
| 778 | + } |
|
| 779 | + |
|
| 780 | + if (!empty($keywords)) {
|
|
| 781 | + foreach ($keywords as $keyword) {
|
|
| 782 | + $keyword = trim($keyword); |
|
| 783 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 784 | + if ($keyword != '') {
|
|
| 785 | + /** |
|
| 786 | + * Filter the search query keywords SQL. |
|
| 787 | + * |
|
| 788 | + * @since 1.5.9 |
|
| 789 | + * @package GeoDirectory |
|
| 790 | + * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
| 791 | + * @param array $keywords The array of keywords for the query. |
|
| 792 | + * @param string $keyword The single keyword being searched. |
|
| 793 | + */ |
|
| 794 | 794 | $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);
|
| 795 | - } |
|
| 796 | - } |
|
| 797 | - } |
|
| 798 | - } |
|
| 795 | + } |
|
| 796 | + } |
|
| 797 | + } |
|
| 798 | + } |
|
| 799 | 799 | |
| 800 | - /* get taxonomy */ |
|
| 801 | - $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 802 | - if($taxonomies) {
|
|
| 803 | - $taxonomies = implode("','", $taxonomies);
|
|
| 804 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 805 | - }else{$taxonomies='';}
|
|
| 800 | + /* get taxonomy */ |
|
| 801 | + $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 802 | + if($taxonomies) {
|
|
| 803 | + $taxonomies = implode("','", $taxonomies);
|
|
| 804 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 805 | + }else{$taxonomies='';}
|
|
| 806 | 806 | |
| 807 | - $content_where = $terms_where = ''; |
|
| 807 | + $content_where = $terms_where = ''; |
|
| 808 | 808 | if ($s != '') {
|
| 809 | - /** |
|
| 810 | - * Filter the search query content where values. |
|
| 811 | - * |
|
| 812 | - * @since 1.5.0 |
|
| 813 | - * @package GeoDirectory |
|
| 814 | - * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
| 815 | - */ |
|
| 809 | + /** |
|
| 810 | + * Filter the search query content where values. |
|
| 811 | + * |
|
| 812 | + * @since 1.5.0 |
|
| 813 | + * @package GeoDirectory |
|
| 814 | + * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
| 815 | + */ |
|
| 816 | 816 | $content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
| 817 | - /** |
|
| 818 | - * Filter the search query term values. |
|
| 819 | - * |
|
| 820 | - * @since 1.5.0 |
|
| 821 | - * @package GeoDirectory |
|
| 822 | - * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
| 823 | - */ |
|
| 824 | - $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 817 | + /** |
|
| 818 | + * Filter the search query term values. |
|
| 819 | + * |
|
| 820 | + * @since 1.5.0 |
|
| 821 | + * @package GeoDirectory |
|
| 822 | + * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
| 823 | + */ |
|
| 824 | + $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 825 | 825 | } |
| 826 | 826 | |
| 827 | 827 | |
| 828 | - // get term sql |
|
| 829 | - $term_sql = "SELECT $wpdb->term_taxonomy.term_id, $wpdb->terms.name, $wpdb->term_taxonomy.taxonomy |
|
| 828 | + // get term sql |
|
| 829 | + $term_sql = "SELECT $wpdb->term_taxonomy.term_id, $wpdb->terms.name, $wpdb->term_taxonomy.taxonomy |
|
| 830 | 830 | FROM $wpdb->term_taxonomy, $wpdb->terms, $wpdb->term_relationships |
| 831 | 831 | WHERE $wpdb->term_taxonomy.term_id = $wpdb->terms.term_id |
| 832 | 832 | AND $wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id |
@@ -834,45 +834,45 @@ discard block |
||
| 834 | 834 | $terms_where |
| 835 | 835 | GROUP BY $wpdb->term_taxonomy.term_id"; |
| 836 | 836 | |
| 837 | - $term_results = $wpdb->get_results($term_sql); |
|
| 838 | - $term_ids = array(); |
|
| 839 | - $terms_sql = ''; |
|
| 840 | - |
|
| 841 | - if(!empty($term_results)){
|
|
| 842 | - foreach($term_results as $term_id){
|
|
| 843 | - $term_ids[] = $term_id; |
|
| 844 | - } |
|
| 845 | - if (!empty($term_ids)) {
|
|
| 846 | - foreach($term_ids as $term){
|
|
| 847 | - if ($term->taxonomy == $post_types.'_tags') {
|
|
| 848 | - $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);
|
|
| 849 | - } else {
|
|
| 850 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
| 851 | - } |
|
| 852 | - } |
|
| 853 | - } |
|
| 854 | - } |
|
| 837 | + $term_results = $wpdb->get_results($term_sql); |
|
| 838 | + $term_ids = array(); |
|
| 839 | + $terms_sql = ''; |
|
| 840 | + |
|
| 841 | + if(!empty($term_results)){
|
|
| 842 | + foreach($term_results as $term_id){
|
|
| 843 | + $term_ids[] = $term_id; |
|
| 844 | + } |
|
| 845 | + if (!empty($term_ids)) {
|
|
| 846 | + foreach($term_ids as $term){
|
|
| 847 | + if ($term->taxonomy == $post_types.'_tags') {
|
|
| 848 | + $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);
|
|
| 849 | + } else {
|
|
| 850 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
| 851 | + } |
|
| 852 | + } |
|
| 853 | + } |
|
| 854 | + } |
|
| 855 | 855 | |
| 856 | 856 | |
| 857 | - if ($snear != '') {
|
|
| 857 | + if ($snear != '') {
|
|
| 858 | 858 | |
| 859 | 859 | |
| 860 | - if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 861 | - $dist = $gd_session->get('near_me_range');
|
|
| 862 | - } |
|
| 863 | - $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 864 | - $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 865 | - $lat1 = $mylat - ($dist / 69); |
|
| 866 | - $lat2 = $mylat + ($dist / 69); |
|
| 860 | + if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 861 | + $dist = $gd_session->get('near_me_range');
|
|
| 862 | + } |
|
| 863 | + $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 864 | + $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 865 | + $lat1 = $mylat - ($dist / 69); |
|
| 866 | + $lat2 = $mylat + ($dist / 69); |
|
| 867 | 867 | |
| 868 | - $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 869 | - $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 870 | - $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 871 | - $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 868 | + $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 869 | + $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 870 | + $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 871 | + $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 872 | 872 | |
| 873 | 873 | |
| 874 | 874 | |
| 875 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 875 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 876 | 876 | $content_where |
| 877 | 877 | $terms_sql |
| 878 | 878 | ) |
@@ -881,35 +881,35 @@ discard block |
||
| 881 | 881 | AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
| 882 | 882 | AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
| 883 | 883 | |
| 884 | - if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 885 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 886 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 887 | - } |
|
| 884 | + if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 885 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 886 | + $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 887 | + } |
|
| 888 | 888 | |
| 889 | - } else {
|
|
| 889 | + } else {
|
|
| 890 | 890 | |
| 891 | 891 | |
| 892 | 892 | |
| 893 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 893 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 894 | 894 | $content_where |
| 895 | 895 | $terms_sql |
| 896 | 896 | ) |
| 897 | 897 | |
| 898 | 898 | AND $wpdb->posts.post_type in ('$post_types')
|
| 899 | 899 | AND ($wpdb->posts.post_status = 'publish') "; |
| 900 | - } |
|
| 900 | + } |
|
| 901 | 901 | |
| 902 | 902 | ########### WPML ########### |
| 903 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 903 | + if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 904 | 904 | $lang_code = ICL_LANGUAGE_CODE; |
| 905 | 905 | |
| 906 | 906 | if ($lang_code && $post_types) {
|
| 907 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 908 | - } |
|
| 909 | - } |
|
| 910 | - ########### WPML ########### |
|
| 907 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 908 | + } |
|
| 909 | + } |
|
| 910 | + ########### WPML ########### |
|
| 911 | 911 | |
| 912 | - return $where; |
|
| 912 | + return $where; |
|
| 913 | 913 | } |
| 914 | 914 | |
| 915 | 915 | |
@@ -924,45 +924,45 @@ discard block |
||
| 924 | 924 | * @return string Modified where query string. |
| 925 | 925 | */ |
| 926 | 926 | function author_filter_where($where) {
|
| 927 | - global $wpdb, $geodir_post_type, $table, $curr; |
|
| 927 | + global $wpdb, $geodir_post_type, $table, $curr; |
|
| 928 | 928 | |
| 929 | - $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 930 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 929 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 930 | + $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 931 | 931 | |
| 932 | - if (isset($_REQUEST['stype'])) {
|
|
| 933 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 934 | - } else {
|
|
| 935 | - $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 936 | - } |
|
| 932 | + if (isset($_REQUEST['stype'])) {
|
|
| 933 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 934 | + } else {
|
|
| 935 | + $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 936 | + } |
|
| 937 | 937 | |
| 938 | - if ($user_id > 0) {
|
|
| 939 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 940 | - $user_fav_posts = geodir_get_user_favourites($user_id); |
|
| 941 | - $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 942 | - $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 943 | - } else |
|
| 944 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 945 | - |
|
| 946 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 947 | - $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 948 | - } else {
|
|
| 949 | - $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 950 | - } |
|
| 951 | - } else {
|
|
| 952 | - $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 953 | - } |
|
| 938 | + if ($user_id > 0) {
|
|
| 939 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 940 | + $user_fav_posts = geodir_get_user_favourites($user_id); |
|
| 941 | + $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 942 | + $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 943 | + } else |
|
| 944 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 945 | + |
|
| 946 | + if ($user_id == (int)get_current_user_id()) {
|
|
| 947 | + $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 948 | + } else {
|
|
| 949 | + $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 950 | + } |
|
| 951 | + } else {
|
|
| 952 | + $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 953 | + } |
|
| 954 | 954 | |
| 955 | - ########### WPML ########### |
|
| 956 | - if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 957 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 958 | - if ($lang_code) {
|
|
| 959 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 960 | - } |
|
| 955 | + ########### WPML ########### |
|
| 956 | + if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 957 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 958 | + if ($lang_code) {
|
|
| 959 | + $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 960 | + } |
|
| 961 | 961 | |
| 962 | - } |
|
| 963 | - ########### WPML ########### |
|
| 962 | + } |
|
| 963 | + ########### WPML ########### |
|
| 964 | 964 | |
| 965 | - return $where; |
|
| 965 | + return $where; |
|
| 966 | 966 | } |
| 967 | 967 | |
| 968 | 968 | /** |
@@ -977,11 +977,11 @@ discard block |
||
| 977 | 977 | */ |
| 978 | 978 | function geodir_filter_widget_join($join) |
| 979 | 979 | {
|
| 980 | - global $wp_query, $table; |
|
| 981 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 982 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 983 | - } |
|
| 984 | - return $join; |
|
| 980 | + global $wp_query, $table; |
|
| 981 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 982 | + $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 983 | + } |
|
| 984 | + return $join; |
|
| 985 | 985 | } |
| 986 | 986 | |
| 987 | 987 | /** |
@@ -996,43 +996,43 @@ discard block |
||
| 996 | 996 | */ |
| 997 | 997 | function geodir_filter_widget_where($where) |
| 998 | 998 | {
|
| 999 | - global $wp_query, $table; |
|
| 1000 | - if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 1001 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 1002 | - } |
|
| 1003 | - if (!empty($wp_query->query['show_special_only'])) {
|
|
| 1004 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 1005 | - } |
|
| 1006 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 1007 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 1008 | - } |
|
| 1009 | - if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 1010 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 1011 | - } |
|
| 1012 | - return $where; |
|
| 999 | + global $wp_query, $table; |
|
| 1000 | + if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 1001 | + $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 1002 | + } |
|
| 1003 | + if (!empty($wp_query->query['show_special_only'])) {
|
|
| 1004 | + $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 1005 | + } |
|
| 1006 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 1007 | + $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 1008 | + } |
|
| 1009 | + if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 1010 | + $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 1011 | + } |
|
| 1012 | + return $where; |
|
| 1013 | 1013 | } |
| 1014 | 1014 | |
| 1015 | 1015 | |
| 1016 | 1016 | function geodir_related_posts_fields($fields) {
|
| 1017 | - global $wp_query, $wpdb, $table, $post; |
|
| 1017 | + global $wp_query, $wpdb, $table, $post; |
|
| 1018 | 1018 | |
| 1019 | - $fields .= ", " . $table . ".* "; |
|
| 1019 | + $fields .= ", " . $table . ".* "; |
|
| 1020 | 1020 | |
| 1021 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 1021 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 1022 | 1022 | |
| 1023 | - $mylat = $post->post_latitude; |
|
| 1024 | - $mylon = $post->post_longitude; |
|
| 1023 | + $mylat = $post->post_latitude; |
|
| 1024 | + $mylon = $post->post_longitude; |
|
| 1025 | 1025 | |
| 1026 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 1027 | - return $fields; |
|
| 1026 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 1027 | + return $fields; |
|
| 1028 | 1028 | } |
| 1029 | 1029 | function geodir_related_posts_fields_filter($query) {
|
| 1030 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1031 | - && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1032 | - && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1033 | - ) {
|
|
| 1034 | - add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1035 | - } |
|
| 1030 | + if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1031 | + && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1032 | + && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1033 | + ) {
|
|
| 1034 | + add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1035 | + } |
|
| 1036 | 1036 | } |
| 1037 | 1037 | add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);
|
| 1038 | 1038 | |
@@ -1047,30 +1047,30 @@ discard block |
||
| 1047 | 1047 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1048 | 1048 | */ |
| 1049 | 1049 | function geodir_prepare_custom_sorting( $sorting, $table ) {
|
| 1050 | - $orderby = ''; |
|
| 1050 | + $orderby = ''; |
|
| 1051 | 1051 | |
| 1052 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1053 | - return $orderby; |
|
| 1054 | - } |
|
| 1052 | + if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1053 | + return $orderby; |
|
| 1054 | + } |
|
| 1055 | 1055 | |
| 1056 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1057 | - $sorting_array = explode( '_', $sorting ); |
|
| 1056 | + if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1057 | + $sorting_array = explode( '_', $sorting ); |
|
| 1058 | 1058 | |
| 1059 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1060 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1061 | - array_pop( $sorting_array ); |
|
| 1059 | + if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1060 | + $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1061 | + array_pop( $sorting_array ); |
|
| 1062 | 1062 | |
| 1063 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1064 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1063 | + if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1064 | + $sort_by = implode( '_', $sorting_array ); |
|
| 1065 | 1065 | |
| 1066 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1067 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1068 | - } |
|
| 1069 | - } |
|
| 1070 | - } |
|
| 1071 | - } |
|
| 1066 | + if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1067 | + $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1068 | + } |
|
| 1069 | + } |
|
| 1070 | + } |
|
| 1071 | + } |
|
| 1072 | 1072 | |
| 1073 | - return $orderby; |
|
| 1073 | + return $orderby; |
|
| 1074 | 1074 | } |
| 1075 | 1075 | |
| 1076 | 1076 | /** |
@@ -1090,21 +1090,21 @@ discard block |
||
| 1090 | 1090 | * @return string Modified fields SQL. |
| 1091 | 1091 | */ |
| 1092 | 1092 | function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) {
|
| 1093 | - global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
| 1093 | + global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
| 1094 | 1094 | |
| 1095 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1096 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1095 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1096 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1097 | 1097 | |
| 1098 | - if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1099 | - $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1100 | - $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1101 | - $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1098 | + if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1099 | + $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1100 | + $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1101 | + $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1102 | 1102 | |
| 1103 | - $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude );
|
|
| 1104 | - } |
|
| 1105 | - } |
|
| 1103 | + $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude );
|
|
| 1104 | + } |
|
| 1105 | + } |
|
| 1106 | 1106 | |
| 1107 | - return $fields; |
|
| 1107 | + return $fields; |
|
| 1108 | 1108 | } |
| 1109 | 1109 | |
| 1110 | 1110 | /** |
@@ -1123,17 +1123,17 @@ discard block |
||
| 1123 | 1123 | * @return string Modified fields SQL. |
| 1124 | 1124 | */ |
| 1125 | 1125 | function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) {
|
| 1126 | - global $gd_query_args_widgets, $snear, $gd_session; |
|
| 1126 | + global $gd_query_args_widgets, $snear, $gd_session; |
|
| 1127 | 1127 | |
| 1128 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1129 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1128 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1129 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1130 | 1130 | |
| 1131 | - if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1132 | - $orderby = "distance ASC, " . $orderby; |
|
| 1133 | - } |
|
| 1134 | - } |
|
| 1131 | + if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1132 | + $orderby = "distance ASC, " . $orderby; |
|
| 1133 | + } |
|
| 1134 | + } |
|
| 1135 | 1135 | |
| 1136 | - return $orderby; |
|
| 1136 | + return $orderby; |
|
| 1137 | 1137 | } |
| 1138 | 1138 | |
| 1139 | 1139 | /** |
@@ -1144,23 +1144,23 @@ discard block |
||
| 1144 | 1144 | * @return string Filtered url. |
| 1145 | 1145 | */ |
| 1146 | 1146 | function geodir_search_page_base_url() {
|
| 1147 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1148 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 1149 | - } |
|
| 1147 | + if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1148 | + remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 1149 | + } |
|
| 1150 | 1150 | |
| 1151 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {
|
|
| 1152 | - $url = icl_get_home_url(); |
|
| 1153 | - } else {
|
|
| 1154 | - $url = get_home_url(); |
|
| 1155 | - } |
|
| 1151 | + if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {
|
|
| 1152 | + $url = icl_get_home_url(); |
|
| 1153 | + } else {
|
|
| 1154 | + $url = get_home_url(); |
|
| 1155 | + } |
|
| 1156 | 1156 | |
| 1157 | - $url = trailingslashit( $url ); |
|
| 1157 | + $url = trailingslashit( $url ); |
|
| 1158 | 1158 | |
| 1159 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1160 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 1161 | - } |
|
| 1159 | + if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1160 | + add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 1161 | + } |
|
| 1162 | 1162 | |
| 1163 | - return apply_filters( 'geodir_search_page_base_url', $url ); |
|
| 1163 | + return apply_filters( 'geodir_search_page_base_url', $url ); |
|
| 1164 | 1164 | } |
| 1165 | 1165 | |
| 1166 | 1166 | /** |
@@ -1171,6 +1171,6 @@ discard block |
||
| 1171 | 1171 | function geodir_jetpack_fix_post_types_search(){
|
| 1172 | 1172 | if ( defined( 'JETPACK__VERSION' ) && ! empty( $_REQUEST['geodir_search'] ) ) {
|
| 1173 | 1173 | add_filter( 'jetpack_search_should_handle_query', '__return_false', 999, 1 ); |
| 1174 | - } |
|
| 1174 | + } |
|
| 1175 | 1175 | } |
| 1176 | 1176 | add_action( 'plugins_loaded','geodir_jetpack_fix_post_types_search', 10 ); |
| 1177 | 1177 | \ No newline at end of file |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @global string $s_A Extra parameters. |
| 66 | 66 | * @global string $s_SA Extra parameters. |
| 67 | 67 | */ |
| 68 | -function set_listing_request($query ) |
|
| 68 | +function set_listing_request($query) |
|
| 69 | 69 | {
|
| 70 | 70 | global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
| 71 | 71 | |
@@ -99,15 +99,15 @@ discard block |
||
| 99 | 99 | } // Distance |
| 100 | 100 | |
| 101 | 101 | if (isset($_REQUEST['sgeo_lat'])) {
|
| 102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 102 | + $mylat = (float) esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | 103 | } else {
|
| 104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
| 104 | + $mylat = (float) geodir_get_current_city_lat(); |
|
| 105 | 105 | } // Latitude |
| 106 | 106 | |
| 107 | 107 | if (isset($_REQUEST['sgeo_lon'])) {
|
| 108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 108 | + $mylon = (float) esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | 109 | } else {
|
| 110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
| 110 | + $mylon = (float) geodir_get_current_city_lng(); |
|
| 111 | 111 | } // Distance |
| 112 | 112 | |
| 113 | 113 | if (isset($_REQUEST['snear'])) {
|
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | if ($snear == 'NEAR ME') {
|
| 122 | 122 | $ip = $_SERVER['REMOTE_ADDR']; |
| 123 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 123 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip='.$ip));
|
|
| 124 | 124 | $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
| 125 | 125 | $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
| 126 | 126 | } |
@@ -130,9 +130,9 @@ discard block |
||
| 130 | 130 | $s_AA = str_replace(" ", "", $s);
|
| 131 | 131 | $s_A = explode(",", $s_AA);
|
| 132 | 132 | $s_A = implode('","', $s_A);
|
| 133 | - $s_A = '"' . $s_A . '"'; |
|
| 133 | + $s_A = '"'.$s_A.'"'; |
|
| 134 | 134 | } else {
|
| 135 | - $s_A = '"' . $s . '"'; |
|
| 135 | + $s_A = '"'.$s.'"'; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | if (strstr($s, ' ')) {
|
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | } |
| 194 | 194 | if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
| 195 | 195 | |
| 196 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 196 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
| 197 | 197 | |
| 198 | 198 | add_filter('posts_fields', 'geodir_posts_fields', 1);
|
| 199 | 199 | add_filter('posts_join', 'geodir_posts_join', 1);
|
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
| 234 | 234 | |
| 235 | 235 | // Filter-Location-Manager to add location table. |
| 236 | - $fields .= ", " . $table . ".* "; |
|
| 236 | + $fields .= ", ".$table.".* "; |
|
| 237 | 237 | |
| 238 | 238 | if ($snear != '' || $gd_session->get('all_near_me')) {
|
| 239 | 239 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
@@ -243,16 +243,16 @@ discard block |
||
| 243 | 243 | $mylon = $gd_session->get('user_lon');
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 246 | + $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | global $s; |
| 250 | 250 | if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
| 251 | 251 | $keywords = explode(" ", $s);
|
| 252 | 252 | |
| 253 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 254 | - foreach($keywords as $kkey=>$kword){
|
|
| 255 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 253 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 254 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 255 | + if (geodir_utf8_strlen($kword) <= $klimit) {
|
|
| 256 | 256 | unset($keywords[$kkey]); |
| 257 | 257 | } |
| 258 | 258 | } |
@@ -270,24 +270,24 @@ discard block |
||
| 270 | 270 | $count = 0; |
| 271 | 271 | foreach ($keywords as $keyword) {
|
| 272 | 272 | $keyword = trim($keyword); |
| 273 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 273 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
| 274 | 274 | $count++; |
| 275 | 275 | if ($count < count($keywords)) {
|
| 276 | 276 | // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
| 277 | - $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
|
| 277 | + $gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ".$key." "; |
|
| 278 | 278 | } else {
|
| 279 | 279 | //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
| 280 | - $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
|
| 280 | + $gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) "; |
|
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 283 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS ".$part.","; |
|
| 284 | 284 | } |
| 285 | 285 | } else {
|
| 286 | 286 | $gd_titlematch_part = ""; |
| 287 | 287 | } |
| 288 | - $s = stripslashes_deep( $s ); |
|
| 289 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 290 | - $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));
|
|
| 288 | + $s = stripslashes_deep($s); |
|
| 289 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
| 290 | + $fields .= $wpdb->prepare(", CASE WHEN ".$table.".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN ".$wpdb->posts.".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle,".$gd_titlematch_part." CASE WHEN ( ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s.'%', '% '.$s.'%', $s, $s.' %', '% '.$s.' %', '% '.$s));
|
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | return $fields; |
@@ -311,18 +311,18 @@ discard block |
||
| 311 | 311 | |
| 312 | 312 | ########### WPML ########### |
| 313 | 313 | |
| 314 | - if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 314 | + if (geodir_wpml_is_post_type_translated($geodir_post_type)) {
|
|
| 315 | 315 | global $sitepress; |
| 316 | 316 | $lang_code = ICL_LANGUAGE_CODE; |
| 317 | 317 | $default_lang_code = $sitepress->get_default_language(); |
| 318 | 318 | if ($lang_code) {
|
| 319 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 319 | + $join .= "JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | } |
| 323 | 323 | ########### WPML ########### |
| 324 | 324 | |
| 325 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 325 | + $join .= " INNER JOIN ".$table." ON (".$table.".post_id = $wpdb->posts.ID) ";
|
|
| 326 | 326 | //===old code start |
| 327 | 327 | //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
| 328 | 328 | |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | $sort_by = 'az'; |
| 392 | 392 | } |
| 393 | 393 | |
| 394 | - if ($snear != '' && $sort_by!='farthest') {
|
|
| 394 | + if ($snear != '' && $sort_by != 'farthest') {
|
|
| 395 | 395 | $sort_by = 'nearest'; |
| 396 | 396 | } |
| 397 | 397 | } |
@@ -405,20 +405,20 @@ discard block |
||
| 405 | 405 | break; |
| 406 | 406 | case 'low_review': |
| 407 | 407 | case 'rating_count_asc': |
| 408 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 408 | + $orderby = $table.".rating_count ASC, ".$table.".overall_rating ASC, "; |
|
| 409 | 409 | break; |
| 410 | 410 | case 'high_review': |
| 411 | 411 | case 'rating_count_desc': |
| 412 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 412 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 413 | 413 | break; |
| 414 | 414 | case 'low_rating': |
| 415 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 415 | + $orderby = "( ".$table.".overall_rating ) ASC, ".$table.".rating_count ASC, "; |
|
| 416 | 416 | break; |
| 417 | 417 | case 'high_rating': |
| 418 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 418 | + $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, "; |
|
| 419 | 419 | break; |
| 420 | 420 | case 'featured': |
| 421 | - $orderby = $table . ".is_featured asc, "; |
|
| 421 | + $orderby = $table.".is_featured asc, "; |
|
| 422 | 422 | break; |
| 423 | 423 | case 'nearest': |
| 424 | 424 | $orderby = " distance asc, "; |
@@ -434,10 +434,10 @@ discard block |
||
| 434 | 434 | break; |
| 435 | 435 | // sort by rating |
| 436 | 436 | case 'overall_rating_desc': |
| 437 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 437 | + $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, "; |
|
| 438 | 438 | break; |
| 439 | 439 | case 'overall_rating_asc': |
| 440 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 440 | + $orderby = " ".$table.".overall_rating ASC, ".$table.".rating_count ASC, "; |
|
| 441 | 441 | break; |
| 442 | 442 | default: |
| 443 | 443 | |
@@ -458,24 +458,24 @@ discard block |
||
| 458 | 458 | |
| 459 | 459 | if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
| 460 | 460 | $keywords = explode(" ", $s);
|
| 461 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 462 | - foreach($keywords as $kkey=>$kword){
|
|
| 463 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 461 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 462 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 463 | + if (geodir_utf8_strlen($kword) <= $klimit) {
|
|
| 464 | 464 | unset($keywords[$kkey]); |
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | } |
| 468 | 468 | if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
| 469 | 469 | if (count($keywords) > 1) {
|
| 470 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 470 | + $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 471 | 471 | } else {
|
| 472 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 472 | + $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 473 | 473 | } |
| 474 | 474 | } else {
|
| 475 | 475 | if (count($keywords) > 1) {
|
| 476 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 476 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ".$orderby; |
|
| 477 | 477 | } else {
|
| 478 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 478 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ".$orderby; |
|
| 479 | 479 | } |
| 480 | 480 | } |
| 481 | 481 | } |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | */ |
| 491 | 491 | $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
| 492 | 492 | |
| 493 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 493 | + $orderby .= $table.".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 494 | 494 | |
| 495 | 495 | return $orderby; |
| 496 | 496 | } |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | |
| 513 | 513 | global $wpdb; |
| 514 | 514 | |
| 515 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 515 | + if ($sort_by != '' && (!is_search() || (isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear'] == '' && ($_REQUEST['s'] == '' || $_REQUEST['s'] == ' ')))) {
|
|
| 516 | 516 | |
| 517 | 517 | $sort_array = explode('_', $sort_by);
|
| 518 | 518 | |
@@ -522,48 +522,48 @@ discard block |
||
| 522 | 522 | |
| 523 | 523 | if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
| 524 | 524 | |
| 525 | - $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 525 | + $sort_by = str_replace('_'.$order, '', $sort_by);
|
|
| 526 | 526 | |
| 527 | 527 | switch ($sort_by): |
| 528 | 528 | |
| 529 | 529 | case 'post_date': |
| 530 | 530 | case 'comment_count': |
| 531 | 531 | |
| 532 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 532 | + $orderby = "$wpdb->posts.".$sort_by." ".$order.", ".$table.".overall_rating ".$order.", "; |
|
| 533 | 533 | break; |
| 534 | 534 | |
| 535 | 535 | case 'distance': |
| 536 | - $orderby = $sort_by . " " . $order . ", "; |
|
| 536 | + $orderby = $sort_by." ".$order.", "; |
|
| 537 | 537 | break; |
| 538 | 538 | |
| 539 | 539 | |
| 540 | 540 | // sort by rating |
| 541 | 541 | case 'overall_rating': |
| 542 | 542 | |
| 543 | - $use_bayesian = apply_filters('gd_use_bayesian',true,$table);
|
|
| 543 | + $use_bayesian = apply_filters('gd_use_bayesian', true, $table);
|
|
| 544 | 544 | $avg_rating = 0; |
| 545 | - if($use_bayesian){
|
|
| 546 | - $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
| 547 | - if(!$avg_num_votes){
|
|
| 545 | + if ($use_bayesian) {
|
|
| 546 | + $avg_num_votes = get_transient('gd_avg_num_votes_'.$table);
|
|
| 547 | + if (!$avg_num_votes) {
|
|
| 548 | 548 | $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table");
|
| 549 | - if($avg_num_votes){
|
|
| 549 | + if ($avg_num_votes) {
|
|
| 550 | 550 | |
| 551 | - $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
| 552 | - if(!$avg_rating){
|
|
| 553 | - $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes;
|
|
| 551 | + $avg_rating = get_transient('gd_avg_rating_'.$table);
|
|
| 552 | + if (!$avg_rating) {
|
|
| 553 | + $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table") / $avg_num_votes;
|
|
| 554 | 554 | } |
| 555 | - set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
| 556 | - set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
| 555 | + set_transient('gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS);
|
|
| 556 | + set_transient('gd_avg_rating_'.$table, $avg_rating, 12 * HOUR_IN_SECONDS);
|
|
| 557 | 557 | } |
| 558 | 558 | } |
| 559 | 559 | |
| 560 | - if(!$avg_num_votes){ $avg_num_votes = 0;}
|
|
| 560 | + if (!$avg_num_votes) { $avg_num_votes = 0; }
|
|
| 561 | 561 | |
| 562 | - $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , ";
|
|
| 562 | + $orderby = " (( $avg_num_votes * $avg_rating ) + (".$table.".rating_count * ".$table.".overall_rating )) / ( $avg_num_votes + ".$table.".rating_count ) $order , ";
|
|
| 563 | 563 | |
| 564 | 564 | //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads
|
| 565 | - }else{
|
|
| 566 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 565 | + } else {
|
|
| 566 | + $orderby = " ".$table.".".$sort_by." ".$order.", ".$table.".rating_count ".$order.", "; |
|
| 567 | 567 | } |
| 568 | 568 | |
| 569 | 569 | break; |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | |
| 572 | 572 | default: |
| 573 | 573 | if (geodir_column_exist($table, $sort_by)) {
|
| 574 | - $orderby = $table . "." . $sort_by . " " . $order . ", "; |
|
| 574 | + $orderby = $table.".".$sort_by." ".$order.", "; |
|
| 575 | 575 | } |
| 576 | 576 | break; |
| 577 | 577 | |
@@ -619,7 +619,7 @@ discard block |
||
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | //if (!geodir_is_page('detail'))
|
| 622 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 622 | + add_filter('posts_where', 'geodir_default_where', 1); /**/
|
|
| 623 | 623 | |
| 624 | 624 | //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
| 625 | 625 | |
@@ -690,7 +690,7 @@ discard block |
||
| 690 | 690 | $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
| 691 | 691 | //echo '##########'.$q_post_type; |
| 692 | 692 | if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
| 693 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 693 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') ";
|
|
| 694 | 694 | //$where .= " AND icl_t.language_code = '$lang_code' "; |
| 695 | 695 | } |
| 696 | 696 | |
@@ -757,8 +757,8 @@ discard block |
||
| 757 | 757 | } |
| 758 | 758 | |
| 759 | 759 | $s = trim($s); |
| 760 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 761 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 760 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
| 761 | + $s_A = wp_specialchars_decode($s_A, ENT_QUOTES); |
|
| 762 | 762 | |
| 763 | 763 | $where = ''; |
| 764 | 764 | $better_search_terms = ''; |
@@ -769,9 +769,9 @@ discard block |
||
| 769 | 769 | |
| 770 | 770 | if ($s != '') {
|
| 771 | 771 | $keywords = explode(" ", $s);
|
| 772 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 773 | - foreach($keywords as $kkey=>$kword){
|
|
| 774 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 772 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 773 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 774 | + if (geodir_utf8_strlen($kword) <= $klimit) {
|
|
| 775 | 775 | unset($keywords[$kkey]); |
| 776 | 776 | } |
| 777 | 777 | } |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | if (!empty($keywords)) {
|
| 781 | 781 | foreach ($keywords as $keyword) {
|
| 782 | 782 | $keyword = trim($keyword); |
| 783 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 783 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
| 784 | 784 | if ($keyword != '') {
|
| 785 | 785 | /** |
| 786 | 786 | * Filter the search query keywords SQL. |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | * @param array $keywords The array of keywords for the query. |
| 792 | 792 | * @param string $keyword The single keyword being searched. |
| 793 | 793 | */ |
| 794 | - $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);
|
|
| 794 | + $better_search_terms .= apply_filters("geodir_search_better_search_terms", ' OR ( '.$wpdb->posts.'.post_title LIKE "'.$keyword.'" OR '.$wpdb->posts.'.post_title LIKE "'.$keyword.'%" OR '.$wpdb->posts.'.post_title LIKE "% '.$keyword.'%" )', $keywords, $keyword);
|
|
| 795 | 795 | } |
| 796 | 796 | } |
| 797 | 797 | } |
@@ -799,10 +799,10 @@ discard block |
||
| 799 | 799 | |
| 800 | 800 | /* get taxonomy */ |
| 801 | 801 | $taxonomies = geodir_get_taxonomies($post_types, true); |
| 802 | - if($taxonomies) {
|
|
| 802 | + if ($taxonomies) {
|
|
| 803 | 803 | $taxonomies = implode("','", $taxonomies);
|
| 804 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 805 | - }else{$taxonomies='';}
|
|
| 804 | + $taxonomies = "'".$taxonomies."'"; |
|
| 805 | + } else {$taxonomies = ''; }
|
|
| 806 | 806 | |
| 807 | 807 | $content_where = $terms_where = ''; |
| 808 | 808 | if ($s != '') {
|
@@ -813,7 +813,7 @@ discard block |
||
| 813 | 813 | * @package GeoDirectory |
| 814 | 814 | * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
| 815 | 815 | */ |
| 816 | - $content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
|
| 816 | + $content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
|
| 817 | 817 | /** |
| 818 | 818 | * Filter the search query term values. |
| 819 | 819 | * |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | * @package GeoDirectory |
| 822 | 822 | * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
| 823 | 823 | */ |
| 824 | - $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 824 | + $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 825 | 825 | } |
| 826 | 826 | |
| 827 | 827 | |
@@ -838,16 +838,16 @@ discard block |
||
| 838 | 838 | $term_ids = array(); |
| 839 | 839 | $terms_sql = ''; |
| 840 | 840 | |
| 841 | - if(!empty($term_results)){
|
|
| 842 | - foreach($term_results as $term_id){
|
|
| 841 | + if (!empty($term_results)) {
|
|
| 842 | + foreach ($term_results as $term_id) {
|
|
| 843 | 843 | $term_ids[] = $term_id; |
| 844 | 844 | } |
| 845 | 845 | if (!empty($term_ids)) {
|
| 846 | - foreach($term_ids as $term){
|
|
| 846 | + foreach ($term_ids as $term) {
|
|
| 847 | 847 | if ($term->taxonomy == $post_types.'_tags') {
|
| 848 | - $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);
|
|
| 848 | + $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , ".$table.".post_tags) ", $term->name);
|
|
| 849 | 849 | } else {
|
| 850 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
| 850 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) "; |
|
| 851 | 851 | } |
| 852 | 852 | } |
| 853 | 853 | } |
@@ -878,12 +878,12 @@ discard block |
||
| 878 | 878 | ) |
| 879 | 879 | AND $wpdb->posts.post_type in ('{$post_types}')
|
| 880 | 880 | AND ($wpdb->posts.post_status = 'publish') |
| 881 | - AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
|
| 882 | - AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
|
| 881 | + AND ( ".$table.".post_latitude between $rlat1 and $rlat2 ) |
|
| 882 | + AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) "; |
|
| 883 | 883 | |
| 884 | 884 | if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
| 885 | 885 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
| 886 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 886 | + $where .= " AND CONVERT((".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= ".$dist;
|
|
| 887 | 887 | } |
| 888 | 888 | |
| 889 | 889 | } else {
|
@@ -900,11 +900,11 @@ discard block |
||
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | ########### WPML ########### |
| 903 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 903 | + if (geodir_wpml_is_post_type_translated($post_types)) {
|
|
| 904 | 904 | $lang_code = ICL_LANGUAGE_CODE; |
| 905 | 905 | |
| 906 | 906 | if ($lang_code && $post_types) {
|
| 907 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 907 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') ";
|
|
| 908 | 908 | } |
| 909 | 909 | } |
| 910 | 910 | ########### WPML ########### |
@@ -927,10 +927,10 @@ discard block |
||
| 927 | 927 | global $wpdb, $geodir_post_type, $table, $curr; |
| 928 | 928 | |
| 929 | 929 | $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
| 930 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 930 | + $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0; |
|
| 931 | 931 | |
| 932 | 932 | if (isset($_REQUEST['stype'])) {
|
| 933 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 933 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);
|
|
| 934 | 934 | } else {
|
| 935 | 935 | $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
| 936 | 936 | } |
@@ -943,7 +943,7 @@ discard block |
||
| 943 | 943 | } else |
| 944 | 944 | $where .= " AND $wpdb->posts.post_author = $user_id"; |
| 945 | 945 | |
| 946 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 946 | + if ($user_id == (int) get_current_user_id()) {
|
|
| 947 | 947 | $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
| 948 | 948 | } else {
|
| 949 | 949 | $where .= " AND $wpdb->posts.post_status = 'publish' "; |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
| 957 | 957 | $lang_code = ICL_LANGUAGE_CODE; |
| 958 | 958 | if ($lang_code) {
|
| 959 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 959 | + $where .= " AND icl_t.language_code='".$lang_code."' "; |
|
| 960 | 960 | } |
| 961 | 961 | |
| 962 | 962 | } |
@@ -979,7 +979,7 @@ discard block |
||
| 979 | 979 | {
|
| 980 | 980 | global $wp_query, $table; |
| 981 | 981 | if (!empty($wp_query->query['with_pics_only'])) {
|
| 982 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 982 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 983 | 983 | } |
| 984 | 984 | return $join; |
| 985 | 985 | } |
@@ -998,16 +998,16 @@ discard block |
||
| 998 | 998 | {
|
| 999 | 999 | global $wp_query, $table; |
| 1000 | 1000 | if (!empty($wp_query->query['show_featured_only'])) {
|
| 1001 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 1001 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 1002 | 1002 | } |
| 1003 | 1003 | if (!empty($wp_query->query['show_special_only'])) {
|
| 1004 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 1004 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 1005 | 1005 | } |
| 1006 | 1006 | if (!empty($wp_query->query['with_pics_only'])) {
|
| 1007 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 1007 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id"; |
|
| 1008 | 1008 | } |
| 1009 | 1009 | if (!empty($wp_query->query['with_videos_only'])) {
|
| 1010 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 1010 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 1011 | 1011 | } |
| 1012 | 1012 | return $where; |
| 1013 | 1013 | } |
@@ -1016,18 +1016,18 @@ discard block |
||
| 1016 | 1016 | function geodir_related_posts_fields($fields) {
|
| 1017 | 1017 | global $wp_query, $wpdb, $table, $post; |
| 1018 | 1018 | |
| 1019 | - $fields .= ", " . $table . ".* "; |
|
| 1019 | + $fields .= ", ".$table.".* "; |
|
| 1020 | 1020 | |
| 1021 | 1021 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
| 1022 | 1022 | |
| 1023 | 1023 | $mylat = $post->post_latitude; |
| 1024 | 1024 | $mylon = $post->post_longitude; |
| 1025 | 1025 | |
| 1026 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 1026 | + $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 1027 | 1027 | return $fields; |
| 1028 | 1028 | } |
| 1029 | 1029 | function geodir_related_posts_fields_filter($query) {
|
| 1030 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1030 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1031 | 1031 | && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
| 1032 | 1032 | && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
| 1033 | 1033 | ) {
|
@@ -1046,25 +1046,25 @@ discard block |
||
| 1046 | 1046 | * @param string $table Listing table name. |
| 1047 | 1047 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1048 | 1048 | */ |
| 1049 | -function geodir_prepare_custom_sorting( $sorting, $table ) {
|
|
| 1049 | +function geodir_prepare_custom_sorting($sorting, $table) {
|
|
| 1050 | 1050 | $orderby = ''; |
| 1051 | 1051 | |
| 1052 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1052 | + if (empty($sorting) || empty($table)) {
|
|
| 1053 | 1053 | return $orderby; |
| 1054 | 1054 | } |
| 1055 | 1055 | |
| 1056 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1057 | - $sorting_array = explode( '_', $sorting ); |
|
| 1056 | + if (strpos(strtoupper($sorting), '_ASC') !== false || strpos(strtoupper($sorting), '_DESC') !== false) {
|
|
| 1057 | + $sorting_array = explode('_', $sorting);
|
|
| 1058 | 1058 | |
| 1059 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1060 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1061 | - array_pop( $sorting_array ); |
|
| 1059 | + if (($count = count($sorting_array)) > 1) {
|
|
| 1060 | + $order = !empty($sorting_array[$count - 1]) ? strtoupper($sorting_array[$count - 1]) : ''; |
|
| 1061 | + array_pop($sorting_array); |
|
| 1062 | 1062 | |
| 1063 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1064 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1063 | + if (!empty($sorting_array) && ($order == 'ASC' || $order == 'DESC')) {
|
|
| 1064 | + $sort_by = implode('_', $sorting_array);
|
|
| 1065 | 1065 | |
| 1066 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1067 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1066 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 1067 | + $orderby = $table.".".$sort_by." ".$order; |
|
| 1068 | 1068 | } |
| 1069 | 1069 | } |
| 1070 | 1070 | } |
@@ -1089,18 +1089,18 @@ discard block |
||
| 1089 | 1089 | * |
| 1090 | 1090 | * @return string Modified fields SQL. |
| 1091 | 1091 | */ |
| 1092 | -function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) {
|
|
| 1092 | +function geodir_search_widget_location_filter_fields($fields, $table, $post_type) {
|
|
| 1093 | 1093 | global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
| 1094 | 1094 | |
| 1095 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1096 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1095 | + if (!empty($gd_query_args_widgets['gd_location']) && geodir_is_page('search') && !empty($_REQUEST['sgeo_lat']) && !empty($_REQUEST['sgeo_lon'])) {
|
|
| 1096 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 1097 | 1097 | |
| 1098 | - if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1099 | - $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1100 | - $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1101 | - $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1098 | + if ($location_allowed && strpos(strtolower($fields), ' as distance ') === false && ($snear != '' || $gd_session->get('all_near_me'))) {
|
|
| 1099 | + $latitude = sanitize_text_field($_REQUEST['sgeo_lat']); |
|
| 1100 | + $longitude = sanitize_text_field($_REQUEST['sgeo_lon']); |
|
| 1101 | + $radius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 1102 | 1102 | |
| 1103 | - $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude );
|
|
| 1103 | + $fields .= $wpdb->prepare(", (".$radius." * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(".$table.".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(".$table.".post_latitude) * PI() / 180) * POWER(SIN((%s - ".$table.".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude);
|
|
| 1104 | 1104 | } |
| 1105 | 1105 | } |
| 1106 | 1106 | |
@@ -1122,14 +1122,14 @@ discard block |
||
| 1122 | 1122 | * |
| 1123 | 1123 | * @return string Modified fields SQL. |
| 1124 | 1124 | */ |
| 1125 | -function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) {
|
|
| 1125 | +function geodir_search_widget_location_filter_orderby($orderby, $table, $post_type) {
|
|
| 1126 | 1126 | global $gd_query_args_widgets, $snear, $gd_session; |
| 1127 | 1127 | |
| 1128 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1129 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1128 | + if (!empty($gd_query_args_widgets['gd_location']) && geodir_is_page('search') && !empty($_REQUEST['sgeo_lat']) && !empty($_REQUEST['sgeo_lon'])) {
|
|
| 1129 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 1130 | 1130 | |
| 1131 | - if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1132 | - $orderby = "distance ASC, " . $orderby; |
|
| 1131 | + if ($location_allowed && ($snear != '' || $gd_session->get('all_near_me'))) {
|
|
| 1132 | + $orderby = "distance ASC, ".$orderby; |
|
| 1133 | 1133 | } |
| 1134 | 1134 | } |
| 1135 | 1135 | |
@@ -1144,23 +1144,23 @@ discard block |
||
| 1144 | 1144 | * @return string Filtered url. |
| 1145 | 1145 | */ |
| 1146 | 1146 | function geodir_search_page_base_url() {
|
| 1147 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1148 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 1147 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1148 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1149 | 1149 | } |
| 1150 | 1150 | |
| 1151 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {
|
|
| 1151 | + if (defined('DOING_AJAX') && DOING_AJAX && geodir_is_wpml()) {
|
|
| 1152 | 1152 | $url = icl_get_home_url(); |
| 1153 | 1153 | } else {
|
| 1154 | 1154 | $url = get_home_url(); |
| 1155 | 1155 | } |
| 1156 | 1156 | |
| 1157 | - $url = trailingslashit( $url ); |
|
| 1157 | + $url = trailingslashit($url); |
|
| 1158 | 1158 | |
| 1159 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1160 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 1159 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1160 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1161 | 1161 | } |
| 1162 | 1162 | |
| 1163 | - return apply_filters( 'geodir_search_page_base_url', $url ); |
|
| 1163 | + return apply_filters('geodir_search_page_base_url', $url);
|
|
| 1164 | 1164 | } |
| 1165 | 1165 | |
| 1166 | 1166 | /** |
@@ -1168,9 +1168,9 @@ discard block |
||
| 1168 | 1168 | * |
| 1169 | 1169 | * @since 1.6.31 |
| 1170 | 1170 | */ |
| 1171 | -function geodir_jetpack_fix_post_types_search(){
|
|
| 1172 | - if ( defined( 'JETPACK__VERSION' ) && ! empty( $_REQUEST['geodir_search'] ) ) {
|
|
| 1173 | - add_filter( 'jetpack_search_should_handle_query', '__return_false', 999, 1 ); |
|
| 1171 | +function geodir_jetpack_fix_post_types_search() {
|
|
| 1172 | + if (defined('JETPACK__VERSION') && !empty($_REQUEST['geodir_search'])) {
|
|
| 1173 | + add_filter('jetpack_search_should_handle_query', '__return_false', 999, 1);
|
|
| 1174 | 1174 | } |
| 1175 | 1175 | } |
| 1176 | -add_action( 'plugins_loaded','geodir_jetpack_fix_post_types_search', 10 ); |
|
| 1177 | 1176 | \ No newline at end of file |
| 1177 | +add_action('plugins_loaded', 'geodir_jetpack_fix_post_types_search', 10); |
|
| 1178 | 1178 | \ No newline at end of file |
