GeoDirectory /
geodirectory
@@ -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,95 +745,95 @@ 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_friend' ) {
|
|
| 756 | - $subject = get_option( 'geodir_email_friend_subject' ); |
|
| 757 | - $message = get_option( 'geodir_email_friend_content' ); |
|
| 758 | - } elseif ( $message_type == 'send_enquiry' ) {
|
|
| 759 | - $subject = get_option( 'geodir_email_enquiry_subject' ); |
|
| 760 | - $message = get_option( 'geodir_email_enquiry_content' ); |
|
| 755 | + if ($message_type == 'send_friend') {
|
|
| 756 | + $subject = get_option('geodir_email_friend_subject');
|
|
| 757 | + $message = get_option('geodir_email_friend_content');
|
|
| 758 | + } elseif ($message_type == 'send_enquiry') {
|
|
| 759 | + $subject = get_option('geodir_email_enquiry_subject');
|
|
| 760 | + $message = get_option('geodir_email_enquiry_content');
|
|
| 761 | 761 | |
| 762 | 762 | // change to name in some cases |
| 763 | - $post_author = get_post_field( 'post_author', $post_id ); |
|
| 764 | - if(is_super_admin( $post_author )){// if admin probably not the post author so change name
|
|
| 765 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 766 | - }elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed
|
|
| 767 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 763 | + $post_author = get_post_field('post_author', $post_id);
|
|
| 764 | + if (is_super_admin($post_author)) {// if admin probably not the post author so change name
|
|
| 765 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 766 | + }elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed
|
|
| 767 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 768 | 768 | } |
| 769 | 769 | |
| 770 | 770 | |
| 771 | - } elseif ( $message_type == 'forgot_password' ) {
|
|
| 772 | - $subject = get_option( 'geodir_forgot_password_subject' ); |
|
| 773 | - $message = get_option( 'geodir_forgot_password_content' ); |
|
| 771 | + } elseif ($message_type == 'forgot_password') {
|
|
| 772 | + $subject = get_option('geodir_forgot_password_subject');
|
|
| 773 | + $message = get_option('geodir_forgot_password_content');
|
|
| 774 | 774 | $login_details = $to_message; |
| 775 | - } elseif ( $message_type == 'registration' ) {
|
|
| 776 | - $subject = get_option( 'geodir_registration_success_email_subject' ); |
|
| 777 | - $message = get_option( 'geodir_registration_success_email_content' ); |
|
| 775 | + } elseif ($message_type == 'registration') {
|
|
| 776 | + $subject = get_option('geodir_registration_success_email_subject');
|
|
| 777 | + $message = get_option('geodir_registration_success_email_content');
|
|
| 778 | 778 | $login_details = $to_message; |
| 779 | - } elseif ( $message_type == 'post_submit' ) {
|
|
| 780 | - $subject = get_option( 'geodir_post_submited_success_email_subject' ); |
|
| 781 | - $message = get_option( 'geodir_post_submited_success_email_content' ); |
|
| 782 | - } elseif ( $message_type == 'listing_published' ) {
|
|
| 783 | - $subject = get_option( 'geodir_post_published_email_subject' ); |
|
| 784 | - $message = get_option( 'geodir_post_published_email_content' ); |
|
| 785 | - } elseif ( $message_type == 'listing_edited' ) {
|
|
| 786 | - $subject = get_option( 'geodir_post_edited_email_subject_admin' ); |
|
| 787 | - $message = get_option( 'geodir_post_edited_email_content_admin' ); |
|
| 779 | + } elseif ($message_type == 'post_submit') {
|
|
| 780 | + $subject = get_option('geodir_post_submited_success_email_subject');
|
|
| 781 | + $message = get_option('geodir_post_submited_success_email_content');
|
|
| 782 | + } elseif ($message_type == 'listing_published') {
|
|
| 783 | + $subject = get_option('geodir_post_published_email_subject');
|
|
| 784 | + $message = get_option('geodir_post_published_email_content');
|
|
| 785 | + } elseif ($message_type == 'listing_edited') {
|
|
| 786 | + $subject = get_option('geodir_post_edited_email_subject_admin');
|
|
| 787 | + $message = get_option('geodir_post_edited_email_content_admin');
|
|
| 788 | 788 | } |
| 789 | 789 | |
| 790 | - if ( ! empty( $subject ) ) {
|
|
| 791 | - $subject = __( stripslashes_deep( $subject ), 'geodirectory' ); |
|
| 790 | + if (!empty($subject)) {
|
|
| 791 | + $subject = __(stripslashes_deep($subject), 'geodirectory'); |
|
| 792 | 792 | } |
| 793 | 793 | |
| 794 | - if ( ! empty( $message ) ) {
|
|
| 795 | - $message = __( stripslashes_deep( $message ), 'geodirectory' ); |
|
| 794 | + if (!empty($message)) {
|
|
| 795 | + $message = __(stripslashes_deep($message), 'geodirectory'); |
|
| 796 | 796 | } |
| 797 | 797 | |
| 798 | - $to_message = nl2br( $to_message ); |
|
| 799 | - $sitefromEmail = get_option( 'site_email' ); |
|
| 798 | + $to_message = nl2br($to_message); |
|
| 799 | + $sitefromEmail = get_option('site_email');
|
|
| 800 | 800 | $sitefromEmailName = get_site_emailName(); |
| 801 | - $productlink = get_permalink( $post_id ); |
|
| 801 | + $productlink = get_permalink($post_id); |
|
| 802 | 802 | |
| 803 | 803 | $user_login = ''; |
| 804 | - if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {
|
|
| 804 | + if ($user_id > 0 && $user_info = get_userdata($user_id)) {
|
|
| 805 | 805 | $user_login = $user_info->user_login; |
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | $posted_date = ''; |
| 809 | 809 | $listingLink = ''; |
| 810 | 810 | |
| 811 | - $post_info = get_post( $post_id ); |
|
| 811 | + $post_info = get_post($post_id); |
|
| 812 | 812 | |
| 813 | - if ( $post_info ) {
|
|
| 813 | + if ($post_info) {
|
|
| 814 | 814 | $posted_date = $post_info->post_date; |
| 815 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 815 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 816 | 816 | } |
| 817 | 817 | $siteurl = home_url(); |
| 818 | - $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>'; |
|
| 818 | + $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>'; |
|
| 819 | 819 | $loginurl = geodir_login_url(); |
| 820 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 820 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 821 | 821 | |
| 822 | - $post_author_id = ! empty( $post_info ) ? $post_info->post_author : 0; |
|
| 823 | - $post_author_data = $post_author_id ? get_userdata( $post_author_id ) : NULL; |
|
| 824 | - $post_author_name = geodir_get_client_name( $post_author_id ); |
|
| 825 | - $post_author_email = !empty( $post_author_data->user_email ) ? $post_author_data->user_email : ''; |
|
| 826 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); |
|
| 827 | - |
|
| 828 | - if ( $fromEmail == '' ) {
|
|
| 829 | - $fromEmail = get_option( 'site_email' ); |
|
| 822 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; |
|
| 823 | + $post_author_data = $post_author_id ? get_userdata($post_author_id) : NULL; |
|
| 824 | + $post_author_name = geodir_get_client_name($post_author_id); |
|
| 825 | + $post_author_email = !empty($post_author_data->user_email) ? $post_author_data->user_email : ''; |
|
| 826 | + $current_date = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
|
|
| 827 | + |
|
| 828 | + if ($fromEmail == '') {
|
|
| 829 | + $fromEmail = get_option('site_email');
|
|
| 830 | 830 | } |
| 831 | 831 | |
| 832 | - if ( $fromEmailName == '' ) {
|
|
| 833 | - $fromEmailName = get_option( 'site_email_name' ); |
|
| 832 | + if ($fromEmailName == '') {
|
|
| 833 | + $fromEmailName = get_option('site_email_name');
|
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | - $search_array = array( |
|
| 836 | + $search_array = array( |
|
| 837 | 837 | '[#listing_link#]', |
| 838 | 838 | '[#site_name_url#]', |
| 839 | 839 | '[#post_id#]', |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | $post_author_email, |
| 876 | 876 | $current_date, |
| 877 | 877 | ); |
| 878 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 878 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 879 | 879 | |
| 880 | 880 | $search_array = array( |
| 881 | 881 | '[#listing_link#]', |
@@ -913,12 +913,12 @@ discard block |
||
| 913 | 913 | $post_author_email, |
| 914 | 914 | $current_date |
| 915 | 915 | ); |
| 916 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 916 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 917 | 917 | |
| 918 | - $headers = array(); |
|
| 918 | + $headers = array(); |
|
| 919 | 919 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 920 | - $headers[] = "Reply-To: " . $fromEmail; |
|
| 921 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; |
|
| 920 | + $headers[] = "Reply-To: ".$fromEmail; |
|
| 921 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; |
|
| 922 | 922 | |
| 923 | 923 | $to = $toEmail; |
| 924 | 924 | |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | * @param string $post_id The post ID. |
| 941 | 941 | * @param string $user_id The user ID. |
| 942 | 942 | */ |
| 943 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 943 | + $to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 944 | 944 | /** |
| 945 | 945 | * Filter the client email subject. |
| 946 | 946 | * |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | * @param string $post_id The post ID. |
| 960 | 960 | * @param string $user_id The user ID. |
| 961 | 961 | */ |
| 962 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 962 | + $subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 963 | 963 | /** |
| 964 | 964 | * Filter the client email message. |
| 965 | 965 | * |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | * @param string $post_id The post ID. |
| 979 | 979 | * @param string $user_id The user ID. |
| 980 | 980 | */ |
| 981 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 981 | + $message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 982 | 982 | /** |
| 983 | 983 | * Filter the client email headers. |
| 984 | 984 | * |
@@ -997,39 +997,39 @@ discard block |
||
| 997 | 997 | * @param string $post_id The post ID. |
| 998 | 998 | * @param string $user_id The user ID. |
| 999 | 999 | */ |
| 1000 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1000 | + $headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1001 | 1001 | |
| 1002 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1002 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1003 | 1003 | |
| 1004 | - if ( ! $sent ) {
|
|
| 1005 | - if ( is_array( $to ) ) {
|
|
| 1006 | - $to = implode( ',', $to ); |
|
| 1004 | + if (!$sent) {
|
|
| 1005 | + if (is_array($to)) {
|
|
| 1006 | + $to = implode(',', $to);
|
|
| 1007 | 1007 | } |
| 1008 | 1008 | $log_message = sprintf( |
| 1009 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1009 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1010 | 1010 | $message_type, |
| 1011 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1011 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1012 | 1012 | $to, |
| 1013 | 1013 | $subject |
| 1014 | 1014 | ); |
| 1015 | - geodir_error_log( $log_message ); |
|
| 1015 | + geodir_error_log($log_message); |
|
| 1016 | 1016 | } |
| 1017 | 1017 | |
| 1018 | 1018 | ///////// ADMIN BCC EMIALS |
| 1019 | - $adminEmail = get_bloginfo( 'admin_email' ); |
|
| 1019 | + $adminEmail = get_bloginfo('admin_email');
|
|
| 1020 | 1020 | $to = $adminEmail; |
| 1021 | 1021 | |
| 1022 | 1022 | $admin_bcc = false; |
| 1023 | - if ( $message_type == 'registration' ) {
|
|
| 1024 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); |
|
| 1025 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); |
|
| 1026 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; |
|
| 1023 | + if ($message_type == 'registration') {
|
|
| 1024 | + $message_raw = explode(__("Password:", 'geodirectory'), $message);
|
|
| 1025 | + $message_raw2 = explode("</p>", $message_raw[1], 2);
|
|
| 1026 | + $message = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
|
|
| 1027 | 1027 | } |
| 1028 | - if ( $message_type == 'post_submit' && ( get_option( 'geodir_notify_post_submit' ) || get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) ) {
|
|
| 1029 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); |
|
| 1030 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); |
|
| 1028 | + if ($message_type == 'post_submit' && (get_option('geodir_notify_post_submit') || get_option('geodir_notify_post_submit', '-1') == '-1')) {
|
|
| 1029 | + $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
|
|
| 1030 | + $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
|
|
| 1031 | 1031 | |
| 1032 | - $search_array = array( |
|
| 1032 | + $search_array = array( |
|
| 1033 | 1033 | '[#listing_link#]', |
| 1034 | 1034 | '[#site_name_url#]', |
| 1035 | 1035 | '[#post_id#]', |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | $user_login, |
| 1066 | 1066 | $post_author_email, |
| 1067 | 1067 | ); |
| 1068 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 1068 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 1069 | 1069 | |
| 1070 | 1070 | $search_array = array( |
| 1071 | 1071 | '[#listing_link#]', |
@@ -1097,26 +1097,26 @@ discard block |
||
| 1097 | 1097 | $user_login, |
| 1098 | 1098 | $post_author_email, |
| 1099 | 1099 | ); |
| 1100 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1100 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1101 | 1101 | |
| 1102 | 1102 | $subject .= ' - ADMIN BCC COPY'; |
| 1103 | 1103 | $admin_bcc = true; |
| 1104 | 1104 | |
| 1105 | - } elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
|
|
| 1105 | + } elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
|
|
| 1106 | 1106 | $subject .= ' - ADMIN BCC COPY'; |
| 1107 | 1107 | $admin_bcc = true; |
| 1108 | - } elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {
|
|
| 1108 | + } elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {
|
|
| 1109 | 1109 | $subject .= ' - ADMIN BCC COPY'; |
| 1110 | 1110 | $admin_bcc = true; |
| 1111 | - } elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
|
|
| 1111 | + } elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
|
|
| 1112 | 1112 | $subject .= ' - ADMIN BCC COPY'; |
| 1113 | 1113 | $admin_bcc = true; |
| 1114 | - } elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
|
|
| 1114 | + } elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
|
|
| 1115 | 1115 | $subject .= ' - ADMIN BCC COPY'; |
| 1116 | 1116 | $admin_bcc = true; |
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | - if ( $admin_bcc === true ) {
|
|
| 1119 | + if ($admin_bcc === true) {
|
|
| 1120 | 1120 | |
| 1121 | 1121 | /** |
| 1122 | 1122 | * Filter the client email subject. |
@@ -1136,7 +1136,7 @@ discard block |
||
| 1136 | 1136 | * @param string $post_id The post ID. |
| 1137 | 1137 | * @param string $user_id The user ID. |
| 1138 | 1138 | */ |
| 1139 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1139 | + $subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1140 | 1140 | /** |
| 1141 | 1141 | * Filter the client email message. |
| 1142 | 1142 | * |
@@ -1155,23 +1155,23 @@ discard block |
||
| 1155 | 1155 | * @param string $post_id The post ID. |
| 1156 | 1156 | * @param string $user_id The user ID. |
| 1157 | 1157 | */ |
| 1158 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1158 | + $message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1159 | 1159 | |
| 1160 | 1160 | |
| 1161 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1161 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1162 | 1162 | |
| 1163 | - if ( ! $sent ) {
|
|
| 1164 | - if ( is_array( $to ) ) {
|
|
| 1165 | - $to = implode( ',', $to ); |
|
| 1163 | + if (!$sent) {
|
|
| 1164 | + if (is_array($to)) {
|
|
| 1165 | + $to = implode(',', $to);
|
|
| 1166 | 1166 | } |
| 1167 | 1167 | $log_message = sprintf( |
| 1168 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1168 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1169 | 1169 | $message_type, |
| 1170 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1170 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1171 | 1171 | $to, |
| 1172 | 1172 | $subject |
| 1173 | 1173 | ); |
| 1174 | - geodir_error_log( $log_message ); |
|
| 1174 | + geodir_error_log($log_message); |
|
| 1175 | 1175 | } |
| 1176 | 1176 | } |
| 1177 | 1177 | |
@@ -1187,51 +1187,51 @@ discard block |
||
| 1187 | 1187 | */ |
| 1188 | 1188 | function geodir_taxonomy_breadcrumb() {
|
| 1189 | 1189 | |
| 1190 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); |
|
| 1190 | + $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
|
|
| 1191 | 1191 | $parent = $term->parent; |
| 1192 | 1192 | |
| 1193 | - while ( $parent ): |
|
| 1193 | + while ($parent): |
|
| 1194 | 1194 | $parents[] = $parent; |
| 1195 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1195 | + $new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1196 | 1196 | $parent = $new_parent->parent; |
| 1197 | 1197 | endwhile; |
| 1198 | 1198 | |
| 1199 | - if ( ! empty( $parents ) ): |
|
| 1200 | - $parents = array_reverse( $parents ); |
|
| 1199 | + if (!empty($parents)): |
|
| 1200 | + $parents = array_reverse($parents); |
|
| 1201 | 1201 | |
| 1202 | - foreach ( $parents as $parent ): |
|
| 1203 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1204 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); |
|
| 1205 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; |
|
| 1202 | + foreach ($parents as $parent): |
|
| 1203 | + $item = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1204 | + $url = get_term_link($item, get_query_var('taxonomy'));
|
|
| 1205 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; |
|
| 1206 | 1206 | endforeach; |
| 1207 | 1207 | |
| 1208 | 1208 | endif; |
| 1209 | 1209 | |
| 1210 | - echo '<li> > ' . $term->name . '</li>'; |
|
| 1210 | + echo '<li> > '.$term->name.'</li>'; |
|
| 1211 | 1211 | } |
| 1212 | 1212 | |
| 1213 | -function geodir_wpml_post_type_archive_link($link, $post_type){
|
|
| 1213 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
|
|
| 1214 | 1214 | if (geodir_is_wpml()) {
|
| 1215 | - $post_types = get_option( 'geodir_post_types' ); |
|
| 1215 | + $post_types = get_option('geodir_post_types');
|
|
| 1216 | 1216 | |
| 1217 | - if ( isset( $post_types[ $post_type ] ) ) {
|
|
| 1218 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; |
|
| 1217 | + if (isset($post_types[$post_type])) {
|
|
| 1218 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1219 | 1219 | |
| 1220 | 1220 | // Alter the CPT slug if WPML is set to do so |
| 1221 | - if ( geodir_wpml_is_post_type_translated( $post_type ) ) {
|
|
| 1222 | - if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
|
|
| 1221 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 1222 | + if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
|
|
| 1223 | 1223 | |
| 1224 | 1224 | $org_slug = $slug; |
| 1225 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1225 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1226 | 1226 | $slug, |
| 1227 | 1227 | 'WordPress', |
| 1228 | - 'URL slug: ' . $slug, |
|
| 1229 | - $language_code ); |
|
| 1228 | + 'URL slug: '.$slug, |
|
| 1229 | + $language_code); |
|
| 1230 | 1230 | |
| 1231 | - if ( ! $slug ) {
|
|
| 1231 | + if (!$slug) {
|
|
| 1232 | 1232 | $slug = $org_slug; |
| 1233 | 1233 | } else {
|
| 1234 | - $link = str_replace( $org_slug, $slug, $link ); |
|
| 1234 | + $link = str_replace($org_slug, $slug, $link); |
|
| 1235 | 1235 | } |
| 1236 | 1236 | } |
| 1237 | 1237 | } |
@@ -1240,7 +1240,7 @@ discard block |
||
| 1240 | 1240 | |
| 1241 | 1241 | return $link; |
| 1242 | 1242 | } |
| 1243 | -add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2); |
|
| 1243 | +add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);
|
|
| 1244 | 1244 | |
| 1245 | 1245 | /** |
| 1246 | 1246 | * Main function that generates breadcrumb for all pages. |
@@ -1261,9 +1261,9 @@ discard block |
||
| 1261 | 1261 | * |
| 1262 | 1262 | * @since 1.0.0 |
| 1263 | 1263 | */ |
| 1264 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); |
|
| 1264 | + $separator = apply_filters('geodir_breadcrumb_separator', ' > ');
|
|
| 1265 | 1265 | |
| 1266 | - if ( ! geodir_is_page( 'home' ) ) {
|
|
| 1266 | + if (!geodir_is_page('home')) {
|
|
| 1267 | 1267 | $breadcrumb = ''; |
| 1268 | 1268 | $url_categoris = ''; |
| 1269 | 1269 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; |
@@ -1272,167 +1272,167 @@ discard block |
||
| 1272 | 1272 | * |
| 1273 | 1273 | * @since 1.0.0 |
| 1274 | 1274 | */ |
| 1275 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; |
|
| 1275 | + $breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
|
|
| 1276 | 1276 | |
| 1277 | 1277 | $gd_post_type = geodir_get_current_posttype(); |
| 1278 | - $post_type_info = get_post_type_object( $gd_post_type ); |
|
| 1278 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1279 | 1279 | |
| 1280 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); |
|
| 1280 | + remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
|
|
| 1281 | 1281 | |
| 1282 | - $listing_link = get_post_type_archive_link( $gd_post_type ); |
|
| 1282 | + $listing_link = get_post_type_archive_link($gd_post_type); |
|
| 1283 | 1283 | |
| 1284 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); |
|
| 1285 | - $listing_link = rtrim( $listing_link, '/' ); |
|
| 1284 | + add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
|
|
| 1285 | + $listing_link = rtrim($listing_link, '/'); |
|
| 1286 | 1286 | $listing_link .= '/'; |
| 1287 | 1287 | |
| 1288 | 1288 | $post_type_for_location_link = $listing_link; |
| 1289 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 1289 | + $location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 1290 | 1290 | |
| 1291 | 1291 | global $wp, $gd_session; |
| 1292 | 1292 | $location_link = $post_type_for_location_link; |
| 1293 | 1293 | |
| 1294 | - if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
|
|
| 1294 | + if (geodir_is_page('detail') || geodir_is_page('listing')) {
|
|
| 1295 | 1295 | global $post; |
| 1296 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 1297 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; |
|
| 1296 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1297 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1298 | 1298 | |
| 1299 | - if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
|
|
| 1299 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1300 | 1300 | $location_terms = array( |
| 1301 | 1301 | 'gd_country' => $post->country_slug, |
| 1302 | 1302 | 'gd_region' => $post->region_slug, |
| 1303 | 1303 | 'gd_city' => $post->city_slug |
| 1304 | 1304 | ); |
| 1305 | 1305 | |
| 1306 | - if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
|
|
| 1306 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1307 | 1307 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
| 1308 | 1308 | } |
| 1309 | 1309 | } |
| 1310 | 1310 | |
| 1311 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 1311 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1312 | 1312 | |
| 1313 | 1313 | $hide_url_part = array(); |
| 1314 | - if ( $location_manager ) {
|
|
| 1315 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 1316 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 1317 | - |
|
| 1318 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 1319 | - $hide_url_part = array( 'gd_country', 'gd_region' ); |
|
| 1320 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 1321 | - $hide_url_part = array( 'gd_region' ); |
|
| 1322 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 1323 | - $hide_url_part = array( 'gd_country' ); |
|
| 1314 | + if ($location_manager) {
|
|
| 1315 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 1316 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 1317 | + |
|
| 1318 | + if ($hide_region_part && $hide_country_part) {
|
|
| 1319 | + $hide_url_part = array('gd_country', 'gd_region');
|
|
| 1320 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 1321 | + $hide_url_part = array('gd_region');
|
|
| 1322 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 1323 | + $hide_url_part = array('gd_country');
|
|
| 1324 | 1324 | } |
| 1325 | 1325 | } |
| 1326 | 1326 | |
| 1327 | 1327 | $hide_text_part = array(); |
| 1328 | - if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 1329 | - $hide_text_part = array( 'gd_region' ); |
|
| 1328 | + if ($geodir_show_location_url == 'country_city') {
|
|
| 1329 | + $hide_text_part = array('gd_region');
|
|
| 1330 | 1330 | |
| 1331 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1332 | - unset( $location_terms['gd_region'] ); |
|
| 1331 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1332 | + unset($location_terms['gd_region']); |
|
| 1333 | 1333 | } |
| 1334 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 1335 | - $hide_text_part = array( 'gd_country' ); |
|
| 1334 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 1335 | + $hide_text_part = array('gd_country');
|
|
| 1336 | 1336 | |
| 1337 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1338 | - unset( $location_terms['gd_country'] ); |
|
| 1337 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1338 | + unset($location_terms['gd_country']); |
|
| 1339 | 1339 | } |
| 1340 | - } else if ( $geodir_show_location_url == 'city' ) {
|
|
| 1341 | - $hide_text_part = array( 'gd_country', 'gd_region' ); |
|
| 1340 | + } else if ($geodir_show_location_url == 'city') {
|
|
| 1341 | + $hide_text_part = array('gd_country', 'gd_region');
|
|
| 1342 | 1342 | |
| 1343 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1344 | - unset( $location_terms['gd_country'] ); |
|
| 1343 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1344 | + unset($location_terms['gd_country']); |
|
| 1345 | 1345 | } |
| 1346 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1347 | - unset( $location_terms['gd_region'] ); |
|
| 1346 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1347 | + unset($location_terms['gd_region']); |
|
| 1348 | 1348 | } |
| 1349 | 1349 | } |
| 1350 | 1350 | |
| 1351 | 1351 | $is_location_last = ''; |
| 1352 | 1352 | $is_taxonomy_last = ''; |
| 1353 | 1353 | $breadcrumb .= '<li>'; |
| 1354 | - if ( get_query_var( $gd_post_type . 'category' ) ) {
|
|
| 1355 | - $gd_taxonomy = $gd_post_type . 'category'; |
|
| 1356 | - } elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1357 | - $gd_taxonomy = $gd_post_type . '_tags'; |
|
| 1354 | + if (get_query_var($gd_post_type.'category')) {
|
|
| 1355 | + $gd_taxonomy = $gd_post_type.'category'; |
|
| 1356 | + } elseif (get_query_var($gd_post_type.'_tags')) {
|
|
| 1357 | + $gd_taxonomy = $gd_post_type.'_tags'; |
|
| 1358 | 1358 | } |
| 1359 | 1359 | |
| 1360 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1361 | - if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
|
|
| 1360 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1361 | + if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
|
|
| 1362 | 1362 | $is_location_last = false; |
| 1363 | 1363 | } else {
|
| 1364 | 1364 | $is_location_last = true; |
| 1365 | 1365 | } |
| 1366 | 1366 | |
| 1367 | - if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
|
|
| 1367 | + if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
|
|
| 1368 | 1368 | $is_taxonomy_last = true; |
| 1369 | 1369 | } else {
|
| 1370 | 1370 | $is_taxonomy_last = false; |
| 1371 | 1371 | } |
| 1372 | 1372 | |
| 1373 | - if ( ! empty( $location_terms ) ) {
|
|
| 1374 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 1373 | + if (!empty($location_terms)) {
|
|
| 1374 | + $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
|
|
| 1375 | 1375 | |
| 1376 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1377 | - if ( $location_term != '' ) {
|
|
| 1378 | - if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
|
|
| 1376 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1377 | + if ($location_term != '') {
|
|
| 1378 | + if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
|
|
| 1379 | 1379 | continue; |
| 1380 | 1380 | } |
| 1381 | 1381 | |
| 1382 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); |
|
| 1383 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 1384 | - $gd_location_link_text = geodir_utf8_ucfirst( $gd_location_link_text ); |
|
| 1382 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
|
|
| 1383 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 1384 | + $gd_location_link_text = geodir_utf8_ucfirst($gd_location_link_text); |
|
| 1385 | 1385 | |
| 1386 | 1386 | $location_term_actual_country = ''; |
| 1387 | 1387 | $location_term_actual_region = ''; |
| 1388 | 1388 | $location_term_actual_city = ''; |
| 1389 | 1389 | $location_term_actual_neighbourhood = ''; |
| 1390 | - if ( $geodir_get_locations ) {
|
|
| 1391 | - if ( $key == 'gd_country' ) {
|
|
| 1392 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); |
|
| 1393 | - } else if ( $key == 'gd_region' ) {
|
|
| 1394 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); |
|
| 1395 | - } else if ( $key == 'gd_city' ) {
|
|
| 1396 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); |
|
| 1397 | - } else if ( $key == 'gd_neighbourhood' ) {
|
|
| 1398 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); |
|
| 1390 | + if ($geodir_get_locations) {
|
|
| 1391 | + if ($key == 'gd_country') {
|
|
| 1392 | + $location_term_actual_country = get_actual_location_name('country', $location_term, true);
|
|
| 1393 | + } else if ($key == 'gd_region') {
|
|
| 1394 | + $location_term_actual_region = get_actual_location_name('region', $location_term, true);
|
|
| 1395 | + } else if ($key == 'gd_city') {
|
|
| 1396 | + $location_term_actual_city = get_actual_location_name('city', $location_term, true);
|
|
| 1397 | + } else if ($key == 'gd_neighbourhood') {
|
|
| 1398 | + $location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
|
|
| 1399 | 1399 | } |
| 1400 | 1400 | } else {
|
| 1401 | 1401 | $location_info = geodir_get_location(); |
| 1402 | 1402 | |
| 1403 | - if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
|
|
| 1404 | - if ( $key == 'gd_country' ) {
|
|
| 1405 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); |
|
| 1406 | - } else if ( $key == 'gd_region' ) {
|
|
| 1407 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); |
|
| 1408 | - } else if ( $key == 'gd_city' ) {
|
|
| 1409 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); |
|
| 1403 | + if (!empty($location_info) && isset($location_info->location_id)) {
|
|
| 1404 | + if ($key == 'gd_country') {
|
|
| 1405 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); |
|
| 1406 | + } else if ($key == 'gd_region') {
|
|
| 1407 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); |
|
| 1408 | + } else if ($key == 'gd_city') {
|
|
| 1409 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); |
|
| 1410 | 1410 | } |
| 1411 | 1411 | } |
| 1412 | 1412 | } |
| 1413 | 1413 | |
| 1414 | - 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'] != '' ) ) {
|
|
| 1415 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; |
|
| 1416 | - } else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1417 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; |
|
| 1418 | - } else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
|
|
| 1419 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; |
|
| 1420 | - } else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
|
|
| 1421 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; |
|
| 1414 | + 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'] != '')) {
|
|
| 1415 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; |
|
| 1416 | + } else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1417 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; |
|
| 1418 | + } else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
|
|
| 1419 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; |
|
| 1420 | + } else if ($is_location_last && $key == 'gd_neighbourhood') {
|
|
| 1421 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; |
|
| 1422 | 1422 | } else {
|
| 1423 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1424 | - $location_link .= $location_term . '/'; |
|
| 1423 | + if (get_option('permalink_structure') != '') {
|
|
| 1424 | + $location_link .= $location_term.'/'; |
|
| 1425 | 1425 | } else {
|
| 1426 | - $location_link .= "&$key=" . $location_term; |
|
| 1426 | + $location_link .= "&$key=".$location_term; |
|
| 1427 | 1427 | } |
| 1428 | 1428 | |
| 1429 | - if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
|
|
| 1429 | + if ($key == 'gd_country' && $location_term_actual_country != '') {
|
|
| 1430 | 1430 | $gd_location_link_text = $location_term_actual_country; |
| 1431 | - } else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
|
|
| 1431 | + } else if ($key == 'gd_region' && $location_term_actual_region != '') {
|
|
| 1432 | 1432 | $gd_location_link_text = $location_term_actual_region; |
| 1433 | - } else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
|
|
| 1433 | + } else if ($key == 'gd_city' && $location_term_actual_city != '') {
|
|
| 1434 | 1434 | $gd_location_link_text = $location_term_actual_city; |
| 1435 | - } else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
|
|
| 1435 | + } else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
|
|
| 1436 | 1436 | $gd_location_link_text = $location_term_actual_neighbourhood; |
| 1437 | 1437 | } |
| 1438 | 1438 | |
@@ -1442,77 +1442,77 @@ discard block |
||
| 1442 | 1442 | } |
| 1443 | 1443 | */ |
| 1444 | 1444 | |
| 1445 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; |
|
| 1445 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; |
|
| 1446 | 1446 | } |
| 1447 | 1447 | } |
| 1448 | 1448 | } |
| 1449 | 1449 | } |
| 1450 | 1450 | |
| 1451 | - if ( ! empty( $gd_taxonomy ) ) {
|
|
| 1451 | + if (!empty($gd_taxonomy)) {
|
|
| 1452 | 1452 | $term_index = 1; |
| 1453 | 1453 | |
| 1454 | 1454 | //if(get_option('geodir_add_categories_url'))
|
| 1455 | 1455 | {
|
| 1456 | - if ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1457 | - $cat_link = $listing_link . 'tags/'; |
|
| 1456 | + if (get_query_var($gd_post_type.'_tags')) {
|
|
| 1457 | + $cat_link = $listing_link.'tags/'; |
|
| 1458 | 1458 | } else {
|
| 1459 | 1459 | $cat_link = $listing_link; |
| 1460 | 1460 | } |
| 1461 | 1461 | |
| 1462 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1463 | - if ( $location_manager && in_array( $key, $hide_url_part ) ) {
|
|
| 1462 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1463 | + if ($location_manager && in_array($key, $hide_url_part)) {
|
|
| 1464 | 1464 | continue; |
| 1465 | 1465 | } |
| 1466 | 1466 | |
| 1467 | - if ( $location_term != '' ) {
|
|
| 1468 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1469 | - $cat_link .= $location_term . '/'; |
|
| 1467 | + if ($location_term != '') {
|
|
| 1468 | + if (get_option('permalink_structure') != '') {
|
|
| 1469 | + $cat_link .= $location_term.'/'; |
|
| 1470 | 1470 | } |
| 1471 | 1471 | } |
| 1472 | 1472 | } |
| 1473 | 1473 | |
| 1474 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); |
|
| 1475 | - foreach ( $term_array as $term ) {
|
|
| 1476 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); |
|
| 1477 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); |
|
| 1474 | + $term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
|
|
| 1475 | + foreach ($term_array as $term) {
|
|
| 1476 | + $term_link_text = preg_replace('/-(\d+)$/', '', $term);
|
|
| 1477 | + $term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
|
|
| 1478 | 1478 | |
| 1479 | 1479 | // get term actual name |
| 1480 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); |
|
| 1481 | - if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
|
|
| 1482 | - $term_link_text = urldecode( $term_info['name'] ); |
|
| 1480 | + $term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
|
|
| 1481 | + if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
|
|
| 1482 | + $term_link_text = urldecode($term_info['name']); |
|
| 1483 | 1483 | } else {
|
| 1484 | 1484 | continue; |
| 1485 | 1485 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); |
| 1486 | 1486 | } |
| 1487 | 1487 | |
| 1488 | - if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
|
|
| 1489 | - $breadcrumb .= $separator . $term_link_text; |
|
| 1488 | + if ($term_index == count($term_array) && $is_taxonomy_last) {
|
|
| 1489 | + $breadcrumb .= $separator.$term_link_text; |
|
| 1490 | 1490 | } else {
|
| 1491 | - $cat_link .= $term . '/'; |
|
| 1492 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; |
|
| 1491 | + $cat_link .= $term.'/'; |
|
| 1492 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; |
|
| 1493 | 1493 | } |
| 1494 | - $term_index ++; |
|
| 1494 | + $term_index++; |
|
| 1495 | 1495 | } |
| 1496 | 1496 | } |
| 1497 | 1497 | |
| 1498 | 1498 | |
| 1499 | 1499 | } |
| 1500 | 1500 | |
| 1501 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1502 | - $breadcrumb .= $separator . get_the_title(); |
|
| 1501 | + if (geodir_is_page('detail')) {
|
|
| 1502 | + $breadcrumb .= $separator.get_the_title(); |
|
| 1503 | 1503 | } |
| 1504 | 1504 | |
| 1505 | 1505 | $breadcrumb .= '</li>'; |
| 1506 | 1506 | |
| 1507 | 1507 | |
| 1508 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1508 | + } elseif (geodir_is_page('author')) {
|
|
| 1509 | 1509 | $dashboard_post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : $gd_post_type; |
| 1510 | 1510 | $user_id = get_current_user_id(); |
| 1511 | - $author_link = get_author_posts_url( $user_id ); |
|
| 1512 | - $default_author_link = geodir_getlink( $author_link, array( |
|
| 1511 | + $author_link = get_author_posts_url($user_id); |
|
| 1512 | + $default_author_link = geodir_getlink($author_link, array( |
|
| 1513 | 1513 | 'geodir_dashbord' => 'true', |
| 1514 | 1514 | 'stype' => $dashboard_post_type |
| 1515 | - ), false ); |
|
| 1515 | + ), false); |
|
| 1516 | 1516 | |
| 1517 | 1517 | /** |
| 1518 | 1518 | * Filter author page link. |
@@ -1522,16 +1522,16 @@ discard block |
||
| 1522 | 1522 | * @param string $default_author_link Default author link. |
| 1523 | 1523 | * @param int $user_id Author ID. |
| 1524 | 1524 | */ |
| 1525 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); |
|
| 1525 | + $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
|
|
| 1526 | 1526 | |
| 1527 | 1527 | $breadcrumb .= '<li>'; |
| 1528 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; |
|
| 1528 | + $breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
|
|
| 1529 | 1529 | |
| 1530 | - if ( isset( $_REQUEST['list'] ) ) {
|
|
| 1531 | - $author_link = geodir_getlink( $author_link, array( |
|
| 1530 | + if (isset($_REQUEST['list'])) {
|
|
| 1531 | + $author_link = geodir_getlink($author_link, array( |
|
| 1532 | 1532 | 'geodir_dashbord' => 'true', |
| 1533 | 1533 | 'stype' => $_REQUEST['stype'] |
| 1534 | - ), false ); |
|
| 1534 | + ), false); |
|
| 1535 | 1535 | |
| 1536 | 1536 | /** |
| 1537 | 1537 | * Filter author page link. |
@@ -1542,61 +1542,61 @@ discard block |
||
| 1542 | 1542 | * @param int $user_id Author ID. |
| 1543 | 1543 | * @param string $_REQUEST ['stype'] Post type. |
| 1544 | 1544 | */ |
| 1545 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); |
|
| 1545 | + $author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
|
|
| 1546 | 1546 | |
| 1547 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1548 | - $breadcrumb .= $separator . geodir_utf8_ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] ); |
|
| 1547 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1548 | + $breadcrumb .= $separator.geodir_utf8_ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);
|
|
| 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,60 +2513,60 @@ 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'] ) ) {
|
|
| 2559 | - $user_favorites = get_user_meta( (int)$query_args['favorites_by_user'], 'gd_user_favourite_post', true ); |
|
| 2558 | + if (!empty($query_args['favorites_by_user'])) {
|
|
| 2559 | + $user_favorites = get_user_meta((int) $query_args['favorites_by_user'], 'gd_user_favourite_post', true); |
|
| 2560 | 2560 | $user_favorites = !empty($user_favorites) && is_array($user_favorites) ? implode("','", $user_favorites) : '-1';
|
| 2561 | 2561 | } |
| 2562 | 2562 | |
| 2563 | - $where .= " AND `" . $wpdb->posts . "`.`ID` IN('" . $user_favorites . "')";
|
|
| 2563 | + $where .= " AND `".$wpdb->posts."`.`ID` IN('".$user_favorites."')";
|
|
| 2564 | 2564 | } |
| 2565 | 2565 | |
| 2566 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2567 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2566 | + if (!empty($query_args['tax_query'])) {
|
|
| 2567 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2568 | 2568 | |
| 2569 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2569 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2570 | 2570 | $where .= $tax_queries['where']; |
| 2571 | 2571 | } |
| 2572 | 2572 | } |
@@ -2587,11 +2587,11 @@ discard block |
||
| 2587 | 2587 | * |
| 2588 | 2588 | * @return string Modified orderby clause SQL. |
| 2589 | 2589 | */ |
| 2590 | -function geodir_function_widget_listings_orderby( $orderby ) {
|
|
| 2590 | +function geodir_function_widget_listings_orderby($orderby) {
|
|
| 2591 | 2591 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2592 | 2592 | |
| 2593 | 2593 | $query_args = $gd_query_args_widgets; |
| 2594 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2594 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2595 | 2595 | return $orderby; |
| 2596 | 2596 | } |
| 2597 | 2597 | |
@@ -2610,15 +2610,15 @@ discard block |
||
| 2610 | 2610 | * |
| 2611 | 2611 | * @return int Query limit. |
| 2612 | 2612 | */ |
| 2613 | -function geodir_function_widget_listings_limit( $limit ) {
|
|
| 2613 | +function geodir_function_widget_listings_limit($limit) {
|
|
| 2614 | 2614 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2615 | 2615 | |
| 2616 | 2616 | $query_args = $gd_query_args_widgets; |
| 2617 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2617 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2618 | 2618 | return $limit; |
| 2619 | 2619 | } |
| 2620 | 2620 | |
| 2621 | - if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
|
|
| 2621 | + if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
|
|
| 2622 | 2622 | $limit = (int) $query_args['posts_per_page']; |
| 2623 | 2623 | } |
| 2624 | 2624 | |
@@ -2636,12 +2636,12 @@ discard block |
||
| 2636 | 2636 | * |
| 2637 | 2637 | * @return int Large size width. |
| 2638 | 2638 | */ |
| 2639 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
|
|
| 2640 | - $large_size_w = get_option( 'large_size_w' ); |
|
| 2639 | +function geodir_media_image_large_width($default = 800, $params = '') {
|
|
| 2640 | + $large_size_w = get_option('large_size_w');
|
|
| 2641 | 2641 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; |
| 2642 | - $large_size_w = absint( $large_size_w ); |
|
| 2642 | + $large_size_w = absint($large_size_w); |
|
| 2643 | 2643 | |
| 2644 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2644 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2645 | 2645 | $large_size_w = 800; |
| 2646 | 2646 | } |
| 2647 | 2647 | |
@@ -2654,7 +2654,7 @@ discard block |
||
| 2654 | 2654 | * @param int $default Default width. |
| 2655 | 2655 | * @param string|array $params Image parameters. |
| 2656 | 2656 | */ |
| 2657 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); |
|
| 2657 | + $large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
|
|
| 2658 | 2658 | |
| 2659 | 2659 | return $large_size_w; |
| 2660 | 2660 | } |
@@ -2670,12 +2670,12 @@ discard block |
||
| 2670 | 2670 | * |
| 2671 | 2671 | * @return int Large size height. |
| 2672 | 2672 | */ |
| 2673 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
|
|
| 2674 | - $large_size_h = get_option( 'large_size_h' ); |
|
| 2673 | +function geodir_media_image_large_height($default = 800, $params = '') {
|
|
| 2674 | + $large_size_h = get_option('large_size_h');
|
|
| 2675 | 2675 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; |
| 2676 | - $large_size_h = absint( $large_size_h ); |
|
| 2676 | + $large_size_h = absint($large_size_h); |
|
| 2677 | 2677 | |
| 2678 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2678 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2679 | 2679 | $large_size_h = 800; |
| 2680 | 2680 | } |
| 2681 | 2681 | |
@@ -2688,7 +2688,7 @@ discard block |
||
| 2688 | 2688 | * @param int $default Default height. |
| 2689 | 2689 | * @param string|array $params Image parameters. |
| 2690 | 2690 | */ |
| 2691 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); |
|
| 2691 | + $large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
|
|
| 2692 | 2692 | |
| 2693 | 2693 | return $large_size_h; |
| 2694 | 2694 | } |
@@ -2705,8 +2705,8 @@ discard block |
||
| 2705 | 2705 | * |
| 2706 | 2706 | * @return string Sanitized name. |
| 2707 | 2707 | */ |
| 2708 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
|
|
| 2709 | - if ( $name == '' ) {
|
|
| 2708 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
|
|
| 2709 | + if ($name == '') {
|
|
| 2710 | 2710 | return null; |
| 2711 | 2711 | } |
| 2712 | 2712 | |
@@ -2715,13 +2715,13 @@ discard block |
||
| 2715 | 2715 | $type = $type == 'gd_city' ? 'city' : $type; |
| 2716 | 2716 | |
| 2717 | 2717 | $return = $name; |
| 2718 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 2719 | - $return = get_actual_location_name( $type, $name, $translate ); |
|
| 2718 | + if (function_exists('get_actual_location_name')) {
|
|
| 2719 | + $return = get_actual_location_name($type, $name, $translate); |
|
| 2720 | 2720 | } else {
|
| 2721 | - $return = preg_replace( '/-(\d+)$/', '', $return ); |
|
| 2722 | - $return = preg_replace( '/[_-]/', ' ', $return ); |
|
| 2723 | - $return = geodir_ucwords( $return ); |
|
| 2724 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; |
|
| 2721 | + $return = preg_replace('/-(\d+)$/', '', $return);
|
|
| 2722 | + $return = preg_replace('/[_-]/', ' ', $return);
|
|
| 2723 | + $return = geodir_ucwords($return); |
|
| 2724 | + $return = $translate ? __($return, 'geodirectory') : $return; |
|
| 2725 | 2725 | } |
| 2726 | 2726 | |
| 2727 | 2727 | return $return; |
@@ -2739,26 +2739,26 @@ discard block |
||
| 2739 | 2739 | * |
| 2740 | 2740 | * @param int $number Comments number. |
| 2741 | 2741 | */ |
| 2742 | -function geodir_comments_number( $number ) {
|
|
| 2742 | +function geodir_comments_number($number) {
|
|
| 2743 | 2743 | global $post; |
| 2744 | 2744 | |
| 2745 | - if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {
|
|
| 2745 | + if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {
|
|
| 2746 | 2746 | $number = get_comments_number(); |
| 2747 | 2747 | |
| 2748 | - if ( $number > 1 ) {
|
|
| 2749 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) ); |
|
| 2750 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2751 | - $output = __( 'No Comments', 'geodirectory' ); |
|
| 2748 | + if ($number > 1) {
|
|
| 2749 | + $output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));
|
|
| 2750 | + } elseif ($number == 0 || $number == '') {
|
|
| 2751 | + $output = __('No Comments', 'geodirectory');
|
|
| 2752 | 2752 | } else { // must be one
|
| 2753 | - $output = __( '1 Comment', 'geodirectory' ); |
|
| 2753 | + $output = __('1 Comment', 'geodirectory');
|
|
| 2754 | 2754 | } |
| 2755 | 2755 | } else {
|
| 2756 | - if ( $number > 1 ) {
|
|
| 2757 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); |
|
| 2758 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2759 | - $output = __( 'No Reviews', 'geodirectory' ); |
|
| 2756 | + if ($number > 1) {
|
|
| 2757 | + $output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
|
|
| 2758 | + } elseif ($number == 0 || $number == '') {
|
|
| 2759 | + $output = __('No Reviews', 'geodirectory');
|
|
| 2760 | 2760 | } else { // must be one
|
| 2761 | - $output = __( '1 Review', 'geodirectory' ); |
|
| 2761 | + $output = __('1 Review', 'geodirectory');
|
|
| 2762 | 2762 | } |
| 2763 | 2763 | } |
| 2764 | 2764 | |
@@ -2775,18 +2775,18 @@ discard block |
||
| 2775 | 2775 | */ |
| 2776 | 2776 | function is_page_geodir_home() {
|
| 2777 | 2777 | global $wpdb; |
| 2778 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); |
|
| 2779 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2780 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 2778 | + $cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
|
|
| 2779 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2780 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 2781 | 2781 | } |
| 2782 | - $home_url = home_url( '', 'http' ); |
|
| 2783 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2784 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 2782 | + $home_url = home_url('', 'http');
|
|
| 2783 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2784 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 2785 | 2785 | } |
| 2786 | - $home_url = str_replace( "www.", "", $home_url ); |
|
| 2787 | - 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' ) ) ) {
|
|
| 2786 | + $home_url = str_replace("www.", "", $home_url);
|
|
| 2787 | + 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'))) {
|
|
| 2788 | 2788 | return true; |
| 2789 | - } 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' ) ) {
|
|
| 2789 | + } 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')) {
|
|
| 2790 | 2790 | return true; |
| 2791 | 2791 | } else {
|
| 2792 | 2792 | return false; |
@@ -2806,18 +2806,18 @@ discard block |
||
| 2806 | 2806 | * |
| 2807 | 2807 | * @return string The canonical URL. |
| 2808 | 2808 | */ |
| 2809 | -function geodir_wpseo_homepage_canonical( $url ) {
|
|
| 2809 | +function geodir_wpseo_homepage_canonical($url) {
|
|
| 2810 | 2810 | global $post; |
| 2811 | 2811 | |
| 2812 | - if ( is_page_geodir_home() ) {
|
|
| 2812 | + if (is_page_geodir_home()) {
|
|
| 2813 | 2813 | return home_url(); |
| 2814 | 2814 | } |
| 2815 | 2815 | |
| 2816 | 2816 | return $url; |
| 2817 | 2817 | } |
| 2818 | 2818 | |
| 2819 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2820 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2819 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2820 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2821 | 2821 | |
| 2822 | 2822 | /** |
| 2823 | 2823 | * Add extra fields to google maps script call. |
@@ -2830,20 +2830,20 @@ discard block |
||
| 2830 | 2830 | * |
| 2831 | 2831 | * @return string Modified extra string. |
| 2832 | 2832 | */ |
| 2833 | -function geodir_googlemap_script_extra_details_page( $extra ) {
|
|
| 2833 | +function geodir_googlemap_script_extra_details_page($extra) {
|
|
| 2834 | 2834 | global $post; |
| 2835 | 2835 | $add_google_places_api = false; |
| 2836 | - if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 2836 | + if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 2837 | 2837 | $add_google_places_api = true; |
| 2838 | 2838 | } |
| 2839 | - if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
|
|
| 2839 | + if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
|
|
| 2840 | 2840 | $extra .= "&libraries=places"; |
| 2841 | 2841 | } |
| 2842 | 2842 | |
| 2843 | 2843 | return $extra; |
| 2844 | 2844 | } |
| 2845 | 2845 | |
| 2846 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); |
|
| 2846 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
|
|
| 2847 | 2847 | |
| 2848 | 2848 | |
| 2849 | 2849 | /** |
@@ -2862,119 +2862,119 @@ discard block |
||
| 2862 | 2862 | * after_widget. |
| 2863 | 2863 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2864 | 2864 | */ |
| 2865 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
|
|
| 2865 | +function geodir_popular_post_category_output($args = '', $instance = '') {
|
|
| 2866 | 2866 | // prints the widget |
| 2867 | 2867 | global $wpdb, $plugin_prefix, $geodir_post_category_str; |
| 2868 | - extract( $args, EXTR_SKIP ); |
|
| 2868 | + extract($args, EXTR_SKIP); |
|
| 2869 | 2869 | |
| 2870 | 2870 | echo $before_widget; |
| 2871 | 2871 | |
| 2872 | 2872 | /** This filter is documented in geodirectory_widgets.php */ |
| 2873 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2873 | + $title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2874 | 2874 | |
| 2875 | 2875 | $gd_post_type = geodir_get_current_posttype(); |
| 2876 | 2876 | |
| 2877 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2877 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2878 | 2878 | if (!isset($category_restrict)) {
|
| 2879 | 2879 | $category_restrict = false; |
| 2880 | 2880 | } |
| 2881 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2881 | + if (!empty($gd_post_type)) {
|
|
| 2882 | 2882 | $default_post_type = $gd_post_type; |
| 2883 | - } elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
|
|
| 2883 | + } elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
|
|
| 2884 | 2884 | $default_post_type = $instance['default_post_type']; |
| 2885 | 2885 | } else {
|
| 2886 | 2886 | $all_gd_post_type = geodir_get_posttypes(); |
| 2887 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; |
|
| 2887 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; |
|
| 2888 | 2888 | } |
| 2889 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; |
|
| 2889 | + $parent_only = !empty($instance['parent_only']) ? true : false; |
|
| 2890 | 2890 | |
| 2891 | 2891 | $taxonomy = array(); |
| 2892 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2893 | - $taxonomy[] = $gd_post_type . "category"; |
|
| 2892 | + if (!empty($gd_post_type)) {
|
|
| 2893 | + $taxonomy[] = $gd_post_type."category"; |
|
| 2894 | 2894 | } else {
|
| 2895 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); |
|
| 2895 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2896 | 2896 | } |
| 2897 | 2897 | |
| 2898 | 2898 | $taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);
|
| 2899 | 2899 | |
| 2900 | - $term_args = array( 'taxonomy' => $taxonomy ); |
|
| 2901 | - if ( $parent_only ) {
|
|
| 2900 | + $term_args = array('taxonomy' => $taxonomy);
|
|
| 2901 | + if ($parent_only) {
|
|
| 2902 | 2902 | $term_args['parent'] = 0; |
| 2903 | 2903 | } |
| 2904 | 2904 | |
| 2905 | - $terms = get_terms( $term_args ); |
|
| 2905 | + $terms = get_terms($term_args); |
|
| 2906 | 2906 | $a_terms = array(); |
| 2907 | 2907 | $b_terms = array(); |
| 2908 | 2908 | |
| 2909 | - foreach ( $terms as $term ) {
|
|
| 2910 | - if ( $term->count > 0 ) {
|
|
| 2911 | - $a_terms[ $term->taxonomy ][] = $term; |
|
| 2909 | + foreach ($terms as $term) {
|
|
| 2910 | + if ($term->count > 0) {
|
|
| 2911 | + $a_terms[$term->taxonomy][] = $term; |
|
| 2912 | 2912 | } |
| 2913 | 2913 | } |
| 2914 | 2914 | |
| 2915 | - if ( ! empty( $a_terms ) ) {
|
|
| 2915 | + if (!empty($a_terms)) {
|
|
| 2916 | 2916 | // Sort CPT taxonomies in categories widget. |
| 2917 | - if ( !empty( $taxonomy ) && is_array( $taxonomy ) && count( $taxonomy ) > 1 ) {
|
|
| 2917 | + if (!empty($taxonomy) && is_array($taxonomy) && count($taxonomy) > 1) {
|
|
| 2918 | 2918 | $gd_post_types = geodir_get_posttypes(); |
| 2919 | 2919 | $sort_taxonomies = array(); |
| 2920 | 2920 | |
| 2921 | - foreach ( $gd_post_types as $gd_post_type ) {
|
|
| 2922 | - $taxonomy_name = $gd_post_type . 'category'; |
|
| 2921 | + foreach ($gd_post_types as $gd_post_type) {
|
|
| 2922 | + $taxonomy_name = $gd_post_type.'category'; |
|
| 2923 | 2923 | |
| 2924 | - if ( !empty( $a_terms[$taxonomy_name] ) ) {
|
|
| 2924 | + if (!empty($a_terms[$taxonomy_name])) {
|
|
| 2925 | 2925 | $sort_taxonomies[$taxonomy_name] = $a_terms[$taxonomy_name]; |
| 2926 | 2926 | } |
| 2927 | 2927 | } |
| 2928 | - $a_terms = !empty( $sort_taxonomies ) ? $sort_taxonomies : $a_terms; |
|
| 2928 | + $a_terms = !empty($sort_taxonomies) ? $sort_taxonomies : $a_terms; |
|
| 2929 | 2929 | } |
| 2930 | 2930 | |
| 2931 | - foreach ( $a_terms as $b_key => $b_val ) {
|
|
| 2932 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, 'count' ); |
|
| 2931 | + foreach ($a_terms as $b_key => $b_val) {
|
|
| 2932 | + $b_terms[$b_key] = geodir_sort_terms($b_val, 'count'); |
|
| 2933 | 2933 | } |
| 2934 | 2934 | |
| 2935 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; |
|
| 2935 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; |
|
| 2936 | 2936 | |
| 2937 | 2937 | $tax_change_output = ''; |
| 2938 | - if ( count( $b_terms ) > 1 ) {
|
|
| 2939 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2940 | - foreach ( $b_terms as $key => $val ) {
|
|
| 2941 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); |
|
| 2942 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); |
|
| 2943 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; |
|
| 2938 | + if (count($b_terms) > 1) {
|
|
| 2939 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2940 | + foreach ($b_terms as $key => $val) {
|
|
| 2941 | + $ptype = get_post_type_object(str_replace("category", "", $key));
|
|
| 2942 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); |
|
| 2943 | + $tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
|
|
| 2944 | 2944 | } |
| 2945 | 2945 | $tax_change_output .= "</select>"; |
| 2946 | 2946 | } |
| 2947 | 2947 | |
| 2948 | - if ( ! empty( $b_terms ) ) {
|
|
| 2949 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array |
|
| 2950 | - global $cat_count;//make global so we can change via function |
|
| 2948 | + if (!empty($b_terms)) {
|
|
| 2949 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array |
|
| 2950 | + global $cat_count; //make global so we can change via function |
|
| 2951 | 2951 | $cat_count = 0; |
| 2952 | 2952 | ?> |
| 2953 | 2953 | <div class="geodir-category-list-in clearfix"> |
| 2954 | 2954 | <div class="geodir-cat-list clearfix"> |
| 2955 | 2955 | <?php |
| 2956 | - echo $before_title . __( $title ) . $after_title; |
|
| 2956 | + echo $before_title.__($title).$after_title; |
|
| 2957 | 2957 | |
| 2958 | 2958 | echo $tax_change_output; |
| 2959 | 2959 | |
| 2960 | 2960 | echo '<ul class="geodir-popular-cat-list">'; |
| 2961 | 2961 | |
| 2962 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); |
|
| 2962 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); |
|
| 2963 | 2963 | |
| 2964 | 2964 | echo '</ul>'; |
| 2965 | 2965 | ?> |
| 2966 | 2966 | </div> |
| 2967 | 2967 | <?php |
| 2968 | 2968 | $hide = ''; |
| 2969 | - if ( $cat_count < $category_limit ) {
|
|
| 2969 | + if ($cat_count < $category_limit) {
|
|
| 2970 | 2970 | $hide = 'style="display:none;"'; |
| 2971 | 2971 | } |
| 2972 | 2972 | echo "<div class='geodir-cat-list-more' $hide >"; |
| 2973 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; |
|
| 2974 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; |
|
| 2973 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
|
|
| 2974 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
|
|
| 2975 | 2975 | echo "</div>"; |
| 2976 | 2976 | /* add scripts */ |
| 2977 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); |
|
| 2977 | + add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
|
|
| 2978 | 2978 | ?> |
| 2979 | 2979 | </div> |
| 2980 | 2980 | <?php |
@@ -2994,28 +2994,28 @@ discard block |
||
| 2994 | 2994 | * @param int $category_limit Number of categories to display by default. |
| 2995 | 2995 | * @param bool $category_restrict If the cat limit should be hidden or not shown. |
| 2996 | 2996 | */ |
| 2997 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
|
|
| 2997 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
|
|
| 2998 | 2998 | global $geodir_post_category_str, $cat_count; |
| 2999 | 2999 | $term_icons = geodir_get_term_icon(); |
| 3000 | 3000 | |
| 3001 | 3001 | $geodir_post_category_str = array(); |
| 3002 | 3002 | |
| 3003 | 3003 | |
| 3004 | - foreach ( $terms as $cat ) {
|
|
| 3005 | - $post_type = str_replace( "category", "", $cat->taxonomy ); |
|
| 3006 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; |
|
| 3004 | + foreach ($terms as $cat) {
|
|
| 3005 | + $post_type = str_replace("category", "", $cat->taxonomy);
|
|
| 3006 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; |
|
| 3007 | 3007 | |
| 3008 | - $cat_count ++; |
|
| 3008 | + $cat_count++; |
|
| 3009 | 3009 | |
| 3010 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); |
|
| 3010 | + $geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
|
|
| 3011 | 3011 | |
| 3012 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3013 | - if($category_restrict && $cat_count > $category_limit ){
|
|
| 3012 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3013 | + if ($category_restrict && $cat_count > $category_limit) {
|
|
| 3014 | 3014 | continue; |
| 3015 | 3015 | } |
| 3016 | 3016 | $total_post = $cat->count; |
| 3017 | 3017 | |
| 3018 | - $term_link = get_term_link( $cat, $cat->taxonomy ); |
|
| 3018 | + $term_link = get_term_link($cat, $cat->taxonomy); |
|
| 3019 | 3019 | /** |
| 3020 | 3020 | * Filer the category term link. |
| 3021 | 3021 | * |
@@ -3025,11 +3025,11 @@ discard block |
||
| 3025 | 3025 | * @param int $cat ->term_id The term id. |
| 3026 | 3026 | * @param string $post_type Wordpress post type. |
| 3027 | 3027 | */ |
| 3028 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); |
|
| 3028 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
|
|
| 3029 | 3029 | |
| 3030 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; |
|
| 3031 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; |
|
| 3032 | - echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
|
|
| 3030 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; |
|
| 3031 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; |
|
| 3032 | + echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
|
|
| 3033 | 3033 | echo '</a></li>'; |
| 3034 | 3034 | } |
| 3035 | 3035 | } |
@@ -3044,14 +3044,14 @@ discard block |
||
| 3044 | 3044 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3045 | 3045 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3046 | 3046 | */ |
| 3047 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
|
|
| 3047 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
|
|
| 3048 | 3048 | // prints the widget |
| 3049 | - extract( $args, EXTR_SKIP ); |
|
| 3049 | + extract($args, EXTR_SKIP); |
|
| 3050 | 3050 | |
| 3051 | 3051 | echo $before_widget; |
| 3052 | 3052 | |
| 3053 | 3053 | /** This filter is documented in geodirectory_widgets.php */ |
| 3054 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3054 | + $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3055 | 3055 | /** |
| 3056 | 3056 | * Filter the widget post type. |
| 3057 | 3057 | * |
@@ -3059,7 +3059,7 @@ discard block |
||
| 3059 | 3059 | * |
| 3060 | 3060 | * @param string $instance ['post_type'] Post type of listing. |
| 3061 | 3061 | */ |
| 3062 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3062 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3063 | 3063 | /** |
| 3064 | 3064 | * Filter the widget's term. |
| 3065 | 3065 | * |
@@ -3067,7 +3067,7 @@ discard block |
||
| 3067 | 3067 | * |
| 3068 | 3068 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3069 | 3069 | */ |
| 3070 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3070 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3071 | 3071 | /** |
| 3072 | 3072 | * Filter widget's "add_location_filter" value. |
| 3073 | 3073 | * |
@@ -3075,7 +3075,7 @@ discard block |
||
| 3075 | 3075 | * |
| 3076 | 3076 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3077 | 3077 | */ |
| 3078 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3078 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3079 | 3079 | /** |
| 3080 | 3080 | * Filter the widget listings limit. |
| 3081 | 3081 | * |
@@ -3083,7 +3083,7 @@ discard block |
||
| 3083 | 3083 | * |
| 3084 | 3084 | * @param string $instance ['post_number'] Number of listings to display. |
| 3085 | 3085 | */ |
| 3086 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3086 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3087 | 3087 | /** |
| 3088 | 3088 | * Filter the widget listings limit shown at one time. |
| 3089 | 3089 | * |
@@ -3091,7 +3091,7 @@ discard block |
||
| 3091 | 3091 | * |
| 3092 | 3092 | * @param string $instance ['max_show'] Number of listings to display on screen. |
| 3093 | 3093 | */ |
| 3094 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); |
|
| 3094 | + $max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
|
|
| 3095 | 3095 | /** |
| 3096 | 3096 | * Filter the widget slide width. |
| 3097 | 3097 | * |
@@ -3099,7 +3099,7 @@ discard block |
||
| 3099 | 3099 | * |
| 3100 | 3100 | * @param string $instance ['slide_width'] Width of the slides shown. |
| 3101 | 3101 | */ |
| 3102 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); |
|
| 3102 | + $slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
|
|
| 3103 | 3103 | /** |
| 3104 | 3104 | * Filter widget's "show title" value. |
| 3105 | 3105 | * |
@@ -3107,7 +3107,7 @@ discard block |
||
| 3107 | 3107 | * |
| 3108 | 3108 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. |
| 3109 | 3109 | */ |
| 3110 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); |
|
| 3110 | + $show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
|
|
| 3111 | 3111 | /** |
| 3112 | 3112 | * Filter widget's "slideshow" value. |
| 3113 | 3113 | * |
@@ -3115,7 +3115,7 @@ discard block |
||
| 3115 | 3115 | * |
| 3116 | 3116 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. |
| 3117 | 3117 | */ |
| 3118 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); |
|
| 3118 | + $slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
|
|
| 3119 | 3119 | /** |
| 3120 | 3120 | * Filter widget's "animationLoop" value. |
| 3121 | 3121 | * |
@@ -3123,7 +3123,7 @@ discard block |
||
| 3123 | 3123 | * |
| 3124 | 3124 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. |
| 3125 | 3125 | */ |
| 3126 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); |
|
| 3126 | + $animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
|
|
| 3127 | 3127 | /** |
| 3128 | 3128 | * Filter widget's "directionNav" value. |
| 3129 | 3129 | * |
@@ -3131,7 +3131,7 @@ discard block |
||
| 3131 | 3131 | * |
| 3132 | 3132 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. |
| 3133 | 3133 | */ |
| 3134 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); |
|
| 3134 | + $directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
|
|
| 3135 | 3135 | /** |
| 3136 | 3136 | * Filter widget's "slideshowSpeed" value. |
| 3137 | 3137 | * |
@@ -3139,7 +3139,7 @@ discard block |
||
| 3139 | 3139 | * |
| 3140 | 3140 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. |
| 3141 | 3141 | */ |
| 3142 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); |
|
| 3142 | + $slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
|
|
| 3143 | 3143 | /** |
| 3144 | 3144 | * Filter widget's "animationSpeed" value. |
| 3145 | 3145 | * |
@@ -3147,7 +3147,7 @@ discard block |
||
| 3147 | 3147 | * |
| 3148 | 3148 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. |
| 3149 | 3149 | */ |
| 3150 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); |
|
| 3150 | + $animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
|
|
| 3151 | 3151 | /** |
| 3152 | 3152 | * Filter widget's "animation" value. |
| 3153 | 3153 | * |
@@ -3155,7 +3155,7 @@ discard block |
||
| 3155 | 3155 | * |
| 3156 | 3156 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". |
| 3157 | 3157 | */ |
| 3158 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); |
|
| 3158 | + $animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
|
|
| 3159 | 3159 | /** |
| 3160 | 3160 | * Filter widget's "list_sort" type. |
| 3161 | 3161 | * |
@@ -3163,10 +3163,10 @@ discard block |
||
| 3163 | 3163 | * |
| 3164 | 3164 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3165 | 3165 | */ |
| 3166 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3167 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; |
|
| 3166 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3167 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; |
|
| 3168 | 3168 | |
| 3169 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); |
|
| 3169 | + wp_enqueue_script('geodirectory-jquery-flexslider-js');
|
|
| 3170 | 3170 | ?> |
| 3171 | 3171 | <script type="text/javascript"> |
| 3172 | 3172 | jQuery(window).load(function () {
|
@@ -3185,7 +3185,7 @@ discard block |
||
| 3185 | 3185 | itemWidth: 75, |
| 3186 | 3186 | itemMargin: 5, |
| 3187 | 3187 | asNavFor: '#geodir_widget_slider', |
| 3188 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>, |
|
| 3188 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>, |
|
| 3189 | 3189 | start: function (slider) {
|
| 3190 | 3190 | // chrome 53 introduced a bug, so we need to repaint the slider when shown. |
| 3191 | 3191 | jQuery('.geodir-slides', jQuery(slider)).removeClass('flexslider-fix-rtl');
|
@@ -3193,19 +3193,19 @@ discard block |
||
| 3193 | 3193 | }); |
| 3194 | 3194 | |
| 3195 | 3195 | jQuery('#geodir_widget_slider').flexslider({
|
| 3196 | - animation: "<?php echo $animation;?>", |
|
| 3196 | + animation: "<?php echo $animation; ?>", |
|
| 3197 | 3197 | selector: ".geodir-slides > li", |
| 3198 | 3198 | namespace: "geodir-", |
| 3199 | 3199 | controlNav: true, |
| 3200 | - animationLoop: <?php echo $animationLoop;?>, |
|
| 3201 | - slideshow: <?php echo $slideshow;?>, |
|
| 3202 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, |
|
| 3203 | - animationSpeed: <?php echo $animationSpeed;?>, |
|
| 3204 | - directionNav: <?php echo $directionNav;?>, |
|
| 3205 | - maxItems: <?php echo $max_show;?>, |
|
| 3200 | + animationLoop: <?php echo $animationLoop; ?>, |
|
| 3201 | + slideshow: <?php echo $slideshow; ?>, |
|
| 3202 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, |
|
| 3203 | + animationSpeed: <?php echo $animationSpeed; ?>, |
|
| 3204 | + directionNav: <?php echo $directionNav; ?>, |
|
| 3205 | + maxItems: <?php echo $max_show; ?>, |
|
| 3206 | 3206 | move: 1, |
| 3207 | - <?php if ( $slide_width ) {
|
|
| 3208 | - echo "itemWidth: " . $slide_width . ","; |
|
| 3207 | + <?php if ($slide_width) {
|
|
| 3208 | + echo "itemWidth: ".$slide_width.","; |
|
| 3209 | 3209 | }?> |
| 3210 | 3210 | sync: "#geodir_widget_carousel", |
| 3211 | 3211 | start: function (slider) {
|
@@ -3216,7 +3216,7 @@ discard block |
||
| 3216 | 3216 | jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
|
| 3217 | 3217 | jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
|
| 3218 | 3218 | }, |
| 3219 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3219 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3220 | 3220 | }); |
| 3221 | 3221 | }); |
| 3222 | 3222 | </script> |
@@ -3229,62 +3229,62 @@ discard block |
||
| 3229 | 3229 | 'order_by' => $list_sort |
| 3230 | 3230 | ); |
| 3231 | 3231 | |
| 3232 | - if ( $show_featured_only ) {
|
|
| 3232 | + if ($show_featured_only) {
|
|
| 3233 | 3233 | $query_args['show_featured_only'] = 1; |
| 3234 | 3234 | } |
| 3235 | 3235 | |
| 3236 | - if ( $category != 0 || $category != '' ) {
|
|
| 3237 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3236 | + if ($category != 0 || $category != '') {
|
|
| 3237 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3238 | 3238 | $tax_query = array( |
| 3239 | 3239 | 'taxonomy' => $category_taxonomy[0], |
| 3240 | 3240 | 'field' => 'id', |
| 3241 | 3241 | 'terms' => $category |
| 3242 | 3242 | ); |
| 3243 | 3243 | |
| 3244 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3244 | + $query_args['tax_query'] = array($tax_query); |
|
| 3245 | 3245 | } |
| 3246 | 3246 | |
| 3247 | 3247 | // we want listings with featured image only |
| 3248 | 3248 | $query_args['featured_image_only'] = 1; |
| 3249 | 3249 | |
| 3250 | - if ( $post_type == 'gd_event' ) {
|
|
| 3250 | + if ($post_type == 'gd_event') {
|
|
| 3251 | 3251 | $query_args['gedir_event_listing_filter'] = 'upcoming'; |
| 3252 | 3252 | }// show only upcoming events |
| 3253 | 3253 | |
| 3254 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3255 | - if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
|
|
| 3256 | - if ( $title ) {
|
|
| 3257 | - echo $before_title . $title . $after_title; |
|
| 3254 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3255 | + if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
|
|
| 3256 | + if ($title) {
|
|
| 3257 | + echo $before_title.$title.$after_title; |
|
| 3258 | 3258 | } |
| 3259 | 3259 | |
| 3260 | 3260 | global $post; |
| 3261 | 3261 | |
| 3262 | - $current_post = $post;// keep current post info |
|
| 3262 | + $current_post = $post; // keep current post info |
|
| 3263 | 3263 | |
| 3264 | 3264 | $widget_main_slides = ''; |
| 3265 | 3265 | $nav_slides = ''; |
| 3266 | 3266 | $widget_slides = 0; |
| 3267 | 3267 | |
| 3268 | - foreach ( $widget_listings as $widget_listing ) {
|
|
| 3268 | + foreach ($widget_listings as $widget_listing) {
|
|
| 3269 | 3269 | global $gd_widget_listing_type; |
| 3270 | 3270 | $post = $widget_listing; |
| 3271 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); |
|
| 3271 | + $widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 3272 | 3272 | |
| 3273 | - if ( ! empty( $widget_image ) ) {
|
|
| 3274 | - if ( $widget_image->height >= 200 ) {
|
|
| 3273 | + if (!empty($widget_image)) {
|
|
| 3274 | + if ($widget_image->height >= 200) {
|
|
| 3275 | 3275 | $widget_spacer_height = 0; |
| 3276 | 3276 | } else {
|
| 3277 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); |
|
| 3277 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); |
|
| 3278 | 3278 | } |
| 3279 | 3279 | |
| 3280 | - $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" />'; |
|
| 3280 | + $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" />'; |
|
| 3281 | 3281 | |
| 3282 | 3282 | $title = ''; |
| 3283 | - if ( $show_title ) {
|
|
| 3284 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; |
|
| 3283 | + if ($show_title) {
|
|
| 3284 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; |
|
| 3285 | 3285 | $post_id = $post->ID; |
| 3286 | - $post_permalink = get_permalink( $post->ID ); |
|
| 3287 | - $post_title = get_the_title( $post->ID ); |
|
| 3286 | + $post_permalink = get_permalink($post->ID); |
|
| 3287 | + $post_title = get_the_title($post->ID); |
|
| 3288 | 3288 | /** |
| 3289 | 3289 | * Filter the listing slider widget title. |
| 3290 | 3290 | * |
@@ -3295,12 +3295,12 @@ discard block |
||
| 3295 | 3295 | * @param string $post_permalink The post permalink url. |
| 3296 | 3296 | * @param string $post_title The post title text. |
| 3297 | 3297 | */ |
| 3298 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); |
|
| 3298 | + $title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
|
|
| 3299 | 3299 | } |
| 3300 | 3300 | |
| 3301 | - $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>'; |
|
| 3302 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3303 | - $widget_slides ++; |
|
| 3301 | + $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>'; |
|
| 3302 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3303 | + $widget_slides++; |
|
| 3304 | 3304 | } |
| 3305 | 3305 | } |
| 3306 | 3306 | ?> |
@@ -3309,7 +3309,7 @@ discard block |
||
| 3309 | 3309 | <div id="geodir_widget_slider" class="geodir_flexslider"> |
| 3310 | 3310 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> |
| 3311 | 3311 | </div> |
| 3312 | - <?php if ( $widget_slides > 1 ) { ?>
|
|
| 3312 | + <?php if ($widget_slides > 1) { ?>
|
|
| 3313 | 3313 | <div id="geodir_widget_carousel" class="geodir_flexslider"> |
| 3314 | 3314 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> |
| 3315 | 3315 | </div> |
@@ -3317,7 +3317,7 @@ discard block |
||
| 3317 | 3317 | </div> |
| 3318 | 3318 | <?php |
| 3319 | 3319 | $GLOBALS['post'] = $current_post; |
| 3320 | - setup_postdata( $current_post ); |
|
| 3320 | + setup_postdata($current_post); |
|
| 3321 | 3321 | } |
| 3322 | 3322 | echo $after_widget; |
| 3323 | 3323 | } |
@@ -3333,50 +3333,50 @@ discard block |
||
| 3333 | 3333 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3334 | 3334 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3335 | 3335 | */ |
| 3336 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
|
|
| 3336 | +function geodir_loginwidget_output($args = '', $instance = '') {
|
|
| 3337 | 3337 | //print_r($args); |
| 3338 | 3338 | //print_r($instance); |
| 3339 | 3339 | // prints the widget |
| 3340 | - extract( $args, EXTR_SKIP ); |
|
| 3340 | + extract($args, EXTR_SKIP); |
|
| 3341 | 3341 | |
| 3342 | 3342 | /** This filter is documented in geodirectory_widgets.php */ |
| 3343 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3343 | + $title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3344 | 3344 | |
| 3345 | 3345 | echo $before_widget; |
| 3346 | - echo $before_title . $title . $after_title; |
|
| 3346 | + echo $before_title.$title.$after_title; |
|
| 3347 | 3347 | |
| 3348 | 3348 | // global $gd_session; |
| 3349 | 3349 | // print_r($gd_session); |
| 3350 | 3350 | // print_r($_SESSION); |
| 3351 | 3351 | |
| 3352 | - if ( is_user_logged_in() ) {
|
|
| 3352 | + if (is_user_logged_in()) {
|
|
| 3353 | 3353 | global $current_user; |
| 3354 | 3354 | |
| 3355 | - $author_link = get_author_posts_url( $current_user->data->ID ); |
|
| 3356 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 3355 | + $author_link = get_author_posts_url($current_user->data->ID); |
|
| 3356 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
|
|
| 3357 | 3357 | |
| 3358 | 3358 | echo '<ul class="geodir-loginbox-list">'; |
| 3359 | 3359 | ob_start(); |
| 3360 | 3360 | ?> |
| 3361 | 3361 | <li><a class="signin" |
| 3362 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> |
|
| 3362 | + href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
|
|
| 3363 | 3363 | <?php |
| 3364 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 3365 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); |
|
| 3366 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); |
|
| 3364 | + $post_types = geodir_get_posttypes('object');
|
|
| 3365 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
|
|
| 3366 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 3367 | 3367 | |
| 3368 | - if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
|
|
| 3368 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 3369 | 3369 | $addlisting_links = ''; |
| 3370 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3370 | + foreach ($post_types as $key => $postobj) {
|
|
| 3371 | 3371 | |
| 3372 | - if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
|
|
| 3372 | + if (in_array($key, $show_add_listing_post_types_main_nav)) {
|
|
| 3373 | 3373 | |
| 3374 | - if ( $add_link = geodir_get_addlisting_link( $key ) ) {
|
|
| 3374 | + if ($add_link = geodir_get_addlisting_link($key)) {
|
|
| 3375 | 3375 | |
| 3376 | 3376 | $name = $postobj->labels->name; |
| 3377 | 3377 | |
| 3378 | 3378 | $selected = ''; |
| 3379 | - if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
|
|
| 3379 | + if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
|
|
| 3380 | 3380 | $selected = 'selected="selected"'; |
| 3381 | 3381 | } |
| 3382 | 3382 | |
@@ -3389,23 +3389,23 @@ discard block |
||
| 3389 | 3389 | * @param string $key Add listing array key. |
| 3390 | 3390 | * @param int $current_user ->ID Current user ID. |
| 3391 | 3391 | */ |
| 3392 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); |
|
| 3393 | - $name = apply_filters( 'geodir_dashboard_label_add_listing', $name, $key, $current_user->ID ); |
|
| 3392 | + $add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
|
|
| 3393 | + $name = apply_filters('geodir_dashboard_label_add_listing', $name, $key, $current_user->ID);
|
|
| 3394 | 3394 | |
| 3395 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3395 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3396 | 3396 | |
| 3397 | 3397 | } |
| 3398 | 3398 | } |
| 3399 | 3399 | |
| 3400 | 3400 | } |
| 3401 | 3401 | |
| 3402 | - if ( $addlisting_links != '' ) { ?>
|
|
| 3402 | + if ($addlisting_links != '') { ?>
|
|
| 3403 | 3403 | |
| 3404 | 3404 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" |
| 3405 | 3405 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" |
| 3406 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> |
|
| 3406 | + data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
|
|
| 3407 | 3407 | <option value="" disabled="disabled" selected="selected" |
| 3408 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> |
|
| 3408 | + style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
|
|
| 3409 | 3409 | <?php echo $addlisting_links; ?> |
| 3410 | 3410 | </select></li> <?php |
| 3411 | 3411 | |
@@ -3413,24 +3413,24 @@ discard block |
||
| 3413 | 3413 | |
| 3414 | 3414 | } |
| 3415 | 3415 | // My Favourites in Dashboard |
| 3416 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 3416 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
|
|
| 3417 | 3417 | $user_favourite = geodir_user_favourite_listing_count(); |
| 3418 | 3418 | |
| 3419 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
|
|
| 3419 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
|
|
| 3420 | 3420 | $favourite_links = ''; |
| 3421 | 3421 | |
| 3422 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3423 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
|
|
| 3422 | + foreach ($post_types as $key => $postobj) {
|
|
| 3423 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
|
|
| 3424 | 3424 | $name = $postobj->labels->name; |
| 3425 | 3425 | $fav_author_link = apply_filters('gd_dash_fav_author_link', $author_link, $current_user->data->ID);
|
| 3426 | - $post_type_link = geodir_getlink( $fav_author_link, array( |
|
| 3426 | + $post_type_link = geodir_getlink($fav_author_link, array( |
|
| 3427 | 3427 | 'stype' => $key, |
| 3428 | 3428 | 'list' => 'favourite' |
| 3429 | - ), false ); |
|
| 3429 | + ), false); |
|
| 3430 | 3430 | |
| 3431 | 3431 | $selected = ''; |
| 3432 | 3432 | |
| 3433 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 3433 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 3434 | 3434 | $selected = 'selected="selected"'; |
| 3435 | 3435 | } |
| 3436 | 3436 | /** |
@@ -3442,20 +3442,20 @@ discard block |
||
| 3442 | 3442 | * @param string $key Favorite listing array key. |
| 3443 | 3443 | * @param int $current_user ->ID Current user ID. |
| 3444 | 3444 | */ |
| 3445 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); |
|
| 3445 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
|
|
| 3446 | 3446 | |
| 3447 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3447 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3448 | 3448 | } |
| 3449 | 3449 | } |
| 3450 | 3450 | |
| 3451 | - if ( $favourite_links != '' ) {
|
|
| 3451 | + if ($favourite_links != '') {
|
|
| 3452 | 3452 | ?> |
| 3453 | 3453 | <li> |
| 3454 | 3454 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 3455 | 3455 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
| 3456 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> |
|
| 3456 | + data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
|
|
| 3457 | 3457 | <option value="" disabled="disabled" selected="selected" |
| 3458 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> |
|
| 3458 | + style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
|
|
| 3459 | 3459 | <?php echo $favourite_links; ?> |
| 3460 | 3460 | </select> |
| 3461 | 3461 | </li> |
@@ -3464,20 +3464,20 @@ discard block |
||
| 3464 | 3464 | } |
| 3465 | 3465 | |
| 3466 | 3466 | |
| 3467 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 3467 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
|
|
| 3468 | 3468 | $user_listing = geodir_user_post_listing_count(); |
| 3469 | 3469 | |
| 3470 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
|
|
| 3470 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
|
|
| 3471 | 3471 | $listing_links = ''; |
| 3472 | 3472 | |
| 3473 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3474 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
|
|
| 3473 | + foreach ($post_types as $key => $postobj) {
|
|
| 3474 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
|
|
| 3475 | 3475 | $name = $postobj->labels->name; |
| 3476 | 3476 | $listing_author_link = apply_filters('gd_dash_listing_author_link', $author_link, $current_user->data->ID);
|
| 3477 | - $listing_link = geodir_getlink( $listing_author_link, array( 'stype' => $key ), false ); |
|
| 3477 | + $listing_link = geodir_getlink($listing_author_link, array('stype' => $key), false);
|
|
| 3478 | 3478 | |
| 3479 | 3479 | $selected = ''; |
| 3480 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
|
|
| 3480 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
|
|
| 3481 | 3481 | $selected = 'selected="selected"'; |
| 3482 | 3482 | } |
| 3483 | 3483 | |
@@ -3490,20 +3490,20 @@ discard block |
||
| 3490 | 3490 | * @param string $key My listing array key. |
| 3491 | 3491 | * @param int $current_user ->ID Current user ID. |
| 3492 | 3492 | */ |
| 3493 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); |
|
| 3493 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
|
|
| 3494 | 3494 | |
| 3495 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3495 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3496 | 3496 | } |
| 3497 | 3497 | } |
| 3498 | 3498 | |
| 3499 | - if ( $listing_links != '' ) {
|
|
| 3499 | + if ($listing_links != '') {
|
|
| 3500 | 3500 | ?> |
| 3501 | 3501 | <li> |
| 3502 | 3502 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 3503 | 3503 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
| 3504 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> |
|
| 3504 | + data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
|
|
| 3505 | 3505 | <option value="" disabled="disabled" selected="selected" |
| 3506 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> |
|
| 3506 | + style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
|
|
| 3507 | 3507 | <?php echo $listing_links; ?> |
| 3508 | 3508 | </select> |
| 3509 | 3509 | </li> |
@@ -3519,7 +3519,7 @@ discard block |
||
| 3519 | 3519 | * |
| 3520 | 3520 | * @param string $dashboard_link Dashboard links HTML. |
| 3521 | 3521 | */ |
| 3522 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); |
|
| 3522 | + echo apply_filters('geodir_dashboard_links', $dashboard_link);
|
|
| 3523 | 3523 | echo '</ul>'; |
| 3524 | 3524 | |
| 3525 | 3525 | /** |
@@ -3527,7 +3527,7 @@ discard block |
||
| 3527 | 3527 | * |
| 3528 | 3528 | * @since 1.6.6 |
| 3529 | 3529 | */ |
| 3530 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); |
|
| 3530 | + do_action('geodir_after_loginwidget_form_logged_in');
|
|
| 3531 | 3531 | |
| 3532 | 3532 | |
| 3533 | 3533 | } else {
|
@@ -3542,18 +3542,18 @@ discard block |
||
| 3542 | 3542 | <form name="loginform" class="loginform1" |
| 3543 | 3543 | action="<?php echo geodir_login_url(); ?>" |
| 3544 | 3544 | method="post"> |
| 3545 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Email', 'geodirectory' ); ?>" name="log" |
|
| 3545 | + <div class="geodir_form_row"><input placeholder="<?php _e('Email', 'geodirectory'); ?>" name="log"
|
|
| 3546 | 3546 | type="text" class="textfield user_login1"/> <span |
| 3547 | 3547 | class="user_loginInfo"></span></div> |
| 3548 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" |
|
| 3548 | + <div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
|
|
| 3549 | 3549 | name="pwd" type="password" |
| 3550 | 3550 | class="textfield user_pass1 input-text"/><span |
| 3551 | 3551 | class="user_passInfo"></span></div> |
| 3552 | 3552 | |
| 3553 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> |
|
| 3553 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> |
|
| 3554 | 3554 | <input type="hidden" name="testcookie" value="1"/> |
| 3555 | 3555 | |
| 3556 | - <?php do_action( 'login_form' ); ?> |
|
| 3556 | + <?php do_action('login_form'); ?>
|
|
| 3557 | 3557 | |
| 3558 | 3558 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" |
| 3559 | 3559 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> |
@@ -3565,11 +3565,11 @@ discard block |
||
| 3565 | 3565 | * |
| 3566 | 3566 | * @since 1.0.0 |
| 3567 | 3567 | */ |
| 3568 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 3568 | + $is_enable_signup = get_option('users_can_register');
|
|
| 3569 | 3569 | |
| 3570 | - if ( $is_enable_signup ) {
|
|
| 3570 | + if ($is_enable_signup) {
|
|
| 3571 | 3571 | ?> |
| 3572 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" |
|
| 3572 | + <a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
|
|
| 3573 | 3573 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> |
| 3574 | 3574 | |
| 3575 | 3575 | <?php |
@@ -3580,7 +3580,7 @@ discard block |
||
| 3580 | 3580 | * @since 1.0.0 |
| 3581 | 3581 | */ |
| 3582 | 3582 | ?> |
| 3583 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" |
|
| 3583 | + <a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
|
|
| 3584 | 3584 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> |
| 3585 | 3585 | </form> |
| 3586 | 3586 | <?php |
@@ -3589,7 +3589,7 @@ discard block |
||
| 3589 | 3589 | * |
| 3590 | 3590 | * @since 1.6.6 |
| 3591 | 3591 | */ |
| 3592 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); |
|
| 3592 | + do_action('geodir_after_loginwidget_form_logged_out');
|
|
| 3593 | 3593 | } |
| 3594 | 3594 | |
| 3595 | 3595 | echo $after_widget; |
@@ -3611,14 +3611,14 @@ discard block |
||
| 3611 | 3611 | * after_widget. |
| 3612 | 3612 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3613 | 3613 | */ |
| 3614 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
|
|
| 3614 | +function geodir_popular_postview_output($args = '', $instance = '') {
|
|
| 3615 | 3615 | global $gd_session; |
| 3616 | 3616 | |
| 3617 | 3617 | // prints the widget |
| 3618 | - extract( $args, EXTR_SKIP ); |
|
| 3618 | + extract($args, EXTR_SKIP); |
|
| 3619 | 3619 | |
| 3620 | 3620 | /** This filter is documented in geodirectory_widgets.php */ |
| 3621 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3621 | + $title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3622 | 3622 | /** |
| 3623 | 3623 | * Filter the widget post type. |
| 3624 | 3624 | * |
@@ -3626,7 +3626,7 @@ discard block |
||
| 3626 | 3626 | * |
| 3627 | 3627 | * @param string $instance ['post_type'] Post type of listing. |
| 3628 | 3628 | */ |
| 3629 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3629 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3630 | 3630 | /** |
| 3631 | 3631 | * Filter the widget's term. |
| 3632 | 3632 | * |
@@ -3634,7 +3634,7 @@ discard block |
||
| 3634 | 3634 | * |
| 3635 | 3635 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3636 | 3636 | */ |
| 3637 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3637 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3638 | 3638 | /** |
| 3639 | 3639 | * Filter the widget listings limit. |
| 3640 | 3640 | * |
@@ -3642,7 +3642,7 @@ discard block |
||
| 3642 | 3642 | * |
| 3643 | 3643 | * @param string $instance ['post_number'] Number of listings to display. |
| 3644 | 3644 | */ |
| 3645 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3645 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3646 | 3646 | /** |
| 3647 | 3647 | * Filter widget's "layout" type. |
| 3648 | 3648 | * |
@@ -3650,7 +3650,7 @@ discard block |
||
| 3650 | 3650 | * |
| 3651 | 3651 | * @param string $instance ['layout'] Widget layout type. |
| 3652 | 3652 | */ |
| 3653 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); |
|
| 3653 | + $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
|
|
| 3654 | 3654 | /** |
| 3655 | 3655 | * Filter widget's "add_location_filter" value. |
| 3656 | 3656 | * |
@@ -3658,7 +3658,7 @@ discard block |
||
| 3658 | 3658 | * |
| 3659 | 3659 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3660 | 3660 | */ |
| 3661 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3661 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3662 | 3662 | /** |
| 3663 | 3663 | * Filter widget's listing width. |
| 3664 | 3664 | * |
@@ -3666,7 +3666,7 @@ discard block |
||
| 3666 | 3666 | * |
| 3667 | 3667 | * @param string $instance ['listing_width'] Listing width. |
| 3668 | 3668 | */ |
| 3669 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); |
|
| 3669 | + $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
|
|
| 3670 | 3670 | /** |
| 3671 | 3671 | * Filter widget's "list_sort" type. |
| 3672 | 3672 | * |
@@ -3674,36 +3674,36 @@ discard block |
||
| 3674 | 3674 | * |
| 3675 | 3675 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3676 | 3676 | */ |
| 3677 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3678 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; |
|
| 3677 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3678 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; |
|
| 3679 | 3679 | |
| 3680 | 3680 | // set post type to current viewing post type |
| 3681 | - if ( $use_viewing_post_type ) {
|
|
| 3681 | + if ($use_viewing_post_type) {
|
|
| 3682 | 3682 | $current_post_type = geodir_get_current_posttype(); |
| 3683 | - if ( $current_post_type != '' && $current_post_type != $post_type ) {
|
|
| 3683 | + if ($current_post_type != '' && $current_post_type != $post_type) {
|
|
| 3684 | 3684 | $post_type = $current_post_type; |
| 3685 | 3685 | $category = array(); // old post type category will not work for current changed post type |
| 3686 | 3686 | } |
| 3687 | 3687 | } |
| 3688 | 3688 | // replace widget title dynamically |
| 3689 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3690 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); |
|
| 3689 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3690 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); |
|
| 3691 | 3691 | |
| 3692 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); |
|
| 3693 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); |
|
| 3692 | + $title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
|
|
| 3693 | + $title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
|
|
| 3694 | 3694 | |
| 3695 | 3695 | $categories = $category; |
| 3696 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3697 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3696 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3697 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3698 | 3698 | |
| 3699 | 3699 | ######### WPML ######### |
| 3700 | - if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
|
|
| 3701 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); |
|
| 3700 | + if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
|
|
| 3701 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); |
|
| 3702 | 3702 | } |
| 3703 | 3703 | ######### WPML ######### |
| 3704 | 3704 | } |
| 3705 | 3705 | |
| 3706 | - if ( isset( $instance['character_count'] ) ) {
|
|
| 3706 | + if (isset($instance['character_count'])) {
|
|
| 3707 | 3707 | /** |
| 3708 | 3708 | * Filter the widget's excerpt character count. |
| 3709 | 3709 | * |
@@ -3711,37 +3711,37 @@ discard block |
||
| 3711 | 3711 | * |
| 3712 | 3712 | * @param int $instance ['character_count'] Excerpt character count. |
| 3713 | 3713 | */ |
| 3714 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); |
|
| 3714 | + $character_count = apply_filters('widget_list_character_count', $instance['character_count']);
|
|
| 3715 | 3715 | } else {
|
| 3716 | 3716 | $character_count = ''; |
| 3717 | 3717 | } |
| 3718 | 3718 | |
| 3719 | - if ( empty( $title ) || $title == 'All' ) {
|
|
| 3720 | - $title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3719 | + if (empty($title) || $title == 'All') {
|
|
| 3720 | + $title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3721 | 3721 | } |
| 3722 | 3722 | |
| 3723 | 3723 | $location_url = array(); |
| 3724 | - $city = get_query_var( 'gd_city' ); |
|
| 3725 | - if ( ! empty( $city ) ) {
|
|
| 3726 | - $country = get_query_var( 'gd_country' ); |
|
| 3727 | - $region = get_query_var( 'gd_region' ); |
|
| 3724 | + $city = get_query_var('gd_city');
|
|
| 3725 | + if (!empty($city)) {
|
|
| 3726 | + $country = get_query_var('gd_country');
|
|
| 3727 | + $region = get_query_var('gd_region');
|
|
| 3728 | 3728 | |
| 3729 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 3729 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 3730 | 3730 | |
| 3731 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 3732 | - if ( $country != '' ) {
|
|
| 3731 | + if ($geodir_show_location_url == 'all') {
|
|
| 3732 | + if ($country != '') {
|
|
| 3733 | 3733 | $location_url[] = $country; |
| 3734 | 3734 | } |
| 3735 | 3735 | |
| 3736 | - if ( $region != '' ) {
|
|
| 3736 | + if ($region != '') {
|
|
| 3737 | 3737 | $location_url[] = $region; |
| 3738 | 3738 | } |
| 3739 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 3740 | - if ( $country != '' ) {
|
|
| 3739 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 3740 | + if ($country != '') {
|
|
| 3741 | 3741 | $location_url[] = $country; |
| 3742 | 3742 | } |
| 3743 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 3744 | - if ( $region != '' ) {
|
|
| 3743 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 3744 | + if ($region != '') {
|
|
| 3745 | 3745 | $location_url[] = $region; |
| 3746 | 3746 | } |
| 3747 | 3747 | } |
@@ -3749,37 +3749,37 @@ discard block |
||
| 3749 | 3749 | $location_url[] = $city; |
| 3750 | 3750 | } |
| 3751 | 3751 | |
| 3752 | - $location_url = implode( '/', $location_url ); |
|
| 3752 | + $location_url = implode('/', $location_url);
|
|
| 3753 | 3753 | $skip_location = false; |
| 3754 | - if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 3754 | + if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
|
|
| 3755 | 3755 | $skip_location = true; |
| 3756 | - $gd_session->un_set( 'gd_multi_location' ); |
|
| 3756 | + $gd_session->un_set('gd_multi_location');
|
|
| 3757 | 3757 | } |
| 3758 | 3758 | |
| 3759 | - if ( get_option( 'permalink_structure' ) ) {
|
|
| 3760 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3759 | + if (get_option('permalink_structure')) {
|
|
| 3760 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3761 | 3761 | } else {
|
| 3762 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3762 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3763 | 3763 | } |
| 3764 | 3764 | |
| 3765 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3765 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3766 | 3766 | global $geodir_add_location_url; |
| 3767 | 3767 | |
| 3768 | 3768 | $geodir_add_location_url = '0'; |
| 3769 | 3769 | |
| 3770 | - if ( $add_location_filter != '0' ) {
|
|
| 3770 | + if ($add_location_filter != '0') {
|
|
| 3771 | 3771 | $geodir_add_location_url = '1'; |
| 3772 | 3772 | } |
| 3773 | 3773 | |
| 3774 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); |
|
| 3774 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); |
|
| 3775 | 3775 | |
| 3776 | 3776 | $geodir_add_location_url = null; |
| 3777 | 3777 | } |
| 3778 | - if ( $skip_location ) {
|
|
| 3779 | - $gd_session->set( 'gd_multi_location', 1 ); |
|
| 3778 | + if ($skip_location) {
|
|
| 3779 | + $gd_session->set('gd_multi_location', 1);
|
|
| 3780 | 3780 | } |
| 3781 | 3781 | |
| 3782 | - if ( is_wp_error( $viewall_url ) ) {
|
|
| 3782 | + if (is_wp_error($viewall_url)) {
|
|
| 3783 | 3783 | $viewall_url = ''; |
| 3784 | 3784 | } |
| 3785 | 3785 | |
@@ -3791,43 +3791,43 @@ discard block |
||
| 3791 | 3791 | 'order_by' => $list_sort |
| 3792 | 3792 | ); |
| 3793 | 3793 | |
| 3794 | - if ( $character_count ) {
|
|
| 3794 | + if ($character_count) {
|
|
| 3795 | 3795 | $query_args['excerpt_length'] = $character_count; |
| 3796 | 3796 | } |
| 3797 | 3797 | |
| 3798 | - if ( ! empty( $instance['show_featured_only'] ) ) {
|
|
| 3798 | + if (!empty($instance['show_featured_only'])) {
|
|
| 3799 | 3799 | $query_args['show_featured_only'] = 1; |
| 3800 | 3800 | } |
| 3801 | 3801 | |
| 3802 | - if ( ! empty( $instance['show_special_only'] ) ) {
|
|
| 3802 | + if (!empty($instance['show_special_only'])) {
|
|
| 3803 | 3803 | $query_args['show_special_only'] = 1; |
| 3804 | 3804 | } |
| 3805 | 3805 | |
| 3806 | - if ( ! empty( $instance['with_pics_only'] ) ) {
|
|
| 3806 | + if (!empty($instance['with_pics_only'])) {
|
|
| 3807 | 3807 | $query_args['with_pics_only'] = 0; |
| 3808 | 3808 | $query_args['featured_image_only'] = 1; |
| 3809 | 3809 | } |
| 3810 | 3810 | |
| 3811 | - if ( ! empty( $instance['with_videos_only'] ) ) {
|
|
| 3811 | + if (!empty($instance['with_videos_only'])) {
|
|
| 3812 | 3812 | $query_args['with_videos_only'] = 1; |
| 3813 | 3813 | } |
| 3814 | - $hide_if_empty = ! empty( $instance['hide_if_empty'] ) ? true : false; |
|
| 3814 | + $hide_if_empty = !empty($instance['hide_if_empty']) ? true : false; |
|
| 3815 | 3815 | |
| 3816 | - if ( ! empty( $categories ) && $categories[0] != '0' && !empty( $category_taxonomy ) ) {
|
|
| 3816 | + if (!empty($categories) && $categories[0] != '0' && !empty($category_taxonomy)) {
|
|
| 3817 | 3817 | $tax_query = array( |
| 3818 | 3818 | 'taxonomy' => $category_taxonomy[0], |
| 3819 | 3819 | 'field' => 'id', |
| 3820 | 3820 | 'terms' => $category |
| 3821 | 3821 | ); |
| 3822 | 3822 | |
| 3823 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3823 | + $query_args['tax_query'] = array($tax_query); |
|
| 3824 | 3824 | } |
| 3825 | 3825 | |
| 3826 | 3826 | global $gridview_columns_widget, $geodir_is_widget_listing; |
| 3827 | 3827 | |
| 3828 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3828 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3829 | 3829 | |
| 3830 | - if ( $hide_if_empty && empty( $widget_listings ) ) {
|
|
| 3830 | + if ($hide_if_empty && empty($widget_listings)) {
|
|
| 3831 | 3831 | return; |
| 3832 | 3832 | } |
| 3833 | 3833 | |
@@ -3842,11 +3842,11 @@ discard block |
||
| 3842 | 3842 | * |
| 3843 | 3843 | * @since 1.0.0 |
| 3844 | 3844 | */ |
| 3845 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> |
|
| 3845 | + do_action('geodir_before_view_all_link_in_widget'); ?>
|
|
| 3846 | 3846 | <div class="geodir_list_heading clearfix"> |
| 3847 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 3847 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 3848 | 3848 | <a href="<?php echo $viewall_url; ?>" |
| 3849 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> |
|
| 3849 | + class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
|
|
| 3850 | 3850 | </div> |
| 3851 | 3851 | <?php |
| 3852 | 3852 | /** |
@@ -3854,10 +3854,10 @@ discard block |
||
| 3854 | 3854 | * |
| 3855 | 3855 | * @since 1.0.0 |
| 3856 | 3856 | */ |
| 3857 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> |
|
| 3857 | + do_action('geodir_after_view_all_link_in_widget'); ?>
|
|
| 3858 | 3858 | <?php |
| 3859 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 3860 | - $listing_view_exp = explode( '_', $layout ); |
|
| 3859 | + if (strstr($layout, 'gridview')) {
|
|
| 3860 | + $listing_view_exp = explode('_', $layout);
|
|
| 3861 | 3861 | $gridview_columns_widget = $layout; |
| 3862 | 3862 | $layout = $listing_view_exp[0]; |
| 3863 | 3863 | } else {
|
@@ -3868,8 +3868,8 @@ discard block |
||
| 3868 | 3868 | * |
| 3869 | 3869 | * @since 1.0.0 |
| 3870 | 3870 | */ |
| 3871 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 3872 | - if ( ! isset( $character_count ) ) {
|
|
| 3871 | + $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 3872 | + if (!isset($character_count)) {
|
|
| 3873 | 3873 | /** |
| 3874 | 3874 | * Filter the widget's excerpt character count. |
| 3875 | 3875 | * |
@@ -3877,7 +3877,7 @@ discard block |
||
| 3877 | 3877 | * |
| 3878 | 3878 | * @param int $instance ['character_count'] Excerpt character count. |
| 3879 | 3879 | */ |
| 3880 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); |
|
| 3880 | + $character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
|
|
| 3881 | 3881 | } |
| 3882 | 3882 | |
| 3883 | 3883 | global $post, $map_jason, $map_canvas_arr; |
@@ -3892,13 +3892,13 @@ discard block |
||
| 3892 | 3892 | * |
| 3893 | 3893 | * @since 1.0.0 |
| 3894 | 3894 | */ |
| 3895 | - include( $template ); |
|
| 3895 | + include($template); |
|
| 3896 | 3896 | |
| 3897 | 3897 | $geodir_is_widget_listing = false; |
| 3898 | 3898 | |
| 3899 | 3899 | $GLOBALS['post'] = $current_post; |
| 3900 | - if ( ! empty( $current_post ) ) {
|
|
| 3901 | - setup_postdata( $current_post ); |
|
| 3900 | + if (!empty($current_post)) {
|
|
| 3901 | + setup_postdata($current_post); |
|
| 3902 | 3902 | } |
| 3903 | 3903 | $map_jason = $current_map_jason; |
| 3904 | 3904 | $map_canvas_arr = $current_map_canvas_arr; |
@@ -3927,12 +3927,12 @@ discard block |
||
| 3927 | 3927 | * |
| 3928 | 3928 | * @return int Reviews count. |
| 3929 | 3929 | */ |
| 3930 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
|
|
| 3930 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
|
|
| 3931 | 3931 | global $wpdb, $plugin_prefix; |
| 3932 | 3932 | |
| 3933 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 3933 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 3934 | 3934 | |
| 3935 | - $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 . ")";
|
|
| 3935 | + $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.")";
|
|
| 3936 | 3936 | |
| 3937 | 3937 | /** |
| 3938 | 3938 | * Filter count review sql query. |
@@ -3944,9 +3944,9 @@ discard block |
||
| 3944 | 3944 | * @param int $taxonomy The taxonomy Id. |
| 3945 | 3945 | * @param string $post_type The post type. |
| 3946 | 3946 | */ |
| 3947 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); |
|
| 3947 | + $sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
|
|
| 3948 | 3948 | |
| 3949 | - $count = $wpdb->get_var( $sql ); |
|
| 3949 | + $count = $wpdb->get_var($sql); |
|
| 3950 | 3950 | |
| 3951 | 3951 | return $count; |
| 3952 | 3952 | } |
@@ -3964,7 +3964,7 @@ discard block |
||
| 3964 | 3964 | * |
| 3965 | 3965 | * @return array Term array data. |
| 3966 | 3966 | */ |
| 3967 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
|
|
| 3967 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
|
|
| 3968 | 3968 | /** |
| 3969 | 3969 | * Filter review count option data. |
| 3970 | 3970 | * |
@@ -3974,78 +3974,78 @@ discard block |
||
| 3974 | 3974 | * @param bool $force_update Force update option value?. Default.false. |
| 3975 | 3975 | * @param int $post_ID The post id to update if any. |
| 3976 | 3976 | */ |
| 3977 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); |
|
| 3978 | - if ( ! empty( $option_data ) ) {
|
|
| 3977 | + $option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
|
|
| 3978 | + if (!empty($option_data)) {
|
|
| 3979 | 3979 | return $option_data; |
| 3980 | 3980 | } |
| 3981 | 3981 | |
| 3982 | - $option_data = get_option( 'geodir_global_review_count' ); |
|
| 3982 | + $option_data = get_option('geodir_global_review_count');
|
|
| 3983 | 3983 | |
| 3984 | - if ( ! $option_data || $force_update ) {
|
|
| 3985 | - if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
|
|
| 3984 | + if (!$option_data || $force_update) {
|
|
| 3985 | + if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
|
|
| 3986 | 3986 | global $gd_session; |
| 3987 | 3987 | $term_array = (array) $option_data; |
| 3988 | - $post_type = get_post_type( $post_ID ); |
|
| 3989 | - $taxonomy = $post_type . 'category'; |
|
| 3990 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); |
|
| 3991 | - |
|
| 3992 | - if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
|
|
| 3993 | - foreach ( $terms as $term_id ) {
|
|
| 3994 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 3995 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 3996 | - $term_array[ $term_id ] = $count; |
|
| 3988 | + $post_type = get_post_type($post_ID); |
|
| 3989 | + $taxonomy = $post_type.'category'; |
|
| 3990 | + $terms = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
|
|
| 3991 | + |
|
| 3992 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 3993 | + foreach ($terms as $term_id) {
|
|
| 3994 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 3995 | + $children = get_term_children($term_id, $taxonomy); |
|
| 3996 | + $term_array[$term_id] = $count; |
|
| 3997 | 3997 | } |
| 3998 | 3998 | } |
| 3999 | 3999 | |
| 4000 | - $session_listing = $gd_session->get( 'listing' ); |
|
| 4000 | + $session_listing = $gd_session->get('listing');
|
|
| 4001 | 4001 | |
| 4002 | 4002 | $terms = array(); |
| 4003 | - if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
|
|
| 4004 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; |
|
| 4005 | - } else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
|
|
| 4006 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; |
|
| 4003 | + if (isset($_POST['post_category'][$taxonomy])) {
|
|
| 4004 | + $terms = (array) $_POST['post_category'][$taxonomy]; |
|
| 4005 | + } else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
|
|
| 4006 | + $terms = (array) $session_listing['post_category'][$taxonomy]; |
|
| 4007 | 4007 | } |
| 4008 | 4008 | |
| 4009 | - if ( ! empty( $terms ) ) {
|
|
| 4010 | - foreach ( $terms as $term_id ) {
|
|
| 4011 | - if ( $term_id > 0 ) {
|
|
| 4012 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 4013 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 4014 | - $term_array[ $term_id ] = $count; |
|
| 4009 | + if (!empty($terms)) {
|
|
| 4010 | + foreach ($terms as $term_id) {
|
|
| 4011 | + if ($term_id > 0) {
|
|
| 4012 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 4013 | + $children = get_term_children($term_id, $taxonomy); |
|
| 4014 | + $term_array[$term_id] = $count; |
|
| 4015 | 4015 | } |
| 4016 | 4016 | } |
| 4017 | 4017 | } |
| 4018 | 4018 | } else { // Update reviews count for all post categories.
|
| 4019 | 4019 | $term_array = array(); |
| 4020 | 4020 | $post_types = geodir_get_posttypes(); |
| 4021 | - foreach ( $post_types as $post_type ) {
|
|
| 4021 | + foreach ($post_types as $post_type) {
|
|
| 4022 | 4022 | |
| 4023 | - $taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 4023 | + $taxonomy = geodir_get_taxonomies($post_type); |
|
| 4024 | 4024 | $taxonomy = $taxonomy[0]; |
| 4025 | 4025 | |
| 4026 | 4026 | $args = array( |
| 4027 | 4027 | 'hide_empty' => false |
| 4028 | 4028 | ); |
| 4029 | 4029 | |
| 4030 | - $terms = get_terms( $taxonomy, $args ); |
|
| 4030 | + $terms = get_terms($taxonomy, $args); |
|
| 4031 | 4031 | |
| 4032 | - foreach ( $terms as $term ) {
|
|
| 4033 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); |
|
| 4034 | - $children = get_term_children( $term->term_id, $taxonomy ); |
|
| 4032 | + foreach ($terms as $term) {
|
|
| 4033 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); |
|
| 4034 | + $children = get_term_children($term->term_id, $taxonomy); |
|
| 4035 | 4035 | /*if ( is_array( $children ) ) {
|
| 4036 | 4036 | foreach ( $children as $child_id ) {
|
| 4037 | 4037 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); |
| 4038 | 4038 | $count = $count + $child_count; |
| 4039 | 4039 | } |
| 4040 | 4040 | }*/ |
| 4041 | - $term_array[ $term->term_id ] = $count; |
|
| 4041 | + $term_array[$term->term_id] = $count; |
|
| 4042 | 4042 | } |
| 4043 | 4043 | } |
| 4044 | 4044 | } |
| 4045 | 4045 | |
| 4046 | - update_option( 'geodir_global_review_count', $term_array ); |
|
| 4046 | + update_option('geodir_global_review_count', $term_array);
|
|
| 4047 | 4047 | //clear cache |
| 4048 | - wp_cache_delete( 'geodir_global_review_count' ); |
|
| 4048 | + wp_cache_delete('geodir_global_review_count');
|
|
| 4049 | 4049 | |
| 4050 | 4050 | return $term_array; |
| 4051 | 4051 | } else {
|
@@ -4061,39 +4061,39 @@ discard block |
||
| 4061 | 4061 | * @package GeoDirectory |
| 4062 | 4062 | * @return bool |
| 4063 | 4063 | */ |
| 4064 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
|
|
| 4065 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
|
|
| 4064 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
|
|
| 4065 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
|
|
| 4066 | 4066 | return; // do not run if importing listings |
| 4067 | 4067 | } |
| 4068 | 4068 | |
| 4069 | - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
|
|
| 4069 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
|
|
| 4070 | 4070 | return; |
| 4071 | 4071 | } |
| 4072 | 4072 | |
| 4073 | 4073 | $post_ID = 0; |
| 4074 | - if ( ! empty( $post ) ) {
|
|
| 4075 | - if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
|
|
| 4074 | + if (!empty($post)) {
|
|
| 4075 | + if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
|
|
| 4076 | 4076 | return; |
| 4077 | 4077 | } |
| 4078 | 4078 | |
| 4079 | - if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
|
|
| 4079 | + if ($new_status == 'auto-draft' && $old_status == 'new') {
|
|
| 4080 | 4080 | return; |
| 4081 | 4081 | } |
| 4082 | 4082 | |
| 4083 | - if ( ! empty( $post->ID ) ) {
|
|
| 4083 | + if (!empty($post->ID)) {
|
|
| 4084 | 4084 | $post_ID = $post->ID; |
| 4085 | 4085 | } |
| 4086 | 4086 | } |
| 4087 | 4087 | |
| 4088 | - if ( $new_status != $old_status ) {
|
|
| 4089 | - geodir_count_reviews_by_terms( true, $post_ID ); |
|
| 4088 | + if ($new_status != $old_status) {
|
|
| 4089 | + geodir_count_reviews_by_terms(true, $post_ID); |
|
| 4090 | 4090 | } |
| 4091 | 4091 | |
| 4092 | 4092 | return true; |
| 4093 | 4093 | } |
| 4094 | 4094 | |
| 4095 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
|
|
| 4096 | - geodir_count_reviews_by_terms( true, $post_id ); |
|
| 4095 | +function geodir_term_review_count_force_update_single_post($post_id) {
|
|
| 4096 | + geodir_count_reviews_by_terms(true, $post_id); |
|
| 4097 | 4097 | } |
| 4098 | 4098 | |
| 4099 | 4099 | /*-----------------------------------------------------------------------------------*/ |
@@ -4110,11 +4110,11 @@ discard block |
||
| 4110 | 4110 | * |
| 4111 | 4111 | * @return int Post count. |
| 4112 | 4112 | */ |
| 4113 | -function geodir_count_posts_by_term( $data, $term ) {
|
|
| 4113 | +function geodir_count_posts_by_term($data, $term) {
|
|
| 4114 | 4114 | |
| 4115 | - if ( $data ) {
|
|
| 4116 | - if ( isset( $data[ $term->term_id ] ) ) {
|
|
| 4117 | - return $data[ $term->term_id ]; |
|
| 4115 | + if ($data) {
|
|
| 4116 | + if (isset($data[$term->term_id])) {
|
|
| 4117 | + return $data[$term->term_id]; |
|
| 4118 | 4118 | } else {
|
| 4119 | 4119 | return 0; |
| 4120 | 4120 | } |
@@ -4131,8 +4131,8 @@ discard block |
||
| 4131 | 4131 | * param array $terms An array of term objects. |
| 4132 | 4132 | * @return array Sorted terms array. |
| 4133 | 4133 | */ |
| 4134 | -function geodir_sort_terms_by_count( $terms ) {
|
|
| 4135 | - usort( $terms, "geodir_sort_by_count_obj" ); |
|
| 4134 | +function geodir_sort_terms_by_count($terms) {
|
|
| 4135 | + usort($terms, "geodir_sort_by_count_obj"); |
|
| 4136 | 4136 | |
| 4137 | 4137 | return $terms; |
| 4138 | 4138 | } |
@@ -4147,8 +4147,8 @@ discard block |
||
| 4147 | 4147 | * |
| 4148 | 4148 | * @return array Sorted terms array. |
| 4149 | 4149 | */ |
| 4150 | -function geodir_sort_terms_by_review_count( $terms ) {
|
|
| 4151 | - usort( $terms, "geodir_sort_by_review_count_obj" ); |
|
| 4150 | +function geodir_sort_terms_by_review_count($terms) {
|
|
| 4151 | + usort($terms, "geodir_sort_by_review_count_obj"); |
|
| 4152 | 4152 | |
| 4153 | 4153 | return $terms; |
| 4154 | 4154 | } |
@@ -4164,12 +4164,12 @@ discard block |
||
| 4164 | 4164 | * |
| 4165 | 4165 | * @return array Sorted terms array. |
| 4166 | 4166 | */ |
| 4167 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
|
|
| 4168 | - if ( $sort == 'count' ) {
|
|
| 4169 | - return geodir_sort_terms_by_count( $terms ); |
|
| 4167 | +function geodir_sort_terms($terms, $sort = 'count') {
|
|
| 4168 | + if ($sort == 'count') {
|
|
| 4169 | + return geodir_sort_terms_by_count($terms); |
|
| 4170 | 4170 | } |
| 4171 | - if ( $sort == 'review_count' ) {
|
|
| 4172 | - return geodir_sort_terms_by_review_count( $terms ); |
|
| 4171 | + if ($sort == 'review_count') {
|
|
| 4172 | + return geodir_sort_terms_by_review_count($terms); |
|
| 4173 | 4173 | } |
| 4174 | 4174 | } |
| 4175 | 4175 | |
@@ -4187,7 +4187,7 @@ discard block |
||
| 4187 | 4187 | * |
| 4188 | 4188 | * @return bool |
| 4189 | 4189 | */ |
| 4190 | -function geodir_sort_by_count( $a, $b ) {
|
|
| 4190 | +function geodir_sort_by_count($a, $b) {
|
|
| 4191 | 4191 | return $a['count'] < $b['count']; |
| 4192 | 4192 | } |
| 4193 | 4193 | |
@@ -4202,7 +4202,7 @@ discard block |
||
| 4202 | 4202 | * |
| 4203 | 4203 | * @return bool |
| 4204 | 4204 | */ |
| 4205 | -function geodir_sort_by_count_obj( $a, $b ) {
|
|
| 4205 | +function geodir_sort_by_count_obj($a, $b) {
|
|
| 4206 | 4206 | return $a->count < $b->count; |
| 4207 | 4207 | } |
| 4208 | 4208 | |
@@ -4217,7 +4217,7 @@ discard block |
||
| 4217 | 4217 | * |
| 4218 | 4218 | * @return bool |
| 4219 | 4219 | */ |
| 4220 | -function geodir_sort_by_review_count_obj( $a, $b ) {
|
|
| 4220 | +function geodir_sort_by_review_count_obj($a, $b) {
|
|
| 4221 | 4221 | return $a->review_count < $b->review_count; |
| 4222 | 4222 | } |
| 4223 | 4223 | |
@@ -4234,35 +4234,35 @@ discard block |
||
| 4234 | 4234 | * @since 1.4.2 |
| 4235 | 4235 | * @package GeoDirectory |
| 4236 | 4236 | */ |
| 4237 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); |
|
| 4237 | + $locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
|
|
| 4238 | 4238 | |
| 4239 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); |
|
| 4240 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); |
|
| 4239 | + load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
|
|
| 4240 | + load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
|
|
| 4241 | 4241 | |
| 4242 | 4242 | /** |
| 4243 | 4243 | * Define language constants. |
| 4244 | 4244 | * |
| 4245 | 4245 | * @since 1.0.0 |
| 4246 | 4246 | */ |
| 4247 | - require_once( geodir_plugin_path() . '/language.php' ); |
|
| 4247 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 4248 | 4248 | |
| 4249 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4249 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4250 | 4250 | |
| 4251 | 4251 | // Load language string file if not created yet |
| 4252 | - if ( ! file_exists( $language_file ) ) {
|
|
| 4252 | + if (!file_exists($language_file)) {
|
|
| 4253 | 4253 | geodirectory_load_db_language(); |
| 4254 | 4254 | } |
| 4255 | 4255 | |
| 4256 | - if ( file_exists( $language_file ) ) {
|
|
| 4256 | + if (file_exists($language_file)) {
|
|
| 4257 | 4257 | /** |
| 4258 | 4258 | * Language strings from database. |
| 4259 | 4259 | * |
| 4260 | 4260 | * @since 1.4.2 |
| 4261 | 4261 | */ |
| 4262 | 4262 | try {
|
| 4263 | - require_once( $language_file ); |
|
| 4264 | - } catch ( Exception $e ) {
|
|
| 4265 | - error_log( 'Language Error: ' . $e->getMessage() ); |
|
| 4263 | + require_once($language_file); |
|
| 4264 | + } catch (Exception $e) {
|
|
| 4265 | + error_log('Language Error: '.$e->getMessage());
|
|
| 4266 | 4266 | } |
| 4267 | 4267 | } |
| 4268 | 4268 | } |
@@ -4279,19 +4279,19 @@ discard block |
||
| 4279 | 4279 | */ |
| 4280 | 4280 | function geodirectory_load_db_language() {
|
| 4281 | 4281 | global $wp_filesystem; |
| 4282 | - if ( empty( $wp_filesystem ) ) {
|
|
| 4283 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); |
|
| 4282 | + if (empty($wp_filesystem)) {
|
|
| 4283 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); |
|
| 4284 | 4284 | WP_Filesystem(); |
| 4285 | 4285 | global $wp_filesystem; |
| 4286 | 4286 | } |
| 4287 | 4287 | |
| 4288 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4288 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4289 | 4289 | |
| 4290 | - if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
|
|
| 4290 | + if (is_file($language_file) && !is_writable($language_file)) {
|
|
| 4291 | 4291 | return false; |
| 4292 | 4292 | } // Not possible to create. |
| 4293 | 4293 | |
| 4294 | - if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
|
|
| 4294 | + if (!is_file($language_file) && !is_writable(dirname($language_file))) {
|
|
| 4295 | 4295 | return false; |
| 4296 | 4296 | } // Not possible to create. |
| 4297 | 4297 | |
@@ -4305,9 +4305,9 @@ discard block |
||
| 4305 | 4305 | * |
| 4306 | 4306 | * @param array $contents_strings Array of strings. |
| 4307 | 4307 | */ |
| 4308 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); |
|
| 4308 | + $contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
|
|
| 4309 | 4309 | |
| 4310 | - $contents_strings = array_unique( $contents_strings ); |
|
| 4310 | + $contents_strings = array_unique($contents_strings); |
|
| 4311 | 4311 | |
| 4312 | 4312 | $contents_head = array(); |
| 4313 | 4313 | $contents_head[] = "<?php"; |
@@ -4324,21 +4324,21 @@ discard block |
||
| 4324 | 4324 | $contents_foot[] = ""; |
| 4325 | 4325 | $contents_foot[] = ""; |
| 4326 | 4326 | |
| 4327 | - $contents = implode( PHP_EOL, $contents_head ); |
|
| 4327 | + $contents = implode(PHP_EOL, $contents_head); |
|
| 4328 | 4328 | |
| 4329 | - if ( ! empty( $contents_strings ) ) {
|
|
| 4330 | - foreach ( $contents_strings as $string ) {
|
|
| 4331 | - if ( is_scalar( $string ) && $string != '' ) {
|
|
| 4332 | - $string = str_replace( "'", "\'", $string ); |
|
| 4333 | - geodir_wpml_register_string( $string ); |
|
| 4334 | - $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
|
|
| 4329 | + if (!empty($contents_strings)) {
|
|
| 4330 | + foreach ($contents_strings as $string) {
|
|
| 4331 | + if (is_scalar($string) && $string != '') {
|
|
| 4332 | + $string = str_replace("'", "\'", $string);
|
|
| 4333 | + geodir_wpml_register_string($string); |
|
| 4334 | + $contents .= PHP_EOL."__('".$string."', 'geodirectory');";
|
|
| 4335 | 4335 | } |
| 4336 | 4336 | } |
| 4337 | 4337 | } |
| 4338 | 4338 | |
| 4339 | - $contents .= implode( PHP_EOL, $contents_foot ); |
|
| 4339 | + $contents .= implode(PHP_EOL, $contents_foot); |
|
| 4340 | 4340 | |
| 4341 | - if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
|
|
| 4341 | + if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
|
|
| 4342 | 4342 | return false; |
| 4343 | 4343 | } // Failure; could not write file. |
| 4344 | 4344 | |
@@ -4359,49 +4359,49 @@ discard block |
||
| 4359 | 4359 | * |
| 4360 | 4360 | * @return array Translation texts. |
| 4361 | 4361 | */ |
| 4362 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
|
|
| 4362 | +function geodir_load_custom_field_translation($translation_texts = array()) {
|
|
| 4363 | 4363 | global $wpdb; |
| 4364 | 4364 | |
| 4365 | 4365 | // Custom fields table |
| 4366 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4367 | - $rows = $wpdb->get_results( $sql ); |
|
| 4366 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4367 | + $rows = $wpdb->get_results($sql); |
|
| 4368 | 4368 | |
| 4369 | - if ( ! empty( $rows ) ) {
|
|
| 4370 | - foreach ( $rows as $row ) {
|
|
| 4371 | - if ( ! empty( $row->admin_title ) ) {
|
|
| 4372 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); |
|
| 4369 | + if (!empty($rows)) {
|
|
| 4370 | + foreach ($rows as $row) {
|
|
| 4371 | + if (!empty($row->admin_title)) {
|
|
| 4372 | + $translation_texts[] = stripslashes_deep($row->admin_title); |
|
| 4373 | 4373 | } |
| 4374 | 4374 | |
| 4375 | - if ( ! empty( $row->admin_desc ) ) {
|
|
| 4376 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); |
|
| 4375 | + if (!empty($row->admin_desc)) {
|
|
| 4376 | + $translation_texts[] = stripslashes_deep($row->admin_desc); |
|
| 4377 | 4377 | } |
| 4378 | 4378 | |
| 4379 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4380 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4379 | + if (!empty($row->site_title)) {
|
|
| 4380 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4381 | 4381 | } |
| 4382 | 4382 | |
| 4383 | - if ( ! empty( $row->clabels ) ) {
|
|
| 4384 | - $translation_texts[] = stripslashes_deep( $row->clabels ); |
|
| 4383 | + if (!empty($row->clabels)) {
|
|
| 4384 | + $translation_texts[] = stripslashes_deep($row->clabels); |
|
| 4385 | 4385 | } |
| 4386 | 4386 | |
| 4387 | - if ( ! empty( $row->required_msg ) ) {
|
|
| 4388 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); |
|
| 4387 | + if (!empty($row->required_msg)) {
|
|
| 4388 | + $translation_texts[] = stripslashes_deep($row->required_msg); |
|
| 4389 | 4389 | } |
| 4390 | 4390 | |
| 4391 | - if ( ! empty( $row->validation_msg ) ) {
|
|
| 4392 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); |
|
| 4391 | + if (!empty($row->validation_msg)) {
|
|
| 4392 | + $translation_texts[] = stripslashes_deep($row->validation_msg); |
|
| 4393 | 4393 | } |
| 4394 | 4394 | |
| 4395 | - if ( ! empty( $row->default_value ) ) {
|
|
| 4396 | - $translation_texts[] = stripslashes_deep( $row->default_value ); |
|
| 4395 | + if (!empty($row->default_value)) {
|
|
| 4396 | + $translation_texts[] = stripslashes_deep($row->default_value); |
|
| 4397 | 4397 | } |
| 4398 | 4398 | |
| 4399 | - if ( ! empty( $row->option_values ) ) {
|
|
| 4400 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); |
|
| 4399 | + if (!empty($row->option_values)) {
|
|
| 4400 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); |
|
| 4401 | 4401 | |
| 4402 | - if ( ! empty( $option_values ) ) {
|
|
| 4403 | - foreach ( $option_values as $option_value ) {
|
|
| 4404 | - if ( ! empty( $option_value['label'] ) ) {
|
|
| 4402 | + if (!empty($option_values)) {
|
|
| 4403 | + foreach ($option_values as $option_value) {
|
|
| 4404 | + if (!empty($option_value['label'])) {
|
|
| 4405 | 4405 | $translation_texts[] = $option_value['label']; |
| 4406 | 4406 | } |
| 4407 | 4407 | } |
@@ -4411,56 +4411,56 @@ discard block |
||
| 4411 | 4411 | } |
| 4412 | 4412 | |
| 4413 | 4413 | // Custom sorting fields table |
| 4414 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4415 | - $rows = $wpdb->get_results( $sql ); |
|
| 4414 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4415 | + $rows = $wpdb->get_results($sql); |
|
| 4416 | 4416 | |
| 4417 | - if ( ! empty( $rows ) ) {
|
|
| 4418 | - foreach ( $rows as $row ) {
|
|
| 4419 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4420 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4417 | + if (!empty($rows)) {
|
|
| 4418 | + foreach ($rows as $row) {
|
|
| 4419 | + if (!empty($row->site_title)) {
|
|
| 4420 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4421 | 4421 | } |
| 4422 | 4422 | |
| 4423 | - if ( ! empty( $row->asc_title ) ) {
|
|
| 4424 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); |
|
| 4423 | + if (!empty($row->asc_title)) {
|
|
| 4424 | + $translation_texts[] = stripslashes_deep($row->asc_title); |
|
| 4425 | 4425 | } |
| 4426 | 4426 | |
| 4427 | - if ( ! empty( $row->desc_title ) ) {
|
|
| 4428 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); |
|
| 4427 | + if (!empty($row->desc_title)) {
|
|
| 4428 | + $translation_texts[] = stripslashes_deep($row->desc_title); |
|
| 4429 | 4429 | } |
| 4430 | 4430 | } |
| 4431 | 4431 | } |
| 4432 | 4432 | |
| 4433 | 4433 | // Advance search filter fields table |
| 4434 | - if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
|
|
| 4435 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4436 | - $rows = $wpdb->get_results( $sql ); |
|
| 4437 | - |
|
| 4438 | - if ( ! empty( $rows ) ) {
|
|
| 4439 | - foreach ( $rows as $row ) {
|
|
| 4440 | - if ( ! empty( $row->field_site_name ) ) {
|
|
| 4441 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); |
|
| 4434 | + if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
|
|
| 4435 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4436 | + $rows = $wpdb->get_results($sql); |
|
| 4437 | + |
|
| 4438 | + if (!empty($rows)) {
|
|
| 4439 | + foreach ($rows as $row) {
|
|
| 4440 | + if (!empty($row->field_site_name)) {
|
|
| 4441 | + $translation_texts[] = stripslashes_deep($row->field_site_name); |
|
| 4442 | 4442 | } |
| 4443 | 4443 | |
| 4444 | - if ( ! empty( $row->front_search_title ) ) {
|
|
| 4445 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); |
|
| 4444 | + if (!empty($row->front_search_title)) {
|
|
| 4445 | + $translation_texts[] = stripslashes_deep($row->front_search_title); |
|
| 4446 | 4446 | } |
| 4447 | 4447 | |
| 4448 | - if ( ! empty( $row->first_search_text ) ) {
|
|
| 4449 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); |
|
| 4448 | + if (!empty($row->first_search_text)) {
|
|
| 4449 | + $translation_texts[] = stripslashes_deep($row->first_search_text); |
|
| 4450 | 4450 | } |
| 4451 | 4451 | |
| 4452 | - if ( ! empty( $row->last_search_text ) ) {
|
|
| 4453 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); |
|
| 4452 | + if (!empty($row->last_search_text)) {
|
|
| 4453 | + $translation_texts[] = stripslashes_deep($row->last_search_text); |
|
| 4454 | 4454 | } |
| 4455 | 4455 | |
| 4456 | - if ( ! empty( $row->field_desc ) ) {
|
|
| 4457 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); |
|
| 4456 | + if (!empty($row->field_desc)) {
|
|
| 4457 | + $translation_texts[] = stripslashes_deep($row->field_desc); |
|
| 4458 | 4458 | } |
| 4459 | 4459 | } |
| 4460 | 4460 | } |
| 4461 | 4461 | } |
| 4462 | 4462 | |
| 4463 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4463 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4464 | 4464 | |
| 4465 | 4465 | return $translation_texts; |
| 4466 | 4466 | } |
@@ -4482,7 +4482,7 @@ discard block |
||
| 4482 | 4482 | * |
| 4483 | 4483 | * @param array $geodir_allowed_mime_types and file extensions. |
| 4484 | 4484 | */ |
| 4485 | - return apply_filters( 'geodir_allowed_mime_types', array( |
|
| 4485 | + return apply_filters('geodir_allowed_mime_types', array(
|
|
| 4486 | 4486 | 'Image' => array( // Image formats. |
| 4487 | 4487 | 'jpg' => 'image/jpeg', |
| 4488 | 4488 | 'jpe' => 'image/jpeg', |
@@ -4551,18 +4551,18 @@ discard block |
||
| 4551 | 4551 | * |
| 4552 | 4552 | * @return string User display name. |
| 4553 | 4553 | */ |
| 4554 | -function geodir_get_client_name( $user_id ) {
|
|
| 4554 | +function geodir_get_client_name($user_id) {
|
|
| 4555 | 4555 | $client_name = ''; |
| 4556 | 4556 | |
| 4557 | - $user_data = get_userdata( $user_id ); |
|
| 4557 | + $user_data = get_userdata($user_id); |
|
| 4558 | 4558 | |
| 4559 | - if ( ! empty( $user_data ) ) {
|
|
| 4560 | - if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
|
|
| 4561 | - $client_name = trim( $user_data->display_name ); |
|
| 4562 | - } else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
|
|
| 4563 | - $client_name = trim( $user_data->user_nicename ); |
|
| 4559 | + if (!empty($user_data)) {
|
|
| 4560 | + if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
|
|
| 4561 | + $client_name = trim($user_data->display_name); |
|
| 4562 | + } else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
|
|
| 4563 | + $client_name = trim($user_data->user_nicename); |
|
| 4564 | 4564 | } else {
|
| 4565 | - $client_name = trim( $user_data->user_login ); |
|
| 4565 | + $client_name = trim($user_data->user_login); |
|
| 4566 | 4566 | } |
| 4567 | 4567 | } |
| 4568 | 4568 | |
@@ -4570,17 +4570,17 @@ discard block |
||
| 4570 | 4570 | } |
| 4571 | 4571 | |
| 4572 | 4572 | |
| 4573 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); |
|
| 4573 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
|
|
| 4574 | 4574 | /* |
| 4575 | 4575 | * Add location variables to wpseo replacements. |
| 4576 | 4576 | * |
| 4577 | 4577 | * @since 1.5.4 |
| 4578 | 4578 | */ |
| 4579 | -function geodir_wpseo_replacements( $vars ) {
|
|
| 4579 | +function geodir_wpseo_replacements($vars) {
|
|
| 4580 | 4580 | |
| 4581 | 4581 | // location variables |
| 4582 | 4582 | $gd_post_type = geodir_get_current_posttype(); |
| 4583 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4583 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4584 | 4584 | /** |
| 4585 | 4585 | * Filter the title variables location variables array |
| 4586 | 4586 | * |
@@ -4590,7 +4590,7 @@ discard block |
||
| 4590 | 4590 | * @param array $location_array The array of location variables. |
| 4591 | 4591 | * @param array $vars The page title variables. |
| 4592 | 4592 | */ |
| 4593 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); |
|
| 4593 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
|
|
| 4594 | 4594 | |
| 4595 | 4595 | |
| 4596 | 4596 | $location_replace_vars = geodir_location_replace_vars($location_array, NULL, ''); |
@@ -4605,13 +4605,13 @@ discard block |
||
| 4605 | 4605 | * @param string $vars The title with variables. |
| 4606 | 4606 | * @param array $location_array The array of location variables. |
| 4607 | 4607 | */ |
| 4608 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); |
|
| 4608 | + return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
|
|
| 4609 | 4609 | } |
| 4610 | 4610 | |
| 4611 | 4611 | |
| 4612 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4613 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); |
|
| 4614 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4612 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
|
|
| 4613 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
|
|
| 4614 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
|
|
| 4615 | 4615 | |
| 4616 | 4616 | /** |
| 4617 | 4617 | * Filter the title variables. |
@@ -4653,14 +4653,14 @@ discard block |
||
| 4653 | 4653 | * |
| 4654 | 4654 | * @return string Title after filtered variables. |
| 4655 | 4655 | */ |
| 4656 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
|
|
| 4656 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
|
|
| 4657 | 4657 | global $wp, $post; |
| 4658 | 4658 | |
| 4659 | - if ( ! $gd_page || ! $title ) {
|
|
| 4659 | + if (!$gd_page || !$title) {
|
|
| 4660 | 4660 | return $title; // if no a GD page then bail. |
| 4661 | 4661 | } |
| 4662 | 4662 | |
| 4663 | - if ( $sep == '' ) {
|
|
| 4663 | + if ($sep == '') {
|
|
| 4664 | 4664 | /** |
| 4665 | 4665 | * Filter the page title separator. |
| 4666 | 4666 | * |
@@ -4669,100 +4669,100 @@ discard block |
||
| 4669 | 4669 | * |
| 4670 | 4670 | * @param string $sep The separator, default: `|`. |
| 4671 | 4671 | */ |
| 4672 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); |
|
| 4672 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 4673 | 4673 | } |
| 4674 | 4674 | |
| 4675 | - if ( strpos( $title, '%%title%%' ) !== false ) {
|
|
| 4676 | - $title = str_replace( "%%title%%", $post->post_title, $title ); |
|
| 4675 | + if (strpos($title, '%%title%%') !== false) {
|
|
| 4676 | + $title = str_replace("%%title%%", $post->post_title, $title);
|
|
| 4677 | 4677 | } |
| 4678 | 4678 | |
| 4679 | - if ( strpos( $title, '%%sitename%%' ) !== false ) {
|
|
| 4680 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); |
|
| 4679 | + if (strpos($title, '%%sitename%%') !== false) {
|
|
| 4680 | + $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
|
|
| 4681 | 4681 | } |
| 4682 | 4682 | |
| 4683 | - if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
|
|
| 4684 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); |
|
| 4683 | + if (strpos($title, '%%sitedesc%%') !== false) {
|
|
| 4684 | + $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
|
|
| 4685 | 4685 | } |
| 4686 | 4686 | |
| 4687 | - if ( strpos( $title, '%%excerpt%%' ) !== false ) {
|
|
| 4688 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); |
|
| 4687 | + if (strpos($title, '%%excerpt%%') !== false) {
|
|
| 4688 | + $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
|
|
| 4689 | 4689 | } |
| 4690 | 4690 | |
| 4691 | - if ( $gd_page == 'search' || $gd_page == 'author' ) {
|
|
| 4692 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; |
|
| 4693 | - } else if ( $gd_page == 'add-listing' ) {
|
|
| 4694 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; |
|
| 4695 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; |
|
| 4696 | - } else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 4691 | + if ($gd_page == 'search' || $gd_page == 'author') {
|
|
| 4692 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; |
|
| 4693 | + } else if ($gd_page == 'add-listing') {
|
|
| 4694 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 4695 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; |
|
| 4696 | + } else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 4697 | 4697 | $post_type = $post->post_type; |
| 4698 | 4698 | } else {
|
| 4699 | - $post_type = get_query_var( 'post_type' ); |
|
| 4699 | + $post_type = get_query_var('post_type');
|
|
| 4700 | 4700 | } |
| 4701 | 4701 | |
| 4702 | - if ( strpos( $title, '%%pt_single%%' ) !== false ) {
|
|
| 4702 | + if (strpos($title, '%%pt_single%%') !== false) {
|
|
| 4703 | 4703 | $singular_name = ''; |
| 4704 | - if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
|
|
| 4705 | - $singular_name = __( $singular_name, 'geodirectory' ); |
|
| 4704 | + if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
|
|
| 4705 | + $singular_name = __($singular_name, 'geodirectory'); |
|
| 4706 | 4706 | } |
| 4707 | 4707 | |
| 4708 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); |
|
| 4708 | + $title = str_replace("%%pt_single%%", $singular_name, $title);
|
|
| 4709 | 4709 | } |
| 4710 | 4710 | |
| 4711 | - if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
|
|
| 4711 | + if (strpos($title, '%%pt_plural%%') !== false) {
|
|
| 4712 | 4712 | $plural_name = ''; |
| 4713 | - if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
|
|
| 4714 | - $plural_name = __( $plural_name, 'geodirectory' ); |
|
| 4713 | + if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
|
|
| 4714 | + $plural_name = __($plural_name, 'geodirectory'); |
|
| 4715 | 4715 | } |
| 4716 | 4716 | |
| 4717 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); |
|
| 4717 | + $title = str_replace("%%pt_plural%%", $plural_name, $title);
|
|
| 4718 | 4718 | } |
| 4719 | 4719 | |
| 4720 | - if ( strpos( $title, '%%category%%' ) !== false ) {
|
|
| 4720 | + if (strpos($title, '%%category%%') !== false) {
|
|
| 4721 | 4721 | $cat_name = ''; |
| 4722 | 4722 | |
| 4723 | - if ( $gd_page == 'detail' ) {
|
|
| 4724 | - if ( $post->default_category ) {
|
|
| 4725 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4726 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4723 | + if ($gd_page == 'detail') {
|
|
| 4724 | + if ($post->default_category) {
|
|
| 4725 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4726 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4727 | 4727 | } |
| 4728 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4728 | + } else if ($gd_page == 'listing') {
|
|
| 4729 | 4729 | $queried_object = get_queried_object(); |
| 4730 | - if ( isset( $queried_object->name ) ) {
|
|
| 4730 | + if (isset($queried_object->name)) {
|
|
| 4731 | 4731 | $cat_name = $queried_object->name; |
| 4732 | 4732 | } |
| 4733 | 4733 | } |
| 4734 | - $title = str_replace( "%%category%%", $cat_name, $title ); |
|
| 4734 | + $title = str_replace("%%category%%", $cat_name, $title);
|
|
| 4735 | 4735 | } |
| 4736 | 4736 | |
| 4737 | - if ( strpos( $title, '%%tag%%' ) !== false ) {
|
|
| 4737 | + if (strpos($title, '%%tag%%') !== false) {
|
|
| 4738 | 4738 | $cat_name = ''; |
| 4739 | 4739 | |
| 4740 | - if ( $gd_page == 'detail' ) {
|
|
| 4741 | - if ( $post->default_category ) {
|
|
| 4742 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4743 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4740 | + if ($gd_page == 'detail') {
|
|
| 4741 | + if ($post->default_category) {
|
|
| 4742 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4743 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4744 | 4744 | } |
| 4745 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4745 | + } else if ($gd_page == 'listing') {
|
|
| 4746 | 4746 | $queried_object = get_queried_object(); |
| 4747 | - if ( isset( $queried_object->name ) ) {
|
|
| 4747 | + if (isset($queried_object->name)) {
|
|
| 4748 | 4748 | $cat_name = $queried_object->name; |
| 4749 | 4749 | } |
| 4750 | 4750 | } |
| 4751 | - $title = str_replace( "%%tag%%", $cat_name, $title ); |
|
| 4751 | + $title = str_replace("%%tag%%", $cat_name, $title);
|
|
| 4752 | 4752 | } |
| 4753 | 4753 | |
| 4754 | - if ( strpos( $title, '%%id%%' ) !== false ) {
|
|
| 4755 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; |
|
| 4756 | - $title = str_replace( "%%id%%", $ID, $title ); |
|
| 4754 | + if (strpos($title, '%%id%%') !== false) {
|
|
| 4755 | + $ID = (isset($post->ID)) ? $post->ID : ''; |
|
| 4756 | + $title = str_replace("%%id%%", $ID, $title);
|
|
| 4757 | 4757 | } |
| 4758 | 4758 | |
| 4759 | - if ( strpos( $title, '%%sep%%' ) !== false ) {
|
|
| 4760 | - $title = str_replace( "%%sep%%", $sep, $title ); |
|
| 4759 | + if (strpos($title, '%%sep%%') !== false) {
|
|
| 4760 | + $title = str_replace("%%sep%%", $sep, $title);
|
|
| 4761 | 4761 | } |
| 4762 | 4762 | |
| 4763 | 4763 | // location variables |
| 4764 | 4764 | $gd_post_type = geodir_get_current_posttype(); |
| 4765 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4765 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4766 | 4766 | |
| 4767 | 4767 | /** |
| 4768 | 4768 | * Filter the title variables location variables array |
@@ -4775,20 +4775,20 @@ discard block |
||
| 4775 | 4775 | * @param string $gd_page The page being filtered. |
| 4776 | 4776 | * @param string $sep The separator, default: `|`. |
| 4777 | 4777 | */ |
| 4778 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); |
|
| 4778 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
|
|
| 4779 | 4779 | |
| 4780 | - if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
|
|
| 4781 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4782 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); |
|
| 4780 | + if ($gd_page == 'location' && get_query_var('gd_country_full')) {
|
|
| 4781 | + if (get_query_var('gd_country_full')) {
|
|
| 4782 | + $location_array['gd_country'] = get_query_var('gd_country_full');
|
|
| 4783 | 4783 | } |
| 4784 | - if ( get_query_var( 'gd_region_full' ) ) {
|
|
| 4785 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); |
|
| 4784 | + if (get_query_var('gd_region_full')) {
|
|
| 4785 | + $location_array['gd_region'] = get_query_var('gd_region_full');
|
|
| 4786 | 4786 | } |
| 4787 | - if ( get_query_var( 'gd_city_full' ) ) {
|
|
| 4788 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); |
|
| 4787 | + if (get_query_var('gd_city_full')) {
|
|
| 4788 | + $location_array['gd_city'] = get_query_var('gd_city_full');
|
|
| 4789 | 4789 | } |
| 4790 | - if ( get_query_var( 'gd_neighbourhood_full' ) ) {
|
|
| 4791 | - $location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' ); |
|
| 4790 | + if (get_query_var('gd_neighbourhood_full')) {
|
|
| 4791 | + $location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');
|
|
| 4792 | 4792 | } |
| 4793 | 4793 | } |
| 4794 | 4794 | |
@@ -4803,57 +4803,57 @@ discard block |
||
| 4803 | 4803 | * @param string $gd_page The page being filtered. |
| 4804 | 4804 | * @param string $sep The separator, default: `|`. |
| 4805 | 4805 | */ |
| 4806 | - $title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep ); |
|
| 4806 | + $title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);
|
|
| 4807 | 4807 | |
| 4808 | - if ( strpos( $title, '%%search_term%%' ) !== false ) {
|
|
| 4808 | + if (strpos($title, '%%search_term%%') !== false) {
|
|
| 4809 | 4809 | $search_term = ''; |
| 4810 | - if ( isset( $_REQUEST['s'] ) ) {
|
|
| 4811 | - $search_term = esc_attr( $_REQUEST['s'] ); |
|
| 4810 | + if (isset($_REQUEST['s'])) {
|
|
| 4811 | + $search_term = esc_attr($_REQUEST['s']); |
|
| 4812 | 4812 | } |
| 4813 | - $title = str_replace( "%%search_term%%", $search_term, $title ); |
|
| 4813 | + $title = str_replace("%%search_term%%", $search_term, $title);
|
|
| 4814 | 4814 | } |
| 4815 | 4815 | |
| 4816 | - if ( strpos( $title, '%%search_near%%' ) !== false ) {
|
|
| 4816 | + if (strpos($title, '%%search_near%%') !== false) {
|
|
| 4817 | 4817 | $search_term = ''; |
| 4818 | - if ( isset( $_REQUEST['snear'] ) ) {
|
|
| 4819 | - $search_term = esc_attr( $_REQUEST['snear'] ); |
|
| 4818 | + if (isset($_REQUEST['snear'])) {
|
|
| 4819 | + $search_term = esc_attr($_REQUEST['snear']); |
|
| 4820 | 4820 | } |
| 4821 | - $title = str_replace( "%%search_near%%", $search_term, $title ); |
|
| 4821 | + $title = str_replace("%%search_near%%", $search_term, $title);
|
|
| 4822 | 4822 | } |
| 4823 | 4823 | |
| 4824 | - if ( strpos( $title, '%%name%%' ) !== false ) {
|
|
| 4825 | - if ( is_author() ) {
|
|
| 4826 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); |
|
| 4824 | + if (strpos($title, '%%name%%') !== false) {
|
|
| 4825 | + if (is_author()) {
|
|
| 4826 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 4827 | 4827 | $author_name = $curauth->display_name; |
| 4828 | 4828 | } else {
|
| 4829 | 4829 | $author_name = get_the_author(); |
| 4830 | 4830 | } |
| 4831 | - if ( ! $author_name || $author_name === '' ) {
|
|
| 4831 | + if (!$author_name || $author_name === '') {
|
|
| 4832 | 4832 | $queried_object = get_queried_object(); |
| 4833 | 4833 | |
| 4834 | - if ( isset( $queried_object->data->user_nicename ) ) {
|
|
| 4834 | + if (isset($queried_object->data->user_nicename)) {
|
|
| 4835 | 4835 | $author_name = $queried_object->data->display_name; |
| 4836 | 4836 | } |
| 4837 | 4837 | } |
| 4838 | - $title = str_replace( "%%name%%", $author_name, $title ); |
|
| 4838 | + $title = str_replace("%%name%%", $author_name, $title);
|
|
| 4839 | 4839 | } |
| 4840 | 4840 | |
| 4841 | - if ( strpos( $title, '%%page%%' ) !== false ) {
|
|
| 4842 | - $page = geodir_title_meta_page( $sep ); |
|
| 4843 | - $title = str_replace( "%%page%%", $page, $title ); |
|
| 4841 | + if (strpos($title, '%%page%%') !== false) {
|
|
| 4842 | + $page = geodir_title_meta_page($sep); |
|
| 4843 | + $title = str_replace("%%page%%", $page, $title);
|
|
| 4844 | 4844 | } |
| 4845 | - if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
|
|
| 4845 | + if (strpos($title, '%%pagenumber%%') !== false) {
|
|
| 4846 | 4846 | $pagenumber = geodir_title_meta_pagenumber(); |
| 4847 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); |
|
| 4847 | + $title = str_replace("%%pagenumber%%", $pagenumber, $title);
|
|
| 4848 | 4848 | } |
| 4849 | - if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
|
|
| 4849 | + if (strpos($title, '%%pagetotal%%') !== false) {
|
|
| 4850 | 4850 | $pagetotal = geodir_title_meta_pagetotal(); |
| 4851 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); |
|
| 4851 | + $title = str_replace("%%pagetotal%%", $pagetotal, $title);
|
|
| 4852 | 4852 | } |
| 4853 | 4853 | |
| 4854 | - $title = wptexturize( $title ); |
|
| 4855 | - $title = convert_chars( $title ); |
|
| 4856 | - $title = esc_html( $title ); |
|
| 4854 | + $title = wptexturize($title); |
|
| 4855 | + $title = convert_chars($title); |
|
| 4856 | + $title = esc_html($title); |
|
| 4857 | 4857 | |
| 4858 | 4858 | /** |
| 4859 | 4859 | * Filter the title variables after standard ones have been filtered. |
@@ -4867,7 +4867,7 @@ discard block |
||
| 4867 | 4867 | * @param string $sep The separator, default: `|`. |
| 4868 | 4868 | */ |
| 4869 | 4869 | |
| 4870 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); |
|
| 4870 | + return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
|
|
| 4871 | 4871 | } |
| 4872 | 4872 | |
| 4873 | 4873 | /** |
@@ -4880,82 +4880,82 @@ discard block |
||
| 4880 | 4880 | * |
| 4881 | 4881 | * @return array Translation texts. |
| 4882 | 4882 | */ |
| 4883 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
|
|
| 4884 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 4883 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
|
|
| 4884 | + $gd_post_types = geodir_get_posttypes('array');
|
|
| 4885 | 4885 | |
| 4886 | - if ( ! empty( $gd_post_types ) ) {
|
|
| 4887 | - foreach ( $gd_post_types as $post_type => $cpt_info ) {
|
|
| 4888 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; |
|
| 4889 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; |
|
| 4890 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; |
|
| 4886 | + if (!empty($gd_post_types)) {
|
|
| 4887 | + foreach ($gd_post_types as $post_type => $cpt_info) {
|
|
| 4888 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; |
|
| 4889 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; |
|
| 4890 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; |
|
| 4891 | 4891 | |
| 4892 | - if ( ! empty( $labels ) ) {
|
|
| 4893 | - if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
|
|
| 4892 | + if (!empty($labels)) {
|
|
| 4893 | + if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
|
|
| 4894 | 4894 | $translation_texts[] = $labels['name']; |
| 4895 | 4895 | } |
| 4896 | - if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
|
|
| 4896 | + if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
|
|
| 4897 | 4897 | $translation_texts[] = $labels['singular_name']; |
| 4898 | 4898 | } |
| 4899 | - if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
|
|
| 4899 | + if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
|
|
| 4900 | 4900 | $translation_texts[] = $labels['add_new']; |
| 4901 | 4901 | } |
| 4902 | - if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
|
|
| 4902 | + if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
|
|
| 4903 | 4903 | $translation_texts[] = $labels['add_new_item']; |
| 4904 | 4904 | } |
| 4905 | - if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
|
|
| 4905 | + if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
|
|
| 4906 | 4906 | $translation_texts[] = $labels['edit_item']; |
| 4907 | 4907 | } |
| 4908 | - if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
|
|
| 4908 | + if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
|
|
| 4909 | 4909 | $translation_texts[] = $labels['new_item']; |
| 4910 | 4910 | } |
| 4911 | - if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
|
|
| 4911 | + if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
|
|
| 4912 | 4912 | $translation_texts[] = $labels['view_item']; |
| 4913 | 4913 | } |
| 4914 | - if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
|
|
| 4914 | + if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
|
|
| 4915 | 4915 | $translation_texts[] = $labels['search_items']; |
| 4916 | 4916 | } |
| 4917 | - if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
|
|
| 4917 | + if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
|
|
| 4918 | 4918 | $translation_texts[] = $labels['not_found']; |
| 4919 | 4919 | } |
| 4920 | - if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
|
|
| 4920 | + if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
|
|
| 4921 | 4921 | $translation_texts[] = $labels['not_found_in_trash']; |
| 4922 | 4922 | } |
| 4923 | - if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
|
|
| 4923 | + if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
|
|
| 4924 | 4924 | $translation_texts[] = $labels['label_post_profile']; |
| 4925 | 4925 | } |
| 4926 | - if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
|
|
| 4926 | + if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
|
|
| 4927 | 4927 | $translation_texts[] = $labels['label_post_info']; |
| 4928 | 4928 | } |
| 4929 | - if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
|
|
| 4929 | + if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
|
|
| 4930 | 4930 | $translation_texts[] = $labels['label_post_images']; |
| 4931 | 4931 | } |
| 4932 | - if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
|
|
| 4932 | + if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
|
|
| 4933 | 4933 | $translation_texts[] = $labels['label_post_map']; |
| 4934 | 4934 | } |
| 4935 | - if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
|
|
| 4935 | + if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
|
|
| 4936 | 4936 | $translation_texts[] = $labels['label_reviews']; |
| 4937 | 4937 | } |
| 4938 | - if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
|
|
| 4938 | + if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
|
|
| 4939 | 4939 | $translation_texts[] = $labels['label_related_listing']; |
| 4940 | 4940 | } |
| 4941 | 4941 | } |
| 4942 | 4942 | |
| 4943 | - if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
|
|
| 4944 | - $translation_texts[] = normalize_whitespace( $description ); |
|
| 4943 | + if ($description != '' && !in_array($description, $translation_texts)) {
|
|
| 4944 | + $translation_texts[] = normalize_whitespace($description); |
|
| 4945 | 4945 | } |
| 4946 | 4946 | |
| 4947 | - if ( ! empty( $seo ) ) {
|
|
| 4948 | - if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
|
|
| 4949 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); |
|
| 4947 | + if (!empty($seo)) {
|
|
| 4948 | + if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
|
|
| 4949 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); |
|
| 4950 | 4950 | } |
| 4951 | 4951 | |
| 4952 | - if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
|
|
| 4953 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); |
|
| 4952 | + if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
|
|
| 4953 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); |
|
| 4954 | 4954 | } |
| 4955 | 4955 | } |
| 4956 | 4956 | } |
| 4957 | 4957 | } |
| 4958 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4958 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4959 | 4959 | |
| 4960 | 4960 | return $translation_texts; |
| 4961 | 4961 | } |
@@ -4970,27 +4970,27 @@ discard block |
||
| 4970 | 4970 | * |
| 4971 | 4971 | * @return array Location terms. |
| 4972 | 4972 | */ |
| 4973 | -function geodir_remove_location_terms( $location_terms = array() ) {
|
|
| 4974 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 4973 | +function geodir_remove_location_terms($location_terms = array()) {
|
|
| 4974 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 4975 | 4975 | |
| 4976 | - if ( ! empty( $location_terms ) && $location_manager ) {
|
|
| 4977 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 4978 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 4976 | + if (!empty($location_terms) && $location_manager) {
|
|
| 4977 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 4978 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 4979 | 4979 | |
| 4980 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 4981 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 4982 | - unset( $location_terms['gd_country'] ); |
|
| 4980 | + if ($hide_region_part && $hide_country_part) {
|
|
| 4981 | + if (isset($location_terms['gd_country'])) {
|
|
| 4982 | + unset($location_terms['gd_country']); |
|
| 4983 | 4983 | } |
| 4984 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 4985 | - unset( $location_terms['gd_region'] ); |
|
| 4984 | + if (isset($location_terms['gd_region'])) {
|
|
| 4985 | + unset($location_terms['gd_region']); |
|
| 4986 | 4986 | } |
| 4987 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 4988 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 4989 | - unset( $location_terms['gd_region'] ); |
|
| 4987 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 4988 | + if (isset($location_terms['gd_region'])) {
|
|
| 4989 | + unset($location_terms['gd_region']); |
|
| 4990 | 4990 | } |
| 4991 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 4992 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 4993 | - unset( $location_terms['gd_country'] ); |
|
| 4991 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 4992 | + if (isset($location_terms['gd_country'])) {
|
|
| 4993 | + unset($location_terms['gd_country']); |
|
| 4994 | 4994 | } |
| 4995 | 4995 | } |
| 4996 | 4996 | } |
@@ -5001,7 +5001,7 @@ discard block |
||
| 5001 | 5001 | * @since 1.6.22 |
| 5002 | 5002 | * @param array $location_terms The array of location terms. |
| 5003 | 5003 | */ |
| 5004 | - return apply_filters('geodir_remove_location_terms',$location_terms);
|
|
| 5004 | + return apply_filters('geodir_remove_location_terms', $location_terms);
|
|
| 5005 | 5005 | } |
| 5006 | 5006 | |
| 5007 | 5007 | /** |
@@ -5017,40 +5017,40 @@ discard block |
||
| 5017 | 5017 | * @param WP_Post $post Post object. |
| 5018 | 5018 | * @param bool $update Whether this is an existing listing being updated or not. |
| 5019 | 5019 | */ |
| 5020 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
|
|
| 5020 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
|
|
| 5021 | 5021 | global $gd_notified_edited; |
| 5022 | 5022 | |
| 5023 | - if ( ! $update ) {
|
|
| 5023 | + if (!$update) {
|
|
| 5024 | 5024 | return; |
| 5025 | 5025 | } |
| 5026 | 5026 | |
| 5027 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; |
|
| 5028 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; |
|
| 5027 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; |
|
| 5028 | + $is_admin = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
|
|
| 5029 | 5029 | $inline_save = $action == 'inline-save' ? true : false; |
| 5030 | 5030 | |
| 5031 | - if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
|
|
| 5031 | + if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
|
|
| 5032 | 5032 | return; |
| 5033 | 5033 | } |
| 5034 | 5034 | |
| 5035 | - if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
|
|
| 5035 | + if ($action != '' && in_array($action, array('geodir_import_export'))) {
|
|
| 5036 | 5036 | return; |
| 5037 | 5037 | } |
| 5038 | 5038 | |
| 5039 | 5039 | $user_id = (int) get_current_user_id(); |
| 5040 | 5040 | |
| 5041 | - if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 5042 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; |
|
| 5041 | + if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 5042 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; |
|
| 5043 | 5043 | |
| 5044 | - if ( $user_id == $author_id && ! is_super_admin() && empty( $gd_notified_edited[$post_ID] ) ) {
|
|
| 5045 | - if ( !empty( $gd_notified_edited ) ) {
|
|
| 5044 | + if ($user_id == $author_id && !is_super_admin() && empty($gd_notified_edited[$post_ID])) {
|
|
| 5045 | + if (!empty($gd_notified_edited)) {
|
|
| 5046 | 5046 | $gd_notified_edited = array(); |
| 5047 | 5047 | } |
| 5048 | 5048 | $gd_notified_edited[$post_ID] = true; |
| 5049 | 5049 | |
| 5050 | - $from_email = get_option( 'site_email' ); |
|
| 5050 | + $from_email = get_option('site_email');
|
|
| 5051 | 5051 | $from_name = get_site_emailName(); |
| 5052 | - $to_email = get_option( 'admin_email' ); |
|
| 5053 | - $to_name = get_option( 'name' ); |
|
| 5052 | + $to_email = get_option('admin_email');
|
|
| 5053 | + $to_name = get_option('name');
|
|
| 5054 | 5054 | $message_type = 'listing_edited'; |
| 5055 | 5055 | |
| 5056 | 5056 | $notify_edited = true; |
@@ -5062,9 +5062,9 @@ discard block |
||
| 5062 | 5062 | * @param bool $notify_edited Notify on listing edited by author? |
| 5063 | 5063 | * @param object $post The current post object. |
| 5064 | 5064 | */ |
| 5065 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post ); |
|
| 5065 | + $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post);
|
|
| 5066 | 5066 | |
| 5067 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); |
|
| 5067 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 5068 | 5068 | } |
| 5069 | 5069 | } |
| 5070 | 5070 | } |
@@ -5079,14 +5079,14 @@ discard block |
||
| 5079 | 5079 | * |
| 5080 | 5080 | * @return string|null The current page start & end numbering. |
| 5081 | 5081 | */ |
| 5082 | -function geodir_title_meta_page( $sep ) {
|
|
| 5082 | +function geodir_title_meta_page($sep) {
|
|
| 5083 | 5083 | $replacement = null; |
| 5084 | 5084 | |
| 5085 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5086 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5085 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5086 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5087 | 5087 | |
| 5088 | - if ( $max > 1 && $nr > 1 ) {
|
|
| 5089 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); |
|
| 5088 | + if ($max > 1 && $nr > 1) {
|
|
| 5089 | + $replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
|
|
| 5090 | 5090 | } |
| 5091 | 5091 | |
| 5092 | 5092 | return $replacement; |
@@ -5103,8 +5103,8 @@ discard block |
||
| 5103 | 5103 | function geodir_title_meta_pagenumber() {
|
| 5104 | 5104 | $replacement = null; |
| 5105 | 5105 | |
| 5106 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5107 | - if ( isset( $nr ) && $nr > 0 ) {
|
|
| 5106 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5107 | + if (isset($nr) && $nr > 0) {
|
|
| 5108 | 5108 | $replacement = (string) $nr; |
| 5109 | 5109 | } |
| 5110 | 5110 | |
@@ -5122,8 +5122,8 @@ discard block |
||
| 5122 | 5122 | function geodir_title_meta_pagetotal() {
|
| 5123 | 5123 | $replacement = null; |
| 5124 | 5124 | |
| 5125 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5126 | - if ( isset( $max ) && $max > 0 ) {
|
|
| 5125 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5126 | + if (isset($max) && $max > 0) {
|
|
| 5127 | 5127 | $replacement = (string) $max; |
| 5128 | 5128 | } |
| 5129 | 5129 | |
@@ -5143,36 +5143,36 @@ discard block |
||
| 5143 | 5143 | * |
| 5144 | 5144 | * @return int|null The current page numbering. |
| 5145 | 5145 | */ |
| 5146 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
|
|
| 5146 | +function geodir_title_meta_pagenumbering($request = 'nr') {
|
|
| 5147 | 5147 | global $wp_query, $post; |
| 5148 | 5148 | $max_num_pages = null; |
| 5149 | 5149 | $page_number = null; |
| 5150 | 5150 | |
| 5151 | 5151 | $max_num_pages = 1; |
| 5152 | 5152 | |
| 5153 | - if ( ! is_singular() ) {
|
|
| 5154 | - $page_number = get_query_var( 'paged' ); |
|
| 5155 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5153 | + if (!is_singular()) {
|
|
| 5154 | + $page_number = get_query_var('paged');
|
|
| 5155 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5156 | 5156 | $page_number = 1; |
| 5157 | 5157 | } |
| 5158 | 5158 | |
| 5159 | - if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
|
|
| 5159 | + if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
|
|
| 5160 | 5160 | $max_num_pages = $wp_query->max_num_pages; |
| 5161 | 5161 | } |
| 5162 | 5162 | } else {
|
| 5163 | - $page_number = get_query_var( 'page' ); |
|
| 5164 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5163 | + $page_number = get_query_var('page');
|
|
| 5164 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5165 | 5165 | $page_number = 1; |
| 5166 | 5166 | } |
| 5167 | 5167 | |
| 5168 | - if ( isset( $post->post_content ) ) {
|
|
| 5169 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); |
|
| 5168 | + if (isset($post->post_content)) {
|
|
| 5169 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); |
|
| 5170 | 5170 | } |
| 5171 | 5171 | } |
| 5172 | 5172 | |
| 5173 | 5173 | $return = null; |
| 5174 | 5174 | |
| 5175 | - switch ( $request ) {
|
|
| 5175 | + switch ($request) {
|
|
| 5176 | 5176 | case 'nr': |
| 5177 | 5177 | $return = $page_number; |
| 5178 | 5178 | break; |
@@ -5193,14 +5193,14 @@ discard block |
||
| 5193 | 5193 | * |
| 5194 | 5194 | * @return array Terms. |
| 5195 | 5195 | */ |
| 5196 | -function geodir_filter_empty_terms( $terms ) {
|
|
| 5197 | - if ( empty( $terms ) ) {
|
|
| 5196 | +function geodir_filter_empty_terms($terms) {
|
|
| 5197 | + if (empty($terms)) {
|
|
| 5198 | 5198 | return $terms; |
| 5199 | 5199 | } |
| 5200 | 5200 | |
| 5201 | 5201 | $return = array(); |
| 5202 | - foreach ( $terms as $term ) {
|
|
| 5203 | - if ( isset( $term->count ) && $term->count > 0 ) {
|
|
| 5202 | + foreach ($terms as $term) {
|
|
| 5203 | + if (isset($term->count) && $term->count > 0) {
|
|
| 5204 | 5204 | $return[] = $term; |
| 5205 | 5205 | } else {
|
| 5206 | 5206 | /** |
@@ -5211,7 +5211,7 @@ discard block |
||
| 5211 | 5211 | * @param array $return The array of terms to return. |
| 5212 | 5212 | * @param object $term The term object. |
| 5213 | 5213 | */ |
| 5214 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); |
|
| 5214 | + $return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
|
|
| 5215 | 5215 | } |
| 5216 | 5216 | } |
| 5217 | 5217 | |
@@ -5228,15 +5228,15 @@ discard block |
||
| 5228 | 5228 | * |
| 5229 | 5229 | * @return array |
| 5230 | 5230 | */ |
| 5231 | -function geodir_remove_hentry( $class ) {
|
|
| 5232 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 5233 | - $class = array_diff( $class, array( 'hentry' ) ); |
|
| 5231 | +function geodir_remove_hentry($class) {
|
|
| 5232 | + if (geodir_is_page('detail')) {
|
|
| 5233 | + $class = array_diff($class, array('hentry'));
|
|
| 5234 | 5234 | } |
| 5235 | 5235 | |
| 5236 | 5236 | return $class; |
| 5237 | 5237 | } |
| 5238 | 5238 | |
| 5239 | -add_filter( 'post_class', 'geodir_remove_hentry' ); |
|
| 5239 | +add_filter('post_class', 'geodir_remove_hentry');
|
|
| 5240 | 5240 | |
| 5241 | 5241 | /** |
| 5242 | 5242 | * Registers a individual text string for WPML translation. |
@@ -5248,8 +5248,8 @@ discard block |
||
| 5248 | 5248 | * @param string $domain The plugin domain. Default geodirectory. |
| 5249 | 5249 | * @param string $name The name of the string which helps to know what's being translated. |
| 5250 | 5250 | */ |
| 5251 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
|
|
| 5252 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5251 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
|
|
| 5252 | + do_action('wpml_register_single_string', $domain, $name, $string);
|
|
| 5253 | 5253 | } |
| 5254 | 5254 | |
| 5255 | 5255 | /** |
@@ -5264,6 +5264,6 @@ discard block |
||
| 5264 | 5264 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. |
| 5265 | 5265 | * @return string The translated string. |
| 5266 | 5266 | */ |
| 5267 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
|
|
| 5268 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5267 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
|
|
| 5268 | + return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
|
|
| 5269 | 5269 | } |
| 5270 | 5270 | \ No newline at end of file |
@@ -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 | - } |
|
| 393 | - |
|
| 394 | - if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | - $sort_by = 'nearest'; |
|
| 396 | - } |
|
| 397 | - } |
|
| 390 | + if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 391 | + $sort_by = 'az'; |
|
| 392 | + } |
|
| 398 | 393 | |
| 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,53 +510,53 @@ 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': |
|
| 542 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 540 | + // sort by rating |
|
| 541 | + case 'overall_rating': |
|
| 542 | + $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 543 | 543 | |
| 544 | - break; |
|
| 544 | + break; |
|
| 545 | 545 | |
| 546 | 546 | |
| 547 | - default: |
|
| 548 | - if (geodir_column_exist($table, $sort_by)) {
|
|
| 547 | + default: |
|
| 548 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 549 | 549 | $orderby = $table . "." . $sort_by . " " . $order . ", "; |
| 550 | 550 | } |
| 551 | - break; |
|
| 551 | + break; |
|
| 552 | 552 | |
| 553 | - endswitch; |
|
| 553 | + endswitch; |
|
| 554 | 554 | |
| 555 | - } |
|
| 555 | + } |
|
| 556 | 556 | |
| 557 | - } |
|
| 557 | + } |
|
| 558 | 558 | |
| 559 | - return $orderby; |
|
| 559 | + return $orderby; |
|
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | /** |
@@ -571,34 +571,34 @@ discard block |
||
| 571 | 571 | {
|
| 572 | 572 | |
| 573 | 573 | |
| 574 | - global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 574 | + global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 575 | 575 | |
| 576 | - if (!is_admin()) {
|
|
| 576 | + if (!is_admin()) {
|
|
| 577 | 577 | |
| 578 | - if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 579 | - add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 578 | + if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 579 | + add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 580 | 580 | |
| 581 | - } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 581 | + } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 582 | 582 | |
| 583 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 583 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 584 | 584 | |
| 585 | - if ($snear != '') |
|
| 586 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 585 | + if ($snear != '') |
|
| 586 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 587 | 587 | |
| 588 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 588 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 589 | 589 | |
| 590 | - } elseif (geodir_is_page('author')) {
|
|
| 590 | + } elseif (geodir_is_page('author')) {
|
|
| 591 | 591 | |
| 592 | - add_filter('posts_where', 'author_filter_where', 1);
|
|
| 592 | + add_filter('posts_where', 'author_filter_where', 1);
|
|
| 593 | 593 | |
| 594 | - } |
|
| 594 | + } |
|
| 595 | 595 | |
| 596 | - //if (!geodir_is_page('detail'))
|
|
| 597 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 596 | + //if (!geodir_is_page('detail'))
|
|
| 597 | + add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 598 | 598 | |
| 599 | - //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 599 | + //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 600 | 600 | |
| 601 | - } |
|
| 601 | + } |
|
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | /** |
@@ -613,13 +613,13 @@ discard block |
||
| 613 | 613 | */ |
| 614 | 614 | function geodir_preview_post_cap($allcaps, $caps, $args) |
| 615 | 615 | {
|
| 616 | - $user_id = get_current_user_id(); |
|
| 617 | - if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 616 | + $user_id = get_current_user_id(); |
|
| 617 | + if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 618 | 618 | |
| 619 | - $allcaps['edit_posts'] = true; |
|
| 620 | - } |
|
| 621 | - //print_r($allcaps); |
|
| 622 | - return $allcaps; |
|
| 619 | + $allcaps['edit_posts'] = true; |
|
| 620 | + } |
|
| 621 | + //print_r($allcaps); |
|
| 622 | + return $allcaps; |
|
| 623 | 623 | } |
| 624 | 624 | |
| 625 | 625 | |
@@ -634,9 +634,9 @@ discard block |
||
| 634 | 634 | */ |
| 635 | 635 | function geodir_edit_listing_where($where) |
| 636 | 636 | {
|
| 637 | - global $wpdb; |
|
| 638 | - $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 639 | - return $where; |
|
| 637 | + global $wpdb; |
|
| 638 | + $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 639 | + return $where; |
|
| 640 | 640 | } |
| 641 | 641 | |
| 642 | 642 | |
@@ -653,29 +653,29 @@ discard block |
||
| 653 | 653 | */ |
| 654 | 654 | function geodir_default_where($where) |
| 655 | 655 | {
|
| 656 | - global $wp_query, $wpdb; |
|
| 657 | - |
|
| 658 | - //print_r($wp_query); |
|
| 659 | - ########### WPML ########### |
|
| 660 | - |
|
| 661 | - if (geodir_is_wpml()) {
|
|
| 662 | - global $sitepress, $table_prefix; |
|
| 663 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 664 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 665 | - $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 666 | - //echo '##########'.$q_post_type; |
|
| 667 | - if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 668 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 669 | - //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 670 | - } |
|
| 656 | + global $wp_query, $wpdb; |
|
| 671 | 657 | |
| 672 | - } |
|
| 673 | - ########### WPML ########### |
|
| 658 | + //print_r($wp_query); |
|
| 659 | + ########### WPML ########### |
|
| 674 | 660 | |
| 661 | + if (geodir_is_wpml()) {
|
|
| 662 | + global $sitepress, $table_prefix; |
|
| 663 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 664 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 665 | + $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 666 | + //echo '##########'.$q_post_type; |
|
| 667 | + if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 668 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 669 | + //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 670 | + } |
|
| 675 | 671 | |
| 676 | - return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 672 | + } |
|
| 673 | + ########### WPML ########### |
|
| 677 | 674 | |
| 678 | - /* ====== old code start === |
|
| 675 | + |
|
| 676 | + return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 677 | + |
|
| 678 | + /* ====== old code start === |
|
| 679 | 679 | $where = str_replace("0 = 1", "1=1", $where);
|
| 680 | 680 | $country = get_query_var('gd_country');
|
| 681 | 681 | $region = get_query_var('gd_region');
|
@@ -716,92 +716,92 @@ discard block |
||
| 716 | 716 | * @return string Modified where query string. |
| 717 | 717 | */ |
| 718 | 718 | function searching_filter_where($where) {
|
| 719 | - global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 719 | + global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 720 | 720 | |
| 721 | - $search_term = 'OR'; |
|
| 722 | - $search_term = 'AND'; |
|
| 723 | - $geodir_custom_search = ''; |
|
| 724 | - $category_search_range = ''; |
|
| 721 | + $search_term = 'OR'; |
|
| 722 | + $search_term = 'AND'; |
|
| 723 | + $geodir_custom_search = ''; |
|
| 724 | + $category_search_range = ''; |
|
| 725 | 725 | |
| 726 | - if (is_single() && get_query_var('post_type')) {
|
|
| 726 | + if (is_single() && get_query_var('post_type')) {
|
|
| 727 | 727 | return $where; |
| 728 | 728 | } |
| 729 | 729 | |
| 730 | - if (is_tax()) {
|
|
| 730 | + if (is_tax()) {
|
|
| 731 | 731 | return $where; |
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | $s = trim($s); |
| 735 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 736 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 737 | - |
|
| 738 | - $where = ''; |
|
| 739 | - $better_search_terms = ''; |
|
| 740 | - if (isset($_REQUEST['stype'])) |
|
| 741 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 742 | - else |
|
| 743 | - $post_types = 'gd_place'; |
|
| 744 | - |
|
| 745 | - if ($s != '') {
|
|
| 746 | - $keywords = explode(" ", $s);
|
|
| 747 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 748 | - foreach($keywords as $kkey=>$kword){
|
|
| 749 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 750 | - unset($keywords[$kkey]); |
|
| 751 | - } |
|
| 752 | - } |
|
| 753 | - } |
|
| 735 | + $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 736 | + $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 737 | + |
|
| 738 | + $where = ''; |
|
| 739 | + $better_search_terms = ''; |
|
| 740 | + if (isset($_REQUEST['stype'])) |
|
| 741 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 742 | + else |
|
| 743 | + $post_types = 'gd_place'; |
|
| 754 | 744 | |
| 755 | - if (!empty($keywords)) {
|
|
| 756 | - foreach ($keywords as $keyword) {
|
|
| 757 | - $keyword = trim($keyword); |
|
| 758 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 759 | - if ($keyword != '') {
|
|
| 760 | - /** |
|
| 761 | - * Filter the search query keywords SQL. |
|
| 762 | - * |
|
| 763 | - * @since 1.5.9 |
|
| 764 | - * @package GeoDirectory |
|
| 765 | - * @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 . '%" )'`. |
|
| 766 | - * @param array $keywords The array of keywords for the query. |
|
| 767 | - * @param string $keyword The single keyword being searched. |
|
| 768 | - */ |
|
| 745 | + if ($s != '') {
|
|
| 746 | + $keywords = explode(" ", $s);
|
|
| 747 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 748 | + foreach($keywords as $kkey=>$kword){
|
|
| 749 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 750 | + unset($keywords[$kkey]); |
|
| 751 | + } |
|
| 752 | + } |
|
| 753 | + } |
|
| 754 | + |
|
| 755 | + if (!empty($keywords)) {
|
|
| 756 | + foreach ($keywords as $keyword) {
|
|
| 757 | + $keyword = trim($keyword); |
|
| 758 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 759 | + if ($keyword != '') {
|
|
| 760 | + /** |
|
| 761 | + * Filter the search query keywords SQL. |
|
| 762 | + * |
|
| 763 | + * @since 1.5.9 |
|
| 764 | + * @package GeoDirectory |
|
| 765 | + * @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 . '%" )'`. |
|
| 766 | + * @param array $keywords The array of keywords for the query. |
|
| 767 | + * @param string $keyword The single keyword being searched. |
|
| 768 | + */ |
|
| 769 | 769 | $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);
|
| 770 | - } |
|
| 771 | - } |
|
| 772 | - } |
|
| 773 | - } |
|
| 770 | + } |
|
| 771 | + } |
|
| 772 | + } |
|
| 773 | + } |
|
| 774 | 774 | |
| 775 | - /* get taxonomy */ |
|
| 776 | - $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 777 | - if($taxonomies) {
|
|
| 778 | - $taxonomies = implode("','", $taxonomies);
|
|
| 779 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 780 | - }else{$taxonomies='';}
|
|
| 775 | + /* get taxonomy */ |
|
| 776 | + $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 777 | + if($taxonomies) {
|
|
| 778 | + $taxonomies = implode("','", $taxonomies);
|
|
| 779 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 780 | + }else{$taxonomies='';}
|
|
| 781 | 781 | |
| 782 | - $content_where = $terms_where = ''; |
|
| 782 | + $content_where = $terms_where = ''; |
|
| 783 | 783 | if ($s != '') {
|
| 784 | - /** |
|
| 785 | - * Filter the search query content where values. |
|
| 786 | - * |
|
| 787 | - * @since 1.5.0 |
|
| 788 | - * @package GeoDirectory |
|
| 789 | - * @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%\") ") "`. |
|
| 790 | - */ |
|
| 784 | + /** |
|
| 785 | + * Filter the search query content where values. |
|
| 786 | + * |
|
| 787 | + * @since 1.5.0 |
|
| 788 | + * @package GeoDirectory |
|
| 789 | + * @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%\") ") "`. |
|
| 790 | + */ |
|
| 791 | 791 | $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%\") ");
|
| 792 | - /** |
|
| 793 | - * Filter the search query term values. |
|
| 794 | - * |
|
| 795 | - * @since 1.5.0 |
|
| 796 | - * @package GeoDirectory |
|
| 797 | - * @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)) "`. |
|
| 798 | - */ |
|
| 799 | - $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)) ");
|
|
| 792 | + /** |
|
| 793 | + * Filter the search query term values. |
|
| 794 | + * |
|
| 795 | + * @since 1.5.0 |
|
| 796 | + * @package GeoDirectory |
|
| 797 | + * @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)) "`. |
|
| 798 | + */ |
|
| 799 | + $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)) ");
|
|
| 800 | 800 | } |
| 801 | 801 | |
| 802 | 802 | |
| 803 | - // get term sql |
|
| 804 | - $term_sql = " SELECT $wpdb->term_taxonomy.term_id |
|
| 803 | + // get term sql |
|
| 804 | + $term_sql = " SELECT $wpdb->term_taxonomy.term_id |
|
| 805 | 805 | FROM $wpdb->term_taxonomy, $wpdb->terms, $wpdb->term_relationships |
| 806 | 806 | WHERE $wpdb->term_taxonomy.term_id = $wpdb->terms.term_id |
| 807 | 807 | AND $wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id |
@@ -809,42 +809,42 @@ discard block |
||
| 809 | 809 | $terms_where |
| 810 | 810 | GROUP BY $wpdb->term_taxonomy.term_id"; |
| 811 | 811 | |
| 812 | - $term_results = $wpdb->get_results($term_sql); |
|
| 813 | - $term_ids = array(); |
|
| 814 | - $terms_sql = ''; |
|
| 812 | + $term_results = $wpdb->get_results($term_sql); |
|
| 813 | + $term_ids = array(); |
|
| 814 | + $terms_sql = ''; |
|
| 815 | 815 | |
| 816 | - if(!empty($term_results)){
|
|
| 817 | - foreach($term_results as $term_id){
|
|
| 818 | - $term_ids[] = $term_id; |
|
| 819 | - } |
|
| 820 | - if(!empty( $term_ids)){
|
|
| 816 | + if(!empty($term_results)){
|
|
| 817 | + foreach($term_results as $term_id){
|
|
| 818 | + $term_ids[] = $term_id; |
|
| 819 | + } |
|
| 820 | + if(!empty( $term_ids)){
|
|
| 821 | 821 | |
| 822 | - foreach($term_ids as $term){
|
|
| 823 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) "; |
|
| 824 | - } |
|
| 825 | - } |
|
| 826 | - } |
|
| 822 | + foreach($term_ids as $term){
|
|
| 823 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) "; |
|
| 824 | + } |
|
| 825 | + } |
|
| 826 | + } |
|
| 827 | 827 | |
| 828 | 828 | |
| 829 | - if ($snear != '') {
|
|
| 829 | + if ($snear != '') {
|
|
| 830 | 830 | |
| 831 | 831 | |
| 832 | - if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 833 | - $dist = $gd_session->get('near_me_range');
|
|
| 834 | - } |
|
| 835 | - $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 836 | - $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 837 | - $lat1 = $mylat - ($dist / 69); |
|
| 838 | - $lat2 = $mylat + ($dist / 69); |
|
| 832 | + if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 833 | + $dist = $gd_session->get('near_me_range');
|
|
| 834 | + } |
|
| 835 | + $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 836 | + $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 837 | + $lat1 = $mylat - ($dist / 69); |
|
| 838 | + $lat2 = $mylat + ($dist / 69); |
|
| 839 | 839 | |
| 840 | - $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 841 | - $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 842 | - $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 843 | - $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 840 | + $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 841 | + $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 842 | + $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 843 | + $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 844 | 844 | |
| 845 | 845 | |
| 846 | 846 | |
| 847 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 847 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 848 | 848 | $content_where |
| 849 | 849 | $terms_sql |
| 850 | 850 | ) |
@@ -853,35 +853,35 @@ discard block |
||
| 853 | 853 | AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
| 854 | 854 | AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
| 855 | 855 | |
| 856 | - if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 857 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 858 | - $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;
|
|
| 859 | - } |
|
| 856 | + if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 857 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 858 | + $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;
|
|
| 859 | + } |
|
| 860 | 860 | |
| 861 | - } else {
|
|
| 861 | + } else {
|
|
| 862 | 862 | |
| 863 | 863 | |
| 864 | 864 | |
| 865 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 865 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 866 | 866 | $content_where |
| 867 | 867 | $terms_sql |
| 868 | 868 | ) |
| 869 | 869 | |
| 870 | 870 | AND $wpdb->posts.post_type in ('$post_types')
|
| 871 | 871 | AND ($wpdb->posts.post_status = 'publish') "; |
| 872 | - } |
|
| 872 | + } |
|
| 873 | 873 | |
| 874 | 874 | ########### WPML ########### |
| 875 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 875 | + if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 876 | 876 | $lang_code = ICL_LANGUAGE_CODE; |
| 877 | 877 | |
| 878 | 878 | if ($lang_code && $post_types) {
|
| 879 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 880 | - } |
|
| 881 | - } |
|
| 882 | - ########### WPML ########### |
|
| 879 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 880 | + } |
|
| 881 | + } |
|
| 882 | + ########### WPML ########### |
|
| 883 | 883 | |
| 884 | - return $where; |
|
| 884 | + return $where; |
|
| 885 | 885 | } |
| 886 | 886 | |
| 887 | 887 | |
@@ -896,45 +896,45 @@ discard block |
||
| 896 | 896 | * @return string Modified where query string. |
| 897 | 897 | */ |
| 898 | 898 | function author_filter_where($where) {
|
| 899 | - global $wpdb, $geodir_post_type, $table, $curr; |
|
| 899 | + global $wpdb, $geodir_post_type, $table, $curr; |
|
| 900 | 900 | |
| 901 | - $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 902 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 901 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 902 | + $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 903 | 903 | |
| 904 | - if (isset($_REQUEST['stype'])) {
|
|
| 905 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 906 | - } else {
|
|
| 907 | - $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 908 | - } |
|
| 904 | + if (isset($_REQUEST['stype'])) {
|
|
| 905 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 906 | + } else {
|
|
| 907 | + $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 908 | + } |
|
| 909 | 909 | |
| 910 | - if ($user_id > 0) {
|
|
| 911 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 912 | - $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 913 | - $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 914 | - $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 915 | - } else |
|
| 916 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 917 | - |
|
| 918 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 919 | - $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 920 | - } else {
|
|
| 921 | - $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 922 | - } |
|
| 923 | - } else {
|
|
| 924 | - $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 925 | - } |
|
| 910 | + if ($user_id > 0) {
|
|
| 911 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 912 | + $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 913 | + $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 914 | + $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 915 | + } else |
|
| 916 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 917 | + |
|
| 918 | + if ($user_id == (int)get_current_user_id()) {
|
|
| 919 | + $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 920 | + } else {
|
|
| 921 | + $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 922 | + } |
|
| 923 | + } else {
|
|
| 924 | + $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 925 | + } |
|
| 926 | 926 | |
| 927 | - ########### WPML ########### |
|
| 928 | - if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 929 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 930 | - if ($lang_code) {
|
|
| 931 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 932 | - } |
|
| 927 | + ########### WPML ########### |
|
| 928 | + if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 929 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 930 | + if ($lang_code) {
|
|
| 931 | + $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 932 | + } |
|
| 933 | 933 | |
| 934 | - } |
|
| 935 | - ########### WPML ########### |
|
| 934 | + } |
|
| 935 | + ########### WPML ########### |
|
| 936 | 936 | |
| 937 | - return $where; |
|
| 937 | + return $where; |
|
| 938 | 938 | } |
| 939 | 939 | |
| 940 | 940 | /** |
@@ -949,11 +949,11 @@ discard block |
||
| 949 | 949 | */ |
| 950 | 950 | function geodir_filter_widget_join($join) |
| 951 | 951 | {
|
| 952 | - global $wp_query, $table; |
|
| 953 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 954 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 955 | - } |
|
| 956 | - return $join; |
|
| 952 | + global $wp_query, $table; |
|
| 953 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 954 | + $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 955 | + } |
|
| 956 | + return $join; |
|
| 957 | 957 | } |
| 958 | 958 | |
| 959 | 959 | /** |
@@ -968,43 +968,43 @@ discard block |
||
| 968 | 968 | */ |
| 969 | 969 | function geodir_filter_widget_where($where) |
| 970 | 970 | {
|
| 971 | - global $wp_query, $table; |
|
| 972 | - if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 973 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 974 | - } |
|
| 975 | - if (!empty($wp_query->query['show_special_only'])) {
|
|
| 976 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 977 | - } |
|
| 978 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 979 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 980 | - } |
|
| 981 | - if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 982 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 983 | - } |
|
| 984 | - return $where; |
|
| 971 | + global $wp_query, $table; |
|
| 972 | + if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 973 | + $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 974 | + } |
|
| 975 | + if (!empty($wp_query->query['show_special_only'])) {
|
|
| 976 | + $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 977 | + } |
|
| 978 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 979 | + $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 980 | + } |
|
| 981 | + if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 982 | + $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 983 | + } |
|
| 984 | + return $where; |
|
| 985 | 985 | } |
| 986 | 986 | |
| 987 | 987 | |
| 988 | 988 | function geodir_related_posts_fields($fields) {
|
| 989 | - global $wp_query, $wpdb, $table, $post; |
|
| 989 | + global $wp_query, $wpdb, $table, $post; |
|
| 990 | 990 | |
| 991 | - $fields .= ", " . $table . ".* "; |
|
| 991 | + $fields .= ", " . $table . ".* "; |
|
| 992 | 992 | |
| 993 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 993 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 994 | 994 | |
| 995 | - $mylat = $post->post_latitude; |
|
| 996 | - $mylon = $post->post_longitude; |
|
| 995 | + $mylat = $post->post_latitude; |
|
| 996 | + $mylon = $post->post_longitude; |
|
| 997 | 997 | |
| 998 | - $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 ";
|
|
| 999 | - return $fields; |
|
| 998 | + $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 ";
|
|
| 999 | + return $fields; |
|
| 1000 | 1000 | } |
| 1001 | 1001 | function geodir_related_posts_fields_filter($query) {
|
| 1002 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1003 | - && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1004 | - && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1005 | - ) {
|
|
| 1006 | - add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1007 | - } |
|
| 1002 | + if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1003 | + && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1004 | + && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1005 | + ) {
|
|
| 1006 | + add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1007 | + } |
|
| 1008 | 1008 | } |
| 1009 | 1009 | add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);
|
| 1010 | 1010 | |
@@ -1019,28 +1019,28 @@ discard block |
||
| 1019 | 1019 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1020 | 1020 | */ |
| 1021 | 1021 | function geodir_prepare_custom_sorting( $sorting, $table ) {
|
| 1022 | - $orderby = ''; |
|
| 1022 | + $orderby = ''; |
|
| 1023 | 1023 | |
| 1024 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1025 | - return $orderby; |
|
| 1026 | - } |
|
| 1024 | + if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1025 | + return $orderby; |
|
| 1026 | + } |
|
| 1027 | 1027 | |
| 1028 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1029 | - $sorting_array = explode( '_', $sorting ); |
|
| 1028 | + if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1029 | + $sorting_array = explode( '_', $sorting ); |
|
| 1030 | 1030 | |
| 1031 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1032 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1033 | - array_pop( $sorting_array ); |
|
| 1031 | + if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1032 | + $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1033 | + array_pop( $sorting_array ); |
|
| 1034 | 1034 | |
| 1035 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1036 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1035 | + if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1036 | + $sort_by = implode( '_', $sorting_array ); |
|
| 1037 | 1037 | |
| 1038 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1039 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1040 | - } |
|
| 1041 | - } |
|
| 1042 | - } |
|
| 1043 | - } |
|
| 1038 | + if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1039 | + $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1040 | + } |
|
| 1041 | + } |
|
| 1042 | + } |
|
| 1043 | + } |
|
| 1044 | 1044 | |
| 1045 | - return $orderby; |
|
| 1045 | + return $orderby; |
|
| 1046 | 1046 | } |
| 1047 | 1047 | \ 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,31 +522,31 @@ 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 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 542 | + $orderby = " ".$table.".".$sort_by." ".$order.", ".$table.".rating_count ".$order.", "; |
|
| 543 | 543 | |
| 544 | 544 | break; |
| 545 | 545 | |
| 546 | 546 | |
| 547 | 547 | default: |
| 548 | 548 | if (geodir_column_exist($table, $sort_by)) {
|
| 549 | - $orderby = $table . "." . $sort_by . " " . $order . ", "; |
|
| 549 | + $orderby = $table.".".$sort_by." ".$order.", "; |
|
| 550 | 550 | } |
| 551 | 551 | break; |
| 552 | 552 | |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | } |
| 595 | 595 | |
| 596 | 596 | //if (!geodir_is_page('detail'))
|
| 597 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 597 | + add_filter('posts_where', 'geodir_default_where', 1); /**/
|
|
| 598 | 598 | |
| 599 | 599 | //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
| 600 | 600 | |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
| 666 | 666 | //echo '##########'.$q_post_type; |
| 667 | 667 | if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
| 668 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 668 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') ";
|
|
| 669 | 669 | //$where .= " AND icl_t.language_code = '$lang_code' "; |
| 670 | 670 | } |
| 671 | 671 | |
@@ -732,8 +732,8 @@ discard block |
||
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | $s = trim($s); |
| 735 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 736 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 735 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
| 736 | + $s_A = wp_specialchars_decode($s_A, ENT_QUOTES); |
|
| 737 | 737 | |
| 738 | 738 | $where = ''; |
| 739 | 739 | $better_search_terms = ''; |
@@ -744,9 +744,9 @@ discard block |
||
| 744 | 744 | |
| 745 | 745 | if ($s != '') {
|
| 746 | 746 | $keywords = explode(" ", $s);
|
| 747 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 748 | - foreach($keywords as $kkey=>$kword){
|
|
| 749 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 747 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 748 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 749 | + if (geodir_utf8_strlen($kword) <= $klimit) {
|
|
| 750 | 750 | unset($keywords[$kkey]); |
| 751 | 751 | } |
| 752 | 752 | } |
@@ -755,7 +755,7 @@ discard block |
||
| 755 | 755 | if (!empty($keywords)) {
|
| 756 | 756 | foreach ($keywords as $keyword) {
|
| 757 | 757 | $keyword = trim($keyword); |
| 758 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 758 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
| 759 | 759 | if ($keyword != '') {
|
| 760 | 760 | /** |
| 761 | 761 | * Filter the search query keywords SQL. |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | * @param array $keywords The array of keywords for the query. |
| 767 | 767 | * @param string $keyword The single keyword being searched. |
| 768 | 768 | */ |
| 769 | - $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);
|
|
| 769 | + $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);
|
|
| 770 | 770 | } |
| 771 | 771 | } |
| 772 | 772 | } |
@@ -774,10 +774,10 @@ discard block |
||
| 774 | 774 | |
| 775 | 775 | /* get taxonomy */ |
| 776 | 776 | $taxonomies = geodir_get_taxonomies($post_types, true); |
| 777 | - if($taxonomies) {
|
|
| 777 | + if ($taxonomies) {
|
|
| 778 | 778 | $taxonomies = implode("','", $taxonomies);
|
| 779 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 780 | - }else{$taxonomies='';}
|
|
| 779 | + $taxonomies = "'".$taxonomies."'"; |
|
| 780 | + } else {$taxonomies = ''; }
|
|
| 781 | 781 | |
| 782 | 782 | $content_where = $terms_where = ''; |
| 783 | 783 | if ($s != '') {
|
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | * @package GeoDirectory |
| 789 | 789 | * @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%\") ") "`. |
| 790 | 790 | */ |
| 791 | - $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%\") ");
|
|
| 791 | + $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%\") ");
|
|
| 792 | 792 | /** |
| 793 | 793 | * Filter the search query term values. |
| 794 | 794 | * |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | * @package GeoDirectory |
| 797 | 797 | * @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)) "`. |
| 798 | 798 | */ |
| 799 | - $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)) ");
|
|
| 799 | + $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)) ");
|
|
| 800 | 800 | } |
| 801 | 801 | |
| 802 | 802 | |
@@ -813,13 +813,13 @@ discard block |
||
| 813 | 813 | $term_ids = array(); |
| 814 | 814 | $terms_sql = ''; |
| 815 | 815 | |
| 816 | - if(!empty($term_results)){
|
|
| 817 | - foreach($term_results as $term_id){
|
|
| 816 | + if (!empty($term_results)) {
|
|
| 817 | + foreach ($term_results as $term_id) {
|
|
| 818 | 818 | $term_ids[] = $term_id; |
| 819 | 819 | } |
| 820 | - if(!empty( $term_ids)){
|
|
| 820 | + if (!empty($term_ids)) {
|
|
| 821 | 821 | |
| 822 | - foreach($term_ids as $term){
|
|
| 822 | + foreach ($term_ids as $term) {
|
|
| 823 | 823 | $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) "; |
| 824 | 824 | } |
| 825 | 825 | } |
@@ -850,12 +850,12 @@ discard block |
||
| 850 | 850 | ) |
| 851 | 851 | AND $wpdb->posts.post_type in ('{$post_types}')
|
| 852 | 852 | AND ($wpdb->posts.post_status = 'publish') |
| 853 | - AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
|
| 854 | - AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
|
| 853 | + AND ( ".$table.".post_latitude between $rlat1 and $rlat2 ) |
|
| 854 | + AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) "; |
|
| 855 | 855 | |
| 856 | 856 | if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
| 857 | 857 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
| 858 | - $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;
|
|
| 858 | + $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;
|
|
| 859 | 859 | } |
| 860 | 860 | |
| 861 | 861 | } else {
|
@@ -872,11 +872,11 @@ discard block |
||
| 872 | 872 | } |
| 873 | 873 | |
| 874 | 874 | ########### WPML ########### |
| 875 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 875 | + if (geodir_wpml_is_post_type_translated($post_types)) {
|
|
| 876 | 876 | $lang_code = ICL_LANGUAGE_CODE; |
| 877 | 877 | |
| 878 | 878 | if ($lang_code && $post_types) {
|
| 879 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 879 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') ";
|
|
| 880 | 880 | } |
| 881 | 881 | } |
| 882 | 882 | ########### WPML ########### |
@@ -899,10 +899,10 @@ discard block |
||
| 899 | 899 | global $wpdb, $geodir_post_type, $table, $curr; |
| 900 | 900 | |
| 901 | 901 | $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
| 902 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 902 | + $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0; |
|
| 903 | 903 | |
| 904 | 904 | if (isset($_REQUEST['stype'])) {
|
| 905 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 905 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);
|
|
| 906 | 906 | } else {
|
| 907 | 907 | $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
| 908 | 908 | } |
@@ -915,7 +915,7 @@ discard block |
||
| 915 | 915 | } else |
| 916 | 916 | $where .= " AND $wpdb->posts.post_author = $user_id"; |
| 917 | 917 | |
| 918 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 918 | + if ($user_id == (int) get_current_user_id()) {
|
|
| 919 | 919 | $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
| 920 | 920 | } else {
|
| 921 | 921 | $where .= " AND $wpdb->posts.post_status = 'publish' "; |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
| 929 | 929 | $lang_code = ICL_LANGUAGE_CODE; |
| 930 | 930 | if ($lang_code) {
|
| 931 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 931 | + $where .= " AND icl_t.language_code='".$lang_code."' "; |
|
| 932 | 932 | } |
| 933 | 933 | |
| 934 | 934 | } |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | {
|
| 952 | 952 | global $wp_query, $table; |
| 953 | 953 | if (!empty($wp_query->query['with_pics_only'])) {
|
| 954 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 954 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 955 | 955 | } |
| 956 | 956 | return $join; |
| 957 | 957 | } |
@@ -970,16 +970,16 @@ discard block |
||
| 970 | 970 | {
|
| 971 | 971 | global $wp_query, $table; |
| 972 | 972 | if (!empty($wp_query->query['show_featured_only'])) {
|
| 973 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 973 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 974 | 974 | } |
| 975 | 975 | if (!empty($wp_query->query['show_special_only'])) {
|
| 976 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 976 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 977 | 977 | } |
| 978 | 978 | if (!empty($wp_query->query['with_pics_only'])) {
|
| 979 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 979 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id"; |
|
| 980 | 980 | } |
| 981 | 981 | if (!empty($wp_query->query['with_videos_only'])) {
|
| 982 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 982 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 983 | 983 | } |
| 984 | 984 | return $where; |
| 985 | 985 | } |
@@ -988,18 +988,18 @@ discard block |
||
| 988 | 988 | function geodir_related_posts_fields($fields) {
|
| 989 | 989 | global $wp_query, $wpdb, $table, $post; |
| 990 | 990 | |
| 991 | - $fields .= ", " . $table . ".* "; |
|
| 991 | + $fields .= ", ".$table.".* "; |
|
| 992 | 992 | |
| 993 | 993 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
| 994 | 994 | |
| 995 | 995 | $mylat = $post->post_latitude; |
| 996 | 996 | $mylon = $post->post_longitude; |
| 997 | 997 | |
| 998 | - $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 ";
|
|
| 998 | + $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 ";
|
|
| 999 | 999 | return $fields; |
| 1000 | 1000 | } |
| 1001 | 1001 | function geodir_related_posts_fields_filter($query) {
|
| 1002 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1002 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1003 | 1003 | && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
| 1004 | 1004 | && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
| 1005 | 1005 | ) {
|
@@ -1018,25 +1018,25 @@ discard block |
||
| 1018 | 1018 | * @param string $table Listing table name. |
| 1019 | 1019 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1020 | 1020 | */ |
| 1021 | -function geodir_prepare_custom_sorting( $sorting, $table ) {
|
|
| 1021 | +function geodir_prepare_custom_sorting($sorting, $table) {
|
|
| 1022 | 1022 | $orderby = ''; |
| 1023 | 1023 | |
| 1024 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1024 | + if (empty($sorting) || empty($table)) {
|
|
| 1025 | 1025 | return $orderby; |
| 1026 | 1026 | } |
| 1027 | 1027 | |
| 1028 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1029 | - $sorting_array = explode( '_', $sorting ); |
|
| 1028 | + if (strpos(strtoupper($sorting), '_ASC') !== false || strpos(strtoupper($sorting), '_DESC') !== false) {
|
|
| 1029 | + $sorting_array = explode('_', $sorting);
|
|
| 1030 | 1030 | |
| 1031 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1032 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1033 | - array_pop( $sorting_array ); |
|
| 1031 | + if (($count = count($sorting_array)) > 1) {
|
|
| 1032 | + $order = !empty($sorting_array[$count - 1]) ? strtoupper($sorting_array[$count - 1]) : ''; |
|
| 1033 | + array_pop($sorting_array); |
|
| 1034 | 1034 | |
| 1035 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1036 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1035 | + if (!empty($sorting_array) && ($order == 'ASC' || $order == 'DESC')) {
|
|
| 1036 | + $sort_by = implode('_', $sorting_array);
|
|
| 1037 | 1037 | |
| 1038 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1039 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1038 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 1039 | + $orderby = $table.".".$sort_by." ".$order; |
|
| 1040 | 1040 | } |
| 1041 | 1041 | } |
| 1042 | 1042 | } |
