GeoDirectory /
geodirectory
@@ -2301,7 +2301,7 @@ discard block |
||
| 2301 | 2301 | * @global string $table_prefix WordPress Database Table prefix. |
| 2302 | 2302 | * |
| 2303 | 2303 | * @param array $query_args The query array. |
| 2304 | - * @param int|bool $count_only If true returns listings count only, otherwise returns array |
|
| 2304 | + * @param boolean $count_only If true returns listings count only, otherwise returns array |
|
| 2305 | 2305 | * |
| 2306 | 2306 | * @return mixed Result object. |
| 2307 | 2307 | */ |
@@ -3958,7 +3958,7 @@ discard block |
||
| 3958 | 3958 | * @since 1.0.0 |
| 3959 | 3959 | * @since 1.6.1 Fixed add listing page load time. |
| 3960 | 3960 | * @package GeoDirectory |
| 3961 | - * @return bool |
|
| 3961 | + * @return null|boolean |
|
| 3962 | 3962 | */ |
| 3963 | 3963 | function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
|
| 3964 | 3964 | if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
|
@@ -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,10 +27,10 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | function geodir_plugin_url() {
|
| 29 | 29 | |
| 30 | - if ( is_ssl() ) : |
|
| 31 | - return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
|
| 30 | + if (is_ssl()) : |
|
| 31 | + return str_replace('http://', 'https://', WP_PLUGIN_URL)."/".plugin_basename(dirname(dirname(__FILE__)));
|
|
| 32 | 32 | else : |
| 33 | - return WP_PLUGIN_URL . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
|
| 33 | + return WP_PLUGIN_URL."/".plugin_basename(dirname(dirname(__FILE__))); |
|
| 34 | 34 | endif; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -45,10 +45,10 @@ discard block |
||
| 45 | 45 | * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory |
| 46 | 46 | */ |
| 47 | 47 | function geodir_plugin_path() {
|
| 48 | - if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {
|
|
| 49 | - return dirname( dirname( __FILE__ ) ); |
|
| 48 | + if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {
|
|
| 49 | + return dirname(dirname(__FILE__)); |
|
| 50 | 50 | } else {
|
| 51 | - return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
|
| 51 | + return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__))); |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
@@ -63,10 +63,10 @@ discard block |
||
| 63 | 63 | * @return bool true or false. |
| 64 | 64 | * @todo check if this is faster than normal WP check and remove if not. |
| 65 | 65 | */ |
| 66 | -function geodir_is_plugin_active( $plugin ) {
|
|
| 67 | - $active_plugins = get_option( 'active_plugins' ); |
|
| 68 | - foreach ( $active_plugins as $key => $active_plugin ) {
|
|
| 69 | - if ( strstr( $active_plugin, $plugin ) ) {
|
|
| 66 | +function geodir_is_plugin_active($plugin) {
|
|
| 67 | + $active_plugins = get_option('active_plugins');
|
|
| 68 | + foreach ($active_plugins as $key => $active_plugin) {
|
|
| 69 | + if (strstr($active_plugin, $plugin)) {
|
|
| 70 | 70 | return true; |
| 71 | 71 | } |
| 72 | 72 | } |
@@ -88,8 +88,8 @@ discard block |
||
| 88 | 88 | * |
| 89 | 89 | * @return bool|int|string the formatted date. |
| 90 | 90 | */ |
| 91 | -function geodir_get_formated_date( $date ) {
|
|
| 92 | - return mysql2date( get_option( 'date_format' ), $date ); |
|
| 91 | +function geodir_get_formated_date($date) {
|
|
| 92 | + return mysql2date(get_option('date_format'), $date);
|
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -105,8 +105,8 @@ discard block |
||
| 105 | 105 | * |
| 106 | 106 | * @return bool|int|string the formatted time. |
| 107 | 107 | */ |
| 108 | -function geodir_get_formated_time( $time ) {
|
|
| 109 | - return mysql2date( get_option( 'time_format' ), $time, $translate = true ); |
|
| 108 | +function geodir_get_formated_time($time) {
|
|
| 109 | + return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | |
@@ -124,35 +124,35 @@ discard block |
||
| 124 | 124 | * |
| 125 | 125 | * @return string Formatted link. |
| 126 | 126 | */ |
| 127 | -function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {
|
|
| 128 | - if ( $use_existing_arguments ) {
|
|
| 127 | +function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {
|
|
| 128 | + if ($use_existing_arguments) {
|
|
| 129 | 129 | $params = $params + $_GET; |
| 130 | 130 | } |
| 131 | - if ( ! $params ) {
|
|
| 131 | + if (!$params) {
|
|
| 132 | 132 | return $url; |
| 133 | 133 | } |
| 134 | 134 | $link = $url; |
| 135 | - if ( strpos( $link, '?' ) === false ) {
|
|
| 135 | + if (strpos($link, '?') === false) {
|
|
| 136 | 136 | $link .= '?'; |
| 137 | 137 | } //If there is no '?' add one at the end |
| 138 | - elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {
|
|
| 138 | + elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {
|
|
| 139 | 139 | $link .= '&'; |
| 140 | 140 | } //If there is no '&' at the END, add one. |
| 141 | - elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {
|
|
| 141 | + elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {
|
|
| 142 | 142 | $link .= '&'; |
| 143 | 143 | } //If there is no '&' at the END, add one. |
| 144 | 144 | |
| 145 | 145 | $params_arr = array(); |
| 146 | - foreach ( $params as $key => $value ) {
|
|
| 147 | - if ( gettype( $value ) == 'array' ) { //Handle array data properly
|
|
| 148 | - foreach ( $value as $val ) {
|
|
| 149 | - $params_arr[] = $key . '[]=' . urlencode( $val ); |
|
| 146 | + foreach ($params as $key => $value) {
|
|
| 147 | + if (gettype($value) == 'array') { //Handle array data properly
|
|
| 148 | + foreach ($value as $val) {
|
|
| 149 | + $params_arr[] = $key.'[]='.urlencode($val); |
|
| 150 | 150 | } |
| 151 | 151 | } else {
|
| 152 | - $params_arr[] = $key . '=' . urlencode( $value ); |
|
| 152 | + $params_arr[] = $key.'='.urlencode($value); |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | - $link .= implode( '&', $params_arr ); |
|
| 155 | + $link .= implode('&', $params_arr);
|
|
| 156 | 156 | |
| 157 | 157 | return $link; |
| 158 | 158 | } |
@@ -169,18 +169,18 @@ discard block |
||
| 169 | 169 | * |
| 170 | 170 | * @return string Listing page url if valid. Otherwise home url will be returned. |
| 171 | 171 | */ |
| 172 | -function geodir_get_addlisting_link( $post_type = '' ) {
|
|
| 172 | +function geodir_get_addlisting_link($post_type = '') {
|
|
| 173 | 173 | global $wpdb; |
| 174 | 174 | |
| 175 | 175 | //$check_pkg = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");
|
| 176 | 176 | $check_pkg = 1; |
| 177 | - if ( post_type_exists( $post_type ) && $check_pkg ) {
|
|
| 177 | + if (post_type_exists($post_type) && $check_pkg) {
|
|
| 178 | 178 | |
| 179 | - $add_listing_link = get_page_link( geodir_add_listing_page_id() ); |
|
| 179 | + $add_listing_link = get_page_link(geodir_add_listing_page_id()); |
|
| 180 | 180 | |
| 181 | - return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) ); |
|
| 181 | + return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));
|
|
| 182 | 182 | } else {
|
| 183 | - return get_bloginfo( 'url' ); |
|
| 183 | + return get_bloginfo('url');
|
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {
|
| 209 | 209 | // To build the entire URI we need to prepend the protocol, and the http host |
| 210 | 210 | // to the URI string. |
| 211 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 211 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; |
|
| 212 | 212 | } else {
|
| 213 | 213 | /* |
| 214 | 214 | * Since we do not have REQUEST_URI to work with, we will assume we are |
@@ -217,11 +217,11 @@ discard block |
||
| 217 | 217 | * |
| 218 | 218 | * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS |
| 219 | 219 | */ |
| 220 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; |
|
| 220 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']; |
|
| 221 | 221 | |
| 222 | 222 | // If the query string exists append it to the URI string |
| 223 | 223 | if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
|
| 224 | - $pageURL .= '?' . $_SERVER['QUERY_STRING']; |
|
| 224 | + $pageURL .= '?'.$_SERVER['QUERY_STRING']; |
|
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | * |
| 233 | 233 | * @param string $pageURL The URL of the current page. |
| 234 | 234 | */ |
| 235 | - return apply_filters( 'geodir_curPageURL', $pageURL ); |
|
| 235 | + return apply_filters('geodir_curPageURL', $pageURL);
|
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | /** |
@@ -247,12 +247,12 @@ discard block |
||
| 247 | 247 | * |
| 248 | 248 | * @return string Cleaned variable. |
| 249 | 249 | */ |
| 250 | -function geodir_clean( $string ) {
|
|
| 250 | +function geodir_clean($string) {
|
|
| 251 | 251 | |
| 252 | - $string = trim( strip_tags( stripslashes( $string ) ) ); |
|
| 253 | - $string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens. |
|
| 254 | - $string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars. |
|
| 255 | - $string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one. |
|
| 252 | + $string = trim(strip_tags(stripslashes($string))); |
|
| 253 | + $string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.
|
|
| 254 | + $string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.
|
|
| 255 | + $string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.
|
|
| 256 | 256 | |
| 257 | 257 | return $string; |
| 258 | 258 | } |
@@ -266,13 +266,13 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | function geodir_get_weekday() {
|
| 268 | 268 | return array( |
| 269 | - __( 'Sunday', 'geodirectory' ), |
|
| 270 | - __( 'Monday', 'geodirectory' ), |
|
| 271 | - __( 'Tuesday', 'geodirectory' ), |
|
| 272 | - __( 'Wednesday', 'geodirectory' ), |
|
| 273 | - __( 'Thursday', 'geodirectory' ), |
|
| 274 | - __( 'Friday', 'geodirectory' ), |
|
| 275 | - __( 'Saturday', 'geodirectory' ) |
|
| 269 | + __('Sunday', 'geodirectory'),
|
|
| 270 | + __('Monday', 'geodirectory'),
|
|
| 271 | + __('Tuesday', 'geodirectory'),
|
|
| 272 | + __('Wednesday', 'geodirectory'),
|
|
| 273 | + __('Thursday', 'geodirectory'),
|
|
| 274 | + __('Friday', 'geodirectory'),
|
|
| 275 | + __('Saturday', 'geodirectory')
|
|
| 276 | 276 | ); |
| 277 | 277 | } |
| 278 | 278 | |
@@ -285,11 +285,11 @@ discard block |
||
| 285 | 285 | */ |
| 286 | 286 | function geodir_get_weeks() {
|
| 287 | 287 | return array( |
| 288 | - __( 'First', 'geodirectory' ), |
|
| 289 | - __( 'Second', 'geodirectory' ), |
|
| 290 | - __( 'Third', 'geodirectory' ), |
|
| 291 | - __( 'Fourth', 'geodirectory' ), |
|
| 292 | - __( 'Last', 'geodirectory' ) |
|
| 288 | + __('First', 'geodirectory'),
|
|
| 289 | + __('Second', 'geodirectory'),
|
|
| 290 | + __('Third', 'geodirectory'),
|
|
| 291 | + __('Fourth', 'geodirectory'),
|
|
| 292 | + __('Last', 'geodirectory')
|
|
| 293 | 293 | ); |
| 294 | 294 | } |
| 295 | 295 | |
@@ -308,112 +308,112 @@ discard block |
||
| 308 | 308 | * |
| 309 | 309 | * @return bool If valid returns true. Otherwise false. |
| 310 | 310 | */ |
| 311 | -function geodir_is_page( $gdpage = '' ) {
|
|
| 311 | +function geodir_is_page($gdpage = '') {
|
|
| 312 | 312 | |
| 313 | 313 | global $wp_query, $post, $wp; |
| 314 | 314 | //if(!is_admin()): |
| 315 | 315 | |
| 316 | - switch ( $gdpage ): |
|
| 316 | + switch ($gdpage): |
|
| 317 | 317 | case 'add-listing': |
| 318 | 318 | |
| 319 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {
|
|
| 319 | + if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {
|
|
| 320 | 320 | return true; |
| 321 | - } elseif ( is_page() && isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 321 | + } elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 322 | 322 | return true; |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | break; |
| 326 | 326 | case 'preview': |
| 327 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] ) |
|
| 328 | - && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) |
|
| 327 | + if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])
|
|
| 328 | + && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) |
|
| 329 | 329 | ) {
|
| 330 | 330 | return true; |
| 331 | 331 | } |
| 332 | 332 | break; |
| 333 | 333 | case 'listing-success': |
| 334 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {
|
|
| 334 | + if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {
|
|
| 335 | 335 | return true; |
| 336 | 336 | } |
| 337 | 337 | break; |
| 338 | 338 | case 'detail': |
| 339 | - $post_type = get_query_var( 'post_type' ); |
|
| 340 | - if ( is_array( $post_type ) ) {
|
|
| 341 | - $post_type = reset( $post_type ); |
|
| 339 | + $post_type = get_query_var('post_type');
|
|
| 340 | + if (is_array($post_type)) {
|
|
| 341 | + $post_type = reset($post_type); |
|
| 342 | 342 | } |
| 343 | - if ( is_single() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 343 | + if (is_single() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 344 | 344 | return true; |
| 345 | 345 | } |
| 346 | 346 | break; |
| 347 | 347 | case 'pt': |
| 348 | - $post_type = get_query_var( 'post_type' ); |
|
| 349 | - if ( is_array( $post_type ) ) {
|
|
| 350 | - $post_type = reset( $post_type ); |
|
| 348 | + $post_type = get_query_var('post_type');
|
|
| 349 | + if (is_array($post_type)) {
|
|
| 350 | + $post_type = reset($post_type); |
|
| 351 | 351 | } |
| 352 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {
|
|
| 352 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {
|
|
| 353 | 353 | return true; |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | break; |
| 357 | 357 | case 'listing': |
| 358 | - if ( is_tax() && geodir_get_taxonomy_posttype() ) {
|
|
| 358 | + if (is_tax() && geodir_get_taxonomy_posttype()) {
|
|
| 359 | 359 | global $current_term, $taxonomy, $term; |
| 360 | 360 | |
| 361 | 361 | return true; |
| 362 | 362 | } |
| 363 | - $post_type = get_query_var( 'post_type' ); |
|
| 364 | - if ( is_array( $post_type ) ) {
|
|
| 365 | - $post_type = reset( $post_type ); |
|
| 363 | + $post_type = get_query_var('post_type');
|
|
| 364 | + if (is_array($post_type)) {
|
|
| 365 | + $post_type = reset($post_type); |
|
| 366 | 366 | } |
| 367 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 367 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 368 | 368 | return true; |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | break; |
| 372 | 372 | case 'home': |
| 373 | 373 | |
| 374 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {
|
|
| 374 | + if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {
|
|
| 375 | 375 | return true; |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | break; |
| 379 | 379 | case 'location': |
| 380 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {
|
|
| 380 | + if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {
|
|
| 381 | 381 | return true; |
| 382 | 382 | } |
| 383 | 383 | break; |
| 384 | 384 | case 'author': |
| 385 | - if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 385 | + if (is_author() && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 386 | 386 | return true; |
| 387 | 387 | } |
| 388 | 388 | |
| 389 | - if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {
|
|
| 390 | - if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {
|
|
| 389 | + if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {
|
|
| 390 | + if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {
|
|
| 391 | 391 | return true; |
| 392 | 392 | } |
| 393 | 393 | } |
| 394 | 394 | break; |
| 395 | 395 | case 'search': |
| 396 | - if ( is_search() && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 396 | + if (is_search() && isset($_REQUEST['geodir_search'])) {
|
|
| 397 | 397 | return true; |
| 398 | 398 | } |
| 399 | 399 | break; |
| 400 | 400 | case 'info': |
| 401 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {
|
|
| 401 | + if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {
|
|
| 402 | 402 | return true; |
| 403 | 403 | } |
| 404 | 404 | break; |
| 405 | 405 | case 'login': |
| 406 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {
|
|
| 406 | + if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {
|
|
| 407 | 407 | return true; |
| 408 | 408 | } |
| 409 | 409 | break; |
| 410 | 410 | case 'checkout': |
| 411 | - if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {
|
|
| 411 | + if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {
|
|
| 412 | 412 | return true; |
| 413 | 413 | } |
| 414 | 414 | break; |
| 415 | 415 | case 'invoices': |
| 416 | - if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {
|
|
| 416 | + if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {
|
|
| 417 | 417 | return true; |
| 418 | 418 | } |
| 419 | 419 | break; |
@@ -438,25 +438,25 @@ discard block |
||
| 438 | 438 | * |
| 439 | 439 | * @param object $wp WordPress object. |
| 440 | 440 | */ |
| 441 | -function geodir_set_is_geodir_page( $wp ) {
|
|
| 442 | - if ( ! is_admin() ) {
|
|
| 441 | +function geodir_set_is_geodir_page($wp) {
|
|
| 442 | + if (!is_admin()) {
|
|
| 443 | 443 | //$wp->query_vars['gd_is_geodir_page'] = false; |
| 444 | 444 | //print_r() |
| 445 | - if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array( |
|
| 445 | + if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array( |
|
| 446 | 446 | 'preview', |
| 447 | 447 | 'page', |
| 448 | 448 | 'paged', |
| 449 | 449 | 'cpage' |
| 450 | - ) ) |
|
| 450 | + )) |
|
| 451 | 451 | ) {
|
| 452 | - if ( geodir_is_page( 'home' ) ) {
|
|
| 452 | + if (geodir_is_page('home')) {
|
|
| 453 | 453 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | |
| 457 | 457 | } |
| 458 | 458 | |
| 459 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {
|
|
| 459 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {
|
|
| 460 | 460 | if ( |
| 461 | 461 | $wp->query_vars['page_id'] == geodir_add_listing_page_id() |
| 462 | 462 | || $wp->query_vars['page_id'] == geodir_preview_page_id() |
@@ -465,26 +465,26 @@ discard block |
||
| 465 | 465 | || $wp->query_vars['page_id'] == geodir_home_page_id() |
| 466 | 466 | || $wp->query_vars['page_id'] == geodir_info_page_id() |
| 467 | 467 | || $wp->query_vars['page_id'] == geodir_login_page_id() |
| 468 | - || ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 469 | - || ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 468 | + || (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 469 | + || (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 470 | 470 | ) {
|
| 471 | 471 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 472 | 472 | } |
| 473 | 473 | } |
| 474 | 474 | |
| 475 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {
|
|
| 476 | - $page = get_page_by_path( $wp->query_vars['pagename'] ); |
|
| 475 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {
|
|
| 476 | + $page = get_page_by_path($wp->query_vars['pagename']); |
|
| 477 | 477 | |
| 478 | - if ( ! empty( $page ) && ( |
|
| 478 | + if (!empty($page) && ( |
|
| 479 | 479 | $page->ID == geodir_add_listing_page_id() |
| 480 | 480 | || $page->ID == geodir_preview_page_id() |
| 481 | 481 | || $page->ID == geodir_success_page_id() |
| 482 | 482 | || $page->ID == geodir_location_page_id() |
| 483 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() ) |
|
| 484 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() ) |
|
| 485 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() ) |
|
| 486 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 487 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 483 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id()) |
|
| 484 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id()) |
|
| 485 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id()) |
|
| 486 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 487 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 488 | 488 | ) |
| 489 | 489 | ) {
|
| 490 | 490 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -492,20 +492,20 @@ discard block |
||
| 492 | 492 | } |
| 493 | 493 | |
| 494 | 494 | |
| 495 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {
|
|
| 495 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
|
|
| 496 | 496 | $requested_post_type = $wp->query_vars['post_type']; |
| 497 | 497 | // check if this post type is geodirectory post types |
| 498 | 498 | $post_type_array = geodir_get_posttypes(); |
| 499 | - if ( in_array( $requested_post_type, $post_type_array ) ) {
|
|
| 499 | + if (in_array($requested_post_type, $post_type_array)) {
|
|
| 500 | 500 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 501 | 501 | } |
| 502 | 502 | } |
| 503 | 503 | |
| 504 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {
|
|
| 505 | - $geodir_taxonomis = geodir_get_taxonomies( '', true ); |
|
| 506 | - if ( ! empty( $geodir_taxonomis ) ) {
|
|
| 507 | - foreach ( $geodir_taxonomis as $taxonomy ) {
|
|
| 508 | - if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {
|
|
| 504 | + if (!isset($wp->query_vars['gd_is_geodir_page'])) {
|
|
| 505 | + $geodir_taxonomis = geodir_get_taxonomies('', true);
|
|
| 506 | + if (!empty($geodir_taxonomis)) {
|
|
| 507 | + foreach ($geodir_taxonomis as $taxonomy) {
|
|
| 508 | + if (array_key_exists($taxonomy, $wp->query_vars)) {
|
|
| 509 | 509 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 510 | 510 | break; |
| 511 | 511 | } |
@@ -514,20 +514,20 @@ discard block |
||
| 514 | 514 | |
| 515 | 515 | } |
| 516 | 516 | |
| 517 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 517 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 518 | 518 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | 521 | |
| 522 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 522 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {
|
|
| 523 | 523 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | |
| 527 | 527 | //check if homepage |
| 528 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) |
|
| 529 | - && ! isset( $wp->query_vars['page_id'] ) |
|
| 530 | - && ! isset( $wp->query_vars['pagename'] ) |
|
| 528 | + if (!isset($wp->query_vars['gd_is_geodir_page']) |
|
| 529 | + && !isset($wp->query_vars['page_id']) |
|
| 530 | + && !isset($wp->query_vars['pagename']) |
|
| 531 | 531 | && is_page_geodir_home() |
| 532 | 532 | ) {
|
| 533 | 533 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -551,14 +551,14 @@ discard block |
||
| 551 | 551 | */ |
| 552 | 552 | function geodir_is_geodir_page() {
|
| 553 | 553 | global $wp; |
| 554 | - if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {
|
|
| 554 | + if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {
|
|
| 555 | 555 | return true; |
| 556 | 556 | } else {
|
| 557 | 557 | return false; |
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | -if ( ! function_exists( 'geodir_get_imagesize' ) ) {
|
|
| 561 | +if (!function_exists('geodir_get_imagesize')) {
|
|
| 562 | 562 | /** |
| 563 | 563 | * Get image size using the size key . |
| 564 | 564 | * |
@@ -569,13 +569,13 @@ discard block |
||
| 569 | 569 | * |
| 570 | 570 | * @return array|mixed|void|WP_Error If valid returns image size. Else returns error. |
| 571 | 571 | */ |
| 572 | - function geodir_get_imagesize( $size = '' ) {
|
|
| 572 | + function geodir_get_imagesize($size = '') {
|
|
| 573 | 573 | |
| 574 | 574 | $imagesizes = array( |
| 575 | - 'list-thumb' => array( 'w' => 283, 'h' => 188 ), |
|
| 576 | - 'thumbnail' => array( 'w' => 125, 'h' => 125 ), |
|
| 577 | - 'widget-thumb' => array( 'w' => 50, 'h' => 50 ), |
|
| 578 | - 'slider-thumb' => array( 'w' => 100, 'h' => 100 ) |
|
| 575 | + 'list-thumb' => array('w' => 283, 'h' => 188),
|
|
| 576 | + 'thumbnail' => array('w' => 125, 'h' => 125),
|
|
| 577 | + 'widget-thumb' => array('w' => 50, 'h' => 50),
|
|
| 578 | + 'slider-thumb' => array('w' => 100, 'h' => 100)
|
|
| 579 | 579 | ); |
| 580 | 580 | |
| 581 | 581 | /** |
@@ -585,9 +585,9 @@ discard block |
||
| 585 | 585 | * |
| 586 | 586 | * @param array $imagesizes Image size array. |
| 587 | 587 | */ |
| 588 | - $imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes ); |
|
| 588 | + $imagesizes = apply_filters('geodir_imagesizes', $imagesizes);
|
|
| 589 | 589 | |
| 590 | - if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {
|
|
| 590 | + if (!empty($size) && array_key_exists($size, $imagesizes)) {
|
|
| 591 | 591 | /** |
| 592 | 592 | * Filters image size of the passed key. |
| 593 | 593 | * |
@@ -595,11 +595,11 @@ discard block |
||
| 595 | 595 | * |
| 596 | 596 | * @param array $imagesizes [$size] Image size array of the passed key. |
| 597 | 597 | */ |
| 598 | - return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] ); |
|
| 598 | + return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);
|
|
| 599 | 599 | |
| 600 | - } elseif ( ! empty( $size ) ) {
|
|
| 600 | + } elseif (!empty($size)) {
|
|
| 601 | 601 | |
| 602 | - return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) ); |
|
| 602 | + return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));
|
|
| 603 | 603 | |
| 604 | 604 | } |
| 605 | 605 | |
@@ -623,7 +623,7 @@ discard block |
||
| 623 | 623 | */ |
| 624 | 624 | |
| 625 | 625 | |
| 626 | -if ( ! function_exists( 'createRandomString' ) ) {
|
|
| 626 | +if (!function_exists('createRandomString')) {
|
|
| 627 | 627 | /** |
| 628 | 628 | * Creates random string. |
| 629 | 629 | * |
@@ -633,21 +633,21 @@ discard block |
||
| 633 | 633 | */ |
| 634 | 634 | function createRandomString() {
|
| 635 | 635 | $chars = "abcdefghijkmlnopqrstuvwxyz1023456789"; |
| 636 | - srand( (double) microtime() * 1000000 ); |
|
| 636 | + srand((double) microtime() * 1000000); |
|
| 637 | 637 | $i = 0; |
| 638 | 638 | $rstring = ''; |
| 639 | - while ( $i <= 25 ) {
|
|
| 639 | + while ($i <= 25) {
|
|
| 640 | 640 | $num = rand() % 33; |
| 641 | - $tmp = substr( $chars, $num, 1 ); |
|
| 642 | - $rstring = $rstring . $tmp; |
|
| 643 | - $i ++; |
|
| 641 | + $tmp = substr($chars, $num, 1); |
|
| 642 | + $rstring = $rstring.$tmp; |
|
| 643 | + $i++; |
|
| 644 | 644 | } |
| 645 | 645 | |
| 646 | 646 | return $rstring; |
| 647 | 647 | } |
| 648 | 648 | } |
| 649 | 649 | |
| 650 | -if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {
|
|
| 650 | +if (!function_exists('geodir_getDistanceRadius')) {
|
|
| 651 | 651 | /** |
| 652 | 652 | * Calculates the distance radius. |
| 653 | 653 | * |
@@ -658,9 +658,9 @@ discard block |
||
| 658 | 658 | * |
| 659 | 659 | * @return float The mean radius. |
| 660 | 660 | */ |
| 661 | - function geodir_getDistanceRadius( $uom = 'km' ) {
|
|
| 661 | + function geodir_getDistanceRadius($uom = 'km') {
|
|
| 662 | 662 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 663 | - switch ( geodir_strtolower( $uom ) ): |
|
| 663 | + switch (geodir_strtolower($uom)): |
|
| 664 | 664 | case 'km' : |
| 665 | 665 | $earthMeanRadius = 6371.009; // km |
| 666 | 666 | break; |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | } |
| 693 | 693 | |
| 694 | 694 | |
| 695 | -if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {
|
|
| 695 | +if (!function_exists('geodir_calculateDistanceFromLatLong')) {
|
|
| 696 | 696 | /** |
| 697 | 697 | * Calculate the great circle distance between two points identified by longitude and latitude. |
| 698 | 698 | * |
@@ -705,17 +705,17 @@ discard block |
||
| 705 | 705 | * |
| 706 | 706 | * @return float The distance. |
| 707 | 707 | */ |
| 708 | - function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {
|
|
| 708 | + function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {
|
|
| 709 | 709 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 710 | 710 | |
| 711 | - $earthMeanRadius = geodir_getDistanceRadius( $uom ); |
|
| 711 | + $earthMeanRadius = geodir_getDistanceRadius($uom); |
|
| 712 | 712 | |
| 713 | - $deltaLatitude = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] ); |
|
| 714 | - $deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] ); |
|
| 715 | - $a = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) + |
|
| 716 | - cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * |
|
| 717 | - sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); |
|
| 718 | - $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) ); |
|
| 713 | + $deltaLatitude = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']); |
|
| 714 | + $deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']); |
|
| 715 | + $a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) + |
|
| 716 | + cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) * |
|
| 717 | + sin($deltaLongitude / 2) * sin($deltaLongitude / 2); |
|
| 718 | + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); |
|
| 719 | 719 | $distance = $earthMeanRadius * $c; |
| 720 | 720 | |
| 721 | 721 | return $distance; |
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | } |
| 725 | 725 | |
| 726 | 726 | |
| 727 | -if ( ! function_exists( 'geodir_sendEmail' ) ) {
|
|
| 727 | +if (!function_exists('geodir_sendEmail')) {
|
|
| 728 | 728 | /** |
| 729 | 729 | * The main function that send transactional emails using the args provided. |
| 730 | 730 | * |
@@ -743,93 +743,93 @@ discard block |
||
| 743 | 743 | * @param string $post_id The post ID. |
| 744 | 744 | * @param string $user_id The user ID. |
| 745 | 745 | */ |
| 746 | - function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {
|
|
| 746 | + function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {
|
|
| 747 | 747 | $login_details = ''; |
| 748 | 748 | |
| 749 | 749 | // strip slashes from subject & message text |
| 750 | - $to_subject = stripslashes_deep( $to_subject ); |
|
| 751 | - $to_message = stripslashes_deep( $to_message ); |
|
| 750 | + $to_subject = stripslashes_deep($to_subject); |
|
| 751 | + $to_message = stripslashes_deep($to_message); |
|
| 752 | 752 | |
| 753 | - if ( $message_type == 'send_friend' ) {
|
|
| 754 | - $subject = get_option( 'geodir_email_friend_subject' ); |
|
| 755 | - $message = get_option( 'geodir_email_friend_content' ); |
|
| 756 | - } elseif ( $message_type == 'send_enquiry' ) {
|
|
| 757 | - $subject = get_option( 'geodir_email_enquiry_subject' ); |
|
| 758 | - $message = get_option( 'geodir_email_enquiry_content' ); |
|
| 753 | + if ($message_type == 'send_friend') {
|
|
| 754 | + $subject = get_option('geodir_email_friend_subject');
|
|
| 755 | + $message = get_option('geodir_email_friend_content');
|
|
| 756 | + } elseif ($message_type == 'send_enquiry') {
|
|
| 757 | + $subject = get_option('geodir_email_enquiry_subject');
|
|
| 758 | + $message = get_option('geodir_email_enquiry_content');
|
|
| 759 | 759 | |
| 760 | 760 | // change to name in some cases |
| 761 | - $post_author = get_post_field( 'post_author', $post_id ); |
|
| 762 | - if(is_super_admin( $post_author )){// if admin probably not the post author so change name
|
|
| 763 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 764 | - }elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed
|
|
| 765 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 761 | + $post_author = get_post_field('post_author', $post_id);
|
|
| 762 | + if (is_super_admin($post_author)) {// if admin probably not the post author so change name
|
|
| 763 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 764 | + }elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed
|
|
| 765 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 766 | 766 | } |
| 767 | 767 | |
| 768 | 768 | |
| 769 | - } elseif ( $message_type == 'forgot_password' ) {
|
|
| 770 | - $subject = get_option( 'geodir_forgot_password_subject' ); |
|
| 771 | - $message = get_option( 'geodir_forgot_password_content' ); |
|
| 769 | + } elseif ($message_type == 'forgot_password') {
|
|
| 770 | + $subject = get_option('geodir_forgot_password_subject');
|
|
| 771 | + $message = get_option('geodir_forgot_password_content');
|
|
| 772 | 772 | $login_details = $to_message; |
| 773 | - } elseif ( $message_type == 'registration' ) {
|
|
| 774 | - $subject = get_option( 'geodir_registration_success_email_subject' ); |
|
| 775 | - $message = get_option( 'geodir_registration_success_email_content' ); |
|
| 773 | + } elseif ($message_type == 'registration') {
|
|
| 774 | + $subject = get_option('geodir_registration_success_email_subject');
|
|
| 775 | + $message = get_option('geodir_registration_success_email_content');
|
|
| 776 | 776 | $login_details = $to_message; |
| 777 | - } elseif ( $message_type == 'post_submit' ) {
|
|
| 778 | - $subject = get_option( 'geodir_post_submited_success_email_subject' ); |
|
| 779 | - $message = get_option( 'geodir_post_submited_success_email_content' ); |
|
| 780 | - } elseif ( $message_type == 'listing_published' ) {
|
|
| 781 | - $subject = get_option( 'geodir_post_published_email_subject' ); |
|
| 782 | - $message = get_option( 'geodir_post_published_email_content' ); |
|
| 783 | - } elseif ( $message_type == 'listing_edited' ) {
|
|
| 784 | - $subject = get_option( 'geodir_post_edited_email_subject_admin' ); |
|
| 785 | - $message = get_option( 'geodir_post_edited_email_content_admin' ); |
|
| 777 | + } elseif ($message_type == 'post_submit') {
|
|
| 778 | + $subject = get_option('geodir_post_submited_success_email_subject');
|
|
| 779 | + $message = get_option('geodir_post_submited_success_email_content');
|
|
| 780 | + } elseif ($message_type == 'listing_published') {
|
|
| 781 | + $subject = get_option('geodir_post_published_email_subject');
|
|
| 782 | + $message = get_option('geodir_post_published_email_content');
|
|
| 783 | + } elseif ($message_type == 'listing_edited') {
|
|
| 784 | + $subject = get_option('geodir_post_edited_email_subject_admin');
|
|
| 785 | + $message = get_option('geodir_post_edited_email_content_admin');
|
|
| 786 | 786 | } |
| 787 | 787 | |
| 788 | - if ( ! empty( $subject ) ) {
|
|
| 789 | - $subject = __( stripslashes_deep( $subject ), 'geodirectory' ); |
|
| 788 | + if (!empty($subject)) {
|
|
| 789 | + $subject = __(stripslashes_deep($subject), 'geodirectory'); |
|
| 790 | 790 | } |
| 791 | 791 | |
| 792 | - if ( ! empty( $message ) ) {
|
|
| 793 | - $message = __( stripslashes_deep( $message ), 'geodirectory' ); |
|
| 792 | + if (!empty($message)) {
|
|
| 793 | + $message = __(stripslashes_deep($message), 'geodirectory'); |
|
| 794 | 794 | } |
| 795 | 795 | |
| 796 | - $to_message = nl2br( $to_message ); |
|
| 797 | - $sitefromEmail = get_option( 'site_email' ); |
|
| 796 | + $to_message = nl2br($to_message); |
|
| 797 | + $sitefromEmail = get_option('site_email');
|
|
| 798 | 798 | $sitefromEmailName = get_site_emailName(); |
| 799 | - $productlink = get_permalink( $post_id ); |
|
| 799 | + $productlink = get_permalink($post_id); |
|
| 800 | 800 | |
| 801 | 801 | $user_login = ''; |
| 802 | - if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {
|
|
| 802 | + if ($user_id > 0 && $user_info = get_userdata($user_id)) {
|
|
| 803 | 803 | $user_login = $user_info->user_login; |
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | $posted_date = ''; |
| 807 | 807 | $listingLink = ''; |
| 808 | 808 | |
| 809 | - $post_info = get_post( $post_id ); |
|
| 809 | + $post_info = get_post($post_id); |
|
| 810 | 810 | |
| 811 | - if ( $post_info ) {
|
|
| 811 | + if ($post_info) {
|
|
| 812 | 812 | $posted_date = $post_info->post_date; |
| 813 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 813 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 814 | 814 | } |
| 815 | 815 | $siteurl = home_url(); |
| 816 | - $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>'; |
|
| 816 | + $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>'; |
|
| 817 | 817 | $loginurl = geodir_login_url(); |
| 818 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 818 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 819 | 819 | |
| 820 | - $post_author_id = ! empty( $post_info ) ? $post_info->post_author : 0; |
|
| 821 | - $post_author_name = geodir_get_client_name( $post_author_id ); |
|
| 822 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); |
|
| 820 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; |
|
| 821 | + $post_author_name = geodir_get_client_name($post_author_id); |
|
| 822 | + $current_date = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
|
|
| 823 | 823 | |
| 824 | - if ( $fromEmail == '' ) {
|
|
| 825 | - $fromEmail = get_option( 'site_email' ); |
|
| 824 | + if ($fromEmail == '') {
|
|
| 825 | + $fromEmail = get_option('site_email');
|
|
| 826 | 826 | } |
| 827 | 827 | |
| 828 | - if ( $fromEmailName == '' ) {
|
|
| 829 | - $fromEmailName = get_option( 'site_email_name' ); |
|
| 828 | + if ($fromEmailName == '') {
|
|
| 829 | + $fromEmailName = get_option('site_email_name');
|
|
| 830 | 830 | } |
| 831 | 831 | |
| 832 | - $search_array = array( |
|
| 832 | + $search_array = array( |
|
| 833 | 833 | '[#listing_link#]', |
| 834 | 834 | '[#site_name_url#]', |
| 835 | 835 | '[#post_id#]', |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | $post_author_name, |
| 870 | 870 | $current_date |
| 871 | 871 | ); |
| 872 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 872 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 873 | 873 | |
| 874 | 874 | $search_array = array( |
| 875 | 875 | '[#listing_link#]', |
@@ -905,12 +905,12 @@ discard block |
||
| 905 | 905 | $post_author_name, |
| 906 | 906 | $current_date |
| 907 | 907 | ); |
| 908 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 908 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 909 | 909 | |
| 910 | - $headers = array(); |
|
| 910 | + $headers = array(); |
|
| 911 | 911 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 912 | - $headers[] = "Reply-To: " . $fromEmail; |
|
| 913 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; |
|
| 912 | + $headers[] = "Reply-To: ".$fromEmail; |
|
| 913 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; |
|
| 914 | 914 | |
| 915 | 915 | $to = $toEmail; |
| 916 | 916 | |
@@ -932,7 +932,7 @@ discard block |
||
| 932 | 932 | * @param string $post_id The post ID. |
| 933 | 933 | * @param string $user_id The user ID. |
| 934 | 934 | */ |
| 935 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 935 | + $to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 936 | 936 | /** |
| 937 | 937 | * Filter the client email subject. |
| 938 | 938 | * |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | * @param string $post_id The post ID. |
| 952 | 952 | * @param string $user_id The user ID. |
| 953 | 953 | */ |
| 954 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 954 | + $subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 955 | 955 | /** |
| 956 | 956 | * Filter the client email message. |
| 957 | 957 | * |
@@ -970,7 +970,7 @@ discard block |
||
| 970 | 970 | * @param string $post_id The post ID. |
| 971 | 971 | * @param string $user_id The user ID. |
| 972 | 972 | */ |
| 973 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 973 | + $message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 974 | 974 | /** |
| 975 | 975 | * Filter the client email headers. |
| 976 | 976 | * |
@@ -989,39 +989,39 @@ discard block |
||
| 989 | 989 | * @param string $post_id The post ID. |
| 990 | 990 | * @param string $user_id The user ID. |
| 991 | 991 | */ |
| 992 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 992 | + $headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 993 | 993 | |
| 994 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 994 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 995 | 995 | |
| 996 | - if ( ! $sent ) {
|
|
| 997 | - if ( is_array( $to ) ) {
|
|
| 998 | - $to = implode( ',', $to ); |
|
| 996 | + if (!$sent) {
|
|
| 997 | + if (is_array($to)) {
|
|
| 998 | + $to = implode(',', $to);
|
|
| 999 | 999 | } |
| 1000 | 1000 | $log_message = sprintf( |
| 1001 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1001 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1002 | 1002 | $message_type, |
| 1003 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1003 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1004 | 1004 | $to, |
| 1005 | 1005 | $subject |
| 1006 | 1006 | ); |
| 1007 | - geodir_error_log( $log_message ); |
|
| 1007 | + geodir_error_log($log_message); |
|
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | 1010 | ///////// ADMIN BCC EMIALS |
| 1011 | - $adminEmail = get_bloginfo( 'admin_email' ); |
|
| 1011 | + $adminEmail = get_bloginfo('admin_email');
|
|
| 1012 | 1012 | $to = $adminEmail; |
| 1013 | 1013 | |
| 1014 | 1014 | $admin_bcc = false; |
| 1015 | - if ( $message_type == 'registration' ) {
|
|
| 1016 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); |
|
| 1017 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); |
|
| 1018 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; |
|
| 1015 | + if ($message_type == 'registration') {
|
|
| 1016 | + $message_raw = explode(__("Password:", 'geodirectory'), $message);
|
|
| 1017 | + $message_raw2 = explode("</p>", $message_raw[1], 2);
|
|
| 1018 | + $message = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
|
|
| 1019 | 1019 | } |
| 1020 | - if ( $message_type == 'post_submit' ) {
|
|
| 1021 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); |
|
| 1022 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); |
|
| 1020 | + if ($message_type == 'post_submit') {
|
|
| 1021 | + $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
|
|
| 1022 | + $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
|
|
| 1023 | 1023 | |
| 1024 | - $search_array = array( |
|
| 1024 | + $search_array = array( |
|
| 1025 | 1025 | '[#listing_link#]', |
| 1026 | 1026 | '[#site_name_url#]', |
| 1027 | 1027 | '[#post_id#]', |
@@ -1053,7 +1053,7 @@ discard block |
||
| 1053 | 1053 | $user_login, |
| 1054 | 1054 | $user_login |
| 1055 | 1055 | ); |
| 1056 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 1056 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 1057 | 1057 | |
| 1058 | 1058 | $search_array = array( |
| 1059 | 1059 | '[#listing_link#]', |
@@ -1081,26 +1081,26 @@ discard block |
||
| 1081 | 1081 | $user_login, |
| 1082 | 1082 | $user_login |
| 1083 | 1083 | ); |
| 1084 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1084 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1085 | 1085 | |
| 1086 | 1086 | $subject .= ' - ADMIN BCC COPY'; |
| 1087 | 1087 | $admin_bcc = true; |
| 1088 | 1088 | |
| 1089 | - } elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
|
|
| 1089 | + } elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
|
|
| 1090 | 1090 | $subject .= ' - ADMIN BCC COPY'; |
| 1091 | 1091 | $admin_bcc = true; |
| 1092 | - } elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {
|
|
| 1092 | + } elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {
|
|
| 1093 | 1093 | $subject .= ' - ADMIN BCC COPY'; |
| 1094 | 1094 | $admin_bcc = true; |
| 1095 | - } elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
|
|
| 1095 | + } elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
|
|
| 1096 | 1096 | $subject .= ' - ADMIN BCC COPY'; |
| 1097 | 1097 | $admin_bcc = true; |
| 1098 | - } elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
|
|
| 1098 | + } elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
|
|
| 1099 | 1099 | $subject .= ' - ADMIN BCC COPY'; |
| 1100 | 1100 | $admin_bcc = true; |
| 1101 | 1101 | } |
| 1102 | 1102 | |
| 1103 | - if ( $admin_bcc === true ) {
|
|
| 1103 | + if ($admin_bcc === true) {
|
|
| 1104 | 1104 | |
| 1105 | 1105 | /** |
| 1106 | 1106 | * Filter the client email subject. |
@@ -1120,7 +1120,7 @@ discard block |
||
| 1120 | 1120 | * @param string $post_id The post ID. |
| 1121 | 1121 | * @param string $user_id The user ID. |
| 1122 | 1122 | */ |
| 1123 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1123 | + $subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1124 | 1124 | /** |
| 1125 | 1125 | * Filter the client email message. |
| 1126 | 1126 | * |
@@ -1139,23 +1139,23 @@ discard block |
||
| 1139 | 1139 | * @param string $post_id The post ID. |
| 1140 | 1140 | * @param string $user_id The user ID. |
| 1141 | 1141 | */ |
| 1142 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1142 | + $message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1143 | 1143 | |
| 1144 | 1144 | |
| 1145 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1145 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1146 | 1146 | |
| 1147 | - if ( ! $sent ) {
|
|
| 1148 | - if ( is_array( $to ) ) {
|
|
| 1149 | - $to = implode( ',', $to ); |
|
| 1147 | + if (!$sent) {
|
|
| 1148 | + if (is_array($to)) {
|
|
| 1149 | + $to = implode(',', $to);
|
|
| 1150 | 1150 | } |
| 1151 | 1151 | $log_message = sprintf( |
| 1152 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1152 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1153 | 1153 | $message_type, |
| 1154 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1154 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1155 | 1155 | $to, |
| 1156 | 1156 | $subject |
| 1157 | 1157 | ); |
| 1158 | - geodir_error_log( $log_message ); |
|
| 1158 | + geodir_error_log($log_message); |
|
| 1159 | 1159 | } |
| 1160 | 1160 | } |
| 1161 | 1161 | |
@@ -1171,52 +1171,52 @@ discard block |
||
| 1171 | 1171 | */ |
| 1172 | 1172 | function geodir_taxonomy_breadcrumb() {
|
| 1173 | 1173 | |
| 1174 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); |
|
| 1174 | + $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
|
|
| 1175 | 1175 | $parent = $term->parent; |
| 1176 | 1176 | |
| 1177 | - while ( $parent ): |
|
| 1177 | + while ($parent): |
|
| 1178 | 1178 | $parents[] = $parent; |
| 1179 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1179 | + $new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1180 | 1180 | $parent = $new_parent->parent; |
| 1181 | 1181 | endwhile; |
| 1182 | 1182 | |
| 1183 | - if ( ! empty( $parents ) ): |
|
| 1184 | - $parents = array_reverse( $parents ); |
|
| 1183 | + if (!empty($parents)): |
|
| 1184 | + $parents = array_reverse($parents); |
|
| 1185 | 1185 | |
| 1186 | - foreach ( $parents as $parent ): |
|
| 1187 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1188 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); |
|
| 1189 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; |
|
| 1186 | + foreach ($parents as $parent): |
|
| 1187 | + $item = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1188 | + $url = get_term_link($item, get_query_var('taxonomy'));
|
|
| 1189 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; |
|
| 1190 | 1190 | endforeach; |
| 1191 | 1191 | |
| 1192 | 1192 | endif; |
| 1193 | 1193 | |
| 1194 | - echo '<li> > ' . $term->name . '</li>'; |
|
| 1194 | + echo '<li> > '.$term->name.'</li>'; |
|
| 1195 | 1195 | } |
| 1196 | 1196 | |
| 1197 | -function geodir_wpml_post_type_archive_link($link, $post_type){
|
|
| 1197 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
|
|
| 1198 | 1198 | |
| 1199 | - if(function_exists('icl_object_id')) {
|
|
| 1200 | - $post_types = get_option( 'geodir_post_types' ); |
|
| 1201 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; |
|
| 1199 | + if (function_exists('icl_object_id')) {
|
|
| 1200 | + $post_types = get_option('geodir_post_types');
|
|
| 1201 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1202 | 1202 | |
| 1203 | 1203 | //echo $link.'###'.gd_wpml_get_lang_from_url( $link) ; |
| 1204 | 1204 | |
| 1205 | 1205 | // Alter the CPT slug if WPML is set to do so |
| 1206 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 1207 | - if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
|
|
| 1206 | + if (function_exists('icl_object_id')) {
|
|
| 1207 | + if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
|
|
| 1208 | 1208 | |
| 1209 | 1209 | $org_slug = $slug; |
| 1210 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1210 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1211 | 1211 | $slug, |
| 1212 | 1212 | 'WordPress', |
| 1213 | - 'URL slug: ' . $slug, |
|
| 1214 | - $language_code ); |
|
| 1213 | + 'URL slug: '.$slug, |
|
| 1214 | + $language_code); |
|
| 1215 | 1215 | |
| 1216 | - if ( ! $slug ) {
|
|
| 1216 | + if (!$slug) {
|
|
| 1217 | 1217 | $slug = $org_slug; |
| 1218 | 1218 | } else {
|
| 1219 | - $link = str_replace( $org_slug, $slug, $link ); |
|
| 1219 | + $link = str_replace($org_slug, $slug, $link); |
|
| 1220 | 1220 | } |
| 1221 | 1221 | |
| 1222 | 1222 | } |
@@ -1248,9 +1248,9 @@ discard block |
||
| 1248 | 1248 | * |
| 1249 | 1249 | * @since 1.0.0 |
| 1250 | 1250 | */ |
| 1251 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); |
|
| 1251 | + $separator = apply_filters('geodir_breadcrumb_separator', ' > ');
|
|
| 1252 | 1252 | |
| 1253 | - if ( ! geodir_is_page( 'home' ) ) {
|
|
| 1253 | + if (!geodir_is_page('home')) {
|
|
| 1254 | 1254 | $breadcrumb = ''; |
| 1255 | 1255 | $url_categoris = ''; |
| 1256 | 1256 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; |
@@ -1259,167 +1259,167 @@ discard block |
||
| 1259 | 1259 | * |
| 1260 | 1260 | * @since 1.0.0 |
| 1261 | 1261 | */ |
| 1262 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; |
|
| 1262 | + $breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
|
|
| 1263 | 1263 | |
| 1264 | 1264 | $gd_post_type = geodir_get_current_posttype(); |
| 1265 | - $post_type_info = get_post_type_object( $gd_post_type ); |
|
| 1265 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1266 | 1266 | |
| 1267 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); |
|
| 1267 | + remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
|
|
| 1268 | 1268 | |
| 1269 | - $listing_link = get_post_type_archive_link( $gd_post_type ); |
|
| 1269 | + $listing_link = get_post_type_archive_link($gd_post_type); |
|
| 1270 | 1270 | |
| 1271 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); |
|
| 1272 | - $listing_link = rtrim( $listing_link, '/' ); |
|
| 1271 | + add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
|
|
| 1272 | + $listing_link = rtrim($listing_link, '/'); |
|
| 1273 | 1273 | $listing_link .= '/'; |
| 1274 | 1274 | |
| 1275 | 1275 | $post_type_for_location_link = $listing_link; |
| 1276 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 1276 | + $location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 1277 | 1277 | |
| 1278 | 1278 | global $wp, $gd_session; |
| 1279 | 1279 | $location_link = $post_type_for_location_link; |
| 1280 | 1280 | |
| 1281 | - if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
|
|
| 1281 | + if (geodir_is_page('detail') || geodir_is_page('listing')) {
|
|
| 1282 | 1282 | global $post; |
| 1283 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 1284 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; |
|
| 1283 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1284 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1285 | 1285 | |
| 1286 | - if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
|
|
| 1286 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1287 | 1287 | $location_terms = array( |
| 1288 | 1288 | 'gd_country' => $post->country_slug, |
| 1289 | 1289 | 'gd_region' => $post->region_slug, |
| 1290 | 1290 | 'gd_city' => $post->city_slug |
| 1291 | 1291 | ); |
| 1292 | 1292 | |
| 1293 | - if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
|
|
| 1293 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1294 | 1294 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
| 1295 | 1295 | } |
| 1296 | 1296 | } |
| 1297 | 1297 | |
| 1298 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 1298 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1299 | 1299 | |
| 1300 | 1300 | $hide_url_part = array(); |
| 1301 | - if ( $location_manager ) {
|
|
| 1302 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 1303 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 1304 | - |
|
| 1305 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 1306 | - $hide_url_part = array( 'gd_country', 'gd_region' ); |
|
| 1307 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 1308 | - $hide_url_part = array( 'gd_region' ); |
|
| 1309 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 1310 | - $hide_url_part = array( 'gd_country' ); |
|
| 1301 | + if ($location_manager) {
|
|
| 1302 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 1303 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 1304 | + |
|
| 1305 | + if ($hide_region_part && $hide_country_part) {
|
|
| 1306 | + $hide_url_part = array('gd_country', 'gd_region');
|
|
| 1307 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 1308 | + $hide_url_part = array('gd_region');
|
|
| 1309 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 1310 | + $hide_url_part = array('gd_country');
|
|
| 1311 | 1311 | } |
| 1312 | 1312 | } |
| 1313 | 1313 | |
| 1314 | 1314 | $hide_text_part = array(); |
| 1315 | - if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 1316 | - $hide_text_part = array( 'gd_region' ); |
|
| 1315 | + if ($geodir_show_location_url == 'country_city') {
|
|
| 1316 | + $hide_text_part = array('gd_region');
|
|
| 1317 | 1317 | |
| 1318 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1319 | - unset( $location_terms['gd_region'] ); |
|
| 1318 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1319 | + unset($location_terms['gd_region']); |
|
| 1320 | 1320 | } |
| 1321 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 1322 | - $hide_text_part = array( 'gd_country' ); |
|
| 1321 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 1322 | + $hide_text_part = array('gd_country');
|
|
| 1323 | 1323 | |
| 1324 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1325 | - unset( $location_terms['gd_country'] ); |
|
| 1324 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1325 | + unset($location_terms['gd_country']); |
|
| 1326 | 1326 | } |
| 1327 | - } else if ( $geodir_show_location_url == 'city' ) {
|
|
| 1328 | - $hide_text_part = array( 'gd_country', 'gd_region' ); |
|
| 1327 | + } else if ($geodir_show_location_url == 'city') {
|
|
| 1328 | + $hide_text_part = array('gd_country', 'gd_region');
|
|
| 1329 | 1329 | |
| 1330 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1331 | - unset( $location_terms['gd_country'] ); |
|
| 1330 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1331 | + unset($location_terms['gd_country']); |
|
| 1332 | 1332 | } |
| 1333 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1334 | - unset( $location_terms['gd_region'] ); |
|
| 1333 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1334 | + unset($location_terms['gd_region']); |
|
| 1335 | 1335 | } |
| 1336 | 1336 | } |
| 1337 | 1337 | |
| 1338 | 1338 | $is_location_last = ''; |
| 1339 | 1339 | $is_taxonomy_last = ''; |
| 1340 | 1340 | $breadcrumb .= '<li>'; |
| 1341 | - if ( get_query_var( $gd_post_type . 'category' ) ) {
|
|
| 1342 | - $gd_taxonomy = $gd_post_type . 'category'; |
|
| 1343 | - } elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1344 | - $gd_taxonomy = $gd_post_type . '_tags'; |
|
| 1341 | + if (get_query_var($gd_post_type.'category')) {
|
|
| 1342 | + $gd_taxonomy = $gd_post_type.'category'; |
|
| 1343 | + } elseif (get_query_var($gd_post_type.'_tags')) {
|
|
| 1344 | + $gd_taxonomy = $gd_post_type.'_tags'; |
|
| 1345 | 1345 | } |
| 1346 | 1346 | |
| 1347 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1348 | - if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
|
|
| 1347 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1348 | + if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
|
|
| 1349 | 1349 | $is_location_last = false; |
| 1350 | 1350 | } else {
|
| 1351 | 1351 | $is_location_last = true; |
| 1352 | 1352 | } |
| 1353 | 1353 | |
| 1354 | - if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
|
|
| 1354 | + if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
|
|
| 1355 | 1355 | $is_taxonomy_last = true; |
| 1356 | 1356 | } else {
|
| 1357 | 1357 | $is_taxonomy_last = false; |
| 1358 | 1358 | } |
| 1359 | 1359 | |
| 1360 | - if ( ! empty( $location_terms ) ) {
|
|
| 1361 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 1360 | + if (!empty($location_terms)) {
|
|
| 1361 | + $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
|
|
| 1362 | 1362 | |
| 1363 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1364 | - if ( $location_term != '' ) {
|
|
| 1365 | - if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
|
|
| 1363 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1364 | + if ($location_term != '') {
|
|
| 1365 | + if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
|
|
| 1366 | 1366 | continue; |
| 1367 | 1367 | } |
| 1368 | 1368 | |
| 1369 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); |
|
| 1370 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 1371 | - $gd_location_link_text = ucfirst( $gd_location_link_text ); |
|
| 1369 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
|
|
| 1370 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 1371 | + $gd_location_link_text = ucfirst($gd_location_link_text); |
|
| 1372 | 1372 | |
| 1373 | 1373 | $location_term_actual_country = ''; |
| 1374 | 1374 | $location_term_actual_region = ''; |
| 1375 | 1375 | $location_term_actual_city = ''; |
| 1376 | 1376 | $location_term_actual_neighbourhood = ''; |
| 1377 | - if ( $geodir_get_locations ) {
|
|
| 1378 | - if ( $key == 'gd_country' ) {
|
|
| 1379 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); |
|
| 1380 | - } else if ( $key == 'gd_region' ) {
|
|
| 1381 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); |
|
| 1382 | - } else if ( $key == 'gd_city' ) {
|
|
| 1383 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); |
|
| 1384 | - } else if ( $key == 'gd_neighbourhood' ) {
|
|
| 1385 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); |
|
| 1377 | + if ($geodir_get_locations) {
|
|
| 1378 | + if ($key == 'gd_country') {
|
|
| 1379 | + $location_term_actual_country = get_actual_location_name('country', $location_term, true);
|
|
| 1380 | + } else if ($key == 'gd_region') {
|
|
| 1381 | + $location_term_actual_region = get_actual_location_name('region', $location_term, true);
|
|
| 1382 | + } else if ($key == 'gd_city') {
|
|
| 1383 | + $location_term_actual_city = get_actual_location_name('city', $location_term, true);
|
|
| 1384 | + } else if ($key == 'gd_neighbourhood') {
|
|
| 1385 | + $location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
|
|
| 1386 | 1386 | } |
| 1387 | 1387 | } else {
|
| 1388 | 1388 | $location_info = geodir_get_location(); |
| 1389 | 1389 | |
| 1390 | - if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
|
|
| 1391 | - if ( $key == 'gd_country' ) {
|
|
| 1392 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); |
|
| 1393 | - } else if ( $key == 'gd_region' ) {
|
|
| 1394 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); |
|
| 1395 | - } else if ( $key == 'gd_city' ) {
|
|
| 1396 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); |
|
| 1390 | + if (!empty($location_info) && isset($location_info->location_id)) {
|
|
| 1391 | + if ($key == 'gd_country') {
|
|
| 1392 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); |
|
| 1393 | + } else if ($key == 'gd_region') {
|
|
| 1394 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); |
|
| 1395 | + } else if ($key == 'gd_city') {
|
|
| 1396 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); |
|
| 1397 | 1397 | } |
| 1398 | 1398 | } |
| 1399 | 1399 | } |
| 1400 | 1400 | |
| 1401 | - 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'] != '' ) ) {
|
|
| 1402 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; |
|
| 1403 | - } else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1404 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; |
|
| 1405 | - } else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
|
|
| 1406 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; |
|
| 1407 | - } else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
|
|
| 1408 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; |
|
| 1401 | + 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'] != '')) {
|
|
| 1402 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; |
|
| 1403 | + } else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1404 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; |
|
| 1405 | + } else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
|
|
| 1406 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; |
|
| 1407 | + } else if ($is_location_last && $key == 'gd_neighbourhood') {
|
|
| 1408 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; |
|
| 1409 | 1409 | } else {
|
| 1410 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1411 | - $location_link .= $location_term . '/'; |
|
| 1410 | + if (get_option('permalink_structure') != '') {
|
|
| 1411 | + $location_link .= $location_term.'/'; |
|
| 1412 | 1412 | } else {
|
| 1413 | - $location_link .= "&$key=" . $location_term; |
|
| 1413 | + $location_link .= "&$key=".$location_term; |
|
| 1414 | 1414 | } |
| 1415 | 1415 | |
| 1416 | - if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
|
|
| 1416 | + if ($key == 'gd_country' && $location_term_actual_country != '') {
|
|
| 1417 | 1417 | $gd_location_link_text = $location_term_actual_country; |
| 1418 | - } else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
|
|
| 1418 | + } else if ($key == 'gd_region' && $location_term_actual_region != '') {
|
|
| 1419 | 1419 | $gd_location_link_text = $location_term_actual_region; |
| 1420 | - } else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
|
|
| 1420 | + } else if ($key == 'gd_city' && $location_term_actual_city != '') {
|
|
| 1421 | 1421 | $gd_location_link_text = $location_term_actual_city; |
| 1422 | - } else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
|
|
| 1422 | + } else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
|
|
| 1423 | 1423 | $gd_location_link_text = $location_term_actual_neighbourhood; |
| 1424 | 1424 | } |
| 1425 | 1425 | |
@@ -1429,76 +1429,76 @@ discard block |
||
| 1429 | 1429 | } |
| 1430 | 1430 | */ |
| 1431 | 1431 | |
| 1432 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; |
|
| 1432 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; |
|
| 1433 | 1433 | } |
| 1434 | 1434 | } |
| 1435 | 1435 | } |
| 1436 | 1436 | } |
| 1437 | 1437 | |
| 1438 | - if ( ! empty( $gd_taxonomy ) ) {
|
|
| 1438 | + if (!empty($gd_taxonomy)) {
|
|
| 1439 | 1439 | $term_index = 1; |
| 1440 | 1440 | |
| 1441 | 1441 | //if(get_option('geodir_add_categories_url'))
|
| 1442 | 1442 | {
|
| 1443 | - if ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1444 | - $cat_link = $listing_link . 'tags/'; |
|
| 1443 | + if (get_query_var($gd_post_type.'_tags')) {
|
|
| 1444 | + $cat_link = $listing_link.'tags/'; |
|
| 1445 | 1445 | } else {
|
| 1446 | 1446 | $cat_link = $listing_link; |
| 1447 | 1447 | } |
| 1448 | 1448 | |
| 1449 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1450 | - if ( $location_manager && in_array( $key, $hide_url_part ) ) {
|
|
| 1449 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1450 | + if ($location_manager && in_array($key, $hide_url_part)) {
|
|
| 1451 | 1451 | continue; |
| 1452 | 1452 | } |
| 1453 | 1453 | |
| 1454 | - if ( $location_term != '' ) {
|
|
| 1455 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1456 | - $cat_link .= $location_term . '/'; |
|
| 1454 | + if ($location_term != '') {
|
|
| 1455 | + if (get_option('permalink_structure') != '') {
|
|
| 1456 | + $cat_link .= $location_term.'/'; |
|
| 1457 | 1457 | } |
| 1458 | 1458 | } |
| 1459 | 1459 | } |
| 1460 | 1460 | |
| 1461 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); |
|
| 1462 | - foreach ( $term_array as $term ) {
|
|
| 1463 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); |
|
| 1464 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); |
|
| 1461 | + $term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
|
|
| 1462 | + foreach ($term_array as $term) {
|
|
| 1463 | + $term_link_text = preg_replace('/-(\d+)$/', '', $term);
|
|
| 1464 | + $term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
|
|
| 1465 | 1465 | |
| 1466 | 1466 | // get term actual name |
| 1467 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); |
|
| 1468 | - if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
|
|
| 1469 | - $term_link_text = urldecode( $term_info['name'] ); |
|
| 1467 | + $term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
|
|
| 1468 | + if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
|
|
| 1469 | + $term_link_text = urldecode($term_info['name']); |
|
| 1470 | 1470 | } else {
|
| 1471 | 1471 | continue; |
| 1472 | 1472 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); |
| 1473 | 1473 | } |
| 1474 | 1474 | |
| 1475 | - if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
|
|
| 1476 | - $breadcrumb .= $separator . $term_link_text; |
|
| 1475 | + if ($term_index == count($term_array) && $is_taxonomy_last) {
|
|
| 1476 | + $breadcrumb .= $separator.$term_link_text; |
|
| 1477 | 1477 | } else {
|
| 1478 | - $cat_link .= $term . '/'; |
|
| 1479 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; |
|
| 1478 | + $cat_link .= $term.'/'; |
|
| 1479 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; |
|
| 1480 | 1480 | } |
| 1481 | - $term_index ++; |
|
| 1481 | + $term_index++; |
|
| 1482 | 1482 | } |
| 1483 | 1483 | } |
| 1484 | 1484 | |
| 1485 | 1485 | |
| 1486 | 1486 | } |
| 1487 | 1487 | |
| 1488 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1489 | - $breadcrumb .= $separator . get_the_title(); |
|
| 1488 | + if (geodir_is_page('detail')) {
|
|
| 1489 | + $breadcrumb .= $separator.get_the_title(); |
|
| 1490 | 1490 | } |
| 1491 | 1491 | |
| 1492 | 1492 | $breadcrumb .= '</li>'; |
| 1493 | 1493 | |
| 1494 | 1494 | |
| 1495 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1495 | + } elseif (geodir_is_page('author')) {
|
|
| 1496 | 1496 | $user_id = get_current_user_id(); |
| 1497 | - $author_link = get_author_posts_url( $user_id ); |
|
| 1498 | - $default_author_link = geodir_getlink( $author_link, array( |
|
| 1497 | + $author_link = get_author_posts_url($user_id); |
|
| 1498 | + $default_author_link = geodir_getlink($author_link, array( |
|
| 1499 | 1499 | 'geodir_dashbord' => 'true', |
| 1500 | 1500 | 'stype' => 'gd_place' |
| 1501 | - ), false ); |
|
| 1501 | + ), false); |
|
| 1502 | 1502 | |
| 1503 | 1503 | /** |
| 1504 | 1504 | * Filter author page link. |
@@ -1508,16 +1508,16 @@ discard block |
||
| 1508 | 1508 | * @param string $default_author_link Default author link. |
| 1509 | 1509 | * @param int $user_id Author ID. |
| 1510 | 1510 | */ |
| 1511 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); |
|
| 1511 | + $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
|
|
| 1512 | 1512 | |
| 1513 | 1513 | $breadcrumb .= '<li>'; |
| 1514 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; |
|
| 1514 | + $breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
|
|
| 1515 | 1515 | |
| 1516 | - if ( isset( $_REQUEST['list'] ) ) {
|
|
| 1517 | - $author_link = geodir_getlink( $author_link, array( |
|
| 1516 | + if (isset($_REQUEST['list'])) {
|
|
| 1517 | + $author_link = geodir_getlink($author_link, array( |
|
| 1518 | 1518 | 'geodir_dashbord' => 'true', |
| 1519 | 1519 | 'stype' => $_REQUEST['stype'] |
| 1520 | - ), false ); |
|
| 1520 | + ), false); |
|
| 1521 | 1521 | |
| 1522 | 1522 | /** |
| 1523 | 1523 | * Filter author page link. |
@@ -1528,61 +1528,61 @@ discard block |
||
| 1528 | 1528 | * @param int $user_id Author ID. |
| 1529 | 1529 | * @param string $_REQUEST ['stype'] Post type. |
| 1530 | 1530 | */ |
| 1531 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); |
|
| 1531 | + $author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
|
|
| 1532 | 1532 | |
| 1533 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1534 | - $breadcrumb .= $separator . ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] ); |
|
| 1533 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1534 | + $breadcrumb .= $separator.ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);
|
|
| 1535 | 1535 | } else {
|
| 1536 | - $breadcrumb .= $separator . __( ucfirst( $post_type_info->label ), 'geodirectory' ); |
|
| 1536 | + $breadcrumb .= $separator.__(ucfirst($post_type_info->label), 'geodirectory'); |
|
| 1537 | 1537 | } |
| 1538 | 1538 | |
| 1539 | 1539 | $breadcrumb .= '</li>'; |
| 1540 | - } elseif ( is_category() || is_single() ) {
|
|
| 1540 | + } elseif (is_category() || is_single()) {
|
|
| 1541 | 1541 | $category = get_the_category(); |
| 1542 | - if ( is_category() ) {
|
|
| 1543 | - $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>'; |
|
| 1542 | + if (is_category()) {
|
|
| 1543 | + $breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>'; |
|
| 1544 | 1544 | } |
| 1545 | - if ( is_single() ) {
|
|
| 1546 | - $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>'; |
|
| 1547 | - $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>'; |
|
| 1545 | + if (is_single()) {
|
|
| 1546 | + $breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>'; |
|
| 1547 | + $breadcrumb .= '<li>'.$separator.get_the_title().'</li>'; |
|
| 1548 | 1548 | } |
| 1549 | 1549 | /* End of my version ##################################################### */ |
| 1550 | - } else if ( is_page() ) {
|
|
| 1550 | + } else if (is_page()) {
|
|
| 1551 | 1551 | $page_title = get_the_title(); |
| 1552 | 1552 | |
| 1553 | - if ( geodir_is_page( 'location' ) ) {
|
|
| 1553 | + if (geodir_is_page('location')) {
|
|
| 1554 | 1554 | $location_page_id = geodir_location_page_id(); |
| 1555 | - $loc_post = get_post( $location_page_id ); |
|
| 1555 | + $loc_post = get_post($location_page_id); |
|
| 1556 | 1556 | $post_name = $loc_post->post_name; |
| 1557 | - $slug = ucwords( str_replace( '-', ' ', $post_name ) ); |
|
| 1558 | - $page_title = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' ); |
|
| 1557 | + $slug = ucwords(str_replace('-', ' ', $post_name));
|
|
| 1558 | + $page_title = !empty($slug) ? $slug : __('Location', 'geodirectory');
|
|
| 1559 | 1559 | } |
| 1560 | 1560 | |
| 1561 | - $breadcrumb .= '<li>' . $separator; |
|
| 1562 | - $breadcrumb .= stripslashes_deep( $page_title ); |
|
| 1561 | + $breadcrumb .= '<li>'.$separator; |
|
| 1562 | + $breadcrumb .= stripslashes_deep($page_title); |
|
| 1563 | 1563 | $breadcrumb .= '</li>'; |
| 1564 | - } else if ( is_tag() ) {
|
|
| 1565 | - $breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>'; |
|
| 1566 | - } else if ( is_day() ) {
|
|
| 1567 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1568 | - the_time( 'F jS, Y' ); |
|
| 1564 | + } else if (is_tag()) {
|
|
| 1565 | + $breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';
|
|
| 1566 | + } else if (is_day()) {
|
|
| 1567 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1568 | + the_time('F jS, Y');
|
|
| 1569 | 1569 | $breadcrumb .= '</li>'; |
| 1570 | - } else if ( is_month() ) {
|
|
| 1571 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1572 | - the_time( 'F, Y' ); |
|
| 1570 | + } else if (is_month()) {
|
|
| 1571 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1572 | + the_time('F, Y');
|
|
| 1573 | 1573 | $breadcrumb .= '</li>'; |
| 1574 | - } else if ( is_year() ) {
|
|
| 1575 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1576 | - the_time( 'Y' ); |
|
| 1574 | + } else if (is_year()) {
|
|
| 1575 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1576 | + the_time('Y');
|
|
| 1577 | 1577 | $breadcrumb .= '</li>'; |
| 1578 | - } else if ( is_author() ) {
|
|
| 1579 | - $breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' ); |
|
| 1578 | + } else if (is_author()) {
|
|
| 1579 | + $breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');
|
|
| 1580 | 1580 | $breadcrumb .= '</li>'; |
| 1581 | - } else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {
|
|
| 1582 | - $breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' ); |
|
| 1581 | + } else if (isset($_GET['paged']) && !empty($_GET['paged'])) {
|
|
| 1582 | + $breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');
|
|
| 1583 | 1583 | $breadcrumb .= '</li>'; |
| 1584 | - } else if ( is_search() ) {
|
|
| 1585 | - $breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' ); |
|
| 1584 | + } else if (is_search()) {
|
|
| 1585 | + $breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');
|
|
| 1586 | 1586 | $breadcrumb .= '</li>'; |
| 1587 | 1587 | } |
| 1588 | 1588 | $breadcrumb .= '</ul></div>'; |
@@ -1595,13 +1595,13 @@ discard block |
||
| 1595 | 1595 | * @param string $breadcrumb Breadcrumb HTML. |
| 1596 | 1596 | * @param string $separator Breadcrumb separator. |
| 1597 | 1597 | */ |
| 1598 | - echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator ); |
|
| 1598 | + echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);
|
|
| 1599 | 1599 | } |
| 1600 | 1600 | } |
| 1601 | 1601 | |
| 1602 | 1602 | |
| 1603 | -add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin |
|
| 1604 | -if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {
|
|
| 1603 | +add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin
|
|
| 1604 | +if (!function_exists('geodir_allow_wpadmin')) {
|
|
| 1605 | 1605 | /** |
| 1606 | 1606 | * Allow only admins to access wp-admin. |
| 1607 | 1607 | * |
@@ -1613,12 +1613,12 @@ discard block |
||
| 1613 | 1613 | */ |
| 1614 | 1614 | function geodir_allow_wpadmin() {
|
| 1615 | 1615 | global $wpdb; |
| 1616 | - if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through |
|
| 1616 | + if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through
|
|
| 1617 | 1617 | {
|
| 1618 | - if ( current_user_can( 'administrator' ) ) {
|
|
| 1618 | + if (current_user_can('administrator')) {
|
|
| 1619 | 1619 | } else {
|
| 1620 | 1620 | |
| 1621 | - wp_redirect( home_url() ); |
|
| 1621 | + wp_redirect(home_url()); |
|
| 1622 | 1622 | exit; |
| 1623 | 1623 | } |
| 1624 | 1624 | |
@@ -1637,23 +1637,23 @@ discard block |
||
| 1637 | 1637 | * |
| 1638 | 1638 | * @return array|WP_Error The uploaded data as array. When failure returns error. |
| 1639 | 1639 | */ |
| 1640 | -function fetch_remote_file( $url ) {
|
|
| 1640 | +function fetch_remote_file($url) {
|
|
| 1641 | 1641 | // extract the file name and extension from the url |
| 1642 | - require_once( ABSPATH . 'wp-includes/pluggable.php' ); |
|
| 1643 | - $file_name = basename( $url ); |
|
| 1644 | - if ( strpos( $file_name, '?' ) !== false ) {
|
|
| 1645 | - list( $file_name ) = explode( '?', $file_name ); |
|
| 1642 | + require_once(ABSPATH.'wp-includes/pluggable.php'); |
|
| 1643 | + $file_name = basename($url); |
|
| 1644 | + if (strpos($file_name, '?') !== false) {
|
|
| 1645 | + list($file_name) = explode('?', $file_name);
|
|
| 1646 | 1646 | } |
| 1647 | 1647 | $dummy = false; |
| 1648 | 1648 | $add_to_cache = false; |
| 1649 | 1649 | $key = null; |
| 1650 | - if ( strpos( $url, '/dummy/' ) !== false ) {
|
|
| 1650 | + if (strpos($url, '/dummy/') !== false) {
|
|
| 1651 | 1651 | $dummy = true; |
| 1652 | - $key = "dummy_" . str_replace( '.', '_', $file_name ); |
|
| 1653 | - $value = get_transient( 'cached_dummy_images' ); |
|
| 1654 | - if ( $value ) {
|
|
| 1655 | - if ( isset( $value[ $key ] ) ) {
|
|
| 1656 | - return $value[ $key ]; |
|
| 1652 | + $key = "dummy_".str_replace('.', '_', $file_name);
|
|
| 1653 | + $value = get_transient('cached_dummy_images');
|
|
| 1654 | + if ($value) {
|
|
| 1655 | + if (isset($value[$key])) {
|
|
| 1656 | + return $value[$key]; |
|
| 1657 | 1657 | } else {
|
| 1658 | 1658 | $add_to_cache = true; |
| 1659 | 1659 | } |
@@ -1664,58 +1664,58 @@ discard block |
||
| 1664 | 1664 | |
| 1665 | 1665 | // get placeholder file in the upload dir with a unique, sanitized filename |
| 1666 | 1666 | |
| 1667 | - $post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : ''; |
|
| 1667 | + $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : ''; |
|
| 1668 | 1668 | |
| 1669 | - $upload = wp_upload_bits( $file_name, 0, '', $post_upload_date ); |
|
| 1670 | - if ( $upload['error'] ) {
|
|
| 1671 | - return new WP_Error( 'upload_dir_error', $upload['error'] ); |
|
| 1669 | + $upload = wp_upload_bits($file_name, 0, '', $post_upload_date); |
|
| 1670 | + if ($upload['error']) {
|
|
| 1671 | + return new WP_Error('upload_dir_error', $upload['error']);
|
|
| 1672 | 1672 | } |
| 1673 | 1673 | |
| 1674 | 1674 | |
| 1675 | - sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1675 | + sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1676 | 1676 | |
| 1677 | 1677 | // fetch the remote url and write it to the placeholder file |
| 1678 | - $headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) ); |
|
| 1678 | + $headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));
|
|
| 1679 | 1679 | |
| 1680 | 1680 | $log_message = ''; |
| 1681 | - if ( is_wp_error( $headers ) ) {
|
|
| 1682 | - echo 'file: ' . $url; |
|
| 1681 | + if (is_wp_error($headers)) {
|
|
| 1682 | + echo 'file: '.$url; |
|
| 1683 | 1683 | |
| 1684 | - return new WP_Error( 'import_file_error', $headers->get_error_message() ); |
|
| 1684 | + return new WP_Error('import_file_error', $headers->get_error_message());
|
|
| 1685 | 1685 | } |
| 1686 | 1686 | |
| 1687 | - $filesize = filesize( $upload['file'] ); |
|
| 1687 | + $filesize = filesize($upload['file']); |
|
| 1688 | 1688 | // request failed |
| 1689 | - if ( ! $headers ) {
|
|
| 1690 | - $log_message = __( 'Remote server did not respond', 'geodirectory' ); |
|
| 1689 | + if (!$headers) {
|
|
| 1690 | + $log_message = __('Remote server did not respond', 'geodirectory');
|
|
| 1691 | 1691 | } // make sure the fetch was successful |
| 1692 | - elseif ( $headers['response']['code'] != '200' ) {
|
|
| 1693 | - $log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) ); |
|
| 1694 | - } elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {
|
|
| 1695 | - $log_message = __( 'Remote file is incorrect size', 'geodirectory' ); |
|
| 1696 | - } elseif ( 0 == $filesize ) {
|
|
| 1697 | - $log_message = __( 'Zero size file downloaded', 'geodirectory' ); |
|
| 1698 | - } |
|
| 1699 | - |
|
| 1700 | - if ( $log_message ) {
|
|
| 1701 | - $del = unlink( $upload['file'] ); |
|
| 1702 | - if ( ! $del ) {
|
|
| 1703 | - geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) ); |
|
| 1692 | + elseif ($headers['response']['code'] != '200') {
|
|
| 1693 | + $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));
|
|
| 1694 | + } elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {
|
|
| 1695 | + $log_message = __('Remote file is incorrect size', 'geodirectory');
|
|
| 1696 | + } elseif (0 == $filesize) {
|
|
| 1697 | + $log_message = __('Zero size file downloaded', 'geodirectory');
|
|
| 1698 | + } |
|
| 1699 | + |
|
| 1700 | + if ($log_message) {
|
|
| 1701 | + $del = unlink($upload['file']); |
|
| 1702 | + if (!$del) {
|
|
| 1703 | + geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));
|
|
| 1704 | 1704 | } |
| 1705 | 1705 | |
| 1706 | - return new WP_Error( 'import_file_error', $log_message ); |
|
| 1706 | + return new WP_Error('import_file_error', $log_message);
|
|
| 1707 | 1707 | } |
| 1708 | 1708 | |
| 1709 | - if ( $dummy && $add_to_cache && is_array( $upload ) ) {
|
|
| 1710 | - $images = get_transient( 'cached_dummy_images' ); |
|
| 1711 | - if ( is_array( $images ) ) {
|
|
| 1712 | - $images[ $key ] = $upload; |
|
| 1709 | + if ($dummy && $add_to_cache && is_array($upload)) {
|
|
| 1710 | + $images = get_transient('cached_dummy_images');
|
|
| 1711 | + if (is_array($images)) {
|
|
| 1712 | + $images[$key] = $upload; |
|
| 1713 | 1713 | } else {
|
| 1714 | - $images = array( $key => $upload ); |
|
| 1714 | + $images = array($key => $upload); |
|
| 1715 | 1715 | } |
| 1716 | 1716 | |
| 1717 | 1717 | //setting the cache using the WP Transient API |
| 1718 | - set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache |
|
| 1718 | + set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache
|
|
| 1719 | 1719 | } |
| 1720 | 1720 | |
| 1721 | 1721 | return $upload; |
@@ -1729,12 +1729,12 @@ discard block |
||
| 1729 | 1729 | * @return string|void Max upload size. |
| 1730 | 1730 | */ |
| 1731 | 1731 | function geodir_max_upload_size() {
|
| 1732 | - $max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 ); |
|
| 1732 | + $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
|
|
| 1733 | 1733 | |
| 1734 | - if ( $max_filesize > 0 && $max_filesize < 1 ) {
|
|
| 1735 | - $max_filesize = (int) ( $max_filesize * 1024 ) . 'kb'; |
|
| 1734 | + if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1735 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; |
|
| 1736 | 1736 | } else {
|
| 1737 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1737 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; |
|
| 1738 | 1738 | } |
| 1739 | 1739 | |
| 1740 | 1740 | /** |
@@ -1744,7 +1744,7 @@ discard block |
||
| 1744 | 1744 | * |
| 1745 | 1745 | * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb. |
| 1746 | 1746 | */ |
| 1747 | - return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize ); |
|
| 1747 | + return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1748 | 1748 | } |
| 1749 | 1749 | |
| 1750 | 1750 | /** |
@@ -1757,8 +1757,8 @@ discard block |
||
| 1757 | 1757 | * @return bool If dummy folder exists returns true, else false. |
| 1758 | 1758 | */ |
| 1759 | 1759 | function geodir_dummy_folder_exists() {
|
| 1760 | - $path = geodir_plugin_path() . '/geodirectory-admin/dummy/'; |
|
| 1761 | - if ( ! is_dir( $path ) ) {
|
|
| 1760 | + $path = geodir_plugin_path().'/geodirectory-admin/dummy/'; |
|
| 1761 | + if (!is_dir($path)) {
|
|
| 1762 | 1762 | return false; |
| 1763 | 1763 | } else {
|
| 1764 | 1764 | return true; |
@@ -1777,17 +1777,17 @@ discard block |
||
| 1777 | 1777 | * |
| 1778 | 1778 | * @return object Author info. |
| 1779 | 1779 | */ |
| 1780 | -function geodir_get_author_info( $aid ) {
|
|
| 1780 | +function geodir_get_author_info($aid) {
|
|
| 1781 | 1781 | global $wpdb; |
| 1782 | 1782 | /*$infosql = "select * from $wpdb->users where ID=$aid";*/ |
| 1783 | - $infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) ); |
|
| 1784 | - $info = $wpdb->get_results( $infosql ); |
|
| 1785 | - if ( $info ) {
|
|
| 1783 | + $infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));
|
|
| 1784 | + $info = $wpdb->get_results($infosql); |
|
| 1785 | + if ($info) {
|
|
| 1786 | 1786 | return $info[0]; |
| 1787 | 1787 | } |
| 1788 | 1788 | } |
| 1789 | 1789 | |
| 1790 | -if ( ! function_exists( 'adminEmail' ) ) {
|
|
| 1790 | +if (!function_exists('adminEmail')) {
|
|
| 1791 | 1791 | /** |
| 1792 | 1792 | * Send emails to client on post submission, renew etc. |
| 1793 | 1793 | * |
@@ -1800,67 +1800,67 @@ discard block |
||
| 1800 | 1800 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1801 | 1801 | * @param string $custom_1 Custom data to be sent. |
| 1802 | 1802 | */ |
| 1803 | - function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {
|
|
| 1803 | + function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {
|
|
| 1804 | 1804 | global $wpdb; |
| 1805 | - if ( $message_type == 'expiration' ) {
|
|
| 1806 | - $subject = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) ); |
|
| 1807 | - $client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) ); |
|
| 1808 | - } elseif ( $message_type == 'post_submited' ) {
|
|
| 1809 | - $subject = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1810 | - $client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' ); |
|
| 1811 | - } elseif ( $message_type == 'renew' ) {
|
|
| 1812 | - $subject = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1813 | - $client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' ); |
|
| 1814 | - } elseif ( $message_type == 'upgrade' ) {
|
|
| 1815 | - $subject = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1816 | - $client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' ); |
|
| 1817 | - } elseif ( $message_type == 'claim_approved' ) {
|
|
| 1818 | - $subject = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' ); |
|
| 1819 | - $client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' ); |
|
| 1820 | - } elseif ( $message_type == 'claim_rejected' ) {
|
|
| 1821 | - $subject = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' ); |
|
| 1822 | - $client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' ); |
|
| 1823 | - } elseif ( $message_type == 'claim_requested' ) {
|
|
| 1824 | - $subject = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' ); |
|
| 1825 | - $client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' ); |
|
| 1826 | - } elseif ( $message_type == 'auto_claim' ) {
|
|
| 1827 | - $subject = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' ); |
|
| 1828 | - $client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' ); |
|
| 1829 | - } elseif ( $message_type == 'payment_success' ) {
|
|
| 1830 | - $subject = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' ); |
|
| 1831 | - $client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' ); |
|
| 1832 | - } elseif ( $message_type == 'payment_fail' ) {
|
|
| 1833 | - $subject = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' ); |
|
| 1834 | - $client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' ); |
|
| 1805 | + if ($message_type == 'expiration') {
|
|
| 1806 | + $subject = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));
|
|
| 1807 | + $client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));
|
|
| 1808 | + } elseif ($message_type == 'post_submited') {
|
|
| 1809 | + $subject = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');
|
|
| 1810 | + $client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');
|
|
| 1811 | + } elseif ($message_type == 'renew') {
|
|
| 1812 | + $subject = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');
|
|
| 1813 | + $client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');
|
|
| 1814 | + } elseif ($message_type == 'upgrade') {
|
|
| 1815 | + $subject = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');
|
|
| 1816 | + $client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');
|
|
| 1817 | + } elseif ($message_type == 'claim_approved') {
|
|
| 1818 | + $subject = __(get_option('claim_approved_email_subject'), 'geodirectory');
|
|
| 1819 | + $client_message = __(get_option('claim_approved_email_content'), 'geodirectory');
|
|
| 1820 | + } elseif ($message_type == 'claim_rejected') {
|
|
| 1821 | + $subject = __(get_option('claim_rejected_email_subject'), 'geodirectory');
|
|
| 1822 | + $client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');
|
|
| 1823 | + } elseif ($message_type == 'claim_requested') {
|
|
| 1824 | + $subject = __(get_option('claim_email_subject_admin'), 'geodirectory');
|
|
| 1825 | + $client_message = __(get_option('claim_email_content_admin'), 'geodirectory');
|
|
| 1826 | + } elseif ($message_type == 'auto_claim') {
|
|
| 1827 | + $subject = __(get_option('auto_claim_email_subject'), 'geodirectory');
|
|
| 1828 | + $client_message = __(get_option('auto_claim_email_content'), 'geodirectory');
|
|
| 1829 | + } elseif ($message_type == 'payment_success') {
|
|
| 1830 | + $subject = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');
|
|
| 1831 | + $client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');
|
|
| 1832 | + } elseif ($message_type == 'payment_fail') {
|
|
| 1833 | + $subject = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');
|
|
| 1834 | + $client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');
|
|
| 1835 | 1835 | } |
| 1836 | 1836 | $transaction_details = $custom_1; |
| 1837 | - $fromEmail = get_option( 'site_email' ); |
|
| 1837 | + $fromEmail = get_option('site_email');
|
|
| 1838 | 1838 | $fromEmailName = get_site_emailName(); |
| 1839 | 1839 | //$alivedays = get_post_meta($page_id,'alive_days',true); |
| 1840 | - $pkg_limit = get_property_price_info_listing( $page_id ); |
|
| 1840 | + $pkg_limit = get_property_price_info_listing($page_id); |
|
| 1841 | 1841 | $alivedays = $pkg_limit['days']; |
| 1842 | - $productlink = get_permalink( $page_id ); |
|
| 1843 | - $post_info = get_post( $page_id ); |
|
| 1844 | - $post_date = date( 'dS F,Y', strtotime( $post_info->post_date ) ); |
|
| 1845 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 1842 | + $productlink = get_permalink($page_id); |
|
| 1843 | + $post_info = get_post($page_id); |
|
| 1844 | + $post_date = date('dS F,Y', strtotime($post_info->post_date));
|
|
| 1845 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 1846 | 1846 | $loginurl = geodir_login_url(); |
| 1847 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 1847 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 1848 | 1848 | $siteurl = home_url(); |
| 1849 | - $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>'; |
|
| 1850 | - $user_info = get_userdata( $user_id ); |
|
| 1849 | + $siteurl_link = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>'; |
|
| 1850 | + $user_info = get_userdata($user_id); |
|
| 1851 | 1851 | $user_email = $user_info->user_email; |
| 1852 | - $display_name = geodir_get_client_name( $user_id ); |
|
| 1852 | + $display_name = geodir_get_client_name($user_id); |
|
| 1853 | 1853 | $user_login = $user_info->user_login; |
| 1854 | - $number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' ); |
|
| 1855 | - if ( $number_of_grace_days == '' ) {
|
|
| 1854 | + $number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');
|
|
| 1855 | + if ($number_of_grace_days == '') {
|
|
| 1856 | 1856 | $number_of_grace_days = 1; |
| 1857 | 1857 | } |
| 1858 | - if ( $post_info->post_type == 'event' ) {
|
|
| 1858 | + if ($post_info->post_type == 'event') {
|
|
| 1859 | 1859 | $post_type = 'event'; |
| 1860 | 1860 | } else {
|
| 1861 | 1861 | $post_type = 'listing'; |
| 1862 | 1862 | } |
| 1863 | - $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>'; |
|
| 1863 | + $renew_link = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>'; |
|
| 1864 | 1864 | $search_array = array( |
| 1865 | 1865 | '[#client_name#]', |
| 1866 | 1866 | '[#listing_link#]', |
@@ -1876,7 +1876,7 @@ discard block |
||
| 1876 | 1876 | '[#site_name#]', |
| 1877 | 1877 | '[#transaction_details#]' |
| 1878 | 1878 | ); |
| 1879 | - $replace_array = array( |
|
| 1879 | + $replace_array = array( |
|
| 1880 | 1880 | $display_name, |
| 1881 | 1881 | $listingLink, |
| 1882 | 1882 | $post_date, |
@@ -1891,13 +1891,13 @@ discard block |
||
| 1891 | 1891 | $fromEmailName, |
| 1892 | 1892 | $transaction_details |
| 1893 | 1893 | ); |
| 1894 | - $client_message = str_replace( $search_array, $replace_array, $client_message ); |
|
| 1895 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1894 | + $client_message = str_replace($search_array, $replace_array, $client_message); |
|
| 1895 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1896 | 1896 | |
| 1897 | 1897 | |
| 1898 | - $headers = array(); |
|
| 1898 | + $headers = array(); |
|
| 1899 | 1899 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 1900 | - $headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>'; |
|
| 1900 | + $headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>'; |
|
| 1901 | 1901 | |
| 1902 | 1902 | $to = $fromEmail; |
| 1903 | 1903 | $message = $client_message; |
@@ -1915,7 +1915,7 @@ discard block |
||
| 1915 | 1915 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1916 | 1916 | * @param string $custom_1 Custom data to be sent. |
| 1917 | 1917 | */ |
| 1918 | - $to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1918 | + $to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1919 | 1919 | /** |
| 1920 | 1920 | * Filter the admin email subject. |
| 1921 | 1921 | * |
@@ -1928,7 +1928,7 @@ discard block |
||
| 1928 | 1928 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1929 | 1929 | * @param string $custom_1 Custom data to be sent. |
| 1930 | 1930 | */ |
| 1931 | - $subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1931 | + $subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1932 | 1932 | /** |
| 1933 | 1933 | * Filter the admin email message. |
| 1934 | 1934 | * |
@@ -1941,7 +1941,7 @@ discard block |
||
| 1941 | 1941 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1942 | 1942 | * @param string $custom_1 Custom data to be sent. |
| 1943 | 1943 | */ |
| 1944 | - $message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1944 | + $message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1945 | 1945 | /** |
| 1946 | 1946 | * Filter the admin email headers. |
| 1947 | 1947 | * |
@@ -1954,22 +1954,22 @@ discard block |
||
| 1954 | 1954 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1955 | 1955 | * @param string $custom_1 Custom data to be sent. |
| 1956 | 1956 | */ |
| 1957 | - $headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1957 | + $headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1958 | 1958 | |
| 1959 | 1959 | |
| 1960 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1961 | - if ( ! $sent ) {
|
|
| 1962 | - if ( is_array( $to ) ) {
|
|
| 1963 | - $to = implode( ',', $to ); |
|
| 1960 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1961 | + if (!$sent) {
|
|
| 1962 | + if (is_array($to)) {
|
|
| 1963 | + $to = implode(',', $to);
|
|
| 1964 | 1964 | } |
| 1965 | 1965 | $log_message = sprintf( |
| 1966 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1966 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1967 | 1967 | $message_type, |
| 1968 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1968 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1969 | 1969 | $to, |
| 1970 | 1970 | $subject |
| 1971 | 1971 | ); |
| 1972 | - geodir_error_log( $log_message ); |
|
| 1972 | + geodir_error_log($log_message); |
|
| 1973 | 1973 | } |
| 1974 | 1974 | } |
| 1975 | 1975 | } |
@@ -1989,12 +1989,12 @@ discard block |
||
| 1989 | 1989 | * |
| 1990 | 1990 | * @return array Category IDs. |
| 1991 | 1991 | */ |
| 1992 | -function gd_lang_object_ids( $ids_array, $type ) {
|
|
| 1993 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 1992 | +function gd_lang_object_ids($ids_array, $type) {
|
|
| 1993 | + if (function_exists('icl_object_id')) {
|
|
| 1994 | 1994 | $res = array(); |
| 1995 | - foreach ( $ids_array as $id ) {
|
|
| 1996 | - $xlat = icl_object_id( $id, $type, false ); |
|
| 1997 | - if ( ! is_null( $xlat ) ) {
|
|
| 1995 | + foreach ($ids_array as $id) {
|
|
| 1996 | + $xlat = icl_object_id($id, $type, false); |
|
| 1997 | + if (!is_null($xlat)) {
|
|
| 1998 | 1998 | $res[] = $xlat; |
| 1999 | 1999 | } |
| 2000 | 2000 | } |
@@ -2018,20 +2018,20 @@ discard block |
||
| 2018 | 2018 | * |
| 2019 | 2019 | * @return array Modified Body CSS classes. |
| 2020 | 2020 | */ |
| 2021 | -function geodir_custom_posts_body_class( $classes ) {
|
|
| 2021 | +function geodir_custom_posts_body_class($classes) {
|
|
| 2022 | 2022 | global $wpdb, $wp; |
| 2023 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 2024 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2023 | + $post_types = geodir_get_posttypes('object');
|
|
| 2024 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2025 | 2025 | $classes[] = 'geodir_custom_posts'; |
| 2026 | 2026 | } |
| 2027 | 2027 | |
| 2028 | 2028 | // fix body class for signup page |
| 2029 | - if ( geodir_is_page( 'login' ) ) {
|
|
| 2029 | + if (geodir_is_page('login')) {
|
|
| 2030 | 2030 | $new_classes = array(); |
| 2031 | 2031 | $new_classes[] = 'signup page-geodir-signup'; |
| 2032 | - if ( ! empty( $classes ) ) {
|
|
| 2033 | - foreach ( $classes as $class ) {
|
|
| 2034 | - if ( $class && $class != 'home' && $class != 'blog' ) {
|
|
| 2032 | + if (!empty($classes)) {
|
|
| 2033 | + foreach ($classes as $class) {
|
|
| 2034 | + if ($class && $class != 'home' && $class != 'blog') {
|
|
| 2035 | 2035 | $new_classes[] = $class; |
| 2036 | 2036 | } |
| 2037 | 2037 | } |
@@ -2039,14 +2039,14 @@ discard block |
||
| 2039 | 2039 | $classes = $new_classes; |
| 2040 | 2040 | } |
| 2041 | 2041 | |
| 2042 | - if ( geodir_is_geodir_page() ) {
|
|
| 2042 | + if (geodir_is_geodir_page()) {
|
|
| 2043 | 2043 | $classes[] = 'geodir-page'; |
| 2044 | 2044 | } |
| 2045 | 2045 | |
| 2046 | 2046 | return $classes; |
| 2047 | 2047 | } |
| 2048 | 2048 | |
| 2049 | -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 |
|
| 2049 | +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
|
|
| 2050 | 2050 | |
| 2051 | 2051 | |
| 2052 | 2052 | /** |
@@ -2062,7 +2062,7 @@ discard block |
||
| 2062 | 2062 | * |
| 2063 | 2063 | * @since 1.0.0 |
| 2064 | 2064 | */ |
| 2065 | - return apply_filters( 'geodir_map_zoom_level', array( |
|
| 2065 | + return apply_filters('geodir_map_zoom_level', array(
|
|
| 2066 | 2066 | 1, |
| 2067 | 2067 | 2, |
| 2068 | 2068 | 3, |
@@ -2082,7 +2082,7 @@ discard block |
||
| 2082 | 2082 | 17, |
| 2083 | 2083 | 18, |
| 2084 | 2084 | 19 |
| 2085 | - ) ); |
|
| 2085 | + )); |
|
| 2086 | 2086 | |
| 2087 | 2087 | } |
| 2088 | 2088 | |
@@ -2095,12 +2095,12 @@ discard block |
||
| 2095 | 2095 | * |
| 2096 | 2096 | * @param string $geodir_option_name Option key. |
| 2097 | 2097 | */ |
| 2098 | -function geodir_option_version_backup( $geodir_option_name ) {
|
|
| 2098 | +function geodir_option_version_backup($geodir_option_name) {
|
|
| 2099 | 2099 | $version_date = time(); |
| 2100 | - $geodir_option = get_option( $geodir_option_name ); |
|
| 2100 | + $geodir_option = get_option($geodir_option_name); |
|
| 2101 | 2101 | |
| 2102 | - if ( ! empty( $geodir_option ) ) {
|
|
| 2103 | - add_option( $geodir_option_name . '_' . $version_date, $geodir_option ); |
|
| 2102 | + if (!empty($geodir_option)) {
|
|
| 2103 | + add_option($geodir_option_name.'_'.$version_date, $geodir_option); |
|
| 2104 | 2104 | } |
| 2105 | 2105 | } |
| 2106 | 2106 | |
@@ -2114,10 +2114,10 @@ discard block |
||
| 2114 | 2114 | * |
| 2115 | 2115 | * @return int Page ID. |
| 2116 | 2116 | */ |
| 2117 | -function get_page_id_geodir_add_listing_page( $page_id ) {
|
|
| 2118 | - if ( geodir_wpml_multilingual_status() ) {
|
|
| 2117 | +function get_page_id_geodir_add_listing_page($page_id) {
|
|
| 2118 | + if (geodir_wpml_multilingual_status()) {
|
|
| 2119 | 2119 | $post_type = 'post_page'; |
| 2120 | - $page_id = geodir_get_wpml_element_id( $page_id, $post_type ); |
|
| 2120 | + $page_id = geodir_get_wpml_element_id($page_id, $post_type); |
|
| 2121 | 2121 | } |
| 2122 | 2122 | |
| 2123 | 2123 | return $page_id; |
@@ -2131,7 +2131,7 @@ discard block |
||
| 2131 | 2131 | * @return bool Returns true when sitepress multilingual CMS active. else returns false. |
| 2132 | 2132 | */ |
| 2133 | 2133 | function geodir_wpml_multilingual_status() {
|
| 2134 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 2134 | + if (function_exists('icl_object_id')) {
|
|
| 2135 | 2135 | return true; |
| 2136 | 2136 | } |
| 2137 | 2137 | |
@@ -2149,19 +2149,19 @@ discard block |
||
| 2149 | 2149 | * |
| 2150 | 2150 | * @return int Element ID when exists. Else the page id. |
| 2151 | 2151 | */ |
| 2152 | -function geodir_get_wpml_element_id( $page_id, $post_type ) {
|
|
| 2152 | +function geodir_get_wpml_element_id($page_id, $post_type) {
|
|
| 2153 | 2153 | global $sitepress; |
| 2154 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2155 | - $trid = $sitepress->get_element_trid( $page_id, $post_type ); |
|
| 2154 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2155 | + $trid = $sitepress->get_element_trid($page_id, $post_type); |
|
| 2156 | 2156 | |
| 2157 | - if ( $trid > 0 ) {
|
|
| 2158 | - $translations = $sitepress->get_element_translations( $trid, $post_type ); |
|
| 2157 | + if ($trid > 0) {
|
|
| 2158 | + $translations = $sitepress->get_element_translations($trid, $post_type); |
|
| 2159 | 2159 | |
| 2160 | 2160 | $lang = $sitepress->get_current_language(); |
| 2161 | 2161 | $lang = $lang ? $lang : $sitepress->get_default_language(); |
| 2162 | 2162 | |
| 2163 | - if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {
|
|
| 2164 | - $page_id = $translations[ $lang ]->element_id; |
|
| 2163 | + if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {
|
|
| 2164 | + $page_id = $translations[$lang]->element_id; |
|
| 2165 | 2165 | } |
| 2166 | 2166 | } |
| 2167 | 2167 | } |
@@ -2178,15 +2178,15 @@ discard block |
||
| 2178 | 2178 | */ |
| 2179 | 2179 | function geodir_wpml_check_element_id() {
|
| 2180 | 2180 | global $sitepress; |
| 2181 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2181 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2182 | 2182 | $el_type = 'post_page'; |
| 2183 | - $el_id = get_option( 'geodir_add_listing_page' ); |
|
| 2183 | + $el_id = get_option('geodir_add_listing_page');
|
|
| 2184 | 2184 | $default_lang = $sitepress->get_default_language(); |
| 2185 | - $el_details = $sitepress->get_element_language_details( $el_id, $el_type ); |
|
| 2185 | + $el_details = $sitepress->get_element_language_details($el_id, $el_type); |
|
| 2186 | 2186 | |
| 2187 | - if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {
|
|
| 2188 | - if ( ! $el_details->source_language_code ) {
|
|
| 2189 | - $sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang ); |
|
| 2187 | + if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {
|
|
| 2188 | + if (!$el_details->source_language_code) {
|
|
| 2189 | + $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang); |
|
| 2190 | 2190 | $sitepress->icl_translations_cache->clear(); |
| 2191 | 2191 | } |
| 2192 | 2192 | } |
@@ -2205,41 +2205,41 @@ discard block |
||
| 2205 | 2205 | * |
| 2206 | 2206 | * @return string Orderby SQL. |
| 2207 | 2207 | */ |
| 2208 | -function geodir_widget_listings_get_order( $query_args ) {
|
|
| 2208 | +function geodir_widget_listings_get_order($query_args) {
|
|
| 2209 | 2209 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2210 | 2210 | |
| 2211 | 2211 | $query_args = $gd_query_args_widgets; |
| 2212 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2213 | - return $wpdb->posts . ".post_date DESC, "; |
|
| 2212 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2213 | + return $wpdb->posts.".post_date DESC, "; |
|
| 2214 | 2214 | } |
| 2215 | 2215 | |
| 2216 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2217 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2216 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2217 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2218 | 2218 | |
| 2219 | - $sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : ''; |
|
| 2219 | + $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : ''; |
|
| 2220 | 2220 | |
| 2221 | - switch ( $sort_by ) {
|
|
| 2221 | + switch ($sort_by) {
|
|
| 2222 | 2222 | case 'latest': |
| 2223 | 2223 | case 'newest': |
| 2224 | - $orderby = $wpdb->posts . ".post_date DESC, "; |
|
| 2224 | + $orderby = $wpdb->posts.".post_date DESC, "; |
|
| 2225 | 2225 | break; |
| 2226 | 2226 | case 'featured': |
| 2227 | - $orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, "; |
|
| 2227 | + $orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, "; |
|
| 2228 | 2228 | break; |
| 2229 | 2229 | case 'az': |
| 2230 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2230 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2231 | 2231 | break; |
| 2232 | 2232 | case 'high_review': |
| 2233 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 2233 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 2234 | 2234 | break; |
| 2235 | 2235 | case 'high_rating': |
| 2236 | - $orderby = "( " . $table . ".overall_rating ) DESC, "; |
|
| 2236 | + $orderby = "( ".$table.".overall_rating ) DESC, "; |
|
| 2237 | 2237 | break; |
| 2238 | 2238 | case 'random': |
| 2239 | 2239 | $orderby = "RAND(), "; |
| 2240 | 2240 | break; |
| 2241 | 2241 | default: |
| 2242 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2242 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2243 | 2243 | break; |
| 2244 | 2244 | } |
| 2245 | 2245 | |
@@ -2262,15 +2262,15 @@ discard block |
||
| 2262 | 2262 | * |
| 2263 | 2263 | * @return mixed Result object. |
| 2264 | 2264 | */ |
| 2265 | -function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {
|
|
| 2265 | +function geodir_get_widget_listings($query_args = array(), $count_only = false) {
|
|
| 2266 | 2266 | global $wpdb, $plugin_prefix, $table_prefix; |
| 2267 | 2267 | $GLOBALS['gd_query_args_widgets'] = $query_args; |
| 2268 | 2268 | $gd_query_args_widgets = $query_args; |
| 2269 | 2269 | |
| 2270 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2271 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2270 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2271 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2272 | 2272 | |
| 2273 | - $fields = $wpdb->posts . ".*, " . $table . ".*"; |
|
| 2273 | + $fields = $wpdb->posts.".*, ".$table.".*"; |
|
| 2274 | 2274 | /** |
| 2275 | 2275 | * Filter widget listing fields string part that is being used for query. |
| 2276 | 2276 | * |
@@ -2280,17 +2280,17 @@ discard block |
||
| 2280 | 2280 | * @param string $table Table name. |
| 2281 | 2281 | * @param string $post_type Post type. |
| 2282 | 2282 | */ |
| 2283 | - $fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type ); |
|
| 2283 | + $fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);
|
|
| 2284 | 2284 | |
| 2285 | - $join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";
|
|
| 2285 | + $join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";
|
|
| 2286 | 2286 | |
| 2287 | 2287 | ########### WPML ########### |
| 2288 | 2288 | |
| 2289 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 2289 | + if (function_exists('icl_object_id')) {
|
|
| 2290 | 2290 | global $sitepress; |
| 2291 | 2291 | $lang_code = ICL_LANGUAGE_CODE; |
| 2292 | - if ( $lang_code ) {
|
|
| 2293 | - $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 2292 | + if ($lang_code) {
|
|
| 2293 | + $join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 2294 | 2294 | } |
| 2295 | 2295 | } |
| 2296 | 2296 | |
@@ -2304,15 +2304,15 @@ discard block |
||
| 2304 | 2304 | * @param string $join Join clause string. |
| 2305 | 2305 | * @param string $post_type Post type. |
| 2306 | 2306 | */ |
| 2307 | - $join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type ); |
|
| 2307 | + $join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);
|
|
| 2308 | 2308 | |
| 2309 | - $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : ''; |
|
| 2309 | + $post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : ''; |
|
| 2310 | 2310 | |
| 2311 | - $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'"; |
|
| 2311 | + $where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'"; |
|
| 2312 | 2312 | |
| 2313 | 2313 | ########### WPML ########### |
| 2314 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 2315 | - if ( $lang_code ) {
|
|
| 2314 | + if (function_exists('icl_object_id')) {
|
|
| 2315 | + if ($lang_code) {
|
|
| 2316 | 2316 | $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' "; |
| 2317 | 2317 | } |
| 2318 | 2318 | } |
@@ -2325,8 +2325,8 @@ discard block |
||
| 2325 | 2325 | * @param string $where Where clause string. |
| 2326 | 2326 | * @param string $post_type Post type. |
| 2327 | 2327 | */ |
| 2328 | - $where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type ); |
|
| 2329 | - $where = $where != '' ? " WHERE 1=1 " . $where : ''; |
|
| 2328 | + $where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);
|
|
| 2329 | + $where = $where != '' ? " WHERE 1=1 ".$where : ''; |
|
| 2330 | 2330 | |
| 2331 | 2331 | $groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster withotu |
| 2332 | 2332 | /** |
@@ -2337,15 +2337,15 @@ discard block |
||
| 2337 | 2337 | * @param string $groupby Group by clause string. |
| 2338 | 2338 | * @param string $post_type Post type. |
| 2339 | 2339 | */ |
| 2340 | - $groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type ); |
|
| 2340 | + $groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);
|
|
| 2341 | 2341 | |
| 2342 | - if ( $count_only ) {
|
|
| 2343 | - $sql = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . " |
|
| 2344 | - " . $join . " |
|
| 2342 | + if ($count_only) {
|
|
| 2343 | + $sql = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts." |
|
| 2344 | + " . $join." |
|
| 2345 | 2345 | " . $where; |
| 2346 | - $rows = (int) $wpdb->get_var( $sql ); |
|
| 2346 | + $rows = (int) $wpdb->get_var($sql); |
|
| 2347 | 2347 | } else {
|
| 2348 | - $orderby = geodir_widget_listings_get_order( $query_args ); |
|
| 2348 | + $orderby = geodir_widget_listings_get_order($query_args); |
|
| 2349 | 2349 | /** |
| 2350 | 2350 | * Filter widget listing orderby clause string part that is being used for query. |
| 2351 | 2351 | * |
@@ -2355,11 +2355,11 @@ discard block |
||
| 2355 | 2355 | * @param string $table Table name. |
| 2356 | 2356 | * @param string $post_type Post type. |
| 2357 | 2357 | */ |
| 2358 | - $orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type ); |
|
| 2359 | - $orderby .= $wpdb->posts . ".post_title ASC"; |
|
| 2360 | - $orderby = $orderby != '' ? " ORDER BY " . $orderby : ''; |
|
| 2358 | + $orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);
|
|
| 2359 | + $orderby .= $wpdb->posts.".post_title ASC"; |
|
| 2360 | + $orderby = $orderby != '' ? " ORDER BY ".$orderby : ''; |
|
| 2361 | 2361 | |
| 2362 | - $limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5; |
|
| 2362 | + $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5; |
|
| 2363 | 2363 | /** |
| 2364 | 2364 | * Filter widget listing limit that is being used for query. |
| 2365 | 2365 | * |
@@ -2368,27 +2368,27 @@ discard block |
||
| 2368 | 2368 | * @param int $limit Query results limit. |
| 2369 | 2369 | * @param string $post_type Post type. |
| 2370 | 2370 | */ |
| 2371 | - $limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type ); |
|
| 2371 | + $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);
|
|
| 2372 | 2372 | |
| 2373 | - $page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1; |
|
| 2374 | - if ( ! $page ) {
|
|
| 2373 | + $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1; |
|
| 2374 | + if (!$page) {
|
|
| 2375 | 2375 | $page = 1; |
| 2376 | 2376 | } |
| 2377 | 2377 | |
| 2378 | - $limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : ""; |
|
| 2378 | + $limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : ""; |
|
| 2379 | 2379 | |
| 2380 | 2380 | //@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without |
| 2381 | - $sql = "SELECT " . $fields . " FROM " . $wpdb->posts . " |
|
| 2382 | - " . $join . " |
|
| 2383 | - " . $where . " |
|
| 2384 | - " . $groupby . " |
|
| 2385 | - " . $orderby . " |
|
| 2381 | + $sql = "SELECT ".$fields." FROM ".$wpdb->posts." |
|
| 2382 | + " . $join." |
|
| 2383 | + " . $where." |
|
| 2384 | + " . $groupby." |
|
| 2385 | + " . $orderby." |
|
| 2386 | 2386 | " . $limit; |
| 2387 | - $rows = $wpdb->get_results( $sql ); |
|
| 2387 | + $rows = $wpdb->get_results($sql); |
|
| 2388 | 2388 | } |
| 2389 | 2389 | |
| 2390 | - unset( $GLOBALS['gd_query_args_widgets'] ); |
|
| 2391 | - unset( $gd_query_args_widgets ); |
|
| 2390 | + unset($GLOBALS['gd_query_args_widgets']); |
|
| 2391 | + unset($gd_query_args_widgets); |
|
| 2392 | 2392 | |
| 2393 | 2393 | return $rows; |
| 2394 | 2394 | } |
@@ -2405,11 +2405,11 @@ discard block |
||
| 2405 | 2405 | * |
| 2406 | 2406 | * @return string Modified fields SQL. |
| 2407 | 2407 | */ |
| 2408 | -function geodir_function_widget_listings_fields( $fields ) {
|
|
| 2408 | +function geodir_function_widget_listings_fields($fields) {
|
|
| 2409 | 2409 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2410 | 2410 | |
| 2411 | 2411 | $query_args = $gd_query_args_widgets; |
| 2412 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2412 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2413 | 2413 | return $fields; |
| 2414 | 2414 | } |
| 2415 | 2415 | |
@@ -2428,24 +2428,24 @@ discard block |
||
| 2428 | 2428 | * |
| 2429 | 2429 | * @return string Modified join clause SQL. |
| 2430 | 2430 | */ |
| 2431 | -function geodir_function_widget_listings_join( $join ) {
|
|
| 2431 | +function geodir_function_widget_listings_join($join) {
|
|
| 2432 | 2432 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2433 | 2433 | |
| 2434 | 2434 | $query_args = $gd_query_args_widgets; |
| 2435 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2435 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2436 | 2436 | return $join; |
| 2437 | 2437 | } |
| 2438 | 2438 | |
| 2439 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2440 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2439 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2440 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2441 | 2441 | |
| 2442 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2443 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 2442 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2443 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 2444 | 2444 | } |
| 2445 | 2445 | |
| 2446 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2447 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2448 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2446 | + if (!empty($query_args['tax_query'])) {
|
|
| 2447 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2448 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2449 | 2449 | $join .= $tax_queries['join']; |
| 2450 | 2450 | } |
| 2451 | 2451 | } |
@@ -2465,49 +2465,49 @@ discard block |
||
| 2465 | 2465 | * |
| 2466 | 2466 | * @return string Modified where clause SQL. |
| 2467 | 2467 | */ |
| 2468 | -function geodir_function_widget_listings_where( $where ) {
|
|
| 2468 | +function geodir_function_widget_listings_where($where) {
|
|
| 2469 | 2469 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2470 | 2470 | |
| 2471 | 2471 | $query_args = $gd_query_args_widgets; |
| 2472 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2472 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2473 | 2473 | return $where; |
| 2474 | 2474 | } |
| 2475 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2476 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2475 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2476 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2477 | 2477 | |
| 2478 | - if ( ! empty( $query_args ) ) {
|
|
| 2479 | - if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {
|
|
| 2480 | - $where = geodir_default_location_where( $where, $table ); |
|
| 2478 | + if (!empty($query_args)) {
|
|
| 2479 | + if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {
|
|
| 2480 | + $where = geodir_default_location_where($where, $table); |
|
| 2481 | 2481 | } |
| 2482 | 2482 | |
| 2483 | - if ( ! empty( $query_args['post_author'] ) ) {
|
|
| 2484 | - $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author']; |
|
| 2483 | + if (!empty($query_args['post_author'])) {
|
|
| 2484 | + $where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author']; |
|
| 2485 | 2485 | } |
| 2486 | 2486 | |
| 2487 | - if ( ! empty( $query_args['show_featured_only'] ) ) {
|
|
| 2488 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 2487 | + if (!empty($query_args['show_featured_only'])) {
|
|
| 2488 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 2489 | 2489 | } |
| 2490 | 2490 | |
| 2491 | - if ( ! empty( $query_args['show_special_only'] ) ) {
|
|
| 2492 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 2491 | + if (!empty($query_args['show_special_only'])) {
|
|
| 2492 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 2493 | 2493 | } |
| 2494 | 2494 | |
| 2495 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2496 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL "; |
|
| 2495 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2496 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL "; |
|
| 2497 | 2497 | } |
| 2498 | 2498 | |
| 2499 | - if ( ! empty( $query_args['featured_image_only'] ) ) {
|
|
| 2500 | - $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' "; |
|
| 2499 | + if (!empty($query_args['featured_image_only'])) {
|
|
| 2500 | + $where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' "; |
|
| 2501 | 2501 | } |
| 2502 | 2502 | |
| 2503 | - if ( ! empty( $query_args['with_videos_only'] ) ) {
|
|
| 2504 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 2503 | + if (!empty($query_args['with_videos_only'])) {
|
|
| 2504 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 2505 | 2505 | } |
| 2506 | 2506 | |
| 2507 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2508 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2507 | + if (!empty($query_args['tax_query'])) {
|
|
| 2508 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2509 | 2509 | |
| 2510 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2510 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2511 | 2511 | $where .= $tax_queries['where']; |
| 2512 | 2512 | } |
| 2513 | 2513 | } |
@@ -2528,11 +2528,11 @@ discard block |
||
| 2528 | 2528 | * |
| 2529 | 2529 | * @return string Modified orderby clause SQL. |
| 2530 | 2530 | */ |
| 2531 | -function geodir_function_widget_listings_orderby( $orderby ) {
|
|
| 2531 | +function geodir_function_widget_listings_orderby($orderby) {
|
|
| 2532 | 2532 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2533 | 2533 | |
| 2534 | 2534 | $query_args = $gd_query_args_widgets; |
| 2535 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2535 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2536 | 2536 | return $orderby; |
| 2537 | 2537 | } |
| 2538 | 2538 | |
@@ -2551,15 +2551,15 @@ discard block |
||
| 2551 | 2551 | * |
| 2552 | 2552 | * @return int Query limit. |
| 2553 | 2553 | */ |
| 2554 | -function geodir_function_widget_listings_limit( $limit ) {
|
|
| 2554 | +function geodir_function_widget_listings_limit($limit) {
|
|
| 2555 | 2555 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2556 | 2556 | |
| 2557 | 2557 | $query_args = $gd_query_args_widgets; |
| 2558 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2558 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2559 | 2559 | return $limit; |
| 2560 | 2560 | } |
| 2561 | 2561 | |
| 2562 | - if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
|
|
| 2562 | + if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
|
|
| 2563 | 2563 | $limit = (int) $query_args['posts_per_page']; |
| 2564 | 2564 | } |
| 2565 | 2565 | |
@@ -2577,12 +2577,12 @@ discard block |
||
| 2577 | 2577 | * |
| 2578 | 2578 | * @return int Large size width. |
| 2579 | 2579 | */ |
| 2580 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
|
|
| 2581 | - $large_size_w = get_option( 'large_size_w' ); |
|
| 2580 | +function geodir_media_image_large_width($default = 800, $params = '') {
|
|
| 2581 | + $large_size_w = get_option('large_size_w');
|
|
| 2582 | 2582 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; |
| 2583 | - $large_size_w = absint( $large_size_w ); |
|
| 2583 | + $large_size_w = absint($large_size_w); |
|
| 2584 | 2584 | |
| 2585 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2585 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2586 | 2586 | $large_size_w = 800; |
| 2587 | 2587 | } |
| 2588 | 2588 | |
@@ -2595,7 +2595,7 @@ discard block |
||
| 2595 | 2595 | * @param int $default Default width. |
| 2596 | 2596 | * @param string|array $params Image parameters. |
| 2597 | 2597 | */ |
| 2598 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); |
|
| 2598 | + $large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
|
|
| 2599 | 2599 | |
| 2600 | 2600 | return $large_size_w; |
| 2601 | 2601 | } |
@@ -2611,12 +2611,12 @@ discard block |
||
| 2611 | 2611 | * |
| 2612 | 2612 | * @return int Large size height. |
| 2613 | 2613 | */ |
| 2614 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
|
|
| 2615 | - $large_size_h = get_option( 'large_size_h' ); |
|
| 2614 | +function geodir_media_image_large_height($default = 800, $params = '') {
|
|
| 2615 | + $large_size_h = get_option('large_size_h');
|
|
| 2616 | 2616 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; |
| 2617 | - $large_size_h = absint( $large_size_h ); |
|
| 2617 | + $large_size_h = absint($large_size_h); |
|
| 2618 | 2618 | |
| 2619 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2619 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2620 | 2620 | $large_size_h = 800; |
| 2621 | 2621 | } |
| 2622 | 2622 | |
@@ -2629,7 +2629,7 @@ discard block |
||
| 2629 | 2629 | * @param int $default Default height. |
| 2630 | 2630 | * @param string|array $params Image parameters. |
| 2631 | 2631 | */ |
| 2632 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); |
|
| 2632 | + $large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
|
|
| 2633 | 2633 | |
| 2634 | 2634 | return $large_size_h; |
| 2635 | 2635 | } |
@@ -2646,8 +2646,8 @@ discard block |
||
| 2646 | 2646 | * |
| 2647 | 2647 | * @return string Sanitized name. |
| 2648 | 2648 | */ |
| 2649 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
|
|
| 2650 | - if ( $name == '' ) {
|
|
| 2649 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
|
|
| 2650 | + if ($name == '') {
|
|
| 2651 | 2651 | return null; |
| 2652 | 2652 | } |
| 2653 | 2653 | |
@@ -2656,13 +2656,13 @@ discard block |
||
| 2656 | 2656 | $type = $type == 'gd_city' ? 'city' : $type; |
| 2657 | 2657 | |
| 2658 | 2658 | $return = $name; |
| 2659 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 2660 | - $return = get_actual_location_name( $type, $name, $translate ); |
|
| 2659 | + if (function_exists('get_actual_location_name')) {
|
|
| 2660 | + $return = get_actual_location_name($type, $name, $translate); |
|
| 2661 | 2661 | } else {
|
| 2662 | - $return = preg_replace( '/-(\d+)$/', '', $return ); |
|
| 2663 | - $return = preg_replace( '/[_-]/', ' ', $return ); |
|
| 2664 | - $return = geodir_ucwords( $return ); |
|
| 2665 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; |
|
| 2662 | + $return = preg_replace('/-(\d+)$/', '', $return);
|
|
| 2663 | + $return = preg_replace('/[_-]/', ' ', $return);
|
|
| 2664 | + $return = geodir_ucwords($return); |
|
| 2665 | + $return = $translate ? __($return, 'geodirectory') : $return; |
|
| 2666 | 2666 | } |
| 2667 | 2667 | |
| 2668 | 2668 | return $return; |
@@ -2677,14 +2677,14 @@ discard block |
||
| 2677 | 2677 | * |
| 2678 | 2678 | * @param int $number Comments number. |
| 2679 | 2679 | */ |
| 2680 | -function geodir_comments_number( $number ) {
|
|
| 2680 | +function geodir_comments_number($number) {
|
|
| 2681 | 2681 | |
| 2682 | - if ( $number > 1 ) {
|
|
| 2683 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); |
|
| 2684 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2685 | - $output = __( 'No Reviews', 'geodirectory' ); |
|
| 2682 | + if ($number > 1) {
|
|
| 2683 | + $output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
|
|
| 2684 | + } elseif ($number == 0 || $number == '') {
|
|
| 2685 | + $output = __('No Reviews', 'geodirectory');
|
|
| 2686 | 2686 | } else { // must be one
|
| 2687 | - $output = __( '1 Review', 'geodirectory' ); |
|
| 2687 | + $output = __('1 Review', 'geodirectory');
|
|
| 2688 | 2688 | } |
| 2689 | 2689 | echo $output; |
| 2690 | 2690 | } |
@@ -2699,18 +2699,18 @@ discard block |
||
| 2699 | 2699 | */ |
| 2700 | 2700 | function is_page_geodir_home() {
|
| 2701 | 2701 | global $wpdb; |
| 2702 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); |
|
| 2703 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2704 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 2702 | + $cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
|
|
| 2703 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2704 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 2705 | 2705 | } |
| 2706 | - $home_url = home_url( '', 'http' ); |
|
| 2707 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2708 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 2706 | + $home_url = home_url('', 'http');
|
|
| 2707 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2708 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 2709 | 2709 | } |
| 2710 | - $home_url = str_replace( "www.", "", $home_url ); |
|
| 2711 | - 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' ) ) ) {
|
|
| 2710 | + $home_url = str_replace("www.", "", $home_url);
|
|
| 2711 | + 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'))) {
|
|
| 2712 | 2712 | return true; |
| 2713 | - } 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' ) ) {
|
|
| 2713 | + } 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')) {
|
|
| 2714 | 2714 | return true; |
| 2715 | 2715 | } else {
|
| 2716 | 2716 | return false; |
@@ -2730,18 +2730,18 @@ discard block |
||
| 2730 | 2730 | * |
| 2731 | 2731 | * @return string The canonical URL. |
| 2732 | 2732 | */ |
| 2733 | -function geodir_wpseo_homepage_canonical( $url ) {
|
|
| 2733 | +function geodir_wpseo_homepage_canonical($url) {
|
|
| 2734 | 2734 | global $post; |
| 2735 | 2735 | |
| 2736 | - if ( is_page_geodir_home() ) {
|
|
| 2736 | + if (is_page_geodir_home()) {
|
|
| 2737 | 2737 | return home_url(); |
| 2738 | 2738 | } |
| 2739 | 2739 | |
| 2740 | 2740 | return $url; |
| 2741 | 2741 | } |
| 2742 | 2742 | |
| 2743 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2744 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2743 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2744 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2745 | 2745 | |
| 2746 | 2746 | /** |
| 2747 | 2747 | * Add extra fields to google maps script call. |
@@ -2754,20 +2754,20 @@ discard block |
||
| 2754 | 2754 | * |
| 2755 | 2755 | * @return string Modified extra string. |
| 2756 | 2756 | */ |
| 2757 | -function geodir_googlemap_script_extra_details_page( $extra ) {
|
|
| 2757 | +function geodir_googlemap_script_extra_details_page($extra) {
|
|
| 2758 | 2758 | global $post; |
| 2759 | 2759 | $add_google_places_api = false; |
| 2760 | - if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 2760 | + if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 2761 | 2761 | $add_google_places_api = true; |
| 2762 | 2762 | } |
| 2763 | - if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
|
|
| 2763 | + if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
|
|
| 2764 | 2764 | $extra .= "&libraries=places"; |
| 2765 | 2765 | } |
| 2766 | 2766 | |
| 2767 | 2767 | return $extra; |
| 2768 | 2768 | } |
| 2769 | 2769 | |
| 2770 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); |
|
| 2770 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
|
|
| 2771 | 2771 | |
| 2772 | 2772 | |
| 2773 | 2773 | /** |
@@ -2785,99 +2785,99 @@ discard block |
||
| 2785 | 2785 | * after_widget. |
| 2786 | 2786 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2787 | 2787 | */ |
| 2788 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
|
|
| 2788 | +function geodir_popular_post_category_output($args = '', $instance = '') {
|
|
| 2789 | 2789 | // prints the widget |
| 2790 | 2790 | global $wpdb, $plugin_prefix, $geodir_post_category_str; |
| 2791 | - extract( $args, EXTR_SKIP ); |
|
| 2791 | + extract($args, EXTR_SKIP); |
|
| 2792 | 2792 | |
| 2793 | 2793 | echo $before_widget; |
| 2794 | 2794 | |
| 2795 | 2795 | /** This filter is documented in geodirectory_widgets.php */ |
| 2796 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2796 | + $title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2797 | 2797 | |
| 2798 | 2798 | $gd_post_type = geodir_get_current_posttype(); |
| 2799 | 2799 | |
| 2800 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2801 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2800 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2801 | + if (!empty($gd_post_type)) {
|
|
| 2802 | 2802 | $default_post_type = $gd_post_type; |
| 2803 | - } elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
|
|
| 2803 | + } elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
|
|
| 2804 | 2804 | $default_post_type = $instance['default_post_type']; |
| 2805 | 2805 | } else {
|
| 2806 | 2806 | $all_gd_post_type = geodir_get_posttypes(); |
| 2807 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; |
|
| 2807 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; |
|
| 2808 | 2808 | } |
| 2809 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; |
|
| 2809 | + $parent_only = !empty($instance['parent_only']) ? true : false; |
|
| 2810 | 2810 | |
| 2811 | 2811 | $taxonomy = array(); |
| 2812 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2813 | - $taxonomy[] = $gd_post_type . "category"; |
|
| 2812 | + if (!empty($gd_post_type)) {
|
|
| 2813 | + $taxonomy[] = $gd_post_type."category"; |
|
| 2814 | 2814 | } else {
|
| 2815 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); |
|
| 2815 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2816 | 2816 | } |
| 2817 | 2817 | |
| 2818 | - $term_args = array( 'taxonomy' => $taxonomy ); |
|
| 2819 | - if ( $parent_only ) {
|
|
| 2818 | + $term_args = array('taxonomy' => $taxonomy);
|
|
| 2819 | + if ($parent_only) {
|
|
| 2820 | 2820 | $term_args['parent'] = 0; |
| 2821 | 2821 | } |
| 2822 | 2822 | |
| 2823 | - $terms = get_terms( $term_args ); |
|
| 2823 | + $terms = get_terms($term_args); |
|
| 2824 | 2824 | $a_terms = array(); |
| 2825 | 2825 | $b_terms = array(); |
| 2826 | 2826 | |
| 2827 | - foreach ( $terms as $term ) {
|
|
| 2828 | - if ( $term->count > 0 ) {
|
|
| 2829 | - $a_terms[ $term->taxonomy ][] = $term; |
|
| 2827 | + foreach ($terms as $term) {
|
|
| 2828 | + if ($term->count > 0) {
|
|
| 2829 | + $a_terms[$term->taxonomy][] = $term; |
|
| 2830 | 2830 | } |
| 2831 | 2831 | } |
| 2832 | 2832 | |
| 2833 | - if ( ! empty( $a_terms ) ) {
|
|
| 2834 | - foreach ( $a_terms as $b_key => $b_val ) {
|
|
| 2835 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, 'count' ); |
|
| 2833 | + if (!empty($a_terms)) {
|
|
| 2834 | + foreach ($a_terms as $b_key => $b_val) {
|
|
| 2835 | + $b_terms[$b_key] = geodir_sort_terms($b_val, 'count'); |
|
| 2836 | 2836 | } |
| 2837 | 2837 | |
| 2838 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; |
|
| 2838 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; |
|
| 2839 | 2839 | |
| 2840 | 2840 | $tax_change_output = ''; |
| 2841 | - if ( count( $b_terms ) > 1 ) {
|
|
| 2842 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2843 | - foreach ( $b_terms as $key => $val ) {
|
|
| 2844 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); |
|
| 2845 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); |
|
| 2846 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; |
|
| 2841 | + if (count($b_terms) > 1) {
|
|
| 2842 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2843 | + foreach ($b_terms as $key => $val) {
|
|
| 2844 | + $ptype = get_post_type_object(str_replace("category", "", $key));
|
|
| 2845 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); |
|
| 2846 | + $tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
|
|
| 2847 | 2847 | } |
| 2848 | 2848 | $tax_change_output .= "</select>"; |
| 2849 | 2849 | } |
| 2850 | 2850 | |
| 2851 | - if ( ! empty( $b_terms ) ) {
|
|
| 2852 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array |
|
| 2853 | - global $cat_count;//make global so we can change via function |
|
| 2851 | + if (!empty($b_terms)) {
|
|
| 2852 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array |
|
| 2853 | + global $cat_count; //make global so we can change via function |
|
| 2854 | 2854 | $cat_count = 0; |
| 2855 | 2855 | ?> |
| 2856 | 2856 | <div class="geodir-category-list-in clearfix"> |
| 2857 | 2857 | <div class="geodir-cat-list clearfix"> |
| 2858 | 2858 | <?php |
| 2859 | - echo $before_title . __( $title ) . $after_title; |
|
| 2859 | + echo $before_title.__($title).$after_title; |
|
| 2860 | 2860 | |
| 2861 | 2861 | echo $tax_change_output; |
| 2862 | 2862 | |
| 2863 | 2863 | echo '<ul class="geodir-popular-cat-list">'; |
| 2864 | 2864 | |
| 2865 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); |
|
| 2865 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); |
|
| 2866 | 2866 | |
| 2867 | 2867 | echo '</ul>'; |
| 2868 | 2868 | ?> |
| 2869 | 2869 | </div> |
| 2870 | 2870 | <?php |
| 2871 | 2871 | $hide = ''; |
| 2872 | - if ( $cat_count < $category_limit ) {
|
|
| 2872 | + if ($cat_count < $category_limit) {
|
|
| 2873 | 2873 | $hide = 'style="display:none;"'; |
| 2874 | 2874 | } |
| 2875 | 2875 | echo "<div class='geodir-cat-list-more' $hide >"; |
| 2876 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; |
|
| 2877 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; |
|
| 2876 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
|
|
| 2877 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
|
|
| 2878 | 2878 | echo "</div>"; |
| 2879 | 2879 | /* add scripts */ |
| 2880 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); |
|
| 2880 | + add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
|
|
| 2881 | 2881 | ?> |
| 2882 | 2882 | </div> |
| 2883 | 2883 | <?php |
@@ -2897,28 +2897,28 @@ discard block |
||
| 2897 | 2897 | * @param int $category_limit Number of categories to display by default. |
| 2898 | 2898 | * @param bool $category_restrict If the cat limit shoudl be hidden or not shown. |
| 2899 | 2899 | */ |
| 2900 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
|
|
| 2900 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
|
|
| 2901 | 2901 | global $geodir_post_category_str, $cat_count; |
| 2902 | 2902 | $term_icons = geodir_get_term_icon(); |
| 2903 | 2903 | |
| 2904 | 2904 | $geodir_post_category_str = array(); |
| 2905 | 2905 | |
| 2906 | 2906 | |
| 2907 | - foreach ( $terms as $cat ) {
|
|
| 2908 | - $post_type = str_replace( "category", "", $cat->taxonomy ); |
|
| 2909 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; |
|
| 2907 | + foreach ($terms as $cat) {
|
|
| 2908 | + $post_type = str_replace("category", "", $cat->taxonomy);
|
|
| 2909 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; |
|
| 2910 | 2910 | |
| 2911 | - $cat_count ++; |
|
| 2911 | + $cat_count++; |
|
| 2912 | 2912 | |
| 2913 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); |
|
| 2913 | + $geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
|
|
| 2914 | 2914 | |
| 2915 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 2916 | - if($category_restrict && $cat_count > $category_limit ){
|
|
| 2915 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 2916 | + if ($category_restrict && $cat_count > $category_limit) {
|
|
| 2917 | 2917 | continue; |
| 2918 | 2918 | } |
| 2919 | 2919 | $total_post = $cat->count; |
| 2920 | 2920 | |
| 2921 | - $term_link = get_term_link( $cat, $cat->taxonomy ); |
|
| 2921 | + $term_link = get_term_link($cat, $cat->taxonomy); |
|
| 2922 | 2922 | /** |
| 2923 | 2923 | * Filer the category term link. |
| 2924 | 2924 | * |
@@ -2928,11 +2928,11 @@ discard block |
||
| 2928 | 2928 | * @param int $cat ->term_id The term id. |
| 2929 | 2929 | * @param string $post_type Wordpress post type. |
| 2930 | 2930 | */ |
| 2931 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); |
|
| 2931 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
|
|
| 2932 | 2932 | |
| 2933 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; |
|
| 2934 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; |
|
| 2935 | - echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
|
|
| 2933 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; |
|
| 2934 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; |
|
| 2935 | + echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
|
|
| 2936 | 2936 | echo '</a></li>'; |
| 2937 | 2937 | } |
| 2938 | 2938 | } |
@@ -2947,14 +2947,14 @@ discard block |
||
| 2947 | 2947 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 2948 | 2948 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2949 | 2949 | */ |
| 2950 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
|
|
| 2950 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
|
|
| 2951 | 2951 | // prints the widget |
| 2952 | - extract( $args, EXTR_SKIP ); |
|
| 2952 | + extract($args, EXTR_SKIP); |
|
| 2953 | 2953 | |
| 2954 | 2954 | echo $before_widget; |
| 2955 | 2955 | |
| 2956 | 2956 | /** This filter is documented in geodirectory_widgets.php */ |
| 2957 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2957 | + $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2958 | 2958 | /** |
| 2959 | 2959 | * Filter the widget post type. |
| 2960 | 2960 | * |
@@ -2962,7 +2962,7 @@ discard block |
||
| 2962 | 2962 | * |
| 2963 | 2963 | * @param string $instance ['post_type'] Post type of listing. |
| 2964 | 2964 | */ |
| 2965 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 2965 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 2966 | 2966 | /** |
| 2967 | 2967 | * Filter the widget's term. |
| 2968 | 2968 | * |
@@ -2970,7 +2970,7 @@ discard block |
||
| 2970 | 2970 | * |
| 2971 | 2971 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 2972 | 2972 | */ |
| 2973 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 2973 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 2974 | 2974 | /** |
| 2975 | 2975 | * Filter widget's "add_location_filter" value. |
| 2976 | 2976 | * |
@@ -2978,7 +2978,7 @@ discard block |
||
| 2978 | 2978 | * |
| 2979 | 2979 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 2980 | 2980 | */ |
| 2981 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 2981 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 2982 | 2982 | /** |
| 2983 | 2983 | * Filter the widget listings limit. |
| 2984 | 2984 | * |
@@ -2986,7 +2986,7 @@ discard block |
||
| 2986 | 2986 | * |
| 2987 | 2987 | * @param string $instance ['post_number'] Number of listings to display. |
| 2988 | 2988 | */ |
| 2989 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 2989 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 2990 | 2990 | /** |
| 2991 | 2991 | * Filter the widget listings limit shown at one time. |
| 2992 | 2992 | * |
@@ -2994,7 +2994,7 @@ discard block |
||
| 2994 | 2994 | * |
| 2995 | 2995 | * @param string $instance ['max_show'] Number of listings to display on screen. |
| 2996 | 2996 | */ |
| 2997 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); |
|
| 2997 | + $max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
|
|
| 2998 | 2998 | /** |
| 2999 | 2999 | * Filter the widget slide width. |
| 3000 | 3000 | * |
@@ -3002,7 +3002,7 @@ discard block |
||
| 3002 | 3002 | * |
| 3003 | 3003 | * @param string $instance ['slide_width'] Width of the slides shown. |
| 3004 | 3004 | */ |
| 3005 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); |
|
| 3005 | + $slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
|
|
| 3006 | 3006 | /** |
| 3007 | 3007 | * Filter widget's "show title" value. |
| 3008 | 3008 | * |
@@ -3010,7 +3010,7 @@ discard block |
||
| 3010 | 3010 | * |
| 3011 | 3011 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. |
| 3012 | 3012 | */ |
| 3013 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); |
|
| 3013 | + $show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
|
|
| 3014 | 3014 | /** |
| 3015 | 3015 | * Filter widget's "slideshow" value. |
| 3016 | 3016 | * |
@@ -3018,7 +3018,7 @@ discard block |
||
| 3018 | 3018 | * |
| 3019 | 3019 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. |
| 3020 | 3020 | */ |
| 3021 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); |
|
| 3021 | + $slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
|
|
| 3022 | 3022 | /** |
| 3023 | 3023 | * Filter widget's "animationLoop" value. |
| 3024 | 3024 | * |
@@ -3026,7 +3026,7 @@ discard block |
||
| 3026 | 3026 | * |
| 3027 | 3027 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. |
| 3028 | 3028 | */ |
| 3029 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); |
|
| 3029 | + $animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
|
|
| 3030 | 3030 | /** |
| 3031 | 3031 | * Filter widget's "directionNav" value. |
| 3032 | 3032 | * |
@@ -3034,7 +3034,7 @@ discard block |
||
| 3034 | 3034 | * |
| 3035 | 3035 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. |
| 3036 | 3036 | */ |
| 3037 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); |
|
| 3037 | + $directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
|
|
| 3038 | 3038 | /** |
| 3039 | 3039 | * Filter widget's "slideshowSpeed" value. |
| 3040 | 3040 | * |
@@ -3042,7 +3042,7 @@ discard block |
||
| 3042 | 3042 | * |
| 3043 | 3043 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. |
| 3044 | 3044 | */ |
| 3045 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); |
|
| 3045 | + $slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
|
|
| 3046 | 3046 | /** |
| 3047 | 3047 | * Filter widget's "animationSpeed" value. |
| 3048 | 3048 | * |
@@ -3050,7 +3050,7 @@ discard block |
||
| 3050 | 3050 | * |
| 3051 | 3051 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. |
| 3052 | 3052 | */ |
| 3053 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); |
|
| 3053 | + $animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
|
|
| 3054 | 3054 | /** |
| 3055 | 3055 | * Filter widget's "animation" value. |
| 3056 | 3056 | * |
@@ -3058,7 +3058,7 @@ discard block |
||
| 3058 | 3058 | * |
| 3059 | 3059 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". |
| 3060 | 3060 | */ |
| 3061 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); |
|
| 3061 | + $animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
|
|
| 3062 | 3062 | /** |
| 3063 | 3063 | * Filter widget's "list_sort" type. |
| 3064 | 3064 | * |
@@ -3066,10 +3066,10 @@ discard block |
||
| 3066 | 3066 | * |
| 3067 | 3067 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3068 | 3068 | */ |
| 3069 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3070 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; |
|
| 3069 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3070 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; |
|
| 3071 | 3071 | |
| 3072 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); |
|
| 3072 | + wp_enqueue_script('geodirectory-jquery-flexslider-js');
|
|
| 3073 | 3073 | ?> |
| 3074 | 3074 | <script type="text/javascript"> |
| 3075 | 3075 | jQuery(window).load(function () {
|
@@ -3087,23 +3087,23 @@ discard block |
||
| 3087 | 3087 | itemWidth: 75, |
| 3088 | 3088 | itemMargin: 5, |
| 3089 | 3089 | asNavFor: '#geodir_widget_slider', |
| 3090 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3090 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3091 | 3091 | }); |
| 3092 | 3092 | |
| 3093 | 3093 | jQuery('#geodir_widget_slider').flexslider({
|
| 3094 | - animation: "<?php echo $animation;?>", |
|
| 3094 | + animation: "<?php echo $animation; ?>", |
|
| 3095 | 3095 | selector: ".geodir-slides > li", |
| 3096 | 3096 | namespace: "geodir-", |
| 3097 | 3097 | controlNav: true, |
| 3098 | - animationLoop: <?php echo $animationLoop;?>, |
|
| 3099 | - slideshow: <?php echo $slideshow;?>, |
|
| 3100 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, |
|
| 3101 | - animationSpeed: <?php echo $animationSpeed;?>, |
|
| 3102 | - directionNav: <?php echo $directionNav;?>, |
|
| 3103 | - maxItems: <?php echo $max_show;?>, |
|
| 3098 | + animationLoop: <?php echo $animationLoop; ?>, |
|
| 3099 | + slideshow: <?php echo $slideshow; ?>, |
|
| 3100 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, |
|
| 3101 | + animationSpeed: <?php echo $animationSpeed; ?>, |
|
| 3102 | + directionNav: <?php echo $directionNav; ?>, |
|
| 3103 | + maxItems: <?php echo $max_show; ?>, |
|
| 3104 | 3104 | move: 1, |
| 3105 | - <?php if ( $slide_width ) {
|
|
| 3106 | - echo "itemWidth: " . $slide_width . ","; |
|
| 3105 | + <?php if ($slide_width) {
|
|
| 3106 | + echo "itemWidth: ".$slide_width.","; |
|
| 3107 | 3107 | }?> |
| 3108 | 3108 | sync: "#geodir_widget_carousel", |
| 3109 | 3109 | start: function (slider) {
|
@@ -3115,7 +3115,7 @@ discard block |
||
| 3115 | 3115 | jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
|
| 3116 | 3116 | jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
|
| 3117 | 3117 | }, |
| 3118 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3118 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3119 | 3119 | }); |
| 3120 | 3120 | }); |
| 3121 | 3121 | </script> |
@@ -3128,62 +3128,62 @@ discard block |
||
| 3128 | 3128 | 'order_by' => $list_sort |
| 3129 | 3129 | ); |
| 3130 | 3130 | |
| 3131 | - if ( $show_featured_only ) {
|
|
| 3131 | + if ($show_featured_only) {
|
|
| 3132 | 3132 | $query_args['show_featured_only'] = 1; |
| 3133 | 3133 | } |
| 3134 | 3134 | |
| 3135 | - if ( $category != 0 || $category != '' ) {
|
|
| 3136 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3135 | + if ($category != 0 || $category != '') {
|
|
| 3136 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3137 | 3137 | $tax_query = array( |
| 3138 | 3138 | 'taxonomy' => $category_taxonomy[0], |
| 3139 | 3139 | 'field' => 'id', |
| 3140 | 3140 | 'terms' => $category |
| 3141 | 3141 | ); |
| 3142 | 3142 | |
| 3143 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3143 | + $query_args['tax_query'] = array($tax_query); |
|
| 3144 | 3144 | } |
| 3145 | 3145 | |
| 3146 | 3146 | // we want listings with featured image only |
| 3147 | 3147 | $query_args['featured_image_only'] = 1; |
| 3148 | 3148 | |
| 3149 | - if ( $post_type == 'gd_event' ) {
|
|
| 3149 | + if ($post_type == 'gd_event') {
|
|
| 3150 | 3150 | $query_args['gedir_event_listing_filter'] = 'upcoming'; |
| 3151 | 3151 | }// show only upcoming events |
| 3152 | 3152 | |
| 3153 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3154 | - if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
|
|
| 3155 | - if ( $title ) {
|
|
| 3156 | - echo $before_title . $title . $after_title; |
|
| 3153 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3154 | + if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
|
|
| 3155 | + if ($title) {
|
|
| 3156 | + echo $before_title.$title.$after_title; |
|
| 3157 | 3157 | } |
| 3158 | 3158 | |
| 3159 | 3159 | global $post; |
| 3160 | 3160 | |
| 3161 | - $current_post = $post;// keep current post info |
|
| 3161 | + $current_post = $post; // keep current post info |
|
| 3162 | 3162 | |
| 3163 | 3163 | $widget_main_slides = ''; |
| 3164 | 3164 | $nav_slides = ''; |
| 3165 | 3165 | $widget_slides = 0; |
| 3166 | 3166 | |
| 3167 | - foreach ( $widget_listings as $widget_listing ) {
|
|
| 3167 | + foreach ($widget_listings as $widget_listing) {
|
|
| 3168 | 3168 | global $gd_widget_listing_type; |
| 3169 | 3169 | $post = $widget_listing; |
| 3170 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); |
|
| 3170 | + $widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 3171 | 3171 | |
| 3172 | - if ( ! empty( $widget_image ) ) {
|
|
| 3173 | - if ( $widget_image->height >= 200 ) {
|
|
| 3172 | + if (!empty($widget_image)) {
|
|
| 3173 | + if ($widget_image->height >= 200) {
|
|
| 3174 | 3174 | $widget_spacer_height = 0; |
| 3175 | 3175 | } else {
|
| 3176 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); |
|
| 3176 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); |
|
| 3177 | 3177 | } |
| 3178 | 3178 | |
| 3179 | - $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" />'; |
|
| 3179 | + $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" />'; |
|
| 3180 | 3180 | |
| 3181 | 3181 | $title = ''; |
| 3182 | - if ( $show_title ) {
|
|
| 3183 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; |
|
| 3182 | + if ($show_title) {
|
|
| 3183 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; |
|
| 3184 | 3184 | $post_id = $post->ID; |
| 3185 | - $post_permalink = get_permalink( $post->ID ); |
|
| 3186 | - $post_title = get_the_title( $post->ID ); |
|
| 3185 | + $post_permalink = get_permalink($post->ID); |
|
| 3186 | + $post_title = get_the_title($post->ID); |
|
| 3187 | 3187 | /** |
| 3188 | 3188 | * Filter the listing slider widget title. |
| 3189 | 3189 | * |
@@ -3194,12 +3194,12 @@ discard block |
||
| 3194 | 3194 | * @param string $post_permalink The post permalink url. |
| 3195 | 3195 | * @param string $post_title The post title text. |
| 3196 | 3196 | */ |
| 3197 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); |
|
| 3197 | + $title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
|
|
| 3198 | 3198 | } |
| 3199 | 3199 | |
| 3200 | - $widget_main_slides .= $title . '<img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></li>'; |
|
| 3201 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3202 | - $widget_slides ++; |
|
| 3200 | + $widget_main_slides .= $title.'<img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></li>'; |
|
| 3201 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3202 | + $widget_slides++; |
|
| 3203 | 3203 | } |
| 3204 | 3204 | } |
| 3205 | 3205 | ?> |
@@ -3208,7 +3208,7 @@ discard block |
||
| 3208 | 3208 | <div id="geodir_widget_slider" class="geodir_flexslider"> |
| 3209 | 3209 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> |
| 3210 | 3210 | </div> |
| 3211 | - <?php if ( $widget_slides > 1 ) { ?>
|
|
| 3211 | + <?php if ($widget_slides > 1) { ?>
|
|
| 3212 | 3212 | <div id="geodir_widget_carousel" class="geodir_flexslider"> |
| 3213 | 3213 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> |
| 3214 | 3214 | </div> |
@@ -3216,7 +3216,7 @@ discard block |
||
| 3216 | 3216 | </div> |
| 3217 | 3217 | <?php |
| 3218 | 3218 | $GLOBALS['post'] = $current_post; |
| 3219 | - setup_postdata( $current_post ); |
|
| 3219 | + setup_postdata($current_post); |
|
| 3220 | 3220 | } |
| 3221 | 3221 | echo $after_widget; |
| 3222 | 3222 | } |
@@ -3232,46 +3232,46 @@ discard block |
||
| 3232 | 3232 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3233 | 3233 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3234 | 3234 | */ |
| 3235 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
|
|
| 3235 | +function geodir_loginwidget_output($args = '', $instance = '') {
|
|
| 3236 | 3236 | //print_r($args); |
| 3237 | 3237 | //print_r($instance); |
| 3238 | 3238 | // prints the widget |
| 3239 | - extract( $args, EXTR_SKIP ); |
|
| 3239 | + extract($args, EXTR_SKIP); |
|
| 3240 | 3240 | |
| 3241 | 3241 | /** This filter is documented in geodirectory_widgets.php */ |
| 3242 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3242 | + $title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3243 | 3243 | |
| 3244 | 3244 | echo $before_widget; |
| 3245 | - echo $before_title . $title . $after_title; |
|
| 3245 | + echo $before_title.$title.$after_title; |
|
| 3246 | 3246 | |
| 3247 | - if ( is_user_logged_in() ) {
|
|
| 3247 | + if (is_user_logged_in()) {
|
|
| 3248 | 3248 | global $current_user; |
| 3249 | 3249 | |
| 3250 | - $author_link = get_author_posts_url( $current_user->data->ID ); |
|
| 3251 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 3250 | + $author_link = get_author_posts_url($current_user->data->ID); |
|
| 3251 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
|
|
| 3252 | 3252 | |
| 3253 | 3253 | echo '<ul class="geodir-loginbox-list">'; |
| 3254 | 3254 | ob_start(); |
| 3255 | 3255 | ?> |
| 3256 | 3256 | <li><a class="signin" |
| 3257 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> |
|
| 3257 | + href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
|
|
| 3258 | 3258 | <?php |
| 3259 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 3260 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); |
|
| 3261 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); |
|
| 3259 | + $post_types = geodir_get_posttypes('object');
|
|
| 3260 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
|
|
| 3261 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 3262 | 3262 | |
| 3263 | - if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
|
|
| 3263 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 3264 | 3264 | $addlisting_links = ''; |
| 3265 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3265 | + foreach ($post_types as $key => $postobj) {
|
|
| 3266 | 3266 | |
| 3267 | - if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
|
|
| 3267 | + if (in_array($key, $show_add_listing_post_types_main_nav)) {
|
|
| 3268 | 3268 | |
| 3269 | - if ( $add_link = geodir_get_addlisting_link( $key ) ) {
|
|
| 3269 | + if ($add_link = geodir_get_addlisting_link($key)) {
|
|
| 3270 | 3270 | |
| 3271 | 3271 | $name = $postobj->labels->name; |
| 3272 | 3272 | |
| 3273 | 3273 | $selected = ''; |
| 3274 | - if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
|
|
| 3274 | + if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
|
|
| 3275 | 3275 | $selected = 'selected="selected"'; |
| 3276 | 3276 | } |
| 3277 | 3277 | |
@@ -3284,22 +3284,22 @@ discard block |
||
| 3284 | 3284 | * @param string $key Add listing array key. |
| 3285 | 3285 | * @param int $current_user ->ID Current user ID. |
| 3286 | 3286 | */ |
| 3287 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); |
|
| 3287 | + $add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
|
|
| 3288 | 3288 | |
| 3289 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3289 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 3290 | 3290 | |
| 3291 | 3291 | } |
| 3292 | 3292 | } |
| 3293 | 3293 | |
| 3294 | 3294 | } |
| 3295 | 3295 | |
| 3296 | - if ( $addlisting_links != '' ) { ?>
|
|
| 3296 | + if ($addlisting_links != '') { ?>
|
|
| 3297 | 3297 | |
| 3298 | 3298 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" |
| 3299 | 3299 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" |
| 3300 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> |
|
| 3300 | + data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
|
|
| 3301 | 3301 | <option value="" disabled="disabled" selected="selected" |
| 3302 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> |
|
| 3302 | + style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
|
|
| 3303 | 3303 | <?php echo $addlisting_links; ?> |
| 3304 | 3304 | </select></li> <?php |
| 3305 | 3305 | |
@@ -3307,23 +3307,23 @@ discard block |
||
| 3307 | 3307 | |
| 3308 | 3308 | } |
| 3309 | 3309 | // My Favourites in Dashboard |
| 3310 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 3310 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
|
|
| 3311 | 3311 | $user_favourite = geodir_user_favourite_listing_count(); |
| 3312 | 3312 | |
| 3313 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
|
|
| 3313 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
|
|
| 3314 | 3314 | $favourite_links = ''; |
| 3315 | 3315 | |
| 3316 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3317 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
|
|
| 3316 | + foreach ($post_types as $key => $postobj) {
|
|
| 3317 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
|
|
| 3318 | 3318 | $name = $postobj->labels->name; |
| 3319 | - $post_type_link = geodir_getlink( $author_link, array( |
|
| 3319 | + $post_type_link = geodir_getlink($author_link, array( |
|
| 3320 | 3320 | 'stype' => $key, |
| 3321 | 3321 | 'list' => 'favourite' |
| 3322 | - ), false ); |
|
| 3322 | + ), false); |
|
| 3323 | 3323 | |
| 3324 | 3324 | $selected = ''; |
| 3325 | 3325 | |
| 3326 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 3326 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 3327 | 3327 | $selected = 'selected="selected"'; |
| 3328 | 3328 | } |
| 3329 | 3329 | /** |
@@ -3335,20 +3335,20 @@ discard block |
||
| 3335 | 3335 | * @param string $key Favorite listing array key. |
| 3336 | 3336 | * @param int $current_user ->ID Current user ID. |
| 3337 | 3337 | */ |
| 3338 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); |
|
| 3338 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
|
|
| 3339 | 3339 | |
| 3340 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3340 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 3341 | 3341 | } |
| 3342 | 3342 | } |
| 3343 | 3343 | |
| 3344 | - if ( $favourite_links != '' ) {
|
|
| 3344 | + if ($favourite_links != '') {
|
|
| 3345 | 3345 | ?> |
| 3346 | 3346 | <li> |
| 3347 | 3347 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 3348 | 3348 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
| 3349 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> |
|
| 3349 | + data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
|
|
| 3350 | 3350 | <option value="" disabled="disabled" selected="selected" |
| 3351 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> |
|
| 3351 | + style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
|
|
| 3352 | 3352 | <?php echo $favourite_links; ?> |
| 3353 | 3353 | </select> |
| 3354 | 3354 | </li> |
@@ -3357,19 +3357,19 @@ discard block |
||
| 3357 | 3357 | } |
| 3358 | 3358 | |
| 3359 | 3359 | |
| 3360 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 3360 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
|
|
| 3361 | 3361 | $user_listing = geodir_user_post_listing_count(); |
| 3362 | 3362 | |
| 3363 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
|
|
| 3363 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
|
|
| 3364 | 3364 | $listing_links = ''; |
| 3365 | 3365 | |
| 3366 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3367 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
|
|
| 3366 | + foreach ($post_types as $key => $postobj) {
|
|
| 3367 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
|
|
| 3368 | 3368 | $name = $postobj->labels->name; |
| 3369 | - $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false ); |
|
| 3369 | + $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
|
|
| 3370 | 3370 | |
| 3371 | 3371 | $selected = ''; |
| 3372 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
|
|
| 3372 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
|
|
| 3373 | 3373 | $selected = 'selected="selected"'; |
| 3374 | 3374 | } |
| 3375 | 3375 | |
@@ -3382,20 +3382,20 @@ discard block |
||
| 3382 | 3382 | * @param string $key My listing array key. |
| 3383 | 3383 | * @param int $current_user ->ID Current user ID. |
| 3384 | 3384 | */ |
| 3385 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); |
|
| 3385 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
|
|
| 3386 | 3386 | |
| 3387 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3387 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 3388 | 3388 | } |
| 3389 | 3389 | } |
| 3390 | 3390 | |
| 3391 | - if ( $listing_links != '' ) {
|
|
| 3391 | + if ($listing_links != '') {
|
|
| 3392 | 3392 | ?> |
| 3393 | 3393 | <li> |
| 3394 | 3394 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 3395 | 3395 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
| 3396 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> |
|
| 3396 | + data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
|
|
| 3397 | 3397 | <option value="" disabled="disabled" selected="selected" |
| 3398 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> |
|
| 3398 | + style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
|
|
| 3399 | 3399 | <?php echo $listing_links; ?> |
| 3400 | 3400 | </select> |
| 3401 | 3401 | </li> |
@@ -3411,7 +3411,7 @@ discard block |
||
| 3411 | 3411 | * |
| 3412 | 3412 | * @param string $dashboard_link Dashboard links HTML. |
| 3413 | 3413 | */ |
| 3414 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); |
|
| 3414 | + echo apply_filters('geodir_dashboard_links', $dashboard_link);
|
|
| 3415 | 3415 | echo '</ul>'; |
| 3416 | 3416 | |
| 3417 | 3417 | /** |
@@ -3419,7 +3419,7 @@ discard block |
||
| 3419 | 3419 | * |
| 3420 | 3420 | * @since 1.6.6 |
| 3421 | 3421 | */ |
| 3422 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); |
|
| 3422 | + do_action('geodir_after_loginwidget_form_logged_in');
|
|
| 3423 | 3423 | |
| 3424 | 3424 | |
| 3425 | 3425 | } else {
|
@@ -3434,18 +3434,18 @@ discard block |
||
| 3434 | 3434 | <form name="loginform" class="loginform1" |
| 3435 | 3435 | action="<?php echo geodir_login_url(); ?>" |
| 3436 | 3436 | method="post"> |
| 3437 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Email', 'geodirectory' ); ?>" name="log" |
|
| 3437 | + <div class="geodir_form_row"><input placeholder="<?php _e('Email', 'geodirectory'); ?>" name="log"
|
|
| 3438 | 3438 | type="text" class="textfield user_login1"/> <span |
| 3439 | 3439 | class="user_loginInfo"></span></div> |
| 3440 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" |
|
| 3440 | + <div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
|
|
| 3441 | 3441 | name="pwd" type="password" |
| 3442 | 3442 | class="textfield user_pass1 input-text"/><span |
| 3443 | 3443 | class="user_passInfo"></span></div> |
| 3444 | 3444 | |
| 3445 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> |
|
| 3445 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> |
|
| 3446 | 3446 | <input type="hidden" name="testcookie" value="1"/> |
| 3447 | 3447 | |
| 3448 | - <?php do_action( 'login_form' ); ?> |
|
| 3448 | + <?php do_action('login_form'); ?>
|
|
| 3449 | 3449 | |
| 3450 | 3450 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" |
| 3451 | 3451 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> |
@@ -3458,7 +3458,7 @@ discard block |
||
| 3458 | 3458 | * @since 1.0.0 |
| 3459 | 3459 | */ |
| 3460 | 3460 | ?> |
| 3461 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" |
|
| 3461 | + <a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
|
|
| 3462 | 3462 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> |
| 3463 | 3463 | |
| 3464 | 3464 | <?php |
@@ -3468,7 +3468,7 @@ discard block |
||
| 3468 | 3468 | * @since 1.0.0 |
| 3469 | 3469 | */ |
| 3470 | 3470 | ?> |
| 3471 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" |
|
| 3471 | + <a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
|
|
| 3472 | 3472 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> |
| 3473 | 3473 | </form> |
| 3474 | 3474 | <?php |
@@ -3477,7 +3477,7 @@ discard block |
||
| 3477 | 3477 | * |
| 3478 | 3478 | * @since 1.6.6 |
| 3479 | 3479 | */ |
| 3480 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); |
|
| 3480 | + do_action('geodir_after_loginwidget_form_logged_out');
|
|
| 3481 | 3481 | } |
| 3482 | 3482 | |
| 3483 | 3483 | echo $after_widget; |
@@ -3499,16 +3499,16 @@ discard block |
||
| 3499 | 3499 | * after_widget. |
| 3500 | 3500 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3501 | 3501 | */ |
| 3502 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
|
|
| 3502 | +function geodir_popular_postview_output($args = '', $instance = '') {
|
|
| 3503 | 3503 | global $gd_session; |
| 3504 | 3504 | |
| 3505 | 3505 | // prints the widget |
| 3506 | - extract( $args, EXTR_SKIP ); |
|
| 3506 | + extract($args, EXTR_SKIP); |
|
| 3507 | 3507 | |
| 3508 | 3508 | echo $before_widget; |
| 3509 | 3509 | |
| 3510 | 3510 | /** This filter is documented in geodirectory_widgets.php */ |
| 3511 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3511 | + $title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3512 | 3512 | /** |
| 3513 | 3513 | * Filter the widget post type. |
| 3514 | 3514 | * |
@@ -3516,7 +3516,7 @@ discard block |
||
| 3516 | 3516 | * |
| 3517 | 3517 | * @param string $instance ['post_type'] Post type of listing. |
| 3518 | 3518 | */ |
| 3519 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3519 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3520 | 3520 | /** |
| 3521 | 3521 | * Filter the widget's term. |
| 3522 | 3522 | * |
@@ -3524,7 +3524,7 @@ discard block |
||
| 3524 | 3524 | * |
| 3525 | 3525 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3526 | 3526 | */ |
| 3527 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3527 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3528 | 3528 | /** |
| 3529 | 3529 | * Filter the widget listings limit. |
| 3530 | 3530 | * |
@@ -3532,7 +3532,7 @@ discard block |
||
| 3532 | 3532 | * |
| 3533 | 3533 | * @param string $instance ['post_number'] Number of listings to display. |
| 3534 | 3534 | */ |
| 3535 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3535 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3536 | 3536 | /** |
| 3537 | 3537 | * Filter widget's "layout" type. |
| 3538 | 3538 | * |
@@ -3540,7 +3540,7 @@ discard block |
||
| 3540 | 3540 | * |
| 3541 | 3541 | * @param string $instance ['layout'] Widget layout type. |
| 3542 | 3542 | */ |
| 3543 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); |
|
| 3543 | + $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
|
|
| 3544 | 3544 | /** |
| 3545 | 3545 | * Filter widget's "add_location_filter" value. |
| 3546 | 3546 | * |
@@ -3548,7 +3548,7 @@ discard block |
||
| 3548 | 3548 | * |
| 3549 | 3549 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3550 | 3550 | */ |
| 3551 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3551 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3552 | 3552 | /** |
| 3553 | 3553 | * Filter widget's listing width. |
| 3554 | 3554 | * |
@@ -3556,7 +3556,7 @@ discard block |
||
| 3556 | 3556 | * |
| 3557 | 3557 | * @param string $instance ['listing_width'] Listing width. |
| 3558 | 3558 | */ |
| 3559 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); |
|
| 3559 | + $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
|
|
| 3560 | 3560 | /** |
| 3561 | 3561 | * Filter widget's "list_sort" type. |
| 3562 | 3562 | * |
@@ -3564,25 +3564,25 @@ discard block |
||
| 3564 | 3564 | * |
| 3565 | 3565 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3566 | 3566 | */ |
| 3567 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3568 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; |
|
| 3567 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3568 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; |
|
| 3569 | 3569 | |
| 3570 | 3570 | // set post type to current viewing post type |
| 3571 | - if ( $use_viewing_post_type ) {
|
|
| 3571 | + if ($use_viewing_post_type) {
|
|
| 3572 | 3572 | $current_post_type = geodir_get_current_posttype(); |
| 3573 | - if ( $current_post_type != '' && $current_post_type != $post_type ) {
|
|
| 3573 | + if ($current_post_type != '' && $current_post_type != $post_type) {
|
|
| 3574 | 3574 | $post_type = $current_post_type; |
| 3575 | 3575 | $category = array(); // old post type category will not work for current changed post type |
| 3576 | 3576 | } |
| 3577 | 3577 | } |
| 3578 | 3578 | // replace widget title dynamically |
| 3579 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3580 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); |
|
| 3579 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3580 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); |
|
| 3581 | 3581 | |
| 3582 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); |
|
| 3583 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); |
|
| 3582 | + $title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
|
|
| 3583 | + $title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
|
|
| 3584 | 3584 | |
| 3585 | - if ( isset( $instance['character_count'] ) ) {
|
|
| 3585 | + if (isset($instance['character_count'])) {
|
|
| 3586 | 3586 | /** |
| 3587 | 3587 | * Filter the widget's excerpt character count. |
| 3588 | 3588 | * |
@@ -3590,37 +3590,37 @@ discard block |
||
| 3590 | 3590 | * |
| 3591 | 3591 | * @param int $instance ['character_count'] Excerpt character count. |
| 3592 | 3592 | */ |
| 3593 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); |
|
| 3593 | + $character_count = apply_filters('widget_list_character_count', $instance['character_count']);
|
|
| 3594 | 3594 | } else {
|
| 3595 | 3595 | $character_count = ''; |
| 3596 | 3596 | } |
| 3597 | 3597 | |
| 3598 | - if ( empty( $title ) || $title == 'All' ) {
|
|
| 3599 | - $title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3598 | + if (empty($title) || $title == 'All') {
|
|
| 3599 | + $title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3600 | 3600 | } |
| 3601 | 3601 | |
| 3602 | 3602 | $location_url = array(); |
| 3603 | - $city = get_query_var( 'gd_city' ); |
|
| 3604 | - if ( ! empty( $city ) ) {
|
|
| 3605 | - $country = get_query_var( 'gd_country' ); |
|
| 3606 | - $region = get_query_var( 'gd_region' ); |
|
| 3603 | + $city = get_query_var('gd_city');
|
|
| 3604 | + if (!empty($city)) {
|
|
| 3605 | + $country = get_query_var('gd_country');
|
|
| 3606 | + $region = get_query_var('gd_region');
|
|
| 3607 | 3607 | |
| 3608 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 3608 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 3609 | 3609 | |
| 3610 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 3611 | - if ( $country != '' ) {
|
|
| 3610 | + if ($geodir_show_location_url == 'all') {
|
|
| 3611 | + if ($country != '') {
|
|
| 3612 | 3612 | $location_url[] = $country; |
| 3613 | 3613 | } |
| 3614 | 3614 | |
| 3615 | - if ( $region != '' ) {
|
|
| 3615 | + if ($region != '') {
|
|
| 3616 | 3616 | $location_url[] = $region; |
| 3617 | 3617 | } |
| 3618 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 3619 | - if ( $country != '' ) {
|
|
| 3618 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 3619 | + if ($country != '') {
|
|
| 3620 | 3620 | $location_url[] = $country; |
| 3621 | 3621 | } |
| 3622 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 3623 | - if ( $region != '' ) {
|
|
| 3622 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 3623 | + if ($region != '') {
|
|
| 3624 | 3624 | $location_url[] = $region; |
| 3625 | 3625 | } |
| 3626 | 3626 | } |
@@ -3628,37 +3628,37 @@ discard block |
||
| 3628 | 3628 | $location_url[] = $city; |
| 3629 | 3629 | } |
| 3630 | 3630 | |
| 3631 | - $location_url = implode( '/', $location_url ); |
|
| 3631 | + $location_url = implode('/', $location_url);
|
|
| 3632 | 3632 | $skip_location = false; |
| 3633 | - if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 3633 | + if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
|
|
| 3634 | 3634 | $skip_location = true; |
| 3635 | - $gd_session->un_set( 'gd_multi_location' ); |
|
| 3635 | + $gd_session->un_set('gd_multi_location');
|
|
| 3636 | 3636 | } |
| 3637 | 3637 | |
| 3638 | - if ( get_option( 'permalink_structure' ) ) {
|
|
| 3639 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3638 | + if (get_option('permalink_structure')) {
|
|
| 3639 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3640 | 3640 | } else {
|
| 3641 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3641 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3642 | 3642 | } |
| 3643 | 3643 | |
| 3644 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3644 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3645 | 3645 | global $geodir_add_location_url; |
| 3646 | 3646 | |
| 3647 | 3647 | $geodir_add_location_url = '0'; |
| 3648 | 3648 | |
| 3649 | - if ( $add_location_filter != '0' ) {
|
|
| 3649 | + if ($add_location_filter != '0') {
|
|
| 3650 | 3650 | $geodir_add_location_url = '1'; |
| 3651 | 3651 | } |
| 3652 | 3652 | |
| 3653 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); |
|
| 3653 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); |
|
| 3654 | 3654 | |
| 3655 | 3655 | $geodir_add_location_url = null; |
| 3656 | 3656 | } |
| 3657 | - if ( $skip_location ) {
|
|
| 3658 | - $gd_session->set( 'gd_multi_location', 1 ); |
|
| 3657 | + if ($skip_location) {
|
|
| 3658 | + $gd_session->set('gd_multi_location', 1);
|
|
| 3659 | 3659 | } |
| 3660 | 3660 | |
| 3661 | - if ( is_wp_error( $viewall_url ) ) {
|
|
| 3661 | + if (is_wp_error($viewall_url)) {
|
|
| 3662 | 3662 | $viewall_url = ''; |
| 3663 | 3663 | } |
| 3664 | 3664 | |
@@ -3670,34 +3670,34 @@ discard block |
||
| 3670 | 3670 | 'order_by' => $list_sort |
| 3671 | 3671 | ); |
| 3672 | 3672 | |
| 3673 | - if ( $character_count ) {
|
|
| 3673 | + if ($character_count) {
|
|
| 3674 | 3674 | $query_args['excerpt_length'] = $character_count; |
| 3675 | 3675 | } |
| 3676 | 3676 | |
| 3677 | - if ( ! empty( $instance['show_featured_only'] ) ) {
|
|
| 3677 | + if (!empty($instance['show_featured_only'])) {
|
|
| 3678 | 3678 | $query_args['show_featured_only'] = 1; |
| 3679 | 3679 | } |
| 3680 | 3680 | |
| 3681 | - if ( ! empty( $instance['show_special_only'] ) ) {
|
|
| 3681 | + if (!empty($instance['show_special_only'])) {
|
|
| 3682 | 3682 | $query_args['show_special_only'] = 1; |
| 3683 | 3683 | } |
| 3684 | 3684 | |
| 3685 | - if ( ! empty( $instance['with_pics_only'] ) ) {
|
|
| 3685 | + if (!empty($instance['with_pics_only'])) {
|
|
| 3686 | 3686 | $query_args['with_pics_only'] = 0; |
| 3687 | 3687 | $query_args['featured_image_only'] = 1; |
| 3688 | 3688 | } |
| 3689 | 3689 | |
| 3690 | - if ( ! empty( $instance['with_videos_only'] ) ) {
|
|
| 3690 | + if (!empty($instance['with_videos_only'])) {
|
|
| 3691 | 3691 | $query_args['with_videos_only'] = 1; |
| 3692 | 3692 | } |
| 3693 | - $with_no_results = ! empty( $instance['without_no_results'] ) ? false : true; |
|
| 3693 | + $with_no_results = !empty($instance['without_no_results']) ? false : true; |
|
| 3694 | 3694 | |
| 3695 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3696 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3695 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3696 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3697 | 3697 | |
| 3698 | 3698 | ######### WPML ######### |
| 3699 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 3700 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); |
|
| 3699 | + if (function_exists('icl_object_id')) {
|
|
| 3700 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); |
|
| 3701 | 3701 | } |
| 3702 | 3702 | ######### WPML ######### |
| 3703 | 3703 | |
@@ -3707,14 +3707,14 @@ discard block |
||
| 3707 | 3707 | 'terms' => $category |
| 3708 | 3708 | ); |
| 3709 | 3709 | |
| 3710 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3710 | + $query_args['tax_query'] = array($tax_query); |
|
| 3711 | 3711 | } |
| 3712 | 3712 | |
| 3713 | 3713 | global $gridview_columns_widget, $geodir_is_widget_listing; |
| 3714 | 3714 | |
| 3715 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3715 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3716 | 3716 | |
| 3717 | - if ( ! empty( $widget_listings ) || $with_no_results ) {
|
|
| 3717 | + if (!empty($widget_listings) || $with_no_results) {
|
|
| 3718 | 3718 | ?> |
| 3719 | 3719 | <div class="geodir_locations geodir_location_listing"> |
| 3720 | 3720 | |
@@ -3724,11 +3724,11 @@ discard block |
||
| 3724 | 3724 | * |
| 3725 | 3725 | * @since 1.0.0 |
| 3726 | 3726 | */ |
| 3727 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> |
|
| 3727 | + do_action('geodir_before_view_all_link_in_widget'); ?>
|
|
| 3728 | 3728 | <div class="geodir_list_heading clearfix"> |
| 3729 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 3729 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 3730 | 3730 | <a href="<?php echo $viewall_url; ?>" |
| 3731 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> |
|
| 3731 | + class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
|
|
| 3732 | 3732 | </div> |
| 3733 | 3733 | <?php |
| 3734 | 3734 | /** |
@@ -3736,10 +3736,10 @@ discard block |
||
| 3736 | 3736 | * |
| 3737 | 3737 | * @since 1.0.0 |
| 3738 | 3738 | */ |
| 3739 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> |
|
| 3739 | + do_action('geodir_after_view_all_link_in_widget'); ?>
|
|
| 3740 | 3740 | <?php |
| 3741 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 3742 | - $listing_view_exp = explode( '_', $layout ); |
|
| 3741 | + if (strstr($layout, 'gridview')) {
|
|
| 3742 | + $listing_view_exp = explode('_', $layout);
|
|
| 3743 | 3743 | $gridview_columns_widget = $layout; |
| 3744 | 3744 | $layout = $listing_view_exp[0]; |
| 3745 | 3745 | } else {
|
@@ -3751,8 +3751,8 @@ discard block |
||
| 3751 | 3751 | * |
| 3752 | 3752 | * @since 1.0.0 |
| 3753 | 3753 | */ |
| 3754 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 3755 | - if ( ! isset( $character_count ) ) {
|
|
| 3754 | + $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 3755 | + if (!isset($character_count)) {
|
|
| 3756 | 3756 | /** |
| 3757 | 3757 | * Filter the widget's excerpt character count. |
| 3758 | 3758 | * |
@@ -3760,7 +3760,7 @@ discard block |
||
| 3760 | 3760 | * |
| 3761 | 3761 | * @param int $instance ['character_count'] Excerpt character count. |
| 3762 | 3762 | */ |
| 3763 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); |
|
| 3763 | + $character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
|
|
| 3764 | 3764 | } |
| 3765 | 3765 | |
| 3766 | 3766 | global $post, $map_jason, $map_canvas_arr; |
@@ -3775,13 +3775,13 @@ discard block |
||
| 3775 | 3775 | * |
| 3776 | 3776 | * @since 1.0.0 |
| 3777 | 3777 | */ |
| 3778 | - include( $template ); |
|
| 3778 | + include($template); |
|
| 3779 | 3779 | |
| 3780 | 3780 | $geodir_is_widget_listing = false; |
| 3781 | 3781 | |
| 3782 | 3782 | $GLOBALS['post'] = $current_post; |
| 3783 | - if ( ! empty( $current_post ) ) {
|
|
| 3784 | - setup_postdata( $current_post ); |
|
| 3783 | + if (!empty($current_post)) {
|
|
| 3784 | + setup_postdata($current_post); |
|
| 3785 | 3785 | } |
| 3786 | 3786 | $map_jason = $current_map_jason; |
| 3787 | 3787 | $map_canvas_arr = $current_map_canvas_arr; |
@@ -3812,12 +3812,12 @@ discard block |
||
| 3812 | 3812 | * |
| 3813 | 3813 | * @return int Reviews count. |
| 3814 | 3814 | */ |
| 3815 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
|
|
| 3815 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
|
|
| 3816 | 3816 | global $wpdb, $plugin_prefix; |
| 3817 | 3817 | |
| 3818 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 3818 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 3819 | 3819 | |
| 3820 | - $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 . ")";
|
|
| 3820 | + $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.")";
|
|
| 3821 | 3821 | |
| 3822 | 3822 | /** |
| 3823 | 3823 | * Filter count review sql query. |
@@ -3829,9 +3829,9 @@ discard block |
||
| 3829 | 3829 | * @param int $taxonomy The taxonomy Id. |
| 3830 | 3830 | * @param string $post_type The post type. |
| 3831 | 3831 | */ |
| 3832 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); |
|
| 3832 | + $sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
|
|
| 3833 | 3833 | |
| 3834 | - $count = $wpdb->get_var( $sql ); |
|
| 3834 | + $count = $wpdb->get_var($sql); |
|
| 3835 | 3835 | |
| 3836 | 3836 | return $count; |
| 3837 | 3837 | } |
@@ -3849,7 +3849,7 @@ discard block |
||
| 3849 | 3849 | * |
| 3850 | 3850 | * @return array Term array data. |
| 3851 | 3851 | */ |
| 3852 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
|
|
| 3852 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
|
|
| 3853 | 3853 | /** |
| 3854 | 3854 | * Filter review count option data. |
| 3855 | 3855 | * |
@@ -3859,78 +3859,78 @@ discard block |
||
| 3859 | 3859 | * @param bool $force_update Force update option value?. Default.false. |
| 3860 | 3860 | * @param int $post_ID The post id to update if any. |
| 3861 | 3861 | */ |
| 3862 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); |
|
| 3863 | - if ( ! empty( $option_data ) ) {
|
|
| 3862 | + $option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
|
|
| 3863 | + if (!empty($option_data)) {
|
|
| 3864 | 3864 | return $option_data; |
| 3865 | 3865 | } |
| 3866 | 3866 | |
| 3867 | - $option_data = get_option( 'geodir_global_review_count' ); |
|
| 3867 | + $option_data = get_option('geodir_global_review_count');
|
|
| 3868 | 3868 | |
| 3869 | - if ( ! $option_data || $force_update ) {
|
|
| 3870 | - if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
|
|
| 3869 | + if (!$option_data || $force_update) {
|
|
| 3870 | + if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
|
|
| 3871 | 3871 | global $gd_session; |
| 3872 | 3872 | $term_array = (array) $option_data; |
| 3873 | - $post_type = get_post_type( $post_ID ); |
|
| 3874 | - $taxonomy = $post_type . 'category'; |
|
| 3875 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); |
|
| 3876 | - |
|
| 3877 | - if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
|
|
| 3878 | - foreach ( $terms as $term_id ) {
|
|
| 3879 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 3880 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 3881 | - $term_array[ $term_id ] = $count; |
|
| 3873 | + $post_type = get_post_type($post_ID); |
|
| 3874 | + $taxonomy = $post_type.'category'; |
|
| 3875 | + $terms = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
|
|
| 3876 | + |
|
| 3877 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 3878 | + foreach ($terms as $term_id) {
|
|
| 3879 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 3880 | + $children = get_term_children($term_id, $taxonomy); |
|
| 3881 | + $term_array[$term_id] = $count; |
|
| 3882 | 3882 | } |
| 3883 | 3883 | } |
| 3884 | 3884 | |
| 3885 | - $session_listing = $gd_session->get( 'listing' ); |
|
| 3885 | + $session_listing = $gd_session->get('listing');
|
|
| 3886 | 3886 | |
| 3887 | 3887 | $terms = array(); |
| 3888 | - if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
|
|
| 3889 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; |
|
| 3890 | - } else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
|
|
| 3891 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; |
|
| 3888 | + if (isset($_POST['post_category'][$taxonomy])) {
|
|
| 3889 | + $terms = (array) $_POST['post_category'][$taxonomy]; |
|
| 3890 | + } else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
|
|
| 3891 | + $terms = (array) $session_listing['post_category'][$taxonomy]; |
|
| 3892 | 3892 | } |
| 3893 | 3893 | |
| 3894 | - if ( ! empty( $terms ) ) {
|
|
| 3895 | - foreach ( $terms as $term_id ) {
|
|
| 3896 | - if ( $term_id > 0 ) {
|
|
| 3897 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 3898 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 3899 | - $term_array[ $term_id ] = $count; |
|
| 3894 | + if (!empty($terms)) {
|
|
| 3895 | + foreach ($terms as $term_id) {
|
|
| 3896 | + if ($term_id > 0) {
|
|
| 3897 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 3898 | + $children = get_term_children($term_id, $taxonomy); |
|
| 3899 | + $term_array[$term_id] = $count; |
|
| 3900 | 3900 | } |
| 3901 | 3901 | } |
| 3902 | 3902 | } |
| 3903 | 3903 | } else { // Update reviews count for all post categories.
|
| 3904 | 3904 | $term_array = array(); |
| 3905 | 3905 | $post_types = geodir_get_posttypes(); |
| 3906 | - foreach ( $post_types as $post_type ) {
|
|
| 3906 | + foreach ($post_types as $post_type) {
|
|
| 3907 | 3907 | |
| 3908 | - $taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3908 | + $taxonomy = geodir_get_taxonomies($post_type); |
|
| 3909 | 3909 | $taxonomy = $taxonomy[0]; |
| 3910 | 3910 | |
| 3911 | 3911 | $args = array( |
| 3912 | 3912 | 'hide_empty' => false |
| 3913 | 3913 | ); |
| 3914 | 3914 | |
| 3915 | - $terms = get_terms( $taxonomy, $args ); |
|
| 3915 | + $terms = get_terms($taxonomy, $args); |
|
| 3916 | 3916 | |
| 3917 | - foreach ( $terms as $term ) {
|
|
| 3918 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); |
|
| 3919 | - $children = get_term_children( $term->term_id, $taxonomy ); |
|
| 3917 | + foreach ($terms as $term) {
|
|
| 3918 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); |
|
| 3919 | + $children = get_term_children($term->term_id, $taxonomy); |
|
| 3920 | 3920 | /*if ( is_array( $children ) ) {
|
| 3921 | 3921 | foreach ( $children as $child_id ) {
|
| 3922 | 3922 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); |
| 3923 | 3923 | $count = $count + $child_count; |
| 3924 | 3924 | } |
| 3925 | 3925 | }*/ |
| 3926 | - $term_array[ $term->term_id ] = $count; |
|
| 3926 | + $term_array[$term->term_id] = $count; |
|
| 3927 | 3927 | } |
| 3928 | 3928 | } |
| 3929 | 3929 | } |
| 3930 | 3930 | |
| 3931 | - update_option( 'geodir_global_review_count', $term_array ); |
|
| 3931 | + update_option('geodir_global_review_count', $term_array);
|
|
| 3932 | 3932 | //clear cache |
| 3933 | - wp_cache_delete( 'geodir_global_review_count' ); |
|
| 3933 | + wp_cache_delete('geodir_global_review_count');
|
|
| 3934 | 3934 | |
| 3935 | 3935 | return $term_array; |
| 3936 | 3936 | } else {
|
@@ -3946,39 +3946,39 @@ discard block |
||
| 3946 | 3946 | * @package GeoDirectory |
| 3947 | 3947 | * @return bool |
| 3948 | 3948 | */ |
| 3949 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
|
|
| 3950 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
|
|
| 3949 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
|
|
| 3950 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
|
|
| 3951 | 3951 | return; // do not run if importing listings |
| 3952 | 3952 | } |
| 3953 | 3953 | |
| 3954 | - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
|
|
| 3954 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
|
|
| 3955 | 3955 | return; |
| 3956 | 3956 | } |
| 3957 | 3957 | |
| 3958 | 3958 | $post_ID = 0; |
| 3959 | - if ( ! empty( $post ) ) {
|
|
| 3960 | - if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
|
|
| 3959 | + if (!empty($post)) {
|
|
| 3960 | + if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
|
|
| 3961 | 3961 | return; |
| 3962 | 3962 | } |
| 3963 | 3963 | |
| 3964 | - if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
|
|
| 3964 | + if ($new_status == 'auto-draft' && $old_status == 'new') {
|
|
| 3965 | 3965 | return; |
| 3966 | 3966 | } |
| 3967 | 3967 | |
| 3968 | - if ( ! empty( $post->ID ) ) {
|
|
| 3968 | + if (!empty($post->ID)) {
|
|
| 3969 | 3969 | $post_ID = $post->ID; |
| 3970 | 3970 | } |
| 3971 | 3971 | } |
| 3972 | 3972 | |
| 3973 | - if ( $new_status != $old_status ) {
|
|
| 3974 | - geodir_count_reviews_by_terms( true, $post_ID ); |
|
| 3973 | + if ($new_status != $old_status) {
|
|
| 3974 | + geodir_count_reviews_by_terms(true, $post_ID); |
|
| 3975 | 3975 | } |
| 3976 | 3976 | |
| 3977 | 3977 | return true; |
| 3978 | 3978 | } |
| 3979 | 3979 | |
| 3980 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
|
|
| 3981 | - geodir_count_reviews_by_terms( true, $post_id ); |
|
| 3980 | +function geodir_term_review_count_force_update_single_post($post_id) {
|
|
| 3981 | + geodir_count_reviews_by_terms(true, $post_id); |
|
| 3982 | 3982 | } |
| 3983 | 3983 | |
| 3984 | 3984 | /*-----------------------------------------------------------------------------------*/ |
@@ -3995,11 +3995,11 @@ discard block |
||
| 3995 | 3995 | * |
| 3996 | 3996 | * @return int Post count. |
| 3997 | 3997 | */ |
| 3998 | -function geodir_count_posts_by_term( $data, $term ) {
|
|
| 3998 | +function geodir_count_posts_by_term($data, $term) {
|
|
| 3999 | 3999 | |
| 4000 | - if ( $data ) {
|
|
| 4001 | - if ( isset( $data[ $term->term_id ] ) ) {
|
|
| 4002 | - return $data[ $term->term_id ]; |
|
| 4000 | + if ($data) {
|
|
| 4001 | + if (isset($data[$term->term_id])) {
|
|
| 4002 | + return $data[$term->term_id]; |
|
| 4003 | 4003 | } else {
|
| 4004 | 4004 | return 0; |
| 4005 | 4005 | } |
@@ -4016,8 +4016,8 @@ discard block |
||
| 4016 | 4016 | * param array $terms An array of term objects. |
| 4017 | 4017 | * @return array Sorted terms array. |
| 4018 | 4018 | */ |
| 4019 | -function geodir_sort_terms_by_count( $terms ) {
|
|
| 4020 | - usort( $terms, "geodir_sort_by_count_obj" ); |
|
| 4019 | +function geodir_sort_terms_by_count($terms) {
|
|
| 4020 | + usort($terms, "geodir_sort_by_count_obj"); |
|
| 4021 | 4021 | |
| 4022 | 4022 | return $terms; |
| 4023 | 4023 | } |
@@ -4032,8 +4032,8 @@ discard block |
||
| 4032 | 4032 | * |
| 4033 | 4033 | * @return array Sorted terms array. |
| 4034 | 4034 | */ |
| 4035 | -function geodir_sort_terms_by_review_count( $terms ) {
|
|
| 4036 | - usort( $terms, "geodir_sort_by_review_count_obj" ); |
|
| 4035 | +function geodir_sort_terms_by_review_count($terms) {
|
|
| 4036 | + usort($terms, "geodir_sort_by_review_count_obj"); |
|
| 4037 | 4037 | |
| 4038 | 4038 | return $terms; |
| 4039 | 4039 | } |
@@ -4049,12 +4049,12 @@ discard block |
||
| 4049 | 4049 | * |
| 4050 | 4050 | * @return array Sorted terms array. |
| 4051 | 4051 | */ |
| 4052 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
|
|
| 4053 | - if ( $sort == 'count' ) {
|
|
| 4054 | - return geodir_sort_terms_by_count( $terms ); |
|
| 4052 | +function geodir_sort_terms($terms, $sort = 'count') {
|
|
| 4053 | + if ($sort == 'count') {
|
|
| 4054 | + return geodir_sort_terms_by_count($terms); |
|
| 4055 | 4055 | } |
| 4056 | - if ( $sort == 'review_count' ) {
|
|
| 4057 | - return geodir_sort_terms_by_review_count( $terms ); |
|
| 4056 | + if ($sort == 'review_count') {
|
|
| 4057 | + return geodir_sort_terms_by_review_count($terms); |
|
| 4058 | 4058 | } |
| 4059 | 4059 | } |
| 4060 | 4060 | |
@@ -4072,7 +4072,7 @@ discard block |
||
| 4072 | 4072 | * |
| 4073 | 4073 | * @return bool |
| 4074 | 4074 | */ |
| 4075 | -function geodir_sort_by_count( $a, $b ) {
|
|
| 4075 | +function geodir_sort_by_count($a, $b) {
|
|
| 4076 | 4076 | return $a['count'] < $b['count']; |
| 4077 | 4077 | } |
| 4078 | 4078 | |
@@ -4087,7 +4087,7 @@ discard block |
||
| 4087 | 4087 | * |
| 4088 | 4088 | * @return bool |
| 4089 | 4089 | */ |
| 4090 | -function geodir_sort_by_count_obj( $a, $b ) {
|
|
| 4090 | +function geodir_sort_by_count_obj($a, $b) {
|
|
| 4091 | 4091 | return $a->count < $b->count; |
| 4092 | 4092 | } |
| 4093 | 4093 | |
@@ -4102,7 +4102,7 @@ discard block |
||
| 4102 | 4102 | * |
| 4103 | 4103 | * @return bool |
| 4104 | 4104 | */ |
| 4105 | -function geodir_sort_by_review_count_obj( $a, $b ) {
|
|
| 4105 | +function geodir_sort_by_review_count_obj($a, $b) {
|
|
| 4106 | 4106 | return $a->review_count < $b->review_count; |
| 4107 | 4107 | } |
| 4108 | 4108 | |
@@ -4119,35 +4119,35 @@ discard block |
||
| 4119 | 4119 | * @since 1.4.2 |
| 4120 | 4120 | * @package GeoDirectory |
| 4121 | 4121 | */ |
| 4122 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); |
|
| 4122 | + $locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
|
|
| 4123 | 4123 | |
| 4124 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); |
|
| 4125 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); |
|
| 4124 | + load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
|
|
| 4125 | + load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
|
|
| 4126 | 4126 | |
| 4127 | 4127 | /** |
| 4128 | 4128 | * Define language constants. |
| 4129 | 4129 | * |
| 4130 | 4130 | * @since 1.0.0 |
| 4131 | 4131 | */ |
| 4132 | - require_once( geodir_plugin_path() . '/language.php' ); |
|
| 4132 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 4133 | 4133 | |
| 4134 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4134 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4135 | 4135 | |
| 4136 | 4136 | // Load language string file if not created yet |
| 4137 | - if ( ! file_exists( $language_file ) ) {
|
|
| 4137 | + if (!file_exists($language_file)) {
|
|
| 4138 | 4138 | geodirectory_load_db_language(); |
| 4139 | 4139 | } |
| 4140 | 4140 | |
| 4141 | - if ( file_exists( $language_file ) ) {
|
|
| 4141 | + if (file_exists($language_file)) {
|
|
| 4142 | 4142 | /** |
| 4143 | 4143 | * Language strings from database. |
| 4144 | 4144 | * |
| 4145 | 4145 | * @since 1.4.2 |
| 4146 | 4146 | */ |
| 4147 | 4147 | try {
|
| 4148 | - require_once( $language_file ); |
|
| 4149 | - } catch ( Exception $e ) {
|
|
| 4150 | - error_log( 'Language Error: ' . $e->getMessage() ); |
|
| 4148 | + require_once($language_file); |
|
| 4149 | + } catch (Exception $e) {
|
|
| 4150 | + error_log('Language Error: '.$e->getMessage());
|
|
| 4151 | 4151 | } |
| 4152 | 4152 | } |
| 4153 | 4153 | } |
@@ -4164,19 +4164,19 @@ discard block |
||
| 4164 | 4164 | */ |
| 4165 | 4165 | function geodirectory_load_db_language() {
|
| 4166 | 4166 | global $wp_filesystem; |
| 4167 | - if ( empty( $wp_filesystem ) ) {
|
|
| 4168 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); |
|
| 4167 | + if (empty($wp_filesystem)) {
|
|
| 4168 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); |
|
| 4169 | 4169 | WP_Filesystem(); |
| 4170 | 4170 | global $wp_filesystem; |
| 4171 | 4171 | } |
| 4172 | 4172 | |
| 4173 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4173 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4174 | 4174 | |
| 4175 | - if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
|
|
| 4175 | + if (is_file($language_file) && !is_writable($language_file)) {
|
|
| 4176 | 4176 | return false; |
| 4177 | 4177 | } // Not possible to create. |
| 4178 | 4178 | |
| 4179 | - if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
|
|
| 4179 | + if (!is_file($language_file) && !is_writable(dirname($language_file))) {
|
|
| 4180 | 4180 | return false; |
| 4181 | 4181 | } // Not possible to create. |
| 4182 | 4182 | |
@@ -4190,9 +4190,9 @@ discard block |
||
| 4190 | 4190 | * |
| 4191 | 4191 | * @param array $contents_strings Array of strings. |
| 4192 | 4192 | */ |
| 4193 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); |
|
| 4193 | + $contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
|
|
| 4194 | 4194 | |
| 4195 | - $contents_strings = array_unique( $contents_strings ); |
|
| 4195 | + $contents_strings = array_unique($contents_strings); |
|
| 4196 | 4196 | |
| 4197 | 4197 | $contents_head = array(); |
| 4198 | 4198 | $contents_head[] = "<?php"; |
@@ -4209,21 +4209,21 @@ discard block |
||
| 4209 | 4209 | $contents_foot[] = ""; |
| 4210 | 4210 | $contents_foot[] = ""; |
| 4211 | 4211 | |
| 4212 | - $contents = implode( PHP_EOL, $contents_head ); |
|
| 4212 | + $contents = implode(PHP_EOL, $contents_head); |
|
| 4213 | 4213 | |
| 4214 | - if ( ! empty( $contents_strings ) ) {
|
|
| 4215 | - foreach ( $contents_strings as $string ) {
|
|
| 4216 | - if ( is_scalar( $string ) && $string != '' ) {
|
|
| 4217 | - $string = str_replace( "'", "\'", $string ); |
|
| 4218 | - geodir_wpml_register_string( $string ); |
|
| 4219 | - $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
|
|
| 4214 | + if (!empty($contents_strings)) {
|
|
| 4215 | + foreach ($contents_strings as $string) {
|
|
| 4216 | + if (is_scalar($string) && $string != '') {
|
|
| 4217 | + $string = str_replace("'", "\'", $string);
|
|
| 4218 | + geodir_wpml_register_string($string); |
|
| 4219 | + $contents .= PHP_EOL."__('".$string."', 'geodirectory');";
|
|
| 4220 | 4220 | } |
| 4221 | 4221 | } |
| 4222 | 4222 | } |
| 4223 | 4223 | |
| 4224 | - $contents .= implode( PHP_EOL, $contents_foot ); |
|
| 4224 | + $contents .= implode(PHP_EOL, $contents_foot); |
|
| 4225 | 4225 | |
| 4226 | - if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
|
|
| 4226 | + if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
|
|
| 4227 | 4227 | return false; |
| 4228 | 4228 | } // Failure; could not write file. |
| 4229 | 4229 | |
@@ -4244,49 +4244,49 @@ discard block |
||
| 4244 | 4244 | * |
| 4245 | 4245 | * @return array Translation texts. |
| 4246 | 4246 | */ |
| 4247 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
|
|
| 4247 | +function geodir_load_custom_field_translation($translation_texts = array()) {
|
|
| 4248 | 4248 | global $wpdb; |
| 4249 | 4249 | |
| 4250 | 4250 | // Custom fields table |
| 4251 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4252 | - $rows = $wpdb->get_results( $sql ); |
|
| 4251 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4252 | + $rows = $wpdb->get_results($sql); |
|
| 4253 | 4253 | |
| 4254 | - if ( ! empty( $rows ) ) {
|
|
| 4255 | - foreach ( $rows as $row ) {
|
|
| 4256 | - if ( ! empty( $row->admin_title ) ) {
|
|
| 4257 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); |
|
| 4254 | + if (!empty($rows)) {
|
|
| 4255 | + foreach ($rows as $row) {
|
|
| 4256 | + if (!empty($row->admin_title)) {
|
|
| 4257 | + $translation_texts[] = stripslashes_deep($row->admin_title); |
|
| 4258 | 4258 | } |
| 4259 | 4259 | |
| 4260 | - if ( ! empty( $row->admin_desc ) ) {
|
|
| 4261 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); |
|
| 4260 | + if (!empty($row->admin_desc)) {
|
|
| 4261 | + $translation_texts[] = stripslashes_deep($row->admin_desc); |
|
| 4262 | 4262 | } |
| 4263 | 4263 | |
| 4264 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4265 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4264 | + if (!empty($row->site_title)) {
|
|
| 4265 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4266 | 4266 | } |
| 4267 | 4267 | |
| 4268 | - if ( ! empty( $row->clabels ) ) {
|
|
| 4269 | - $translation_texts[] = stripslashes_deep( $row->clabels ); |
|
| 4268 | + if (!empty($row->clabels)) {
|
|
| 4269 | + $translation_texts[] = stripslashes_deep($row->clabels); |
|
| 4270 | 4270 | } |
| 4271 | 4271 | |
| 4272 | - if ( ! empty( $row->required_msg ) ) {
|
|
| 4273 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); |
|
| 4272 | + if (!empty($row->required_msg)) {
|
|
| 4273 | + $translation_texts[] = stripslashes_deep($row->required_msg); |
|
| 4274 | 4274 | } |
| 4275 | 4275 | |
| 4276 | - if ( ! empty( $row->validation_msg ) ) {
|
|
| 4277 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); |
|
| 4276 | + if (!empty($row->validation_msg)) {
|
|
| 4277 | + $translation_texts[] = stripslashes_deep($row->validation_msg); |
|
| 4278 | 4278 | } |
| 4279 | 4279 | |
| 4280 | - if ( ! empty( $row->default_value ) ) {
|
|
| 4281 | - $translation_texts[] = stripslashes_deep( $row->default_value ); |
|
| 4280 | + if (!empty($row->default_value)) {
|
|
| 4281 | + $translation_texts[] = stripslashes_deep($row->default_value); |
|
| 4282 | 4282 | } |
| 4283 | 4283 | |
| 4284 | - if ( ! empty( $row->option_values ) ) {
|
|
| 4285 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); |
|
| 4284 | + if (!empty($row->option_values)) {
|
|
| 4285 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); |
|
| 4286 | 4286 | |
| 4287 | - if ( ! empty( $option_values ) ) {
|
|
| 4288 | - foreach ( $option_values as $option_value ) {
|
|
| 4289 | - if ( ! empty( $option_value['label'] ) ) {
|
|
| 4287 | + if (!empty($option_values)) {
|
|
| 4288 | + foreach ($option_values as $option_value) {
|
|
| 4289 | + if (!empty($option_value['label'])) {
|
|
| 4290 | 4290 | $translation_texts[] = $option_value['label']; |
| 4291 | 4291 | } |
| 4292 | 4292 | } |
@@ -4296,56 +4296,56 @@ discard block |
||
| 4296 | 4296 | } |
| 4297 | 4297 | |
| 4298 | 4298 | // Custom sorting fields table |
| 4299 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4300 | - $rows = $wpdb->get_results( $sql ); |
|
| 4299 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4300 | + $rows = $wpdb->get_results($sql); |
|
| 4301 | 4301 | |
| 4302 | - if ( ! empty( $rows ) ) {
|
|
| 4303 | - foreach ( $rows as $row ) {
|
|
| 4304 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4305 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4302 | + if (!empty($rows)) {
|
|
| 4303 | + foreach ($rows as $row) {
|
|
| 4304 | + if (!empty($row->site_title)) {
|
|
| 4305 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4306 | 4306 | } |
| 4307 | 4307 | |
| 4308 | - if ( ! empty( $row->asc_title ) ) {
|
|
| 4309 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); |
|
| 4308 | + if (!empty($row->asc_title)) {
|
|
| 4309 | + $translation_texts[] = stripslashes_deep($row->asc_title); |
|
| 4310 | 4310 | } |
| 4311 | 4311 | |
| 4312 | - if ( ! empty( $row->desc_title ) ) {
|
|
| 4313 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); |
|
| 4312 | + if (!empty($row->desc_title)) {
|
|
| 4313 | + $translation_texts[] = stripslashes_deep($row->desc_title); |
|
| 4314 | 4314 | } |
| 4315 | 4315 | } |
| 4316 | 4316 | } |
| 4317 | 4317 | |
| 4318 | 4318 | // Advance search filter fields table |
| 4319 | - if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
|
|
| 4320 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4321 | - $rows = $wpdb->get_results( $sql ); |
|
| 4322 | - |
|
| 4323 | - if ( ! empty( $rows ) ) {
|
|
| 4324 | - foreach ( $rows as $row ) {
|
|
| 4325 | - if ( ! empty( $row->field_site_name ) ) {
|
|
| 4326 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); |
|
| 4319 | + if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
|
|
| 4320 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4321 | + $rows = $wpdb->get_results($sql); |
|
| 4322 | + |
|
| 4323 | + if (!empty($rows)) {
|
|
| 4324 | + foreach ($rows as $row) {
|
|
| 4325 | + if (!empty($row->field_site_name)) {
|
|
| 4326 | + $translation_texts[] = stripslashes_deep($row->field_site_name); |
|
| 4327 | 4327 | } |
| 4328 | 4328 | |
| 4329 | - if ( ! empty( $row->front_search_title ) ) {
|
|
| 4330 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); |
|
| 4329 | + if (!empty($row->front_search_title)) {
|
|
| 4330 | + $translation_texts[] = stripslashes_deep($row->front_search_title); |
|
| 4331 | 4331 | } |
| 4332 | 4332 | |
| 4333 | - if ( ! empty( $row->first_search_text ) ) {
|
|
| 4334 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); |
|
| 4333 | + if (!empty($row->first_search_text)) {
|
|
| 4334 | + $translation_texts[] = stripslashes_deep($row->first_search_text); |
|
| 4335 | 4335 | } |
| 4336 | 4336 | |
| 4337 | - if ( ! empty( $row->last_search_text ) ) {
|
|
| 4338 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); |
|
| 4337 | + if (!empty($row->last_search_text)) {
|
|
| 4338 | + $translation_texts[] = stripslashes_deep($row->last_search_text); |
|
| 4339 | 4339 | } |
| 4340 | 4340 | |
| 4341 | - if ( ! empty( $row->field_desc ) ) {
|
|
| 4342 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); |
|
| 4341 | + if (!empty($row->field_desc)) {
|
|
| 4342 | + $translation_texts[] = stripslashes_deep($row->field_desc); |
|
| 4343 | 4343 | } |
| 4344 | 4344 | } |
| 4345 | 4345 | } |
| 4346 | 4346 | } |
| 4347 | 4347 | |
| 4348 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4348 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4349 | 4349 | |
| 4350 | 4350 | return $translation_texts; |
| 4351 | 4351 | } |
@@ -4367,7 +4367,7 @@ discard block |
||
| 4367 | 4367 | * |
| 4368 | 4368 | * @param array $geodir_allowed_mime_types and file extensions. |
| 4369 | 4369 | */ |
| 4370 | - return apply_filters( 'geodir_allowed_mime_types', array( |
|
| 4370 | + return apply_filters('geodir_allowed_mime_types', array(
|
|
| 4371 | 4371 | 'Image' => array( // Image formats. |
| 4372 | 4372 | 'jpg' => 'image/jpeg', |
| 4373 | 4373 | 'jpe' => 'image/jpeg', |
@@ -4435,18 +4435,18 @@ discard block |
||
| 4435 | 4435 | * |
| 4436 | 4436 | * @return string User display name. |
| 4437 | 4437 | */ |
| 4438 | -function geodir_get_client_name( $user_id ) {
|
|
| 4438 | +function geodir_get_client_name($user_id) {
|
|
| 4439 | 4439 | $client_name = ''; |
| 4440 | 4440 | |
| 4441 | - $user_data = get_userdata( $user_id ); |
|
| 4441 | + $user_data = get_userdata($user_id); |
|
| 4442 | 4442 | |
| 4443 | - if ( ! empty( $user_data ) ) {
|
|
| 4444 | - if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
|
|
| 4445 | - $client_name = trim( $user_data->display_name ); |
|
| 4446 | - } else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
|
|
| 4447 | - $client_name = trim( $user_data->user_nicename ); |
|
| 4443 | + if (!empty($user_data)) {
|
|
| 4444 | + if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
|
|
| 4445 | + $client_name = trim($user_data->display_name); |
|
| 4446 | + } else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
|
|
| 4447 | + $client_name = trim($user_data->user_nicename); |
|
| 4448 | 4448 | } else {
|
| 4449 | - $client_name = trim( $user_data->user_login ); |
|
| 4449 | + $client_name = trim($user_data->user_login); |
|
| 4450 | 4450 | } |
| 4451 | 4451 | } |
| 4452 | 4452 | |
@@ -4454,19 +4454,19 @@ discard block |
||
| 4454 | 4454 | } |
| 4455 | 4455 | |
| 4456 | 4456 | |
| 4457 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); |
|
| 4457 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
|
|
| 4458 | 4458 | /* |
| 4459 | 4459 | * Add location variables to wpseo replacements. |
| 4460 | 4460 | * |
| 4461 | 4461 | * @since 1.5.4 |
| 4462 | 4462 | */ |
| 4463 | -function geodir_wpseo_replacements( $vars ) {
|
|
| 4463 | +function geodir_wpseo_replacements($vars) {
|
|
| 4464 | 4464 | |
| 4465 | 4465 | global $wp; |
| 4466 | 4466 | $title = ''; |
| 4467 | 4467 | // location variables |
| 4468 | 4468 | $gd_post_type = geodir_get_current_posttype(); |
| 4469 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4469 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4470 | 4470 | /** |
| 4471 | 4471 | * Filter the title variables location variables array |
| 4472 | 4472 | * |
@@ -4476,105 +4476,105 @@ discard block |
||
| 4476 | 4476 | * @param array $location_array The array of location variables. |
| 4477 | 4477 | * @param array $vars The page title variables. |
| 4478 | 4478 | */ |
| 4479 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); |
|
| 4479 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
|
|
| 4480 | 4480 | $location_titles = array(); |
| 4481 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4482 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4483 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); |
|
| 4481 | + if (get_query_var('gd_country_full')) {
|
|
| 4482 | + if (get_query_var('gd_country_full')) {
|
|
| 4483 | + $location_array['gd_country'] = get_query_var('gd_country_full');
|
|
| 4484 | 4484 | } |
| 4485 | - if ( get_query_var( 'gd_region_full' ) ) {
|
|
| 4486 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); |
|
| 4485 | + if (get_query_var('gd_region_full')) {
|
|
| 4486 | + $location_array['gd_region'] = get_query_var('gd_region_full');
|
|
| 4487 | 4487 | } |
| 4488 | - if ( get_query_var( 'gd_city_full' ) ) {
|
|
| 4489 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); |
|
| 4488 | + if (get_query_var('gd_city_full')) {
|
|
| 4489 | + $location_array['gd_city'] = get_query_var('gd_city_full');
|
|
| 4490 | 4490 | } |
| 4491 | 4491 | } |
| 4492 | 4492 | $location_single = ''; |
| 4493 | - $gd_country = ( isset( $wp->query_vars['gd_country'] ) && $wp->query_vars['gd_country'] != '' ) ? $wp->query_vars['gd_country'] : ''; |
|
| 4494 | - $gd_region = ( isset( $wp->query_vars['gd_region'] ) && $wp->query_vars['gd_region'] != '' ) ? $wp->query_vars['gd_region'] : ''; |
|
| 4495 | - $gd_city = ( isset( $wp->query_vars['gd_city'] ) && $wp->query_vars['gd_city'] != '' ) ? $wp->query_vars['gd_city'] : ''; |
|
| 4493 | + $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
| 4494 | + $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
| 4495 | + $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
| 4496 | 4496 | |
| 4497 | 4497 | $gd_country_actual = $gd_region_actual = $gd_city_actual = ''; |
| 4498 | 4498 | |
| 4499 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 4500 | - $gd_country_actual = $gd_country != '' ? get_actual_location_name( 'country', $gd_country, true ) : $gd_country; |
|
| 4501 | - $gd_region_actual = $gd_region != '' ? get_actual_location_name( 'region', $gd_region ) : $gd_region; |
|
| 4502 | - $gd_city_actual = $gd_city != '' ? get_actual_location_name( 'city', $gd_city ) : $gd_city; |
|
| 4499 | + if (function_exists('get_actual_location_name')) {
|
|
| 4500 | + $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;
|
|
| 4501 | + $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;
|
|
| 4502 | + $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;
|
|
| 4503 | 4503 | } |
| 4504 | 4504 | |
| 4505 | - if ( $gd_city != '' ) {
|
|
| 4506 | - if ( $gd_city_actual != '' ) {
|
|
| 4505 | + if ($gd_city != '') {
|
|
| 4506 | + if ($gd_city_actual != '') {
|
|
| 4507 | 4507 | $gd_city = $gd_city_actual; |
| 4508 | 4508 | } else {
|
| 4509 | - $gd_city = preg_replace( '/-(\d+)$/', '', $gd_city ); |
|
| 4510 | - $gd_city = preg_replace( '/[_-]/', ' ', $gd_city ); |
|
| 4511 | - $gd_city = __( geodir_ucwords( $gd_city ), 'geodirectory' ); |
|
| 4509 | + $gd_city = preg_replace('/-(\d+)$/', '', $gd_city);
|
|
| 4510 | + $gd_city = preg_replace('/[_-]/', ' ', $gd_city);
|
|
| 4511 | + $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); |
|
| 4512 | 4512 | } |
| 4513 | 4513 | $location_single = $gd_city; |
| 4514 | 4514 | |
| 4515 | - } else if ( $gd_region != '' ) {
|
|
| 4516 | - if ( $gd_region_actual != '' ) {
|
|
| 4515 | + } else if ($gd_region != '') {
|
|
| 4516 | + if ($gd_region_actual != '') {
|
|
| 4517 | 4517 | $gd_region = $gd_region_actual; |
| 4518 | 4518 | } else {
|
| 4519 | - $gd_region = preg_replace( '/-(\d+)$/', '', $gd_region ); |
|
| 4520 | - $gd_region = preg_replace( '/[_-]/', ' ', $gd_region ); |
|
| 4521 | - $gd_region = __( geodir_ucwords( $gd_region ), 'geodirectory' ); |
|
| 4519 | + $gd_region = preg_replace('/-(\d+)$/', '', $gd_region);
|
|
| 4520 | + $gd_region = preg_replace('/[_-]/', ' ', $gd_region);
|
|
| 4521 | + $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); |
|
| 4522 | 4522 | } |
| 4523 | 4523 | |
| 4524 | 4524 | $location_single = $gd_region; |
| 4525 | - } else if ( $gd_country != '' ) {
|
|
| 4526 | - if ( $gd_country_actual != '' ) {
|
|
| 4525 | + } else if ($gd_country != '') {
|
|
| 4526 | + if ($gd_country_actual != '') {
|
|
| 4527 | 4527 | $gd_country = $gd_country_actual; |
| 4528 | 4528 | } else {
|
| 4529 | - $gd_country = preg_replace( '/-(\d+)$/', '', $gd_country ); |
|
| 4530 | - $gd_country = preg_replace( '/[_-]/', ' ', $gd_country ); |
|
| 4531 | - $gd_country = __( geodir_ucwords( $gd_country ), 'geodirectory' ); |
|
| 4529 | + $gd_country = preg_replace('/-(\d+)$/', '', $gd_country);
|
|
| 4530 | + $gd_country = preg_replace('/[_-]/', ' ', $gd_country);
|
|
| 4531 | + $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); |
|
| 4532 | 4532 | } |
| 4533 | 4533 | |
| 4534 | 4534 | $location_single = $gd_country; |
| 4535 | 4535 | } |
| 4536 | 4536 | |
| 4537 | - if ( ! empty( $location_array ) ) {
|
|
| 4537 | + if (!empty($location_array)) {
|
|
| 4538 | 4538 | |
| 4539 | - $actual_location_name = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 4540 | - $location_array = array_reverse( $location_array ); |
|
| 4539 | + $actual_location_name = function_exists('get_actual_location_name') ? true : false;
|
|
| 4540 | + $location_array = array_reverse($location_array); |
|
| 4541 | 4541 | |
| 4542 | - foreach ( $location_array as $location_type => $location ) {
|
|
| 4543 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location ); |
|
| 4544 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 4542 | + foreach ($location_array as $location_type => $location) {
|
|
| 4543 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location);
|
|
| 4544 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 4545 | 4545 | |
| 4546 | - $location_name = geodir_ucwords( $gd_location_link_text ); |
|
| 4547 | - $location_name = __( $location_name, 'geodirectory' ); |
|
| 4546 | + $location_name = geodir_ucwords($gd_location_link_text); |
|
| 4547 | + $location_name = __($location_name, 'geodirectory'); |
|
| 4548 | 4548 | |
| 4549 | - if ( $actual_location_name ) {
|
|
| 4550 | - $location_type = strpos( $location_type, 'gd_' ) === 0 ? substr( $location_type, 3 ) : $location_type; |
|
| 4551 | - $location_name = get_actual_location_name( $location_type, $location, true ); |
|
| 4549 | + if ($actual_location_name) {
|
|
| 4550 | + $location_type = strpos($location_type, 'gd_') === 0 ? substr($location_type, 3) : $location_type; |
|
| 4551 | + $location_name = get_actual_location_name($location_type, $location, true); |
|
| 4552 | 4552 | } |
| 4553 | 4553 | |
| 4554 | 4554 | $location_titles[] = $location_name; |
| 4555 | 4555 | } |
| 4556 | - if ( ! empty( $location_titles ) ) {
|
|
| 4557 | - $location_titles = array_unique( $location_titles ); |
|
| 4556 | + if (!empty($location_titles)) {
|
|
| 4557 | + $location_titles = array_unique($location_titles); |
|
| 4558 | 4558 | } |
| 4559 | 4559 | } |
| 4560 | 4560 | |
| 4561 | 4561 | |
| 4562 | - if ( ! empty( $location_titles ) ) {
|
|
| 4563 | - $vars['%%location%%'] = implode( ", ", $location_titles ); |
|
| 4562 | + if (!empty($location_titles)) {
|
|
| 4563 | + $vars['%%location%%'] = implode(", ", $location_titles);
|
|
| 4564 | 4564 | } |
| 4565 | 4565 | |
| 4566 | 4566 | |
| 4567 | - if ( ! empty( $location_titles ) ) {
|
|
| 4568 | - $vars['%%in_location%%'] = __( 'in ', 'geodirectory' ) . implode( ", ", $location_titles ); |
|
| 4567 | + if (!empty($location_titles)) {
|
|
| 4568 | + $vars['%%in_location%%'] = __('in ', 'geodirectory').implode(", ", $location_titles);
|
|
| 4569 | 4569 | } |
| 4570 | 4570 | |
| 4571 | 4571 | |
| 4572 | - if ( $location_single ) {
|
|
| 4573 | - $vars['%%in_location_single%%'] = __( 'in', 'geodirectory' ) . ' ' . $location_single; |
|
| 4572 | + if ($location_single) {
|
|
| 4573 | + $vars['%%in_location_single%%'] = __('in', 'geodirectory').' '.$location_single;
|
|
| 4574 | 4574 | } |
| 4575 | 4575 | |
| 4576 | 4576 | |
| 4577 | - if ( $location_single ) {
|
|
| 4577 | + if ($location_single) {
|
|
| 4578 | 4578 | $vars['%%location_single%%'] = $location_single; |
| 4579 | 4579 | } |
| 4580 | 4580 | |
@@ -4587,13 +4587,13 @@ discard block |
||
| 4587 | 4587 | * @param string $vars The title with variables. |
| 4588 | 4588 | * @param array $location_array The array of location variables. |
| 4589 | 4589 | */ |
| 4590 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); |
|
| 4590 | + return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
|
|
| 4591 | 4591 | } |
| 4592 | 4592 | |
| 4593 | 4593 | |
| 4594 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4595 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); |
|
| 4596 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4594 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
|
|
| 4595 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
|
|
| 4596 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
|
|
| 4597 | 4597 | |
| 4598 | 4598 | /** |
| 4599 | 4599 | * Filter the title variables. |
@@ -4635,14 +4635,14 @@ discard block |
||
| 4635 | 4635 | * |
| 4636 | 4636 | * @return string Title after filtered variables. |
| 4637 | 4637 | */ |
| 4638 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
|
|
| 4638 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
|
|
| 4639 | 4639 | global $wp, $post; |
| 4640 | 4640 | |
| 4641 | - if ( ! $gd_page || ! $title ) {
|
|
| 4641 | + if (!$gd_page || !$title) {
|
|
| 4642 | 4642 | return $title; // if no a GD page then bail. |
| 4643 | 4643 | } |
| 4644 | 4644 | |
| 4645 | - if ( $sep == '' ) {
|
|
| 4645 | + if ($sep == '') {
|
|
| 4646 | 4646 | /** |
| 4647 | 4647 | * Filter the page title separator. |
| 4648 | 4648 | * |
@@ -4651,100 +4651,100 @@ discard block |
||
| 4651 | 4651 | * |
| 4652 | 4652 | * @param string $sep The separator, default: `|`. |
| 4653 | 4653 | */ |
| 4654 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); |
|
| 4654 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 4655 | 4655 | } |
| 4656 | 4656 | |
| 4657 | - if ( strpos( $title, '%%title%%' ) !== false ) {
|
|
| 4658 | - $title = str_replace( "%%title%%", $post->post_title, $title ); |
|
| 4657 | + if (strpos($title, '%%title%%') !== false) {
|
|
| 4658 | + $title = str_replace("%%title%%", $post->post_title, $title);
|
|
| 4659 | 4659 | } |
| 4660 | 4660 | |
| 4661 | - if ( strpos( $title, '%%sitename%%' ) !== false ) {
|
|
| 4662 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); |
|
| 4661 | + if (strpos($title, '%%sitename%%') !== false) {
|
|
| 4662 | + $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
|
|
| 4663 | 4663 | } |
| 4664 | 4664 | |
| 4665 | - if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
|
|
| 4666 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); |
|
| 4665 | + if (strpos($title, '%%sitedesc%%') !== false) {
|
|
| 4666 | + $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
|
|
| 4667 | 4667 | } |
| 4668 | 4668 | |
| 4669 | - if ( strpos( $title, '%%excerpt%%' ) !== false ) {
|
|
| 4670 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); |
|
| 4669 | + if (strpos($title, '%%excerpt%%') !== false) {
|
|
| 4670 | + $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
|
|
| 4671 | 4671 | } |
| 4672 | 4672 | |
| 4673 | - if ( $gd_page == 'search' || $gd_page == 'author' ) {
|
|
| 4674 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; |
|
| 4675 | - } else if ( $gd_page == 'add-listing' ) {
|
|
| 4676 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; |
|
| 4677 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; |
|
| 4678 | - } else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 4673 | + if ($gd_page == 'search' || $gd_page == 'author') {
|
|
| 4674 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; |
|
| 4675 | + } else if ($gd_page == 'add-listing') {
|
|
| 4676 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 4677 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; |
|
| 4678 | + } else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 4679 | 4679 | $post_type = $post->post_type; |
| 4680 | 4680 | } else {
|
| 4681 | - $post_type = get_query_var( 'post_type' ); |
|
| 4681 | + $post_type = get_query_var('post_type');
|
|
| 4682 | 4682 | } |
| 4683 | 4683 | |
| 4684 | - if ( strpos( $title, '%%pt_single%%' ) !== false ) {
|
|
| 4684 | + if (strpos($title, '%%pt_single%%') !== false) {
|
|
| 4685 | 4685 | $singular_name = ''; |
| 4686 | - if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
|
|
| 4687 | - $singular_name = __( $singular_name, 'geodirectory' ); |
|
| 4686 | + if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
|
|
| 4687 | + $singular_name = __($singular_name, 'geodirectory'); |
|
| 4688 | 4688 | } |
| 4689 | 4689 | |
| 4690 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); |
|
| 4690 | + $title = str_replace("%%pt_single%%", $singular_name, $title);
|
|
| 4691 | 4691 | } |
| 4692 | 4692 | |
| 4693 | - if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
|
|
| 4693 | + if (strpos($title, '%%pt_plural%%') !== false) {
|
|
| 4694 | 4694 | $plural_name = ''; |
| 4695 | - if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
|
|
| 4696 | - $plural_name = __( $plural_name, 'geodirectory' ); |
|
| 4695 | + if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
|
|
| 4696 | + $plural_name = __($plural_name, 'geodirectory'); |
|
| 4697 | 4697 | } |
| 4698 | 4698 | |
| 4699 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); |
|
| 4699 | + $title = str_replace("%%pt_plural%%", $plural_name, $title);
|
|
| 4700 | 4700 | } |
| 4701 | 4701 | |
| 4702 | - if ( strpos( $title, '%%category%%' ) !== false ) {
|
|
| 4702 | + if (strpos($title, '%%category%%') !== false) {
|
|
| 4703 | 4703 | $cat_name = ''; |
| 4704 | 4704 | |
| 4705 | - if ( $gd_page == 'detail' ) {
|
|
| 4706 | - if ( $post->default_category ) {
|
|
| 4707 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4708 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4705 | + if ($gd_page == 'detail') {
|
|
| 4706 | + if ($post->default_category) {
|
|
| 4707 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4708 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4709 | 4709 | } |
| 4710 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4710 | + } else if ($gd_page == 'listing') {
|
|
| 4711 | 4711 | $queried_object = get_queried_object(); |
| 4712 | - if ( isset( $queried_object->name ) ) {
|
|
| 4712 | + if (isset($queried_object->name)) {
|
|
| 4713 | 4713 | $cat_name = $queried_object->name; |
| 4714 | 4714 | } |
| 4715 | 4715 | } |
| 4716 | - $title = str_replace( "%%category%%", $cat_name, $title ); |
|
| 4716 | + $title = str_replace("%%category%%", $cat_name, $title);
|
|
| 4717 | 4717 | } |
| 4718 | 4718 | |
| 4719 | - if ( strpos( $title, '%%tag%%' ) !== false ) {
|
|
| 4719 | + if (strpos($title, '%%tag%%') !== false) {
|
|
| 4720 | 4720 | $cat_name = ''; |
| 4721 | 4721 | |
| 4722 | - if ( $gd_page == 'detail' ) {
|
|
| 4723 | - if ( $post->default_category ) {
|
|
| 4724 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4725 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4722 | + if ($gd_page == 'detail') {
|
|
| 4723 | + if ($post->default_category) {
|
|
| 4724 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4725 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4726 | 4726 | } |
| 4727 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4727 | + } else if ($gd_page == 'listing') {
|
|
| 4728 | 4728 | $queried_object = get_queried_object(); |
| 4729 | - if ( isset( $queried_object->name ) ) {
|
|
| 4729 | + if (isset($queried_object->name)) {
|
|
| 4730 | 4730 | $cat_name = $queried_object->name; |
| 4731 | 4731 | } |
| 4732 | 4732 | } |
| 4733 | - $title = str_replace( "%%tag%%", $cat_name, $title ); |
|
| 4733 | + $title = str_replace("%%tag%%", $cat_name, $title);
|
|
| 4734 | 4734 | } |
| 4735 | 4735 | |
| 4736 | - if ( strpos( $title, '%%id%%' ) !== false ) {
|
|
| 4737 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; |
|
| 4738 | - $title = str_replace( "%%id%%", $ID, $title ); |
|
| 4736 | + if (strpos($title, '%%id%%') !== false) {
|
|
| 4737 | + $ID = (isset($post->ID)) ? $post->ID : ''; |
|
| 4738 | + $title = str_replace("%%id%%", $ID, $title);
|
|
| 4739 | 4739 | } |
| 4740 | 4740 | |
| 4741 | - if ( strpos( $title, '%%sep%%' ) !== false ) {
|
|
| 4742 | - $title = str_replace( "%%sep%%", $sep, $title ); |
|
| 4741 | + if (strpos($title, '%%sep%%') !== false) {
|
|
| 4742 | + $title = str_replace("%%sep%%", $sep, $title);
|
|
| 4743 | 4743 | } |
| 4744 | 4744 | |
| 4745 | 4745 | // location variables |
| 4746 | 4746 | $gd_post_type = geodir_get_current_posttype(); |
| 4747 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4747 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4748 | 4748 | /** |
| 4749 | 4749 | * Filter the title variables location variables array |
| 4750 | 4750 | * |
@@ -4756,166 +4756,166 @@ discard block |
||
| 4756 | 4756 | * @param string $gd_page The page being filtered. |
| 4757 | 4757 | * @param string $sep The separator, default: `|`. |
| 4758 | 4758 | */ |
| 4759 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); |
|
| 4759 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
|
|
| 4760 | 4760 | $location_titles = array(); |
| 4761 | - if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
|
|
| 4762 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4763 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); |
|
| 4761 | + if ($gd_page == 'location' && get_query_var('gd_country_full')) {
|
|
| 4762 | + if (get_query_var('gd_country_full')) {
|
|
| 4763 | + $location_array['gd_country'] = get_query_var('gd_country_full');
|
|
| 4764 | 4764 | } |
| 4765 | - if ( get_query_var( 'gd_region_full' ) ) {
|
|
| 4766 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); |
|
| 4765 | + if (get_query_var('gd_region_full')) {
|
|
| 4766 | + $location_array['gd_region'] = get_query_var('gd_region_full');
|
|
| 4767 | 4767 | } |
| 4768 | - if ( get_query_var( 'gd_city_full' ) ) {
|
|
| 4769 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); |
|
| 4768 | + if (get_query_var('gd_city_full')) {
|
|
| 4769 | + $location_array['gd_city'] = get_query_var('gd_city_full');
|
|
| 4770 | 4770 | } |
| 4771 | 4771 | } |
| 4772 | 4772 | $location_single = ''; |
| 4773 | - $gd_country = ( isset( $wp->query_vars['gd_country'] ) && $wp->query_vars['gd_country'] != '' ) ? $wp->query_vars['gd_country'] : ''; |
|
| 4774 | - $gd_region = ( isset( $wp->query_vars['gd_region'] ) && $wp->query_vars['gd_region'] != '' ) ? $wp->query_vars['gd_region'] : ''; |
|
| 4775 | - $gd_city = ( isset( $wp->query_vars['gd_city'] ) && $wp->query_vars['gd_city'] != '' ) ? $wp->query_vars['gd_city'] : ''; |
|
| 4773 | + $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
| 4774 | + $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
| 4775 | + $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
| 4776 | 4776 | |
| 4777 | 4777 | $gd_country_actual = $gd_region_actual = $gd_city_actual = ''; |
| 4778 | 4778 | |
| 4779 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 4780 | - $gd_country_actual = $gd_country != '' ? get_actual_location_name( 'country', $gd_country, true ) : $gd_country; |
|
| 4781 | - $gd_region_actual = $gd_region != '' ? get_actual_location_name( 'region', $gd_region ) : $gd_region; |
|
| 4782 | - $gd_city_actual = $gd_city != '' ? get_actual_location_name( 'city', $gd_city ) : $gd_city; |
|
| 4779 | + if (function_exists('get_actual_location_name')) {
|
|
| 4780 | + $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;
|
|
| 4781 | + $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;
|
|
| 4782 | + $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;
|
|
| 4783 | 4783 | } |
| 4784 | 4784 | |
| 4785 | - if ( $gd_city != '' ) {
|
|
| 4786 | - if ( $gd_city_actual != '' ) {
|
|
| 4785 | + if ($gd_city != '') {
|
|
| 4786 | + if ($gd_city_actual != '') {
|
|
| 4787 | 4787 | $gd_city = $gd_city_actual; |
| 4788 | 4788 | } else {
|
| 4789 | - $gd_city = preg_replace( '/-(\d+)$/', '', $gd_city ); |
|
| 4790 | - $gd_city = preg_replace( '/[_-]/', ' ', $gd_city ); |
|
| 4791 | - $gd_city = __( geodir_ucwords( $gd_city ), 'geodirectory' ); |
|
| 4789 | + $gd_city = preg_replace('/-(\d+)$/', '', $gd_city);
|
|
| 4790 | + $gd_city = preg_replace('/[_-]/', ' ', $gd_city);
|
|
| 4791 | + $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); |
|
| 4792 | 4792 | } |
| 4793 | 4793 | $location_single = $gd_city; |
| 4794 | 4794 | |
| 4795 | - } else if ( $gd_region != '' ) {
|
|
| 4796 | - if ( $gd_region_actual != '' ) {
|
|
| 4795 | + } else if ($gd_region != '') {
|
|
| 4796 | + if ($gd_region_actual != '') {
|
|
| 4797 | 4797 | $gd_region = $gd_region_actual; |
| 4798 | 4798 | } else {
|
| 4799 | - $gd_region = preg_replace( '/-(\d+)$/', '', $gd_region ); |
|
| 4800 | - $gd_region = preg_replace( '/[_-]/', ' ', $gd_region ); |
|
| 4801 | - $gd_region = __( geodir_ucwords( $gd_region ), 'geodirectory' ); |
|
| 4799 | + $gd_region = preg_replace('/-(\d+)$/', '', $gd_region);
|
|
| 4800 | + $gd_region = preg_replace('/[_-]/', ' ', $gd_region);
|
|
| 4801 | + $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); |
|
| 4802 | 4802 | } |
| 4803 | 4803 | |
| 4804 | 4804 | $location_single = $gd_region; |
| 4805 | - } else if ( $gd_country != '' ) {
|
|
| 4806 | - if ( $gd_country_actual != '' ) {
|
|
| 4805 | + } else if ($gd_country != '') {
|
|
| 4806 | + if ($gd_country_actual != '') {
|
|
| 4807 | 4807 | $gd_country = $gd_country_actual; |
| 4808 | 4808 | } else {
|
| 4809 | - $gd_country = preg_replace( '/-(\d+)$/', '', $gd_country ); |
|
| 4810 | - $gd_country = preg_replace( '/[_-]/', ' ', $gd_country ); |
|
| 4811 | - $gd_country = __( geodir_ucwords( $gd_country ), 'geodirectory' ); |
|
| 4809 | + $gd_country = preg_replace('/-(\d+)$/', '', $gd_country);
|
|
| 4810 | + $gd_country = preg_replace('/[_-]/', ' ', $gd_country);
|
|
| 4811 | + $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); |
|
| 4812 | 4812 | } |
| 4813 | 4813 | |
| 4814 | 4814 | $location_single = $gd_country; |
| 4815 | 4815 | } |
| 4816 | 4816 | |
| 4817 | - if ( ! empty( $location_array ) ) {
|
|
| 4817 | + if (!empty($location_array)) {
|
|
| 4818 | 4818 | |
| 4819 | - $actual_location_name = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 4820 | - $location_array = array_reverse( $location_array ); |
|
| 4819 | + $actual_location_name = function_exists('get_actual_location_name') ? true : false;
|
|
| 4820 | + $location_array = array_reverse($location_array); |
|
| 4821 | 4821 | |
| 4822 | - foreach ( $location_array as $location_type => $location ) {
|
|
| 4823 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location ); |
|
| 4824 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 4822 | + foreach ($location_array as $location_type => $location) {
|
|
| 4823 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location);
|
|
| 4824 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 4825 | 4825 | |
| 4826 | - $location_name = geodir_ucwords( $gd_location_link_text ); |
|
| 4827 | - $location_name = __( $location_name, 'geodirectory' ); |
|
| 4826 | + $location_name = geodir_ucwords($gd_location_link_text); |
|
| 4827 | + $location_name = __($location_name, 'geodirectory'); |
|
| 4828 | 4828 | |
| 4829 | - if ( $actual_location_name ) {
|
|
| 4830 | - $location_type = strpos( $location_type, 'gd_' ) === 0 ? substr( $location_type, 3 ) : $location_type; |
|
| 4831 | - $location_name = get_actual_location_name( $location_type, $location, true ); |
|
| 4829 | + if ($actual_location_name) {
|
|
| 4830 | + $location_type = strpos($location_type, 'gd_') === 0 ? substr($location_type, 3) : $location_type; |
|
| 4831 | + $location_name = get_actual_location_name($location_type, $location, true); |
|
| 4832 | 4832 | } |
| 4833 | 4833 | |
| 4834 | 4834 | $location_titles[] = $location_name; |
| 4835 | 4835 | } |
| 4836 | - if ( ! empty( $location_titles ) ) {
|
|
| 4837 | - $location_titles = array_unique( $location_titles ); |
|
| 4836 | + if (!empty($location_titles)) {
|
|
| 4837 | + $location_titles = array_unique($location_titles); |
|
| 4838 | 4838 | } |
| 4839 | 4839 | } |
| 4840 | 4840 | |
| 4841 | 4841 | |
| 4842 | - if ( strpos( $title, '%%location%%' ) !== false ) {
|
|
| 4842 | + if (strpos($title, '%%location%%') !== false) {
|
|
| 4843 | 4843 | $location = ''; |
| 4844 | - if ( $location_titles ) {
|
|
| 4845 | - $location = implode( ", ", $location_titles ); |
|
| 4844 | + if ($location_titles) {
|
|
| 4845 | + $location = implode(", ", $location_titles);
|
|
| 4846 | 4846 | } |
| 4847 | - $title = str_replace( "%%location%%", $location, $title ); |
|
| 4847 | + $title = str_replace("%%location%%", $location, $title);
|
|
| 4848 | 4848 | } |
| 4849 | 4849 | |
| 4850 | - if ( strpos( $title, '%%in_location%%' ) !== false ) {
|
|
| 4850 | + if (strpos($title, '%%in_location%%') !== false) {
|
|
| 4851 | 4851 | $location = ''; |
| 4852 | - if ( $location_titles ) {
|
|
| 4853 | - $location = __( 'in ', 'geodirectory' ) . implode( ", ", $location_titles ); |
|
| 4852 | + if ($location_titles) {
|
|
| 4853 | + $location = __('in ', 'geodirectory').implode(", ", $location_titles);
|
|
| 4854 | 4854 | } |
| 4855 | - $title = str_replace( "%%in_location%%", $location, $title ); |
|
| 4855 | + $title = str_replace("%%in_location%%", $location, $title);
|
|
| 4856 | 4856 | } |
| 4857 | 4857 | |
| 4858 | - if ( strpos( $title, '%%in_location_single%%' ) !== false ) {
|
|
| 4859 | - if ( $location_single ) {
|
|
| 4860 | - $location_single = __( 'in', 'geodirectory' ) . ' ' . $location_single; |
|
| 4858 | + if (strpos($title, '%%in_location_single%%') !== false) {
|
|
| 4859 | + if ($location_single) {
|
|
| 4860 | + $location_single = __('in', 'geodirectory').' '.$location_single;
|
|
| 4861 | 4861 | } |
| 4862 | - $title = str_replace( "%%in_location_single%%", $location_single, $title ); |
|
| 4862 | + $title = str_replace("%%in_location_single%%", $location_single, $title);
|
|
| 4863 | 4863 | } |
| 4864 | 4864 | |
| 4865 | - if ( strpos( $title, '%%location_single%%' ) !== false ) {
|
|
| 4866 | - $title = str_replace( "%%location_single%%", $location_single, $title ); |
|
| 4865 | + if (strpos($title, '%%location_single%%') !== false) {
|
|
| 4866 | + $title = str_replace("%%location_single%%", $location_single, $title);
|
|
| 4867 | 4867 | } |
| 4868 | 4868 | |
| 4869 | 4869 | |
| 4870 | - if ( strpos( $title, '%%search_term%%' ) !== false ) {
|
|
| 4870 | + if (strpos($title, '%%search_term%%') !== false) {
|
|
| 4871 | 4871 | $search_term = ''; |
| 4872 | - if ( isset( $_REQUEST['s'] ) ) {
|
|
| 4873 | - $search_term = esc_attr( $_REQUEST['s'] ); |
|
| 4872 | + if (isset($_REQUEST['s'])) {
|
|
| 4873 | + $search_term = esc_attr($_REQUEST['s']); |
|
| 4874 | 4874 | } |
| 4875 | - $title = str_replace( "%%search_term%%", $search_term, $title ); |
|
| 4875 | + $title = str_replace("%%search_term%%", $search_term, $title);
|
|
| 4876 | 4876 | } |
| 4877 | 4877 | |
| 4878 | - if ( strpos( $title, '%%search_near%%' ) !== false ) {
|
|
| 4878 | + if (strpos($title, '%%search_near%%') !== false) {
|
|
| 4879 | 4879 | $search_term = ''; |
| 4880 | - if ( isset( $_REQUEST['snear'] ) ) {
|
|
| 4881 | - $search_term = esc_attr( $_REQUEST['snear'] ); |
|
| 4880 | + if (isset($_REQUEST['snear'])) {
|
|
| 4881 | + $search_term = esc_attr($_REQUEST['snear']); |
|
| 4882 | 4882 | } |
| 4883 | - $title = str_replace( "%%search_near%%", $search_term, $title ); |
|
| 4883 | + $title = str_replace("%%search_near%%", $search_term, $title);
|
|
| 4884 | 4884 | } |
| 4885 | 4885 | |
| 4886 | - if ( strpos( $title, '%%name%%' ) !== false ) {
|
|
| 4887 | - if ( is_author() ) {
|
|
| 4888 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); |
|
| 4886 | + if (strpos($title, '%%name%%') !== false) {
|
|
| 4887 | + if (is_author()) {
|
|
| 4888 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 4889 | 4889 | $author_name = $curauth->display_name; |
| 4890 | 4890 | } else {
|
| 4891 | 4891 | $author_name = get_the_author(); |
| 4892 | 4892 | } |
| 4893 | - if ( ! $author_name || $author_name === '' ) {
|
|
| 4893 | + if (!$author_name || $author_name === '') {
|
|
| 4894 | 4894 | $queried_object = get_queried_object(); |
| 4895 | 4895 | |
| 4896 | - if ( isset( $queried_object->data->user_nicename ) ) {
|
|
| 4896 | + if (isset($queried_object->data->user_nicename)) {
|
|
| 4897 | 4897 | $author_name = $queried_object->data->display_name; |
| 4898 | 4898 | } |
| 4899 | 4899 | } |
| 4900 | - $title = str_replace( "%%name%%", $author_name, $title ); |
|
| 4900 | + $title = str_replace("%%name%%", $author_name, $title);
|
|
| 4901 | 4901 | } |
| 4902 | 4902 | |
| 4903 | - if ( strpos( $title, '%%page%%' ) !== false ) {
|
|
| 4904 | - $page = geodir_title_meta_page( $sep ); |
|
| 4905 | - $title = str_replace( "%%page%%", $page, $title ); |
|
| 4903 | + if (strpos($title, '%%page%%') !== false) {
|
|
| 4904 | + $page = geodir_title_meta_page($sep); |
|
| 4905 | + $title = str_replace("%%page%%", $page, $title);
|
|
| 4906 | 4906 | } |
| 4907 | - if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
|
|
| 4907 | + if (strpos($title, '%%pagenumber%%') !== false) {
|
|
| 4908 | 4908 | $pagenumber = geodir_title_meta_pagenumber(); |
| 4909 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); |
|
| 4909 | + $title = str_replace("%%pagenumber%%", $pagenumber, $title);
|
|
| 4910 | 4910 | } |
| 4911 | - if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
|
|
| 4911 | + if (strpos($title, '%%pagetotal%%') !== false) {
|
|
| 4912 | 4912 | $pagetotal = geodir_title_meta_pagetotal(); |
| 4913 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); |
|
| 4913 | + $title = str_replace("%%pagetotal%%", $pagetotal, $title);
|
|
| 4914 | 4914 | } |
| 4915 | 4915 | |
| 4916 | - $title = wptexturize( $title ); |
|
| 4917 | - $title = convert_chars( $title ); |
|
| 4918 | - $title = esc_html( $title ); |
|
| 4916 | + $title = wptexturize($title); |
|
| 4917 | + $title = convert_chars($title); |
|
| 4918 | + $title = esc_html($title); |
|
| 4919 | 4919 | |
| 4920 | 4920 | /** |
| 4921 | 4921 | * Filter the title variables after standard ones have been filtered. |
@@ -4929,7 +4929,7 @@ discard block |
||
| 4929 | 4929 | * @param string $sep The separator, default: `|`. |
| 4930 | 4930 | */ |
| 4931 | 4931 | |
| 4932 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); |
|
| 4932 | + return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
|
|
| 4933 | 4933 | } |
| 4934 | 4934 | |
| 4935 | 4935 | /** |
@@ -4942,82 +4942,82 @@ discard block |
||
| 4942 | 4942 | * |
| 4943 | 4943 | * @return array Translation texts. |
| 4944 | 4944 | */ |
| 4945 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
|
|
| 4946 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 4945 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
|
|
| 4946 | + $gd_post_types = geodir_get_posttypes('array');
|
|
| 4947 | 4947 | |
| 4948 | - if ( ! empty( $gd_post_types ) ) {
|
|
| 4949 | - foreach ( $gd_post_types as $post_type => $cpt_info ) {
|
|
| 4950 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; |
|
| 4951 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; |
|
| 4952 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; |
|
| 4948 | + if (!empty($gd_post_types)) {
|
|
| 4949 | + foreach ($gd_post_types as $post_type => $cpt_info) {
|
|
| 4950 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; |
|
| 4951 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; |
|
| 4952 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; |
|
| 4953 | 4953 | |
| 4954 | - if ( ! empty( $labels ) ) {
|
|
| 4955 | - if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
|
|
| 4954 | + if (!empty($labels)) {
|
|
| 4955 | + if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
|
|
| 4956 | 4956 | $translation_texts[] = $labels['name']; |
| 4957 | 4957 | } |
| 4958 | - if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
|
|
| 4958 | + if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
|
|
| 4959 | 4959 | $translation_texts[] = $labels['singular_name']; |
| 4960 | 4960 | } |
| 4961 | - if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
|
|
| 4961 | + if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
|
|
| 4962 | 4962 | $translation_texts[] = $labels['add_new']; |
| 4963 | 4963 | } |
| 4964 | - if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
|
|
| 4964 | + if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
|
|
| 4965 | 4965 | $translation_texts[] = $labels['add_new_item']; |
| 4966 | 4966 | } |
| 4967 | - if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
|
|
| 4967 | + if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
|
|
| 4968 | 4968 | $translation_texts[] = $labels['edit_item']; |
| 4969 | 4969 | } |
| 4970 | - if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
|
|
| 4970 | + if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
|
|
| 4971 | 4971 | $translation_texts[] = $labels['new_item']; |
| 4972 | 4972 | } |
| 4973 | - if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
|
|
| 4973 | + if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
|
|
| 4974 | 4974 | $translation_texts[] = $labels['view_item']; |
| 4975 | 4975 | } |
| 4976 | - if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
|
|
| 4976 | + if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
|
|
| 4977 | 4977 | $translation_texts[] = $labels['search_items']; |
| 4978 | 4978 | } |
| 4979 | - if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
|
|
| 4979 | + if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
|
|
| 4980 | 4980 | $translation_texts[] = $labels['not_found']; |
| 4981 | 4981 | } |
| 4982 | - if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
|
|
| 4982 | + if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
|
|
| 4983 | 4983 | $translation_texts[] = $labels['not_found_in_trash']; |
| 4984 | 4984 | } |
| 4985 | - if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
|
|
| 4985 | + if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
|
|
| 4986 | 4986 | $translation_texts[] = $labels['label_post_profile']; |
| 4987 | 4987 | } |
| 4988 | - if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
|
|
| 4988 | + if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
|
|
| 4989 | 4989 | $translation_texts[] = $labels['label_post_info']; |
| 4990 | 4990 | } |
| 4991 | - if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
|
|
| 4991 | + if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
|
|
| 4992 | 4992 | $translation_texts[] = $labels['label_post_images']; |
| 4993 | 4993 | } |
| 4994 | - if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
|
|
| 4994 | + if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
|
|
| 4995 | 4995 | $translation_texts[] = $labels['label_post_map']; |
| 4996 | 4996 | } |
| 4997 | - if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
|
|
| 4997 | + if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
|
|
| 4998 | 4998 | $translation_texts[] = $labels['label_reviews']; |
| 4999 | 4999 | } |
| 5000 | - if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
|
|
| 5000 | + if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
|
|
| 5001 | 5001 | $translation_texts[] = $labels['label_related_listing']; |
| 5002 | 5002 | } |
| 5003 | 5003 | } |
| 5004 | 5004 | |
| 5005 | - if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
|
|
| 5006 | - $translation_texts[] = normalize_whitespace( $description ); |
|
| 5005 | + if ($description != '' && !in_array($description, $translation_texts)) {
|
|
| 5006 | + $translation_texts[] = normalize_whitespace($description); |
|
| 5007 | 5007 | } |
| 5008 | 5008 | |
| 5009 | - if ( ! empty( $seo ) ) {
|
|
| 5010 | - if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
|
|
| 5011 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); |
|
| 5009 | + if (!empty($seo)) {
|
|
| 5010 | + if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
|
|
| 5011 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); |
|
| 5012 | 5012 | } |
| 5013 | 5013 | |
| 5014 | - if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
|
|
| 5015 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); |
|
| 5014 | + if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
|
|
| 5015 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); |
|
| 5016 | 5016 | } |
| 5017 | 5017 | } |
| 5018 | 5018 | } |
| 5019 | 5019 | } |
| 5020 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 5020 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 5021 | 5021 | |
| 5022 | 5022 | return $translation_texts; |
| 5023 | 5023 | } |
@@ -5032,27 +5032,27 @@ discard block |
||
| 5032 | 5032 | * |
| 5033 | 5033 | * @return array Location terms. |
| 5034 | 5034 | */ |
| 5035 | -function geodir_remove_location_terms( $location_terms = array() ) {
|
|
| 5036 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 5035 | +function geodir_remove_location_terms($location_terms = array()) {
|
|
| 5036 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 5037 | 5037 | |
| 5038 | - if ( ! empty( $location_terms ) && $location_manager ) {
|
|
| 5039 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 5040 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 5038 | + if (!empty($location_terms) && $location_manager) {
|
|
| 5039 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 5040 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 5041 | 5041 | |
| 5042 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 5043 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 5044 | - unset( $location_terms['gd_country'] ); |
|
| 5042 | + if ($hide_region_part && $hide_country_part) {
|
|
| 5043 | + if (isset($location_terms['gd_country'])) {
|
|
| 5044 | + unset($location_terms['gd_country']); |
|
| 5045 | 5045 | } |
| 5046 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 5047 | - unset( $location_terms['gd_region'] ); |
|
| 5046 | + if (isset($location_terms['gd_region'])) {
|
|
| 5047 | + unset($location_terms['gd_region']); |
|
| 5048 | 5048 | } |
| 5049 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 5050 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 5051 | - unset( $location_terms['gd_region'] ); |
|
| 5049 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 5050 | + if (isset($location_terms['gd_region'])) {
|
|
| 5051 | + unset($location_terms['gd_region']); |
|
| 5052 | 5052 | } |
| 5053 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 5054 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 5055 | - unset( $location_terms['gd_country'] ); |
|
| 5053 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 5054 | + if (isset($location_terms['gd_country'])) {
|
|
| 5055 | + unset($location_terms['gd_country']); |
|
| 5056 | 5056 | } |
| 5057 | 5057 | } |
| 5058 | 5058 | } |
@@ -5070,33 +5070,33 @@ discard block |
||
| 5070 | 5070 | * @param WP_Post $post Post object. |
| 5071 | 5071 | * @param bool $update Whether this is an existing listing being updated or not. |
| 5072 | 5072 | */ |
| 5073 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
|
|
| 5074 | - if ( ! $update ) {
|
|
| 5073 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
|
|
| 5074 | + if (!$update) {
|
|
| 5075 | 5075 | return; |
| 5076 | 5076 | } |
| 5077 | 5077 | |
| 5078 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; |
|
| 5079 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; |
|
| 5078 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; |
|
| 5079 | + $is_admin = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
|
|
| 5080 | 5080 | $inline_save = $action == 'inline-save' ? true : false; |
| 5081 | 5081 | |
| 5082 | - if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
|
|
| 5082 | + if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
|
|
| 5083 | 5083 | return; |
| 5084 | 5084 | } |
| 5085 | 5085 | |
| 5086 | - if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
|
|
| 5086 | + if ($action != '' && in_array($action, array('geodir_import_export'))) {
|
|
| 5087 | 5087 | return; |
| 5088 | 5088 | } |
| 5089 | 5089 | |
| 5090 | 5090 | $user_id = (int) get_current_user_id(); |
| 5091 | 5091 | |
| 5092 | - if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 5093 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; |
|
| 5092 | + if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 5093 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; |
|
| 5094 | 5094 | |
| 5095 | - if ( $user_id == $author_id && ! is_super_admin() ) {
|
|
| 5096 | - $from_email = get_option( 'site_email' ); |
|
| 5095 | + if ($user_id == $author_id && !is_super_admin()) {
|
|
| 5096 | + $from_email = get_option('site_email');
|
|
| 5097 | 5097 | $from_name = get_site_emailName(); |
| 5098 | - $to_email = get_option( 'admin_email' ); |
|
| 5099 | - $to_name = get_option( 'name' ); |
|
| 5098 | + $to_email = get_option('admin_email');
|
|
| 5099 | + $to_name = get_option('name');
|
|
| 5100 | 5100 | $message_type = 'listing_edited'; |
| 5101 | 5101 | |
| 5102 | 5102 | $notify_edited = true; |
@@ -5108,9 +5108,9 @@ discard block |
||
| 5108 | 5108 | * @param bool $notify_edited Notify on listing edited by author? |
| 5109 | 5109 | * @param object $post The current post object. |
| 5110 | 5110 | */ |
| 5111 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post ); |
|
| 5111 | + $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post);
|
|
| 5112 | 5112 | |
| 5113 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); |
|
| 5113 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 5114 | 5114 | } |
| 5115 | 5115 | } |
| 5116 | 5116 | } |
@@ -5125,14 +5125,14 @@ discard block |
||
| 5125 | 5125 | * |
| 5126 | 5126 | * @return string|null The current page start & end numbering. |
| 5127 | 5127 | */ |
| 5128 | -function geodir_title_meta_page( $sep ) {
|
|
| 5128 | +function geodir_title_meta_page($sep) {
|
|
| 5129 | 5129 | $replacement = null; |
| 5130 | 5130 | |
| 5131 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5132 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5131 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5132 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5133 | 5133 | |
| 5134 | - if ( $max > 1 && $nr > 1 ) {
|
|
| 5135 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); |
|
| 5134 | + if ($max > 1 && $nr > 1) {
|
|
| 5135 | + $replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
|
|
| 5136 | 5136 | } |
| 5137 | 5137 | |
| 5138 | 5138 | return $replacement; |
@@ -5149,8 +5149,8 @@ discard block |
||
| 5149 | 5149 | function geodir_title_meta_pagenumber() {
|
| 5150 | 5150 | $replacement = null; |
| 5151 | 5151 | |
| 5152 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5153 | - if ( isset( $nr ) && $nr > 0 ) {
|
|
| 5152 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5153 | + if (isset($nr) && $nr > 0) {
|
|
| 5154 | 5154 | $replacement = (string) $nr; |
| 5155 | 5155 | } |
| 5156 | 5156 | |
@@ -5168,8 +5168,8 @@ discard block |
||
| 5168 | 5168 | function geodir_title_meta_pagetotal() {
|
| 5169 | 5169 | $replacement = null; |
| 5170 | 5170 | |
| 5171 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5172 | - if ( isset( $max ) && $max > 0 ) {
|
|
| 5171 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5172 | + if (isset($max) && $max > 0) {
|
|
| 5173 | 5173 | $replacement = (string) $max; |
| 5174 | 5174 | } |
| 5175 | 5175 | |
@@ -5189,36 +5189,36 @@ discard block |
||
| 5189 | 5189 | * |
| 5190 | 5190 | * @return int|null The current page numbering. |
| 5191 | 5191 | */ |
| 5192 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
|
|
| 5192 | +function geodir_title_meta_pagenumbering($request = 'nr') {
|
|
| 5193 | 5193 | global $wp_query, $post; |
| 5194 | 5194 | $max_num_pages = null; |
| 5195 | 5195 | $page_number = null; |
| 5196 | 5196 | |
| 5197 | 5197 | $max_num_pages = 1; |
| 5198 | 5198 | |
| 5199 | - if ( ! is_singular() ) {
|
|
| 5200 | - $page_number = get_query_var( 'paged' ); |
|
| 5201 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5199 | + if (!is_singular()) {
|
|
| 5200 | + $page_number = get_query_var('paged');
|
|
| 5201 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5202 | 5202 | $page_number = 1; |
| 5203 | 5203 | } |
| 5204 | 5204 | |
| 5205 | - if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
|
|
| 5205 | + if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
|
|
| 5206 | 5206 | $max_num_pages = $wp_query->max_num_pages; |
| 5207 | 5207 | } |
| 5208 | 5208 | } else {
|
| 5209 | - $page_number = get_query_var( 'page' ); |
|
| 5210 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5209 | + $page_number = get_query_var('page');
|
|
| 5210 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5211 | 5211 | $page_number = 1; |
| 5212 | 5212 | } |
| 5213 | 5213 | |
| 5214 | - if ( isset( $post->post_content ) ) {
|
|
| 5215 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); |
|
| 5214 | + if (isset($post->post_content)) {
|
|
| 5215 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); |
|
| 5216 | 5216 | } |
| 5217 | 5217 | } |
| 5218 | 5218 | |
| 5219 | 5219 | $return = null; |
| 5220 | 5220 | |
| 5221 | - switch ( $request ) {
|
|
| 5221 | + switch ($request) {
|
|
| 5222 | 5222 | case 'nr': |
| 5223 | 5223 | $return = $page_number; |
| 5224 | 5224 | break; |
@@ -5239,14 +5239,14 @@ discard block |
||
| 5239 | 5239 | * |
| 5240 | 5240 | * @return array Terms. |
| 5241 | 5241 | */ |
| 5242 | -function geodir_filter_empty_terms( $terms ) {
|
|
| 5243 | - if ( empty( $terms ) ) {
|
|
| 5242 | +function geodir_filter_empty_terms($terms) {
|
|
| 5243 | + if (empty($terms)) {
|
|
| 5244 | 5244 | return $terms; |
| 5245 | 5245 | } |
| 5246 | 5246 | |
| 5247 | 5247 | $return = array(); |
| 5248 | - foreach ( $terms as $term ) {
|
|
| 5249 | - if ( isset( $term->count ) && $term->count > 0 ) {
|
|
| 5248 | + foreach ($terms as $term) {
|
|
| 5249 | + if (isset($term->count) && $term->count > 0) {
|
|
| 5250 | 5250 | $return[] = $term; |
| 5251 | 5251 | } else {
|
| 5252 | 5252 | /** |
@@ -5257,7 +5257,7 @@ discard block |
||
| 5257 | 5257 | * @param array $return The array of terms to return. |
| 5258 | 5258 | * @param object $term The term object. |
| 5259 | 5259 | */ |
| 5260 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); |
|
| 5260 | + $return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
|
|
| 5261 | 5261 | } |
| 5262 | 5262 | } |
| 5263 | 5263 | |
@@ -5274,15 +5274,15 @@ discard block |
||
| 5274 | 5274 | * |
| 5275 | 5275 | * @return array |
| 5276 | 5276 | */ |
| 5277 | -function geodir_remove_hentry( $class ) {
|
|
| 5278 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 5279 | - $class = array_diff( $class, array( 'hentry' ) ); |
|
| 5277 | +function geodir_remove_hentry($class) {
|
|
| 5278 | + if (geodir_is_page('detail')) {
|
|
| 5279 | + $class = array_diff($class, array('hentry'));
|
|
| 5280 | 5280 | } |
| 5281 | 5281 | |
| 5282 | 5282 | return $class; |
| 5283 | 5283 | } |
| 5284 | 5284 | |
| 5285 | -add_filter( 'post_class', 'geodir_remove_hentry' ); |
|
| 5285 | +add_filter('post_class', 'geodir_remove_hentry');
|
|
| 5286 | 5286 | |
| 5287 | 5287 | /** |
| 5288 | 5288 | * Registers a individual text string for WPML translation. |
@@ -5294,8 +5294,8 @@ discard block |
||
| 5294 | 5294 | * @param string $domain The plugin domain. Default geodirectory. |
| 5295 | 5295 | * @param string $name The name of the string which helps to know what's being translated. |
| 5296 | 5296 | */ |
| 5297 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
|
|
| 5298 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5297 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
|
|
| 5298 | + do_action('wpml_register_single_string', $domain, $name, $string);
|
|
| 5299 | 5299 | } |
| 5300 | 5300 | |
| 5301 | 5301 | /** |
@@ -5310,6 +5310,6 @@ discard block |
||
| 5310 | 5310 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. |
| 5311 | 5311 | * @return string The translated string. |
| 5312 | 5312 | */ |
| 5313 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
|
|
| 5314 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5313 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
|
|
| 5314 | + return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
|
|
| 5315 | 5315 | } |
| 5316 | 5316 | \ No newline at end of file |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | $defaultcity = isset($default_location->city) ? $default_location->city : ''; |
| 36 | 36 | $lat_lng_blank = false; |
| 37 | 37 | if ($lat == '' && $lng == '') {
|
| 38 | - $lat_lng_blank = true; |
|
| 39 | - $city = $defaultcity; |
|
| 40 | - $region = isset($default_location->region) ? $default_location->region : ''; |
|
| 41 | - $country = isset($default_location->country) ? $default_location->country : ''; |
|
| 42 | - $lng = isset($default_location->city_longitude) ? $default_location->city_longitude : ''; |
|
| 43 | - $lat = isset($default_location->city_latitude) ? $default_location->city_latitude : ''; |
|
| 38 | + $lat_lng_blank = true; |
|
| 39 | + $city = $defaultcity; |
|
| 40 | + $region = isset($default_location->region) ? $default_location->region : ''; |
|
| 41 | + $country = isset($default_location->country) ? $default_location->country : ''; |
|
| 42 | + $lng = isset($default_location->city_longitude) ? $default_location->city_longitude : ''; |
|
| 43 | + $lat = isset($default_location->city_latitude) ? $default_location->city_latitude : ''; |
|
| 44 | 44 | } |
| 45 | 45 | $default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : ''; |
| 46 | 46 | $default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : ''; |
| 47 | 47 | if (is_admin() && isset($_REQUEST['tab']) && $mapzoom == '') {
|
| 48 | - $mapzoom = 4; |
|
| 49 | - if (isset($_REQUEST['add_hood'])) |
|
| 50 | - $mapzoom = 10; |
|
| 48 | + $mapzoom = 4; |
|
| 49 | + if (isset($_REQUEST['add_hood'])) |
|
| 50 | + $mapzoom = 10; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * Fires at the start of the add javascript on the add lsitings map. |
| 69 | 69 | * |
| 70 | 70 | * @since 1.0.0 |
| 71 | - * @param string $prefix The prefix for all elements. |
|
| 71 | + * @param string $prefix The prefix for all elements. |
|
| 72 | 72 | */ |
| 73 | 73 | do_action('geodir_add_listing_js_start', $prefix);
|
| 74 | 74 | ?> |
@@ -260,12 +260,12 @@ discard block |
||
| 260 | 260 | // fix for regions in GB |
| 261 | 261 | |
| 262 | 262 | $country_arr = <?php |
| 263 | - /** |
|
| 264 | - * Filter the regions array that uses administrative_area_level_2 instead of administrative_area_level_1. |
|
| 265 | - * |
|
| 266 | - * @since 1.6.16 |
|
| 267 | - */ |
|
| 268 | - echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;
|
|
| 263 | + /** |
|
| 264 | + * Filter the regions array that uses administrative_area_level_2 instead of administrative_area_level_1. |
|
| 265 | + * |
|
| 266 | + * @since 1.6.16 |
|
| 267 | + */ |
|
| 268 | + echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;
|
|
| 269 | 269 | if (jQuery.inArray(rr, $country_arr) !== -1) {
|
| 270 | 270 | if (administrative_area_level_2.long_name) {
|
| 271 | 271 | getState = administrative_area_level_2.long_name; |
@@ -339,13 +339,13 @@ discard block |
||
| 339 | 339 | getZip = postal_code.long_name; |
| 340 | 340 | } |
| 341 | 341 | <?php |
| 342 | - /** |
|
| 343 | - * Fires to add javascript variable to use in google map. |
|
| 344 | - * |
|
| 345 | - * @since 1.0.0 |
|
| 346 | - */ |
|
| 347 | - do_action('geodir_add_listing_geocode_js_vars');
|
|
| 348 | - ?> |
|
| 342 | + /** |
|
| 343 | + * Fires to add javascript variable to use in google map. |
|
| 344 | + * |
|
| 345 | + * @since 1.0.0 |
|
| 346 | + */ |
|
| 347 | + do_action('geodir_add_listing_geocode_js_vars');
|
|
| 348 | + ?> |
|
| 349 | 349 | <?php if ($is_map_restrict) { ?>
|
| 350 | 350 | if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {
|
| 351 | 351 | alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');
|
@@ -426,15 +426,15 @@ discard block |
||
| 426 | 426 | } |
| 427 | 427 | } |
| 428 | 428 | <?php |
| 429 | - /** |
|
| 430 | - * Fires when marker address updated on map. |
|
| 431 | - * |
|
| 432 | - * @since 1.0.0 |
|
| 433 | - * @param string $prefix Identifier used as a prefix for field name |
|
| 434 | - */ |
|
| 435 | - do_action('geodir_update_marker_address', $prefix);
|
|
| 436 | - echo $updateMarkerAddress = ob_get_clean(); |
|
| 437 | - ?> |
|
| 429 | + /** |
|
| 430 | + * Fires when marker address updated on map. |
|
| 431 | + * |
|
| 432 | + * @since 1.0.0 |
|
| 433 | + * @param string $prefix Identifier used as a prefix for field name |
|
| 434 | + */ |
|
| 435 | + do_action('geodir_update_marker_address', $prefix);
|
|
| 436 | + echo $updateMarkerAddress = ob_get_clean(); |
|
| 437 | + ?> |
|
| 438 | 438 | } |
| 439 | 439 | function geodir_codeAddress(set_on_map) {
|
| 440 | 440 | var address = jQuery('#<?php echo $prefix.'address';?>').val();
|
@@ -464,9 +464,9 @@ discard block |
||
| 464 | 464 | } |
| 465 | 465 | var is_restrict = '<?php echo $is_map_restrict; ?>'; |
| 466 | 466 | <?php ob_start(); |
| 467 | - $defaultregion = isset($default_location->region) ? $default_location->region : ''; |
|
| 468 | - $defaultcountry = isset($default_location->country) ? $default_location->country : ''; |
|
| 469 | - ?> |
|
| 467 | + $defaultregion = isset($default_location->region) ? $default_location->region : ''; |
|
| 468 | + $defaultcountry = isset($default_location->country) ? $default_location->country : ''; |
|
| 469 | + ?> |
|
| 470 | 470 | if (set_on_map && is_restrict) {
|
| 471 | 471 | if (zip != '' && address != '') {
|
| 472 | 472 | address = address + ',' + zip; |
@@ -478,12 +478,12 @@ discard block |
||
| 478 | 478 | if( address == city || address == region || address == country || address == zip ) |
| 479 | 479 | address = ''; |
| 480 | 480 | <?php |
| 481 | - if(is_admin() && isset($_REQUEST['tab'])){?>
|
|
| 481 | + if(is_admin() && isset($_REQUEST['tab'])){?>
|
|
| 482 | 482 | if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {
|
| 483 | 483 | address = ''; |
| 484 | 484 | } |
| 485 | 485 | <?php |
| 486 | - }?> |
|
| 486 | + }?> |
|
| 487 | 487 | |
| 488 | 488 | if (ISO2 == 'GB') {
|
| 489 | 489 | address = address + ',' + city + ',' + country; // UK is funny with regions |
@@ -499,15 +499,15 @@ discard block |
||
| 499 | 499 | address = address.replace(",null,", ",");
|
| 500 | 500 | } |
| 501 | 501 | <?php $codeAddress = ob_get_clean(); |
| 502 | - /** |
|
| 503 | - * Filter the address variable |
|
| 504 | - * |
|
| 505 | - * @since 1.0.0 |
|
| 506 | - * |
|
| 507 | - * @param string $codeAddress Row of address to use in google map. |
|
| 508 | - */ |
|
| 509 | - echo apply_filters('geodir_codeaddress', $codeAddress);
|
|
| 510 | - ?> |
|
| 502 | + /** |
|
| 503 | + * Filter the address variable |
|
| 504 | + * |
|
| 505 | + * @since 1.0.0 |
|
| 506 | + * |
|
| 507 | + * @param string $codeAddress Row of address to use in google map. |
|
| 508 | + */ |
|
| 509 | + echo apply_filters('geodir_codeaddress', $codeAddress);
|
|
| 510 | + ?> |
|
| 511 | 511 | if (!window.gdMaps) { // No Google Map Loaded
|
| 512 | 512 | return; |
| 513 | 513 | } |
@@ -532,13 +532,13 @@ discard block |
||
| 532 | 532 | updateMarkerPosition(baseMarker.getPosition()); |
| 533 | 533 | //if(set_on_map && is_restrict) {
|
| 534 | 534 | <?php |
| 535 | - /** |
|
| 536 | - * Fires before set geocode position. |
|
| 537 | - * |
|
| 538 | - * @since 1.0.0 |
|
| 539 | - */ |
|
| 540 | - do_action('geodir_add_listing_codeaddress_before_geocode');
|
|
| 541 | - ?> |
|
| 535 | + /** |
|
| 536 | + * Fires before set geocode position. |
|
| 537 | + * |
|
| 538 | + * @since 1.0.0 |
|
| 539 | + */ |
|
| 540 | + do_action('geodir_add_listing_codeaddress_before_geocode');
|
|
| 541 | + ?> |
|
| 542 | 542 | geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});
|
| 543 | 543 | //} |
| 544 | 544 | } else {
|
@@ -584,13 +584,13 @@ discard block |
||
| 584 | 584 | updateMarkerPositionOSM(baseMarker.getLatLng()); |
| 585 | 585 | } |
| 586 | 586 | <?php |
| 587 | - /** |
|
| 588 | - * Fires to add javascript variable to use in google map. |
|
| 589 | - * |
|
| 590 | - * @since 1.0.0 |
|
| 591 | - */ |
|
| 592 | - do_action('geodir_add_listing_geocode_js_vars');
|
|
| 593 | - ?> |
|
| 587 | + /** |
|
| 588 | + * Fires to add javascript variable to use in google map. |
|
| 589 | + * |
|
| 590 | + * @since 1.0.0 |
|
| 591 | + */ |
|
| 592 | + do_action('geodir_add_listing_geocode_js_vars');
|
|
| 593 | + ?> |
|
| 594 | 594 | <?php if ($is_map_restrict) { ?>
|
| 595 | 595 | if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {
|
| 596 | 596 | alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');
|
@@ -738,7 +738,7 @@ discard block |
||
| 738 | 738 | <?php |
| 739 | 739 | $set_button_class = 'geodir_button'; |
| 740 | 740 | if (is_admin()) |
| 741 | - $set_button_class = 'button-primary'; |
|
| 741 | + $set_button_class = 'button-primary'; |
|
| 742 | 742 | ?> |
| 743 | 743 | <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/> |
| 744 | 744 | <div id="<?php echo $prefix; ?>d_mouseClick"></div> |
@@ -82,16 +82,16 @@ discard block |
||
| 82 | 82 | window.gdMaps = window.gdMaps || gdMaps; |
| 83 | 83 | |
| 84 | 84 | user_address = false; |
| 85 | - jQuery('#<?php echo $prefix.'address';?>').keypress(function () {
|
|
| 85 | + jQuery('#<?php echo $prefix.'address'; ?>').keypress(function () {
|
|
| 86 | 86 | user_address = true; |
| 87 | 87 | }); |
| 88 | 88 | |
| 89 | 89 | baseMarker = ''; |
| 90 | 90 | geocoder = ''; |
| 91 | - var <?php echo $prefix;?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat : '39.952484'; ?>; |
|
| 92 | - var <?php echo $prefix;?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng : '-75.163786'; ?>; |
|
| 93 | - <?php if($lat_lng_blank){$lat='';$lng='';}?>
|
|
| 94 | - var <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12;?>; |
|
| 91 | + var <?php echo $prefix; ?>CITY_MAP_CENTER_LAT = <?php echo ($lat) ? $lat : '39.952484'; ?>; |
|
| 92 | + var <?php echo $prefix; ?>CITY_MAP_CENTER_LNG = <?php echo ($lng) ? $lng : '-75.163786'; ?>; |
|
| 93 | + <?php if ($lat_lng_blank) {$lat = ''; $lng = ''; }?>
|
|
| 94 | + var <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT = <?php echo ($mapzoom) ? $mapzoom : 12; ?>; |
|
| 95 | 95 | var minZoomLevel = <?php echo ($is_map_restrict) ? 5 : 0; ?>; |
| 96 | 96 | var oldstr_address; |
| 97 | 97 | var oldstr_zip; |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | * |
| 266 | 266 | * @since 1.6.16 |
| 267 | 267 | */ |
| 268 | - echo apply_filters("geodir_geocode_region_level",'["GB","ES"]');?>;
|
|
| 268 | + echo apply_filters("geodir_geocode_region_level", '["GB","ES"]'); ?>;
|
|
| 269 | 269 | if (jQuery.inArray(rr, $country_arr) !== -1) {
|
| 270 | 270 | if (administrative_area_level_2.long_name) {
|
| 271 | 271 | getState = administrative_area_level_2.long_name; |
@@ -347,9 +347,9 @@ discard block |
||
| 347 | 347 | do_action('geodir_add_listing_geocode_js_vars');
|
| 348 | 348 | ?> |
| 349 | 349 | <?php if ($is_map_restrict) { ?>
|
| 350 | - if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {
|
|
| 351 | - alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');
|
|
| 352 | - jQuery("#<?php echo $prefix.'map';?>").goMap();
|
|
| 350 | + if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {
|
|
| 351 | + alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');
|
|
| 352 | + jQuery("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 353 | 353 | jQuery.goMap.map.setCenter(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));
|
| 354 | 354 | baseMarker.setPosition(new google.maps.LatLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));
|
| 355 | 355 | updateMarkerPosition(baseMarker.getPosition()); |
@@ -358,11 +358,11 @@ discard block |
||
| 358 | 358 | <?php } ?> |
| 359 | 359 | updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry); |
| 360 | 360 | } else {
|
| 361 | - updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');
|
|
| 361 | + updateMarkerAddress('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');
|
|
| 362 | 362 | } |
| 363 | 363 | } |
| 364 | 364 | function centerMap(latlng) {
|
| 365 | - jQuery("#<?php echo $prefix.'map';?>").goMap();
|
|
| 365 | + jQuery("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 366 | 366 | if (window.gdMaps == 'google') {
|
| 367 | 367 | jQuery.goMap.map.panTo(baseMarker.getPosition()); |
| 368 | 368 | } else if (window.gdMaps == 'osm') {
|
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | } |
| 372 | 372 | } |
| 373 | 373 | function centerMarker() {
|
| 374 | - jQuery("#<?php echo $prefix.'map';?>").goMap();
|
|
| 374 | + jQuery("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 375 | 375 | var center = jQuery.goMap.map.getCenter(); |
| 376 | 376 | if (window.gdMaps == 'google') {
|
| 377 | 377 | baseMarker.setPosition(center); |
@@ -380,48 +380,48 @@ discard block |
||
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | function updateMapZoom(zoom) {
|
| 383 | - jQuery('#<?php echo $prefix.'mapzoom';?>').val(zoom);
|
|
| 383 | + jQuery('#<?php echo $prefix.'mapzoom'; ?>').val(zoom);
|
|
| 384 | 384 | } |
| 385 | 385 | function updateMarkerPosition(markerlatLng) {
|
| 386 | - jQuery("#<?php echo $prefix.'map';?>").goMap();
|
|
| 387 | - jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat());
|
|
| 388 | - jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng());
|
|
| 386 | + jQuery("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 387 | + jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat());
|
|
| 388 | + jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng());
|
|
| 389 | 389 | } |
| 390 | 390 | function updateMarkerPositionOSM(markerlatLng) {
|
| 391 | - jQuery('#<?php echo $prefix.'latitude';?>').val(markerlatLng.lat);
|
|
| 392 | - jQuery('#<?php echo $prefix.'longitude';?>').val(markerlatLng.lng);
|
|
| 391 | + jQuery('#<?php echo $prefix.'latitude'; ?>').val(markerlatLng.lat);
|
|
| 392 | + jQuery('#<?php echo $prefix.'longitude'; ?>').val(markerlatLng.lng);
|
|
| 393 | 393 | } |
| 394 | 394 | function updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry) {
|
| 395 | - var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields);?>'; |
|
| 396 | - <?php ob_start();?> |
|
| 397 | - var old_country = jQuery("#<?php echo $prefix.'country';?>").val();
|
|
| 398 | - var old_region = jQuery("#<?php echo $prefix.'region';?>").val();
|
|
| 395 | + var set_map_val_in_fields = '<?php echo addslashes_gpc($auto_change_map_fields); ?>'; |
|
| 396 | + <?php ob_start(); ?> |
|
| 397 | + var old_country = jQuery("#<?php echo $prefix.'country'; ?>").val();
|
|
| 398 | + var old_region = jQuery("#<?php echo $prefix.'region'; ?>").val();
|
|
| 399 | 399 | |
| 400 | - if (user_address == false || jQuery('#<?php echo $prefix.'address';?>').val() == '') {
|
|
| 401 | - jQuery("#<?php echo $prefix.'address';?>").val(getAddress);
|
|
| 400 | + if (user_address == false || jQuery('#<?php echo $prefix.'address'; ?>').val() == '') {
|
|
| 401 | + jQuery("#<?php echo $prefix.'address'; ?>").val(getAddress);
|
|
| 402 | 402 | } |
| 403 | 403 | if (getAddress) {
|
| 404 | 404 | oldstr_address = getAddress; |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | - jQuery("#<?php echo $prefix.'zip';?>").val(getZip);
|
|
| 407 | + jQuery("#<?php echo $prefix.'zip'; ?>").val(getZip);
|
|
| 408 | 408 | if (getZip) {
|
| 409 | 409 | oldstr_zip = getZip; |
| 410 | 410 | } |
| 411 | 411 | if (set_map_val_in_fields) {
|
| 412 | 412 | if (getCountry) {
|
| 413 | - jQuery('#<?php echo $prefix .'country'; ?> option[value=""]').attr("selected",false);
|
|
| 414 | - jQuery('#<?php echo $prefix.'country';?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);
|
|
| 415 | - jQuery("#<?php echo $prefix.'country';?>").trigger("chosen:updated");
|
|
| 413 | + jQuery('#<?php echo $prefix.'country'; ?> option[value=""]').attr("selected",false);
|
|
| 414 | + jQuery('#<?php echo $prefix.'country'; ?> option[data-country_code="' + getCountryISO + '"]').attr("selected", true);
|
|
| 415 | + jQuery("#<?php echo $prefix.'country'; ?>").trigger("chosen:updated");
|
|
| 416 | 416 | } |
| 417 | 417 | if (getState) {
|
| 418 | - if (jQuery('input[id="<?php echo $prefix.'region';?>"]').attr('id')) {
|
|
| 419 | - jQuery("#<?php echo $prefix.'region';?>").val(getState);
|
|
| 418 | + if (jQuery('input[id="<?php echo $prefix.'region'; ?>"]').attr('id')) {
|
|
| 419 | + jQuery("#<?php echo $prefix.'region'; ?>").val(getState);
|
|
| 420 | 420 | } |
| 421 | 421 | } |
| 422 | 422 | if (getCity) {
|
| 423 | - if (jQuery('input[id="<?php echo $prefix.'city';?>"]').attr('id')) {
|
|
| 424 | - jQuery("#<?php echo $prefix.'city';?>").val(getCity);
|
|
| 423 | + if (jQuery('input[id="<?php echo $prefix.'city'; ?>"]').attr('id')) {
|
|
| 424 | + jQuery("#<?php echo $prefix.'city'; ?>").val(getCity);
|
|
| 425 | 425 | } |
| 426 | 426 | } |
| 427 | 427 | } |
@@ -437,15 +437,15 @@ discard block |
||
| 437 | 437 | ?> |
| 438 | 438 | } |
| 439 | 439 | function geodir_codeAddress(set_on_map) {
|
| 440 | - var address = jQuery('#<?php echo $prefix.'address';?>').val();
|
|
| 441 | - var zip = jQuery('#<?php echo $prefix.'zip';?>').val();
|
|
| 442 | - var city = jQuery('#<?php echo $prefix.'city';?>').val();
|
|
| 443 | - var region = jQuery('#<?php echo $prefix.'region';?>').val();
|
|
| 444 | - var country = jQuery('#<?php echo $prefix.'country';?>').val();
|
|
| 445 | - var country_selected = jQuery('#<?php echo $prefix.'country';?>').find('option:selected');
|
|
| 440 | + var address = jQuery('#<?php echo $prefix.'address'; ?>').val();
|
|
| 441 | + var zip = jQuery('#<?php echo $prefix.'zip'; ?>').val();
|
|
| 442 | + var city = jQuery('#<?php echo $prefix.'city'; ?>').val();
|
|
| 443 | + var region = jQuery('#<?php echo $prefix.'region'; ?>').val();
|
|
| 444 | + var country = jQuery('#<?php echo $prefix.'country'; ?>').val();
|
|
| 445 | + var country_selected = jQuery('#<?php echo $prefix.'country'; ?>').find('option:selected');
|
|
| 446 | 446 | var ISO2 = country_selected.data('country_code');
|
| 447 | - if (!ISO2 && jQuery('#<?php echo $prefix.'country';?>').data('country_code')) {
|
|
| 448 | - ISO2 = jQuery('#<?php echo $prefix.'country';?>').data('country_code');
|
|
| 447 | + if (!ISO2 && jQuery('#<?php echo $prefix.'country'; ?>').data('country_code')) {
|
|
| 448 | + ISO2 = jQuery('#<?php echo $prefix.'country'; ?>').data('country_code');
|
|
| 449 | 449 | } |
| 450 | 450 | if (ISO2 == '--') {
|
| 451 | 451 | ISO2 = ''; |
@@ -454,13 +454,13 @@ discard block |
||
| 454 | 454 | zip = ''; |
| 455 | 455 | } |
| 456 | 456 | if (typeof city == "undefined") {
|
| 457 | - city = '<?php echo addslashes_gpc($city);?>'; |
|
| 457 | + city = '<?php echo addslashes_gpc($city); ?>'; |
|
| 458 | 458 | } |
| 459 | 459 | if (typeof region == "undefined") {
|
| 460 | - region = '<?php echo addslashes_gpc($region);?>'; |
|
| 460 | + region = '<?php echo addslashes_gpc($region); ?>'; |
|
| 461 | 461 | } |
| 462 | 462 | if (typeof country == "undefined") {
|
| 463 | - country = '<?php echo addslashes_gpc($country);?>'; |
|
| 463 | + country = '<?php echo addslashes_gpc($country); ?>'; |
|
| 464 | 464 | } |
| 465 | 465 | var is_restrict = '<?php echo $is_map_restrict; ?>'; |
| 466 | 466 | <?php ob_start(); |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | if( address == city || address == region || address == country || address == zip ) |
| 479 | 479 | address = ''; |
| 480 | 480 | <?php |
| 481 | - if(is_admin() && isset($_REQUEST['tab'])){?>
|
|
| 481 | + if (is_admin() && isset($_REQUEST['tab'])) {?>
|
|
| 482 | 482 | if (jQuery.trim(city) == '' || jQuery.trim(region) == '') {
|
| 483 | 483 | address = ''; |
| 484 | 484 | } |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | geocoder.geocode({'address': address, 'country': ISO2},
|
| 526 | 526 | function (results, status) {
|
| 527 | 527 | console.log(status); |
| 528 | - jQuery("#<?php echo $prefix.'map';?>").goMap();
|
|
| 528 | + jQuery("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 529 | 529 | if (status == google.maps.GeocoderStatus.OK) {
|
| 530 | 530 | baseMarker.setPosition(results[0].geometry.location); |
| 531 | 531 | jQuery.goMap.map.setCenter(results[0].geometry.location); |
@@ -542,21 +542,21 @@ discard block |
||
| 542 | 542 | geocodePosition(baseMarker.getPosition(), {'address': address, 'country': ISO2});
|
| 543 | 543 | //} |
| 544 | 544 | } else {
|
| 545 | - alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:','geodirectory'));?> ' + status);
|
|
| 545 | + alert('<?php echo addslashes_gpc(__('Geocode was not successful for the following reason:', 'geodirectory')); ?> ' + status);
|
|
| 546 | 546 | } |
| 547 | 547 | }); |
| 548 | 548 | } |
| 549 | 549 | } |
| 550 | 550 | function gdMaxMap() {
|
| 551 | - jQuery("#<?php echo $prefix.'map';?>").goMap();
|
|
| 551 | + jQuery("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 552 | 552 | |
| 553 | - jQuery('#<?php echo $prefix.'map';?>').toggleClass('map-fullscreen');
|
|
| 553 | + jQuery('#<?php echo $prefix.'map'; ?>').toggleClass('map-fullscreen');
|
|
| 554 | 554 | jQuery('.map_category').toggleClass('map_category_fullscreen');
|
| 555 | - jQuery('#<?php echo $prefix;?>trigger').toggleClass('map_category_fullscreen');
|
|
| 555 | + jQuery('#<?php echo $prefix; ?>trigger').toggleClass('map_category_fullscreen');
|
|
| 556 | 556 | jQuery('body').toggleClass('body_fullscreen');
|
| 557 | - jQuery('#<?php echo $prefix;?>loading_div').toggleClass('loading_div_fullscreen');
|
|
| 558 | - jQuery('#<?php echo $prefix;?>advmap_nofound').toggleClass('nofound_fullscreen');
|
|
| 559 | - jQuery('#<?php echo $prefix;?>triggermap').toggleClass('triggermap_fullscreen');
|
|
| 557 | + jQuery('#<?php echo $prefix; ?>loading_div').toggleClass('loading_div_fullscreen');
|
|
| 558 | + jQuery('#<?php echo $prefix; ?>advmap_nofound').toggleClass('nofound_fullscreen');
|
|
| 559 | + jQuery('#<?php echo $prefix; ?>triggermap').toggleClass('triggermap_fullscreen');
|
|
| 560 | 560 | jQuery('.TopLeft').toggleClass('TopLeft_fullscreen');
|
| 561 | 561 | window.setTimeout(function () {
|
| 562 | 562 | if (window.gdMaps == 'google') {
|
@@ -592,9 +592,9 @@ discard block |
||
| 592 | 592 | do_action('geodir_add_listing_geocode_js_vars');
|
| 593 | 593 | ?> |
| 594 | 594 | <?php if ($is_map_restrict) { ?>
|
| 595 | - if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city));?>') {
|
|
| 596 | - alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.','geodirectory'), $city));?>');
|
|
| 597 | - jQuery("#<?php echo $prefix.'map';?>").goMap();
|
|
| 595 | + if (getCity.toLowerCase() != '<?php echo geodir_strtolower(addslashes_gpc($city)); ?>') {
|
|
| 596 | + alert('<?php echo addslashes_gpc(wp_sprintf(__('Please choose any address of the (%s) city only.', 'geodirectory'), $city)); ?>');
|
|
| 597 | + jQuery("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 598 | 598 | centerMap(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));
|
| 599 | 599 | baseMarker.setLatLng(new L.latLng('<?php echo $default_lat; ?>', '<?php echo $default_lng; ?>'));
|
| 600 | 600 | updateMarkerPositionOSM(baseMarker.getLatLng()); |
@@ -603,39 +603,39 @@ discard block |
||
| 603 | 603 | <?php } ?> |
| 604 | 604 | updateMarkerAddress(getAddress, getZip, getCity, getState, getCountry); |
| 605 | 605 | } else {
|
| 606 | - alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.','geodirectory'));?>');
|
|
| 606 | + alert('<?php echo addslashes_gpc(__('Cannot determine address at this location.', 'geodirectory')); ?>');
|
|
| 607 | 607 | } |
| 608 | 608 | } |
| 609 | 609 | |
| 610 | 610 | jQuery(function ($) {
|
| 611 | - $("#<?php echo $prefix.'map';?>").goMap({
|
|
| 612 | - latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT, |
|
| 613 | - longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG, |
|
| 614 | - zoom: <?php echo $prefix;?>CITY_MAP_ZOOMING_FACT, |
|
| 611 | + $("#<?php echo $prefix.'map'; ?>").goMap({
|
|
| 612 | + latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT, |
|
| 613 | + longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG, |
|
| 614 | + zoom: <?php echo $prefix; ?>CITY_MAP_ZOOMING_FACT, |
|
| 615 | 615 | maptype: 'ROADMAP', // Map type - HYBRID, ROADMAP, SATELLITE, TERRAIN |
| 616 | 616 | streetViewControl: true, |
| 617 | - <?php if(get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,';}?>
|
|
| 617 | + <?php if (get_option('geodir_add_listing_mouse_scroll')) { echo 'scrollwheel: false,'; }?>
|
|
| 618 | 618 | }); |
| 619 | 619 | |
| 620 | 620 | if (window.gdMaps) {
|
| 621 | 621 | geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : []; |
| 622 | 622 | |
| 623 | 623 | baseMarker = $.goMap.createMarker({
|
| 624 | - latitude: <?php echo $prefix;?>CITY_MAP_CENTER_LAT, |
|
| 625 | - longitude: <?php echo $prefix;?>CITY_MAP_CENTER_LNG, |
|
| 624 | + latitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LAT, |
|
| 625 | + longitude: <?php echo $prefix; ?>CITY_MAP_CENTER_LNG, |
|
| 626 | 626 | id: 'baseMarker', |
| 627 | - icon: '<?php echo $marker_icon;?>', |
|
| 627 | + icon: '<?php echo $marker_icon; ?>', |
|
| 628 | 628 | draggable: true, |
| 629 | 629 | addToMap: true, // For OSM |
| 630 | - w: parseFloat('<?php echo $icon_size['w'];?>'),
|
|
| 631 | - h: parseFloat('<?php echo $icon_size['h'];?>'),
|
|
| 630 | + w: parseFloat('<?php echo $icon_size['w']; ?>'),
|
|
| 631 | + h: parseFloat('<?php echo $icon_size['h']; ?>'),
|
|
| 632 | 632 | }); |
| 633 | 633 | } else {
|
| 634 | - jQuery('#<?php echo $prefix.'advmap_nofound';?>').hide();
|
|
| 635 | - jQuery('#<?php echo $prefix.'advmap_notloaded';?>').show();
|
|
| 634 | + jQuery('#<?php echo $prefix.'advmap_nofound'; ?>').hide();
|
|
| 635 | + jQuery('#<?php echo $prefix.'advmap_notloaded'; ?>').show();
|
|
| 636 | 636 | } |
| 637 | 637 | |
| 638 | - $("#<?php echo $prefix;?>set_address_button").click(function () {
|
|
| 638 | + $("#<?php echo $prefix; ?>set_address_button").click(function () {
|
|
| 639 | 639 | var set_on_map = true; |
| 640 | 640 | geodir_codeAddress(set_on_map); |
| 641 | 641 | }); |
@@ -669,14 +669,14 @@ discard block |
||
| 669 | 669 | updateMapZoom($.goMap.map.zoom); |
| 670 | 670 | }); |
| 671 | 671 | |
| 672 | - var maxMap = document.getElementById('<?php echo $prefix;?>triggermap');
|
|
| 672 | + var maxMap = document.getElementById('<?php echo $prefix; ?>triggermap');
|
|
| 673 | 673 | google.maps.event.addDomListener(maxMap, 'click', gdMaxMap); |
| 674 | 674 | |
| 675 | 675 | <?php if ($is_map_restrict) { ?>
|
| 676 | - var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country);?>'; |
|
| 676 | + var CITY_ADDRESS = '<?php echo addslashes_gpc($city).','.addslashes_gpc($region).','.addslashes_gpc($country); ?>'; |
|
| 677 | 677 | geocoder.geocode({'address': CITY_ADDRESS},
|
| 678 | 678 | function (results, status) {
|
| 679 | - $("#<?php echo $prefix.'map';?>").goMap();
|
|
| 679 | + $("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 680 | 680 | if (status == google.maps.GeocoderStatus.OK) {
|
| 681 | 681 | // Bounds for North America |
| 682 | 682 | var bound_lat_lng = String(results[0].geometry.bounds); |
@@ -687,13 +687,13 @@ discard block |
||
| 687 | 687 | new google.maps.LatLng(bound_lat_lng[2], bound_lat_lng[3]) |
| 688 | 688 | ); |
| 689 | 689 | } else {
|
| 690 | - alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);
|
|
| 690 | + alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);
|
|
| 691 | 691 | } |
| 692 | 692 | }); |
| 693 | 693 | <?php } ?> |
| 694 | 694 | // Limit the zoom level |
| 695 | 695 | google.maps.event.addListener($.goMap.map, 'zoom_changed', function () {
|
| 696 | - $("#<?php echo $prefix.'map';?>").goMap();
|
|
| 696 | + $("#<?php echo $prefix.'map'; ?>").goMap();
|
|
| 697 | 697 | if ($.goMap.map.getZoom() < minZoomLevel) $.goMap.map.setZoom(minZoomLevel); |
| 698 | 698 | }); |
| 699 | 699 | } else if (window.gdMaps == 'osm') {
|
@@ -719,10 +719,10 @@ discard block |
||
| 719 | 719 | updateMapZoom($.goMap.map.getZoom()); |
| 720 | 720 | }); |
| 721 | 721 | |
| 722 | - L.DomEvent.addListener($('<?php echo $prefix;?>triggermap'), 'click', gdMaxMap);
|
|
| 722 | + L.DomEvent.addListener($('<?php echo $prefix; ?>triggermap'), 'click', gdMaxMap);
|
|
| 723 | 723 | |
| 724 | 724 | <?php if ($is_map_restrict) { ?>
|
| 725 | - var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country);?>'; |
|
| 725 | + var CITY_ADDRESS = '<?php echo addslashes_gpc($city).', '.addslashes_gpc($region).', '.addslashes_gpc($country); ?>'; |
|
| 726 | 726 | geocodePositionOSM('', CITY_ADDRESS);
|
| 727 | 727 | <?php } ?> |
| 728 | 728 | // Limit the zoom level |
@@ -745,14 +745,14 @@ discard block |
||
| 745 | 745 | <div class="top_banner_section_inn geodir_map_container clearfix" style="margin-top:10px;"> |
| 746 | 746 | <div class="TopLeft"><span id="<?php echo $prefix; ?>triggermap" style="margin-top:-11px;margin-left:-12px;"></span></div> |
| 747 | 747 | <div class="TopRight"></div> |
| 748 | - <div id="<?php echo $prefix . 'map'; ?>" class="geodir_map" style="height:300px"> |
|
| 748 | + <div id="<?php echo $prefix.'map'; ?>" class="geodir_map" style="height:300px"> |
|
| 749 | 749 | <!-- new map start --> |
| 750 | 750 | <div class="iprelative"> |
| 751 | - <div id="<?php echo $prefix . 'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div> |
|
| 751 | + <div id="<?php echo $prefix.'map'; ?>" style="float:right;height:300px;position:relative;" class="form_row clearfix"></div> |
|
| 752 | 752 | <div id="<?php echo $prefix; ?>loading_div" style="height:300px"></div> |
| 753 | 753 | <div id="<?php echo $prefix; ?>advmap_counter"></div> |
| 754 | 754 | <div id="<?php echo $prefix; ?>advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div> |
| 755 | - <div id="<?php echo $prefix;?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>
|
|
| 755 | + <div id="<?php echo $prefix; ?>advmap_notloaded" class="advmap_notloaded"><?php _e('<h3>Map Not Loaded</h3><p>Sorry, unable to load Maps API.', 'geodirectory'); ?></div>
|
|
| 756 | 756 | </div> |
| 757 | 757 | <!-- new map end --> |
| 758 | 758 | </div> |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | // If this file is called directly, abort. |
| 9 | 9 | if (!defined('WPINC')) { |
| 10 | - die; |
|
| 10 | + die; |
|
| 11 | 11 | } |
| 12 | 12 | require_once('geodirectory-functions/shortcode_functions.php'); |
| 13 | 13 | |
@@ -32,43 +32,43 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | function geodir_sc_add_listing($atts) |
| 34 | 34 | { |
| 35 | - ob_start(); |
|
| 36 | - $defaults = array( |
|
| 37 | - 'pid' => '', |
|
| 38 | - 'listing_type' => 'gd_place', |
|
| 39 | - 'login_msg' => __('You must login to post.', 'geodirectory'), |
|
| 40 | - 'show_login' => false, |
|
| 41 | - ); |
|
| 42 | - $params = shortcode_atts($defaults, $atts); |
|
| 43 | - |
|
| 44 | - foreach ($params as $key => $value) { |
|
| 45 | - $_REQUEST[$key] = $value; |
|
| 46 | - } |
|
| 47 | - |
|
| 48 | - $user_id = get_current_user_id(); |
|
| 49 | - if (!$user_id) { |
|
| 50 | - echo $params['login_msg']; |
|
| 51 | - if ($params['show_login']) { |
|
| 52 | - echo "<br />"; |
|
| 53 | - $defaults = array( |
|
| 54 | - 'before_widget' => '', |
|
| 55 | - 'after_widget' => '', |
|
| 56 | - 'before_title' => '', |
|
| 57 | - 'after_title' => '', |
|
| 58 | - ); |
|
| 59 | - |
|
| 60 | - geodir_loginwidget_output($defaults, $defaults); |
|
| 61 | - } |
|
| 62 | - |
|
| 63 | - |
|
| 64 | - } else { |
|
| 65 | - // Add listing page will be used if shortcode is detected in page content, no need to call it here |
|
| 66 | - } |
|
| 67 | - $output = ob_get_contents(); |
|
| 68 | - |
|
| 69 | - ob_end_clean(); |
|
| 70 | - |
|
| 71 | - return $output; |
|
| 35 | + ob_start(); |
|
| 36 | + $defaults = array( |
|
| 37 | + 'pid' => '', |
|
| 38 | + 'listing_type' => 'gd_place', |
|
| 39 | + 'login_msg' => __('You must login to post.', 'geodirectory'), |
|
| 40 | + 'show_login' => false, |
|
| 41 | + ); |
|
| 42 | + $params = shortcode_atts($defaults, $atts); |
|
| 43 | + |
|
| 44 | + foreach ($params as $key => $value) { |
|
| 45 | + $_REQUEST[$key] = $value; |
|
| 46 | + } |
|
| 47 | + |
|
| 48 | + $user_id = get_current_user_id(); |
|
| 49 | + if (!$user_id) { |
|
| 50 | + echo $params['login_msg']; |
|
| 51 | + if ($params['show_login']) { |
|
| 52 | + echo "<br />"; |
|
| 53 | + $defaults = array( |
|
| 54 | + 'before_widget' => '', |
|
| 55 | + 'after_widget' => '', |
|
| 56 | + 'before_title' => '', |
|
| 57 | + 'after_title' => '', |
|
| 58 | + ); |
|
| 59 | + |
|
| 60 | + geodir_loginwidget_output($defaults, $defaults); |
|
| 61 | + } |
|
| 62 | + |
|
| 63 | + |
|
| 64 | + } else { |
|
| 65 | + // Add listing page will be used if shortcode is detected in page content, no need to call it here |
|
| 66 | + } |
|
| 67 | + $output = ob_get_contents(); |
|
| 68 | + |
|
| 69 | + ob_end_clean(); |
|
| 70 | + |
|
| 71 | + return $output; |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -96,136 +96,136 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | function geodir_sc_home_map($atts) |
| 98 | 98 | { |
| 99 | - ob_start(); |
|
| 100 | - $defaults = array( |
|
| 101 | - 'width' => '960', |
|
| 102 | - 'height' => '425', |
|
| 103 | - 'maptype' => 'ROADMAP', |
|
| 104 | - 'zoom' => '13', |
|
| 105 | - 'autozoom' => '', |
|
| 106 | - 'child_collapse' => '0', |
|
| 107 | - 'scrollwheel' => '0', |
|
| 99 | + ob_start(); |
|
| 100 | + $defaults = array( |
|
| 101 | + 'width' => '960', |
|
| 102 | + 'height' => '425', |
|
| 103 | + 'maptype' => 'ROADMAP', |
|
| 104 | + 'zoom' => '13', |
|
| 105 | + 'autozoom' => '', |
|
| 106 | + 'child_collapse' => '0', |
|
| 107 | + 'scrollwheel' => '0', |
|
| 108 | 108 | 'marker_cluster' => false, |
| 109 | - 'latitude' => '', |
|
| 110 | - 'longitude' => '' |
|
| 111 | - ); |
|
| 112 | - |
|
| 113 | - $params = shortcode_atts($defaults, $atts); |
|
| 114 | - |
|
| 115 | - $params = gdsc_validate_map_args($params); |
|
| 116 | - |
|
| 117 | - $map_args = array( |
|
| 118 | - 'map_canvas_name' => 'gd_home_map', |
|
| 119 | - 'latitude' => $params['latitude'], |
|
| 120 | - 'longitude' => $params['longitude'], |
|
| 121 | - |
|
| 122 | - /** |
|
| 123 | - * Filter the widget width of the map on home/listings page. |
|
| 124 | - * |
|
| 125 | - * @since 1.0.0 |
|
| 126 | - * @param mixed(string|int|float) $params['width'] The map width. |
|
| 127 | - */ |
|
| 128 | - 'width' => apply_filters('widget_width', $params['width']), |
|
| 129 | - /** |
|
| 130 | - * Filter the widget height of the map on home/listings page. |
|
| 131 | - * |
|
| 132 | - * @since 1.0.0 |
|
| 133 | - * @param mixed(string|int|float) $params['height'] The map height. |
|
| 134 | - */ |
|
| 135 | - 'height' => apply_filters('widget_heigh', $params['height']), |
|
| 136 | - /** |
|
| 137 | - * Filter the widget maptype of the map on home/listings page. |
|
| 138 | - * |
|
| 139 | - * @since 1.0.0 |
|
| 109 | + 'latitude' => '', |
|
| 110 | + 'longitude' => '' |
|
| 111 | + ); |
|
| 112 | + |
|
| 113 | + $params = shortcode_atts($defaults, $atts); |
|
| 114 | + |
|
| 115 | + $params = gdsc_validate_map_args($params); |
|
| 116 | + |
|
| 117 | + $map_args = array( |
|
| 118 | + 'map_canvas_name' => 'gd_home_map', |
|
| 119 | + 'latitude' => $params['latitude'], |
|
| 120 | + 'longitude' => $params['longitude'], |
|
| 121 | + |
|
| 122 | + /** |
|
| 123 | + * Filter the widget width of the map on home/listings page. |
|
| 124 | + * |
|
| 125 | + * @since 1.0.0 |
|
| 126 | + * @param mixed(string|int|float) $params['width'] The map width. |
|
| 127 | + */ |
|
| 128 | + 'width' => apply_filters('widget_width', $params['width']), |
|
| 129 | + /** |
|
| 130 | + * Filter the widget height of the map on home/listings page. |
|
| 131 | + * |
|
| 132 | + * @since 1.0.0 |
|
| 133 | + * @param mixed(string|int|float) $params['height'] The map height. |
|
| 134 | + */ |
|
| 135 | + 'height' => apply_filters('widget_heigh', $params['height']), |
|
| 136 | + /** |
|
| 137 | + * Filter the widget maptype of the map on home/listings page. |
|
| 138 | + * |
|
| 139 | + * @since 1.0.0 |
|
| 140 | 140 | * @since 1.5.2 Added TERRAIN map type. |
| 141 | - * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN. |
|
| 142 | - */ |
|
| 143 | - 'maptype' => apply_filters('widget_maptype', $params['maptype']), |
|
| 144 | - /** |
|
| 145 | - * Filter the widget scrollwheel value of the map on home/listings page. |
|
| 146 | - * |
|
| 147 | - * Should the scrollwheel zoom the map or not. |
|
| 148 | - * |
|
| 149 | - * @since 1.0.0 |
|
| 150 | - * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not. |
|
| 151 | - */ |
|
| 152 | - 'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']), |
|
| 153 | - /** |
|
| 154 | - * Filter the widget zoom level of the map on home/listings page. |
|
| 155 | - * |
|
| 156 | - * @since 1.0.0 |
|
| 157 | - * @param int $params['zoom'] The zoom level of the map. Between 1-19. |
|
| 158 | - */ |
|
| 159 | - 'zoom' => apply_filters('widget_zoom', $params['zoom']), |
|
| 160 | - /** |
|
| 161 | - * Filter the widget auto zoom value of the map on home/listings page. |
|
| 162 | - * |
|
| 163 | - * If the map should autozoom to fit the markers shown. |
|
| 164 | - * |
|
| 165 | - * @since 1.0.0 |
|
| 166 | - * @param bool $params['autozoom'] True if the map should autozoom, false if not. |
|
| 167 | - */ |
|
| 168 | - 'autozoom' => apply_filters('widget_autozoom', $params['autozoom']), |
|
| 169 | - /** |
|
| 170 | - * Filter the widget child_collapse value of the map on home/listings page. |
|
| 171 | - * |
|
| 172 | - * If the map should auto collapse the child categories if the category bar is present. |
|
| 173 | - * |
|
| 174 | - * @since 1.0.0 |
|
| 175 | - * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not. |
|
| 176 | - */ |
|
| 177 | - 'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']), |
|
| 178 | - 'enable_cat_filters' => true, |
|
| 179 | - 'enable_text_search' => true, |
|
| 180 | - 'enable_post_type_filters' => true, |
|
| 181 | - /** |
|
| 182 | - * Filter the widget enable_location_filters value of the map on home/listings page. |
|
| 183 | - * |
|
| 184 | - * This is used when the location addon is used. |
|
| 185 | - * |
|
| 186 | - * @since 1.0.0 |
|
| 187 | - * @param bool $val True if location filters should be used, false if not. |
|
| 188 | - */ |
|
| 189 | - 'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false), |
|
| 190 | - 'enable_jason_on_load' => false, |
|
| 191 | - 'enable_marker_cluster' => false, |
|
| 192 | - 'enable_map_resize_button' => true, |
|
| 193 | - 'map_class_name' => 'geodir-map-home-page', |
|
| 194 | - 'is_geodir_home_map_widget' => true, |
|
| 195 | - ); |
|
| 141 | + * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN. |
|
| 142 | + */ |
|
| 143 | + 'maptype' => apply_filters('widget_maptype', $params['maptype']), |
|
| 144 | + /** |
|
| 145 | + * Filter the widget scrollwheel value of the map on home/listings page. |
|
| 146 | + * |
|
| 147 | + * Should the scrollwheel zoom the map or not. |
|
| 148 | + * |
|
| 149 | + * @since 1.0.0 |
|
| 150 | + * @param bool $params['scrollwheel'] True to allow scroll wheel to scroll map or false if not. |
|
| 151 | + */ |
|
| 152 | + 'scrollwheel' => apply_filters('widget_scrollwheel', $params['scrollwheel']), |
|
| 153 | + /** |
|
| 154 | + * Filter the widget zoom level of the map on home/listings page. |
|
| 155 | + * |
|
| 156 | + * @since 1.0.0 |
|
| 157 | + * @param int $params['zoom'] The zoom level of the map. Between 1-19. |
|
| 158 | + */ |
|
| 159 | + 'zoom' => apply_filters('widget_zoom', $params['zoom']), |
|
| 160 | + /** |
|
| 161 | + * Filter the widget auto zoom value of the map on home/listings page. |
|
| 162 | + * |
|
| 163 | + * If the map should autozoom to fit the markers shown. |
|
| 164 | + * |
|
| 165 | + * @since 1.0.0 |
|
| 166 | + * @param bool $params['autozoom'] True if the map should autozoom, false if not. |
|
| 167 | + */ |
|
| 168 | + 'autozoom' => apply_filters('widget_autozoom', $params['autozoom']), |
|
| 169 | + /** |
|
| 170 | + * Filter the widget child_collapse value of the map on home/listings page. |
|
| 171 | + * |
|
| 172 | + * If the map should auto collapse the child categories if the category bar is present. |
|
| 173 | + * |
|
| 174 | + * @since 1.0.0 |
|
| 175 | + * @param bool $params['child_collapse'] True if the map should collapse the categories, false if not. |
|
| 176 | + */ |
|
| 177 | + 'child_collapse' => apply_filters('widget_child_collapse', $params['child_collapse']), |
|
| 178 | + 'enable_cat_filters' => true, |
|
| 179 | + 'enable_text_search' => true, |
|
| 180 | + 'enable_post_type_filters' => true, |
|
| 181 | + /** |
|
| 182 | + * Filter the widget enable_location_filters value of the map on home/listings page. |
|
| 183 | + * |
|
| 184 | + * This is used when the location addon is used. |
|
| 185 | + * |
|
| 186 | + * @since 1.0.0 |
|
| 187 | + * @param bool $val True if location filters should be used, false if not. |
|
| 188 | + */ |
|
| 189 | + 'enable_location_filters' => apply_filters('geodir_home_map_enable_location_filters', false), |
|
| 190 | + 'enable_jason_on_load' => false, |
|
| 191 | + 'enable_marker_cluster' => false, |
|
| 192 | + 'enable_map_resize_button' => true, |
|
| 193 | + 'map_class_name' => 'geodir-map-home-page', |
|
| 194 | + 'is_geodir_home_map_widget' => true, |
|
| 195 | + ); |
|
| 196 | 196 | |
| 197 | 197 | // Add marker cluster |
| 198 | 198 | if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) { |
| 199 | - $map_args['enable_marker_cluster'] = true; |
|
| 200 | - if(get_option('geodir_marker_cluster_type')) { |
|
| 201 | - if ($map_args['autozoom']) { |
|
| 202 | - $map_args['enable_marker_cluster_no_reposition'] = false; |
|
| 203 | - } else { |
|
| 204 | - $map_args['enable_marker_cluster_no_reposition'] = true; |
|
| 205 | - } |
|
| 199 | + $map_args['enable_marker_cluster'] = true; |
|
| 200 | + if(get_option('geodir_marker_cluster_type')) { |
|
| 201 | + if ($map_args['autozoom']) { |
|
| 202 | + $map_args['enable_marker_cluster_no_reposition'] = false; |
|
| 203 | + } else { |
|
| 204 | + $map_args['enable_marker_cluster_no_reposition'] = true; |
|
| 205 | + } |
|
| 206 | 206 | |
| 207 | - $map_args['enable_marker_cluster_server'] = true ; |
|
| 207 | + $map_args['enable_marker_cluster_server'] = true ; |
|
| 208 | 208 | |
| 209 | - } |
|
| 209 | + } |
|
| 210 | 210 | } else { |
| 211 | 211 | $map_args['enable_marker_cluster'] = false; |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | - // if lat and long set in shortcode, hack it so the map is not repositioned |
|
| 215 | - if(!empty($params['latitude']) && !empty($params['longitude']) ){ |
|
| 216 | - $map_args['enable_marker_cluster_no_reposition'] = true; |
|
| 217 | - } |
|
| 214 | + // if lat and long set in shortcode, hack it so the map is not repositioned |
|
| 215 | + if(!empty($params['latitude']) && !empty($params['longitude']) ){ |
|
| 216 | + $map_args['enable_marker_cluster_no_reposition'] = true; |
|
| 217 | + } |
|
| 218 | 218 | |
| 219 | 219 | |
| 220 | - geodir_draw_map($map_args); |
|
| 220 | + geodir_draw_map($map_args); |
|
| 221 | 221 | |
| 222 | - add_action('wp_footer', 'geodir_home_map_add_script', 100); |
|
| 222 | + add_action('wp_footer', 'geodir_home_map_add_script', 100); |
|
| 223 | 223 | |
| 224 | - $output = ob_get_contents(); |
|
| 224 | + $output = ob_get_contents(); |
|
| 225 | 225 | |
| 226 | - ob_end_clean(); |
|
| 226 | + ob_end_clean(); |
|
| 227 | 227 | |
| 228 | - return $output; |
|
| 228 | + return $output; |
|
| 229 | 229 | } |
| 230 | 230 | add_shortcode('gd_homepage_map', 'geodir_sc_home_map'); |
| 231 | 231 | |
@@ -263,242 +263,242 @@ discard block |
||
| 263 | 263 | */ |
| 264 | 264 | function geodir_sc_listing_map($atts) { |
| 265 | 265 | |
| 266 | - // if some params are set then we need a new query, if not then we can use the main query |
|
| 267 | - if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) { |
|
| 268 | - |
|
| 269 | - global $add_post_in_marker_array, $gd_sc_map_params; |
|
| 270 | - $backup_globals = array(); |
|
| 271 | - $backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array; |
|
| 272 | - $backup_globals['gd_sc_map_params'] = $gd_sc_map_params; |
|
| 273 | - |
|
| 274 | - $defaults = array( |
|
| 275 | - 'width' => '294', |
|
| 276 | - 'height' => '370', |
|
| 277 | - 'zoom' => '13', |
|
| 278 | - 'autozoom' => '', |
|
| 279 | - 'sticky' => '', |
|
| 280 | - 'showall' => '0', |
|
| 281 | - 'scrollwheel' => '0', |
|
| 282 | - 'maptype' => 'ROADMAP', |
|
| 283 | - 'child_collapse' => 0, |
|
| 284 | - 'marker_cluster' => false, |
|
| 285 | - 'post_type' => 'gd_place', |
|
| 286 | - 'category' => '0', |
|
| 287 | - 'event_type' => 'all' |
|
| 288 | - ); |
|
| 289 | - |
|
| 290 | - $params = shortcode_atts( $defaults, $atts ); |
|
| 291 | - |
|
| 292 | - if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) { |
|
| 293 | - $params['post_type'] = 'gd_place'; |
|
| 294 | - } |
|
| 295 | - |
|
| 296 | - // Validate the selected category/ies - Grab the current list based on post_type |
|
| 297 | - $category_taxonomy = geodir_get_taxonomies( $params['post_type'] ); |
|
| 298 | - $categories = get_terms( $category_taxonomy, array( |
|
| 299 | - 'orderby' => 'count', |
|
| 300 | - 'order' => 'DESC', |
|
| 301 | - 'fields' => 'ids' |
|
| 302 | - ) ); |
|
| 303 | - |
|
| 304 | - // Make sure we have an array |
|
| 305 | - if ( ! ( is_array( $params['category'] ) ) ) { |
|
| 306 | - $params['category'] = explode( ',', $params['category'] ); |
|
| 307 | - } |
|
| 308 | - |
|
| 309 | - // Array_intersect returns only the items in $params['category'] that are also in our category list |
|
| 310 | - // Otherwise it becomes empty and later on that will mean "All" |
|
| 311 | - $params['category'] = array_intersect( $params['category'], $categories ); |
|
| 312 | - |
|
| 313 | - if ( $params['post_type'] == 'gd_event' ) { |
|
| 314 | - $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] ); |
|
| 315 | - } |
|
| 316 | - |
|
| 317 | - $params = gdsc_validate_map_args( $params ); |
|
| 318 | - |
|
| 319 | - $gd_sc_map_params = $params; |
|
| 320 | - |
|
| 321 | - $query_args = array( |
|
| 322 | - 'posts_per_page' => 1000000, //@todo kiran why was this added? |
|
| 323 | - 'is_geodir_loop' => true, |
|
| 324 | - 'gd_location' => false, |
|
| 325 | - ); |
|
| 326 | - |
|
| 327 | - if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) { |
|
| 328 | - $category_taxonomy = geodir_get_taxonomies( $params['post_type'] ); |
|
| 329 | - |
|
| 330 | - ######### WPML ######### |
|
| 331 | - if ( function_exists( 'icl_object_id' ) ) { |
|
| 332 | - $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] ); |
|
| 333 | - } |
|
| 334 | - ######### WPML ######### |
|
| 335 | - |
|
| 336 | - $tax_query = array( |
|
| 337 | - 'taxonomy' => $category_taxonomy[0], |
|
| 338 | - 'field' => 'id', |
|
| 339 | - 'terms' => $params['category'] |
|
| 340 | - ); |
|
| 341 | - |
|
| 342 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 343 | - } |
|
| 344 | - |
|
| 345 | - $add_post_in_marker_array = true; |
|
| 346 | - |
|
| 347 | - if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) { |
|
| 348 | - global $geodir_event_widget_listview; |
|
| 349 | - $geodir_event_widget_listview = true; |
|
| 350 | - |
|
| 351 | - $query_args['geodir_event_type'] = $params['event_type']; |
|
| 352 | - |
|
| 353 | - $listings = geodir_event_get_widget_events( $query_args ); |
|
| 354 | - |
|
| 355 | - $geodir_event_widget_listview = false; |
|
| 356 | - } else { |
|
| 357 | - $listings = geodir_get_widget_listings( $query_args ); |
|
| 358 | - } |
|
| 359 | - |
|
| 360 | - if ( ! empty( $listings ) ) { |
|
| 361 | - foreach ( $listings as $listing ) { |
|
| 362 | - create_marker_jason_of_posts( $listing ); |
|
| 363 | - } |
|
| 364 | - } |
|
| 365 | - |
|
| 366 | - ob_start(); |
|
| 367 | - add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array |
|
| 368 | - |
|
| 369 | - add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array |
|
| 370 | - |
|
| 371 | - add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers |
|
| 372 | - |
|
| 373 | - $default_location = geodir_get_default_location(); |
|
| 374 | - |
|
| 375 | - $map_args = array( |
|
| 376 | - 'map_canvas_name' => 'gd_listing_map', |
|
| 377 | - 'width' => $params['width'], |
|
| 378 | - 'height' => $params['height'], |
|
| 379 | - 'zoom' => $params['zoom'], |
|
| 380 | - 'autozoom' => $params['autozoom'], |
|
| 381 | - 'sticky' => $params['sticky'], |
|
| 382 | - 'showall' => $params['showall'], |
|
| 383 | - 'scrollwheel' => $params['scrollwheel'], |
|
| 384 | - 'maptype' => $params['maptype'], |
|
| 385 | - 'child_collapse' => 0, |
|
| 386 | - 'enable_cat_filters' => false, |
|
| 387 | - 'enable_text_search' => false, |
|
| 388 | - 'enable_post_type_filters' => false, |
|
| 389 | - 'enable_location_filters' => false, |
|
| 390 | - 'enable_jason_on_load' => true, |
|
| 391 | - 'ajax_url' => geodir_get_ajax_url(), |
|
| 392 | - 'latitude' => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '', |
|
| 393 | - 'longitude' => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '', |
|
| 394 | - 'streetViewControl' => true, |
|
| 395 | - 'showPreview' => '0', |
|
| 396 | - 'maxZoom' => 21, |
|
| 397 | - 'bubble_size' => 'small', |
|
| 398 | - ); |
|
| 399 | - |
|
| 400 | - if ( is_single() ) { |
|
| 401 | - global $post; |
|
| 402 | - if ( isset( $post->post_latitude ) ) { |
|
| 403 | - $map_args['latitude'] = $post->post_latitude; |
|
| 404 | - $map_args['longitude'] = $post->post_longitude; |
|
| 405 | - } |
|
| 406 | - |
|
| 407 | - $map_args['map_class_name'] = 'geodir-map-listing-page-single'; |
|
| 408 | - } else { |
|
| 409 | - $map_args['map_class_name'] = 'geodir-map-listing-page'; |
|
| 410 | - } |
|
| 411 | - |
|
| 412 | - // Add marker cluster |
|
| 413 | - if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) { |
|
| 414 | - $map_args['enable_marker_cluster'] = true; |
|
| 415 | - } else { |
|
| 416 | - $map_args['enable_marker_cluster'] = false; |
|
| 417 | - } |
|
| 418 | - |
|
| 419 | - geodir_draw_map( $map_args ); |
|
| 420 | - |
|
| 421 | - $output = ob_get_contents(); |
|
| 422 | - |
|
| 423 | - ob_end_clean(); |
|
| 424 | - |
|
| 425 | - foreach ( $backup_globals as $global => $value ) { |
|
| 426 | - ${$global} = $value; |
|
| 427 | - } |
|
| 428 | - |
|
| 429 | - return $output; |
|
| 430 | - }else{ |
|
| 431 | - ob_start(); |
|
| 432 | - add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array |
|
| 433 | - add_action('the_post', 'create_list_jsondata'); // Add marker in json array |
|
| 434 | - add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers |
|
| 435 | - $defaults = array( |
|
| 436 | - 'width' => '294', |
|
| 437 | - 'height' => '370', |
|
| 438 | - 'zoom' => '13', |
|
| 439 | - 'autozoom' => '', |
|
| 440 | - 'sticky' => '', |
|
| 441 | - 'showall' => '0', |
|
| 442 | - 'scrollwheel' => '0', |
|
| 443 | - 'maptype' => 'ROADMAP', |
|
| 444 | - 'child_collapse' => 0, |
|
| 445 | - 'marker_cluster' => false |
|
| 446 | - ); |
|
| 447 | - $params = shortcode_atts($defaults, $atts); |
|
| 448 | - $params = gdsc_validate_map_args($params); |
|
| 449 | - $map_args = array( |
|
| 450 | - 'map_canvas_name' => 'gd_listing_map', |
|
| 451 | - 'width' => $params['width'], |
|
| 452 | - 'height' => $params['height'], |
|
| 453 | - 'zoom' => $params['zoom'], |
|
| 454 | - 'autozoom' => $params['autozoom'], |
|
| 455 | - 'sticky' => $params['sticky'], |
|
| 456 | - 'showall' => $params['showall'], |
|
| 457 | - 'scrollwheel' => $params['scrollwheel'], |
|
| 458 | - 'child_collapse' => 0, |
|
| 459 | - 'enable_cat_filters' => false, |
|
| 460 | - 'enable_text_search' => false, |
|
| 461 | - 'enable_post_type_filters' => false, |
|
| 462 | - 'enable_location_filters' => false, |
|
| 463 | - 'enable_jason_on_load' => true, |
|
| 464 | - ); |
|
| 465 | - if (is_single()) { |
|
| 466 | - global $post; |
|
| 467 | - $map_default_lat = $address_latitude = $post->post_latitude; |
|
| 468 | - $map_default_lng = $address_longitude = $post->post_longitude; |
|
| 469 | - $mapview = $post->post_mapview; |
|
| 470 | - $map_args['zoom'] = $post->post_mapzoom; |
|
| 471 | - $map_args['map_class_name'] = 'geodir-map-listing-page-single'; |
|
| 472 | - } else { |
|
| 473 | - $default_location = geodir_get_default_location(); |
|
| 474 | - $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : ''; |
|
| 475 | - $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : ''; |
|
| 476 | - $map_args['map_class_name'] = 'geodir-map-listing-page'; |
|
| 477 | - } |
|
| 478 | - if (empty($mapview)) { |
|
| 479 | - $mapview = 'ROADMAP'; |
|
| 480 | - } |
|
| 481 | - // Set default map options |
|
| 482 | - $map_args['ajax_url'] = geodir_get_ajax_url(); |
|
| 483 | - $map_args['latitude'] = $map_default_lat; |
|
| 484 | - $map_args['longitude'] = $map_default_lng; |
|
| 485 | - $map_args['streetViewControl'] = true; |
|
| 486 | - $map_args['maptype'] = $mapview; |
|
| 487 | - $map_args['showPreview'] = '0'; |
|
| 488 | - $map_args['maxZoom'] = 21; |
|
| 489 | - $map_args['bubble_size'] = 'small'; |
|
| 490 | - |
|
| 491 | - // Add marker cluster |
|
| 492 | - if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) { |
|
| 493 | - $map_args['enable_marker_cluster'] = true; |
|
| 494 | - } else { |
|
| 495 | - $map_args['enable_marker_cluster'] = false; |
|
| 496 | - } |
|
| 497 | - geodir_draw_map($map_args); |
|
| 498 | - $output = ob_get_contents(); |
|
| 499 | - ob_end_clean(); |
|
| 500 | - return $output; |
|
| 501 | - } |
|
| 266 | + // if some params are set then we need a new query, if not then we can use the main query |
|
| 267 | + if( isset($atts['post_type']) || isset($atts['category']) || isset($atts['event_type']) ) { |
|
| 268 | + |
|
| 269 | + global $add_post_in_marker_array, $gd_sc_map_params; |
|
| 270 | + $backup_globals = array(); |
|
| 271 | + $backup_globals['add_post_in_marker_array'] = $add_post_in_marker_array; |
|
| 272 | + $backup_globals['gd_sc_map_params'] = $gd_sc_map_params; |
|
| 273 | + |
|
| 274 | + $defaults = array( |
|
| 275 | + 'width' => '294', |
|
| 276 | + 'height' => '370', |
|
| 277 | + 'zoom' => '13', |
|
| 278 | + 'autozoom' => '', |
|
| 279 | + 'sticky' => '', |
|
| 280 | + 'showall' => '0', |
|
| 281 | + 'scrollwheel' => '0', |
|
| 282 | + 'maptype' => 'ROADMAP', |
|
| 283 | + 'child_collapse' => 0, |
|
| 284 | + 'marker_cluster' => false, |
|
| 285 | + 'post_type' => 'gd_place', |
|
| 286 | + 'category' => '0', |
|
| 287 | + 'event_type' => 'all' |
|
| 288 | + ); |
|
| 289 | + |
|
| 290 | + $params = shortcode_atts( $defaults, $atts ); |
|
| 291 | + |
|
| 292 | + if ( ! ( gdsc_is_post_type_valid( $params['post_type'] ) ) ) { |
|
| 293 | + $params['post_type'] = 'gd_place'; |
|
| 294 | + } |
|
| 295 | + |
|
| 296 | + // Validate the selected category/ies - Grab the current list based on post_type |
|
| 297 | + $category_taxonomy = geodir_get_taxonomies( $params['post_type'] ); |
|
| 298 | + $categories = get_terms( $category_taxonomy, array( |
|
| 299 | + 'orderby' => 'count', |
|
| 300 | + 'order' => 'DESC', |
|
| 301 | + 'fields' => 'ids' |
|
| 302 | + ) ); |
|
| 303 | + |
|
| 304 | + // Make sure we have an array |
|
| 305 | + if ( ! ( is_array( $params['category'] ) ) ) { |
|
| 306 | + $params['category'] = explode( ',', $params['category'] ); |
|
| 307 | + } |
|
| 308 | + |
|
| 309 | + // Array_intersect returns only the items in $params['category'] that are also in our category list |
|
| 310 | + // Otherwise it becomes empty and later on that will mean "All" |
|
| 311 | + $params['category'] = array_intersect( $params['category'], $categories ); |
|
| 312 | + |
|
| 313 | + if ( $params['post_type'] == 'gd_event' ) { |
|
| 314 | + $params['event_type'] = gdsc_validate_list_filter_choice( $params['event_type'] ); |
|
| 315 | + } |
|
| 316 | + |
|
| 317 | + $params = gdsc_validate_map_args( $params ); |
|
| 318 | + |
|
| 319 | + $gd_sc_map_params = $params; |
|
| 320 | + |
|
| 321 | + $query_args = array( |
|
| 322 | + 'posts_per_page' => 1000000, //@todo kiran why was this added? |
|
| 323 | + 'is_geodir_loop' => true, |
|
| 324 | + 'gd_location' => false, |
|
| 325 | + ); |
|
| 326 | + |
|
| 327 | + if ( ! empty( $params['category'] ) && isset( $params['category'][0] ) && (int) $params['category'][0] != 0 ) { |
|
| 328 | + $category_taxonomy = geodir_get_taxonomies( $params['post_type'] ); |
|
| 329 | + |
|
| 330 | + ######### WPML ######### |
|
| 331 | + if ( function_exists( 'icl_object_id' ) ) { |
|
| 332 | + $category = gd_lang_object_ids( $params['category'], $category_taxonomy[0] ); |
|
| 333 | + } |
|
| 334 | + ######### WPML ######### |
|
| 335 | + |
|
| 336 | + $tax_query = array( |
|
| 337 | + 'taxonomy' => $category_taxonomy[0], |
|
| 338 | + 'field' => 'id', |
|
| 339 | + 'terms' => $params['category'] |
|
| 340 | + ); |
|
| 341 | + |
|
| 342 | + $query_args['tax_query'] = array( $tax_query ); |
|
| 343 | + } |
|
| 344 | + |
|
| 345 | + $add_post_in_marker_array = true; |
|
| 346 | + |
|
| 347 | + if ( $params['post_type'] == 'gd_event' && function_exists( 'geodir_event_get_widget_events' ) ) { |
|
| 348 | + global $geodir_event_widget_listview; |
|
| 349 | + $geodir_event_widget_listview = true; |
|
| 350 | + |
|
| 351 | + $query_args['geodir_event_type'] = $params['event_type']; |
|
| 352 | + |
|
| 353 | + $listings = geodir_event_get_widget_events( $query_args ); |
|
| 354 | + |
|
| 355 | + $geodir_event_widget_listview = false; |
|
| 356 | + } else { |
|
| 357 | + $listings = geodir_get_widget_listings( $query_args ); |
|
| 358 | + } |
|
| 359 | + |
|
| 360 | + if ( ! empty( $listings ) ) { |
|
| 361 | + foreach ( $listings as $listing ) { |
|
| 362 | + create_marker_jason_of_posts( $listing ); |
|
| 363 | + } |
|
| 364 | + } |
|
| 365 | + |
|
| 366 | + ob_start(); |
|
| 367 | + add_action( 'wp_head', 'init_listing_map_script' ); // Initialize the map object and marker array |
|
| 368 | + |
|
| 369 | + add_action( 'the_post', 'create_list_jsondata' ); // Add marker in json array |
|
| 370 | + |
|
| 371 | + add_action( 'wp_footer', 'show_listing_widget_map' ); // Show map for listings with markers |
|
| 372 | + |
|
| 373 | + $default_location = geodir_get_default_location(); |
|
| 374 | + |
|
| 375 | + $map_args = array( |
|
| 376 | + 'map_canvas_name' => 'gd_listing_map', |
|
| 377 | + 'width' => $params['width'], |
|
| 378 | + 'height' => $params['height'], |
|
| 379 | + 'zoom' => $params['zoom'], |
|
| 380 | + 'autozoom' => $params['autozoom'], |
|
| 381 | + 'sticky' => $params['sticky'], |
|
| 382 | + 'showall' => $params['showall'], |
|
| 383 | + 'scrollwheel' => $params['scrollwheel'], |
|
| 384 | + 'maptype' => $params['maptype'], |
|
| 385 | + 'child_collapse' => 0, |
|
| 386 | + 'enable_cat_filters' => false, |
|
| 387 | + 'enable_text_search' => false, |
|
| 388 | + 'enable_post_type_filters' => false, |
|
| 389 | + 'enable_location_filters' => false, |
|
| 390 | + 'enable_jason_on_load' => true, |
|
| 391 | + 'ajax_url' => geodir_get_ajax_url(), |
|
| 392 | + 'latitude' => isset( $default_location->city_latitude ) ? $default_location->city_latitude : '', |
|
| 393 | + 'longitude' => isset( $default_location->city_longitude ) ? $default_location->city_longitude : '', |
|
| 394 | + 'streetViewControl' => true, |
|
| 395 | + 'showPreview' => '0', |
|
| 396 | + 'maxZoom' => 21, |
|
| 397 | + 'bubble_size' => 'small', |
|
| 398 | + ); |
|
| 399 | + |
|
| 400 | + if ( is_single() ) { |
|
| 401 | + global $post; |
|
| 402 | + if ( isset( $post->post_latitude ) ) { |
|
| 403 | + $map_args['latitude'] = $post->post_latitude; |
|
| 404 | + $map_args['longitude'] = $post->post_longitude; |
|
| 405 | + } |
|
| 406 | + |
|
| 407 | + $map_args['map_class_name'] = 'geodir-map-listing-page-single'; |
|
| 408 | + } else { |
|
| 409 | + $map_args['map_class_name'] = 'geodir-map-listing-page'; |
|
| 410 | + } |
|
| 411 | + |
|
| 412 | + // Add marker cluster |
|
| 413 | + if ( isset( $params['marker_cluster'] ) && gdsc_to_bool_val( $params['marker_cluster'] ) && defined( 'GDCLUSTER_VERSION' ) ) { |
|
| 414 | + $map_args['enable_marker_cluster'] = true; |
|
| 415 | + } else { |
|
| 416 | + $map_args['enable_marker_cluster'] = false; |
|
| 417 | + } |
|
| 418 | + |
|
| 419 | + geodir_draw_map( $map_args ); |
|
| 420 | + |
|
| 421 | + $output = ob_get_contents(); |
|
| 422 | + |
|
| 423 | + ob_end_clean(); |
|
| 424 | + |
|
| 425 | + foreach ( $backup_globals as $global => $value ) { |
|
| 426 | + ${$global} = $value; |
|
| 427 | + } |
|
| 428 | + |
|
| 429 | + return $output; |
|
| 430 | + }else{ |
|
| 431 | + ob_start(); |
|
| 432 | + add_action('wp_head', 'init_listing_map_script'); // Initialize the map object and marker array |
|
| 433 | + add_action('the_post', 'create_list_jsondata'); // Add marker in json array |
|
| 434 | + add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers |
|
| 435 | + $defaults = array( |
|
| 436 | + 'width' => '294', |
|
| 437 | + 'height' => '370', |
|
| 438 | + 'zoom' => '13', |
|
| 439 | + 'autozoom' => '', |
|
| 440 | + 'sticky' => '', |
|
| 441 | + 'showall' => '0', |
|
| 442 | + 'scrollwheel' => '0', |
|
| 443 | + 'maptype' => 'ROADMAP', |
|
| 444 | + 'child_collapse' => 0, |
|
| 445 | + 'marker_cluster' => false |
|
| 446 | + ); |
|
| 447 | + $params = shortcode_atts($defaults, $atts); |
|
| 448 | + $params = gdsc_validate_map_args($params); |
|
| 449 | + $map_args = array( |
|
| 450 | + 'map_canvas_name' => 'gd_listing_map', |
|
| 451 | + 'width' => $params['width'], |
|
| 452 | + 'height' => $params['height'], |
|
| 453 | + 'zoom' => $params['zoom'], |
|
| 454 | + 'autozoom' => $params['autozoom'], |
|
| 455 | + 'sticky' => $params['sticky'], |
|
| 456 | + 'showall' => $params['showall'], |
|
| 457 | + 'scrollwheel' => $params['scrollwheel'], |
|
| 458 | + 'child_collapse' => 0, |
|
| 459 | + 'enable_cat_filters' => false, |
|
| 460 | + 'enable_text_search' => false, |
|
| 461 | + 'enable_post_type_filters' => false, |
|
| 462 | + 'enable_location_filters' => false, |
|
| 463 | + 'enable_jason_on_load' => true, |
|
| 464 | + ); |
|
| 465 | + if (is_single()) { |
|
| 466 | + global $post; |
|
| 467 | + $map_default_lat = $address_latitude = $post->post_latitude; |
|
| 468 | + $map_default_lng = $address_longitude = $post->post_longitude; |
|
| 469 | + $mapview = $post->post_mapview; |
|
| 470 | + $map_args['zoom'] = $post->post_mapzoom; |
|
| 471 | + $map_args['map_class_name'] = 'geodir-map-listing-page-single'; |
|
| 472 | + } else { |
|
| 473 | + $default_location = geodir_get_default_location(); |
|
| 474 | + $map_default_lat = isset($default_location->city_latitude) ? $default_location->city_latitude : ''; |
|
| 475 | + $map_default_lng = isset($default_location->city_longitude) ? $default_location->city_longitude : ''; |
|
| 476 | + $map_args['map_class_name'] = 'geodir-map-listing-page'; |
|
| 477 | + } |
|
| 478 | + if (empty($mapview)) { |
|
| 479 | + $mapview = 'ROADMAP'; |
|
| 480 | + } |
|
| 481 | + // Set default map options |
|
| 482 | + $map_args['ajax_url'] = geodir_get_ajax_url(); |
|
| 483 | + $map_args['latitude'] = $map_default_lat; |
|
| 484 | + $map_args['longitude'] = $map_default_lng; |
|
| 485 | + $map_args['streetViewControl'] = true; |
|
| 486 | + $map_args['maptype'] = $mapview; |
|
| 487 | + $map_args['showPreview'] = '0'; |
|
| 488 | + $map_args['maxZoom'] = 21; |
|
| 489 | + $map_args['bubble_size'] = 'small'; |
|
| 490 | + |
|
| 491 | + // Add marker cluster |
|
| 492 | + if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) { |
|
| 493 | + $map_args['enable_marker_cluster'] = true; |
|
| 494 | + } else { |
|
| 495 | + $map_args['enable_marker_cluster'] = false; |
|
| 496 | + } |
|
| 497 | + geodir_draw_map($map_args); |
|
| 498 | + $output = ob_get_contents(); |
|
| 499 | + ob_end_clean(); |
|
| 500 | + return $output; |
|
| 501 | + } |
|
| 502 | 502 | } |
| 503 | 503 | |
| 504 | 504 | add_shortcode('gd_listing_slider', 'geodir_sc_listing_slider'); |
@@ -531,120 +531,120 @@ discard block |
||
| 531 | 531 | */ |
| 532 | 532 | function geodir_sc_listing_slider($atts) |
| 533 | 533 | { |
| 534 | - ob_start(); |
|
| 535 | - $defaults = array( |
|
| 536 | - 'post_type' => 'gd_place', |
|
| 537 | - 'category' => '0', |
|
| 538 | - 'post_number' => '5', |
|
| 539 | - 'slideshow' => '0', |
|
| 540 | - 'animation_loop' => 0, |
|
| 541 | - 'direction_nav' => 0, |
|
| 542 | - 'slideshow_speed' => 5000, |
|
| 543 | - 'animation_speed' => 600, |
|
| 544 | - 'animation' => 'slide', |
|
| 545 | - 'order_by' => 'latest', |
|
| 546 | - 'show_title' => '', |
|
| 547 | - 'show_featured_only' => '', |
|
| 548 | - 'title' => '', |
|
| 549 | - ); |
|
| 550 | - |
|
| 551 | - $params = shortcode_atts($defaults, $atts); |
|
| 552 | - |
|
| 553 | - |
|
| 554 | - /* |
|
| 534 | + ob_start(); |
|
| 535 | + $defaults = array( |
|
| 536 | + 'post_type' => 'gd_place', |
|
| 537 | + 'category' => '0', |
|
| 538 | + 'post_number' => '5', |
|
| 539 | + 'slideshow' => '0', |
|
| 540 | + 'animation_loop' => 0, |
|
| 541 | + 'direction_nav' => 0, |
|
| 542 | + 'slideshow_speed' => 5000, |
|
| 543 | + 'animation_speed' => 600, |
|
| 544 | + 'animation' => 'slide', |
|
| 545 | + 'order_by' => 'latest', |
|
| 546 | + 'show_title' => '', |
|
| 547 | + 'show_featured_only' => '', |
|
| 548 | + 'title' => '', |
|
| 549 | + ); |
|
| 550 | + |
|
| 551 | + $params = shortcode_atts($defaults, $atts); |
|
| 552 | + |
|
| 553 | + |
|
| 554 | + /* |
|
| 555 | 555 | * |
| 556 | 556 | * Now we begin the validation of the attributes. |
| 557 | 557 | */ |
| 558 | - // Check we have a valid post_type |
|
| 559 | - if (!(gdsc_is_post_type_valid($params['post_type']))) { |
|
| 560 | - $params['post_type'] = 'gd_place'; |
|
| 561 | - } |
|
| 562 | - |
|
| 563 | - // Check we have a valid sort_order |
|
| 564 | - $params['order_by'] = gdsc_validate_sort_choice($params['order_by']); |
|
| 565 | - |
|
| 566 | - // Match the chosen animation to our options |
|
| 567 | - $animation_list = array('slide', 'fade'); |
|
| 568 | - if (!(in_array($params['animation'], $animation_list))) { |
|
| 569 | - $params['animation'] = 'slide'; |
|
| 570 | - } |
|
| 571 | - |
|
| 572 | - // Post_number needs to be a positive integer |
|
| 573 | - $params['post_number'] = absint($params['post_number']); |
|
| 574 | - if (0 == $params['post_number']) { |
|
| 575 | - $params['post_number'] = 1; |
|
| 576 | - } |
|
| 577 | - |
|
| 578 | - // Manage the entered categories |
|
| 579 | - if (0 != $params['category'] || '' != $params['category']) { |
|
| 580 | - $params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']); |
|
| 581 | - } |
|
| 582 | - // Convert show_title to a bool |
|
| 583 | - $params['show_title'] = intval(gdsc_to_bool_val($params['show_title'])); |
|
| 584 | - |
|
| 585 | - // Convert show_featured_only to a bool |
|
| 586 | - $params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only'])); |
|
| 587 | - |
|
| 588 | - /* |
|
| 558 | + // Check we have a valid post_type |
|
| 559 | + if (!(gdsc_is_post_type_valid($params['post_type']))) { |
|
| 560 | + $params['post_type'] = 'gd_place'; |
|
| 561 | + } |
|
| 562 | + |
|
| 563 | + // Check we have a valid sort_order |
|
| 564 | + $params['order_by'] = gdsc_validate_sort_choice($params['order_by']); |
|
| 565 | + |
|
| 566 | + // Match the chosen animation to our options |
|
| 567 | + $animation_list = array('slide', 'fade'); |
|
| 568 | + if (!(in_array($params['animation'], $animation_list))) { |
|
| 569 | + $params['animation'] = 'slide'; |
|
| 570 | + } |
|
| 571 | + |
|
| 572 | + // Post_number needs to be a positive integer |
|
| 573 | + $params['post_number'] = absint($params['post_number']); |
|
| 574 | + if (0 == $params['post_number']) { |
|
| 575 | + $params['post_number'] = 1; |
|
| 576 | + } |
|
| 577 | + |
|
| 578 | + // Manage the entered categories |
|
| 579 | + if (0 != $params['category'] || '' != $params['category']) { |
|
| 580 | + $params['category'] = gdsc_manage_category_choice($params['post_type'], $params['category']); |
|
| 581 | + } |
|
| 582 | + // Convert show_title to a bool |
|
| 583 | + $params['show_title'] = intval(gdsc_to_bool_val($params['show_title'])); |
|
| 584 | + |
|
| 585 | + // Convert show_featured_only to a bool |
|
| 586 | + $params['show_featured_only'] = intval(gdsc_to_bool_val($params['show_featured_only'])); |
|
| 587 | + |
|
| 588 | + /* |
|
| 589 | 589 | * Hopefully all attributes are now valid, and safe to pass forward |
| 590 | 590 | */ |
| 591 | 591 | |
| 592 | - // redeclare vars after validation |
|
| 593 | - |
|
| 594 | - if (isset($params['direction_nav'])) { |
|
| 595 | - $params['directionNav'] = $params['direction_nav']; |
|
| 596 | - } |
|
| 597 | - if (isset($params['animation_loop'])) { |
|
| 598 | - $params['animationLoop'] = $params['animation_loop']; |
|
| 599 | - } |
|
| 600 | - if (isset($params['slideshow_speed'])) { |
|
| 601 | - $params['slideshowSpeed'] = $params['slideshow_speed']; |
|
| 602 | - } |
|
| 603 | - if (isset($params['animation_speed'])) { |
|
| 604 | - $params['animationSpeed'] = $params['animation_speed']; |
|
| 605 | - } |
|
| 606 | - if (isset($params['order_by'])) { |
|
| 607 | - $params['list_sort'] = $params['order_by']; |
|
| 608 | - } |
|
| 609 | - |
|
| 610 | - $query_args = array( |
|
| 611 | - 'post_number' => $params['post_number'], |
|
| 612 | - 'is_geodir_loop' => true, |
|
| 613 | - 'post_type' => $params['post_type'], |
|
| 614 | - 'order_by' => $params['order_by'] |
|
| 615 | - ); |
|
| 616 | - |
|
| 617 | - if (1 == $params['show_featured_only']) { |
|
| 618 | - $query_args['show_featured_only'] = 1; |
|
| 619 | - } |
|
| 620 | - |
|
| 621 | - if (0 != $params['category'] && '' != $params['category']) { |
|
| 622 | - $category_taxonomy = geodir_get_taxonomies($params['post_type']); |
|
| 623 | - $tax_query = array( |
|
| 624 | - 'taxonomy' => $category_taxonomy[0], |
|
| 625 | - 'field' => 'id', |
|
| 626 | - 'terms' => $params['category'], |
|
| 627 | - ); |
|
| 628 | - |
|
| 629 | - $query_args['tax_query'] = array($tax_query); |
|
| 630 | - } |
|
| 631 | - |
|
| 632 | - $defaults = array( |
|
| 633 | - 'before_widget' => '', |
|
| 634 | - 'after_widget' => '', |
|
| 635 | - 'before_title' => '', |
|
| 636 | - 'after_title' => '', |
|
| 637 | - ); |
|
| 638 | - |
|
| 639 | - $query_args = array_merge($query_args, $params); |
|
| 640 | - |
|
| 641 | - geodir_listing_slider_widget_output($defaults, $query_args); |
|
| 642 | - |
|
| 643 | - $output = ob_get_contents(); |
|
| 644 | - |
|
| 645 | - ob_end_clean(); |
|
| 646 | - |
|
| 647 | - return $output; |
|
| 592 | + // redeclare vars after validation |
|
| 593 | + |
|
| 594 | + if (isset($params['direction_nav'])) { |
|
| 595 | + $params['directionNav'] = $params['direction_nav']; |
|
| 596 | + } |
|
| 597 | + if (isset($params['animation_loop'])) { |
|
| 598 | + $params['animationLoop'] = $params['animation_loop']; |
|
| 599 | + } |
|
| 600 | + if (isset($params['slideshow_speed'])) { |
|
| 601 | + $params['slideshowSpeed'] = $params['slideshow_speed']; |
|
| 602 | + } |
|
| 603 | + if (isset($params['animation_speed'])) { |
|
| 604 | + $params['animationSpeed'] = $params['animation_speed']; |
|
| 605 | + } |
|
| 606 | + if (isset($params['order_by'])) { |
|
| 607 | + $params['list_sort'] = $params['order_by']; |
|
| 608 | + } |
|
| 609 | + |
|
| 610 | + $query_args = array( |
|
| 611 | + 'post_number' => $params['post_number'], |
|
| 612 | + 'is_geodir_loop' => true, |
|
| 613 | + 'post_type' => $params['post_type'], |
|
| 614 | + 'order_by' => $params['order_by'] |
|
| 615 | + ); |
|
| 616 | + |
|
| 617 | + if (1 == $params['show_featured_only']) { |
|
| 618 | + $query_args['show_featured_only'] = 1; |
|
| 619 | + } |
|
| 620 | + |
|
| 621 | + if (0 != $params['category'] && '' != $params['category']) { |
|
| 622 | + $category_taxonomy = geodir_get_taxonomies($params['post_type']); |
|
| 623 | + $tax_query = array( |
|
| 624 | + 'taxonomy' => $category_taxonomy[0], |
|
| 625 | + 'field' => 'id', |
|
| 626 | + 'terms' => $params['category'], |
|
| 627 | + ); |
|
| 628 | + |
|
| 629 | + $query_args['tax_query'] = array($tax_query); |
|
| 630 | + } |
|
| 631 | + |
|
| 632 | + $defaults = array( |
|
| 633 | + 'before_widget' => '', |
|
| 634 | + 'after_widget' => '', |
|
| 635 | + 'before_title' => '', |
|
| 636 | + 'after_title' => '', |
|
| 637 | + ); |
|
| 638 | + |
|
| 639 | + $query_args = array_merge($query_args, $params); |
|
| 640 | + |
|
| 641 | + geodir_listing_slider_widget_output($defaults, $query_args); |
|
| 642 | + |
|
| 643 | + $output = ob_get_contents(); |
|
| 644 | + |
|
| 645 | + ob_end_clean(); |
|
| 646 | + |
|
| 647 | + return $output; |
|
| 648 | 648 | } |
| 649 | 649 | |
| 650 | 650 | add_shortcode('gd_login_box', 'geodir_sc_login_box'); |
@@ -668,22 +668,22 @@ discard block |
||
| 668 | 668 | */ |
| 669 | 669 | function geodir_sc_login_box($atts) |
| 670 | 670 | { |
| 671 | - ob_start(); |
|
| 671 | + ob_start(); |
|
| 672 | 672 | |
| 673 | - $defaults = array( |
|
| 674 | - 'before_widget' => '', |
|
| 675 | - 'after_widget' => '', |
|
| 676 | - 'before_title' => '', |
|
| 677 | - 'after_title' => '', |
|
| 678 | - ); |
|
| 673 | + $defaults = array( |
|
| 674 | + 'before_widget' => '', |
|
| 675 | + 'after_widget' => '', |
|
| 676 | + 'before_title' => '', |
|
| 677 | + 'after_title' => '', |
|
| 678 | + ); |
|
| 679 | 679 | |
| 680 | - geodir_loginwidget_output($defaults, $defaults); |
|
| 680 | + geodir_loginwidget_output($defaults, $defaults); |
|
| 681 | 681 | |
| 682 | - $output = ob_get_contents(); |
|
| 682 | + $output = ob_get_contents(); |
|
| 683 | 683 | |
| 684 | - ob_end_clean(); |
|
| 684 | + ob_end_clean(); |
|
| 685 | 685 | |
| 686 | - return $output; |
|
| 686 | + return $output; |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | 689 | add_shortcode('gd_popular_post_category', 'geodir_sc_popular_post_category'); |
@@ -714,31 +714,31 @@ discard block |
||
| 714 | 714 | */ |
| 715 | 715 | function geodir_sc_popular_post_category($atts) |
| 716 | 716 | { |
| 717 | - ob_start(); |
|
| 718 | - global $geodir_post_category_str; |
|
| 719 | - $defaults = array( |
|
| 720 | - 'category_limit' => 15, |
|
| 721 | - 'category_restrict' => false, |
|
| 722 | - 'before_widget' => '', |
|
| 723 | - 'after_widget' => '', |
|
| 724 | - 'before_title' => '', |
|
| 725 | - 'after_title' => '', |
|
| 726 | - 'title' => '', |
|
| 727 | - 'default_post_type' => '', |
|
| 728 | - 'parent_only' => false, |
|
| 729 | - ); |
|
| 730 | - |
|
| 731 | - $params = shortcode_atts($defaults, $atts, 'popular_post_category'); |
|
| 732 | - $params['category_limit'] = absint($params['category_limit']); |
|
| 733 | - $params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : ''; |
|
| 734 | - $params['parent_only'] = gdsc_to_bool_val($params['parent_only']); |
|
| 735 | - geodir_popular_post_category_output($params, $params); |
|
| 736 | - |
|
| 737 | - $output = ob_get_contents(); |
|
| 738 | - |
|
| 739 | - ob_end_clean(); |
|
| 740 | - |
|
| 741 | - return $output; |
|
| 717 | + ob_start(); |
|
| 718 | + global $geodir_post_category_str; |
|
| 719 | + $defaults = array( |
|
| 720 | + 'category_limit' => 15, |
|
| 721 | + 'category_restrict' => false, |
|
| 722 | + 'before_widget' => '', |
|
| 723 | + 'after_widget' => '', |
|
| 724 | + 'before_title' => '', |
|
| 725 | + 'after_title' => '', |
|
| 726 | + 'title' => '', |
|
| 727 | + 'default_post_type' => '', |
|
| 728 | + 'parent_only' => false, |
|
| 729 | + ); |
|
| 730 | + |
|
| 731 | + $params = shortcode_atts($defaults, $atts, 'popular_post_category'); |
|
| 732 | + $params['category_limit'] = absint($params['category_limit']); |
|
| 733 | + $params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : ''; |
|
| 734 | + $params['parent_only'] = gdsc_to_bool_val($params['parent_only']); |
|
| 735 | + geodir_popular_post_category_output($params, $params); |
|
| 736 | + |
|
| 737 | + $output = ob_get_contents(); |
|
| 738 | + |
|
| 739 | + ob_end_clean(); |
|
| 740 | + |
|
| 741 | + return $output; |
|
| 742 | 742 | } |
| 743 | 743 | |
| 744 | 744 | add_shortcode('gd_popular_post_view', 'geodir_sc_popular_post_view'); |
@@ -778,97 +778,97 @@ discard block |
||
| 778 | 778 | */ |
| 779 | 779 | function geodir_sc_popular_post_view($atts) |
| 780 | 780 | { |
| 781 | - ob_start(); |
|
| 782 | - $defaults = array( |
|
| 783 | - 'post_type' => 'gd_place', |
|
| 784 | - 'category' => '0', |
|
| 785 | - 'post_number' => '5', |
|
| 786 | - 'layout' => 'gridview_onehalf', |
|
| 787 | - 'add_location_filter' => '0', |
|
| 788 | - 'list_sort' => 'latest', |
|
| 789 | - 'use_viewing_post_type' => '1', |
|
| 790 | - 'character_count' => '20', |
|
| 791 | - 'listing_width' => '', |
|
| 792 | - 'show_featured_only' => '0', |
|
| 793 | - 'show_special_only' => '0', |
|
| 794 | - 'with_pics_only' => '0', |
|
| 795 | - 'with_videos_only' => '0', |
|
| 796 | - 'before_widget' => '', |
|
| 797 | - 'after_widget' => '', |
|
| 798 | - 'before_title' => '<h3 class="widget-title">', |
|
| 799 | - 'after_title' => '</h3>', |
|
| 800 | - 'title' => '', |
|
| 801 | - 'category_title' => '', |
|
| 802 | - ); |
|
| 803 | - |
|
| 804 | - $params = shortcode_atts($defaults, $atts); |
|
| 805 | - |
|
| 806 | - /** |
|
| 807 | - * Validate our incoming params |
|
| 808 | - */ |
|
| 781 | + ob_start(); |
|
| 782 | + $defaults = array( |
|
| 783 | + 'post_type' => 'gd_place', |
|
| 784 | + 'category' => '0', |
|
| 785 | + 'post_number' => '5', |
|
| 786 | + 'layout' => 'gridview_onehalf', |
|
| 787 | + 'add_location_filter' => '0', |
|
| 788 | + 'list_sort' => 'latest', |
|
| 789 | + 'use_viewing_post_type' => '1', |
|
| 790 | + 'character_count' => '20', |
|
| 791 | + 'listing_width' => '', |
|
| 792 | + 'show_featured_only' => '0', |
|
| 793 | + 'show_special_only' => '0', |
|
| 794 | + 'with_pics_only' => '0', |
|
| 795 | + 'with_videos_only' => '0', |
|
| 796 | + 'before_widget' => '', |
|
| 797 | + 'after_widget' => '', |
|
| 798 | + 'before_title' => '<h3 class="widget-title">', |
|
| 799 | + 'after_title' => '</h3>', |
|
| 800 | + 'title' => '', |
|
| 801 | + 'category_title' => '', |
|
| 802 | + ); |
|
| 809 | 803 | |
| 810 | - // Validate the selected post type, default to gd_place on fail |
|
| 811 | - if (!(gdsc_is_post_type_valid($params['post_type']))) { |
|
| 812 | - $params['post_type'] = 'gd_place'; |
|
| 813 | - } |
|
| 814 | - |
|
| 815 | - // Validate the selected category/ies - Grab the current list based on post_type |
|
| 816 | - $category_taxonomy = geodir_get_taxonomies($params['post_type']); |
|
| 817 | - $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids')); |
|
| 818 | - |
|
| 819 | - // Make sure we have an array |
|
| 820 | - if (!(is_array($params['category']))) { |
|
| 821 | - $params['category'] = explode(',', $params['category']); |
|
| 822 | - } |
|
| 823 | - |
|
| 824 | - // Array_intersect returns only the items in $params['category'] that are also in our category list |
|
| 825 | - // Otherwise it becomes empty and later on that will mean "All" |
|
| 826 | - $params['category'] = array_intersect($params['category'], $categories); |
|
| 827 | - |
|
| 828 | - // Post_number needs to be a positive integer |
|
| 829 | - $params['post_number'] = absint($params['post_number']); |
|
| 830 | - if (0 == $params['post_number']) { |
|
| 831 | - $params['post_number'] = 1; |
|
| 832 | - } |
|
| 833 | - |
|
| 834 | - // Validate our layout choice |
|
| 835 | - // Outside of the norm, I added some more simple terms to match the existing |
|
| 836 | - // So now I just run the switch to set it properly. |
|
| 837 | - $params['layout'] = gdsc_validate_layout_choice($params['layout']); |
|
| 838 | - |
|
| 839 | - // Validate our sorting choice |
|
| 840 | - $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']); |
|
| 841 | - |
|
| 842 | - // Validate character_count |
|
| 843 | - $params['character_count'] = absint($params['character_count']); |
|
| 844 | - if (20 > $params['character_count']) { |
|
| 845 | - $params['character_count'] = 20; |
|
| 846 | - } |
|
| 847 | - |
|
| 848 | - // Validate Listing width, used in the template widget-listing-listview.php |
|
| 849 | - // The context is in width=$listing_width% - So we need a positive number between 0 & 100 |
|
| 850 | - $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']); |
|
| 851 | - |
|
| 852 | - // Validate the checkboxes used on the widget |
|
| 853 | - $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']); |
|
| 854 | - $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']); |
|
| 855 | - $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']); |
|
| 856 | - $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']); |
|
| 857 | - $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']); |
|
| 858 | - $params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']); |
|
| 859 | - |
|
| 860 | - /** |
|
| 861 | - * End of validation |
|
| 862 | - */ |
|
| 804 | + $params = shortcode_atts($defaults, $atts); |
|
| 805 | + |
|
| 806 | + /** |
|
| 807 | + * Validate our incoming params |
|
| 808 | + */ |
|
| 863 | 809 | |
| 864 | - geodir_popular_postview_output($params, $params); |
|
| 810 | + // Validate the selected post type, default to gd_place on fail |
|
| 811 | + if (!(gdsc_is_post_type_valid($params['post_type']))) { |
|
| 812 | + $params['post_type'] = 'gd_place'; |
|
| 813 | + } |
|
| 865 | 814 | |
| 815 | + // Validate the selected category/ies - Grab the current list based on post_type |
|
| 816 | + $category_taxonomy = geodir_get_taxonomies($params['post_type']); |
|
| 817 | + $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids')); |
|
| 866 | 818 | |
| 867 | - $output = ob_get_contents(); |
|
| 819 | + // Make sure we have an array |
|
| 820 | + if (!(is_array($params['category']))) { |
|
| 821 | + $params['category'] = explode(',', $params['category']); |
|
| 822 | + } |
|
| 868 | 823 | |
| 869 | - ob_end_clean(); |
|
| 824 | + // Array_intersect returns only the items in $params['category'] that are also in our category list |
|
| 825 | + // Otherwise it becomes empty and later on that will mean "All" |
|
| 826 | + $params['category'] = array_intersect($params['category'], $categories); |
|
| 870 | 827 | |
| 871 | - return $output; |
|
| 828 | + // Post_number needs to be a positive integer |
|
| 829 | + $params['post_number'] = absint($params['post_number']); |
|
| 830 | + if (0 == $params['post_number']) { |
|
| 831 | + $params['post_number'] = 1; |
|
| 832 | + } |
|
| 833 | + |
|
| 834 | + // Validate our layout choice |
|
| 835 | + // Outside of the norm, I added some more simple terms to match the existing |
|
| 836 | + // So now I just run the switch to set it properly. |
|
| 837 | + $params['layout'] = gdsc_validate_layout_choice($params['layout']); |
|
| 838 | + |
|
| 839 | + // Validate our sorting choice |
|
| 840 | + $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']); |
|
| 841 | + |
|
| 842 | + // Validate character_count |
|
| 843 | + $params['character_count'] = absint($params['character_count']); |
|
| 844 | + if (20 > $params['character_count']) { |
|
| 845 | + $params['character_count'] = 20; |
|
| 846 | + } |
|
| 847 | + |
|
| 848 | + // Validate Listing width, used in the template widget-listing-listview.php |
|
| 849 | + // The context is in width=$listing_width% - So we need a positive number between 0 & 100 |
|
| 850 | + $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']); |
|
| 851 | + |
|
| 852 | + // Validate the checkboxes used on the widget |
|
| 853 | + $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']); |
|
| 854 | + $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']); |
|
| 855 | + $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']); |
|
| 856 | + $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']); |
|
| 857 | + $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']); |
|
| 858 | + $params['use_viewing_post_type'] = gdsc_to_bool_val($params['use_viewing_post_type']); |
|
| 859 | + |
|
| 860 | + /** |
|
| 861 | + * End of validation |
|
| 862 | + */ |
|
| 863 | + |
|
| 864 | + geodir_popular_postview_output($params, $params); |
|
| 865 | + |
|
| 866 | + |
|
| 867 | + $output = ob_get_contents(); |
|
| 868 | + |
|
| 869 | + ob_end_clean(); |
|
| 870 | + |
|
| 871 | + return $output; |
|
| 872 | 872 | } |
| 873 | 873 | |
| 874 | 874 | add_shortcode('gd_recent_reviews', 'geodir_sc_recent_reviews'); |
@@ -890,37 +890,37 @@ discard block |
||
| 890 | 890 | * @return string Recent reviews HTML. |
| 891 | 891 | */ |
| 892 | 892 | function geodir_sc_recent_reviews($atts) { |
| 893 | - ob_start(); |
|
| 894 | - $defaults = array( |
|
| 893 | + ob_start(); |
|
| 894 | + $defaults = array( |
|
| 895 | 895 | 'title' => '', |
| 896 | 896 | 'count' => 5, |
| 897 | - ); |
|
| 897 | + ); |
|
| 898 | 898 | |
| 899 | - $params = shortcode_atts($defaults, $atts); |
|
| 899 | + $params = shortcode_atts($defaults, $atts); |
|
| 900 | 900 | |
| 901 | - $count = absint($params['count']); |
|
| 902 | - if (0 == $count) { |
|
| 903 | - $count = 1; |
|
| 904 | - } |
|
| 901 | + $count = absint($params['count']); |
|
| 902 | + if (0 == $count) { |
|
| 903 | + $count = 1; |
|
| 904 | + } |
|
| 905 | 905 | |
| 906 | 906 | $title = !empty($params['title']) ? __($params['title'], 'geodirectory') : ''; |
| 907 | 907 | |
| 908 | - $comments_li = geodir_get_recent_reviews(30, $count, 100, false); |
|
| 908 | + $comments_li = geodir_get_recent_reviews(30, $count, 100, false); |
|
| 909 | 909 | |
| 910 | - if ($comments_li) { |
|
| 911 | - if ($title != '') { ?> |
|
| 910 | + if ($comments_li) { |
|
| 911 | + if ($title != '') { ?> |
|
| 912 | 912 | <h3 class="geodir-sc-recent-reviews-title widget-title"><?php echo $title; ?></h3> |
| 913 | 913 | <?php } ?> |
| 914 | 914 | <div class="geodir_sc_recent_reviews_section"> |
| 915 | 915 | <ul class="geodir_sc_recent_reviews"><?php echo $comments_li; ?></ul> |
| 916 | 916 | </div> |
| 917 | 917 | <?php |
| 918 | - } |
|
| 919 | - $output = ob_get_contents(); |
|
| 918 | + } |
|
| 919 | + $output = ob_get_contents(); |
|
| 920 | 920 | |
| 921 | - ob_end_clean(); |
|
| 921 | + ob_end_clean(); |
|
| 922 | 922 | |
| 923 | - return $output; |
|
| 923 | + return $output; |
|
| 924 | 924 | } |
| 925 | 925 | |
| 926 | 926 | add_shortcode('gd_related_listings', 'geodir_sc_related_listings'); |
@@ -950,64 +950,64 @@ discard block |
||
| 950 | 950 | */ |
| 951 | 951 | function geodir_sc_related_listings($atts) |
| 952 | 952 | { |
| 953 | - ob_start(); |
|
| 954 | - $defaults = array( |
|
| 955 | - 'post_number' => 5, |
|
| 956 | - 'relate_to' => 'category', |
|
| 957 | - 'layout' => 'gridview_onehalf', |
|
| 958 | - 'add_location_filter' => 0, |
|
| 959 | - 'listing_width' => '', |
|
| 960 | - 'list_sort' => 'latest', |
|
| 961 | - 'character_count' => 20, |
|
| 962 | - 'is_widget' => 1, |
|
| 963 | - 'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>', |
|
| 964 | - ); |
|
| 965 | - // The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet. |
|
| 966 | - |
|
| 967 | - $params = shortcode_atts($defaults, $atts); |
|
| 968 | - |
|
| 969 | - /** |
|
| 970 | - * Begin validating parameters |
|
| 971 | - */ |
|
| 953 | + ob_start(); |
|
| 954 | + $defaults = array( |
|
| 955 | + 'post_number' => 5, |
|
| 956 | + 'relate_to' => 'category', |
|
| 957 | + 'layout' => 'gridview_onehalf', |
|
| 958 | + 'add_location_filter' => 0, |
|
| 959 | + 'listing_width' => '', |
|
| 960 | + 'list_sort' => 'latest', |
|
| 961 | + 'character_count' => 20, |
|
| 962 | + 'is_widget' => 1, |
|
| 963 | + 'before_title' => '<style type="text/css">.geodir_category_list_view li{margin:0px!important}</style>', |
|
| 964 | + ); |
|
| 965 | + // The "before_title" code is an ugly & terrible hack. But it works for now. I should enqueue a new stylesheet. |
|
| 972 | 966 | |
| 973 | - // Validate that post_number is a number and is 1 or higher |
|
| 974 | - $params['post_number'] = absint($params['post_number']); |
|
| 975 | - if (0 === $params['post_number']) { |
|
| 976 | - $params['post_number'] = 1; |
|
| 977 | - } |
|
| 967 | + $params = shortcode_atts($defaults, $atts); |
|
| 978 | 968 | |
| 979 | - // Validate relate_to - only category or tags |
|
| 980 | - $params['relate_to'] = geodir_strtolower($params['relate_to']); |
|
| 981 | - if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) { |
|
| 982 | - $params['relate_to'] = 'category'; |
|
| 983 | - } |
|
| 969 | + /** |
|
| 970 | + * Begin validating parameters |
|
| 971 | + */ |
|
| 984 | 972 | |
| 985 | - // Validate layout selection |
|
| 986 | - $params['layout'] = gdsc_validate_layout_choice($params['layout']); |
|
| 973 | + // Validate that post_number is a number and is 1 or higher |
|
| 974 | + $params['post_number'] = absint($params['post_number']); |
|
| 975 | + if (0 === $params['post_number']) { |
|
| 976 | + $params['post_number'] = 1; |
|
| 977 | + } |
|
| 987 | 978 | |
| 988 | - // Validate sorting option |
|
| 989 | - $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']); |
|
| 979 | + // Validate relate_to - only category or tags |
|
| 980 | + $params['relate_to'] = geodir_strtolower($params['relate_to']); |
|
| 981 | + if ('category' != $params['relate_to'] && 'tags' != $params['relate_to']) { |
|
| 982 | + $params['relate_to'] = 'category'; |
|
| 983 | + } |
|
| 990 | 984 | |
| 991 | - // Validate add_location_filter |
|
| 992 | - $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']); |
|
| 985 | + // Validate layout selection |
|
| 986 | + $params['layout'] = gdsc_validate_layout_choice($params['layout']); |
|
| 993 | 987 | |
| 994 | - // Validate listing_width |
|
| 995 | - $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']); |
|
| 988 | + // Validate sorting option |
|
| 989 | + $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']); |
|
| 996 | 990 | |
| 997 | - // Validate character_count |
|
| 998 | - $params['character_count'] = absint($params['character_count']); |
|
| 999 | - if (20 > $params['character_count']) { |
|
| 1000 | - $params['character_count'] = 20; |
|
| 1001 | - } |
|
| 991 | + // Validate add_location_filter |
|
| 992 | + $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']); |
|
| 1002 | 993 | |
| 1003 | - if ($related_display = geodir_related_posts_display($params)) { |
|
| 1004 | - echo $related_display; |
|
| 1005 | - } |
|
| 1006 | - $output = ob_get_contents(); |
|
| 994 | + // Validate listing_width |
|
| 995 | + $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']); |
|
| 1007 | 996 | |
| 1008 | - ob_end_clean(); |
|
| 997 | + // Validate character_count |
|
| 998 | + $params['character_count'] = absint($params['character_count']); |
|
| 999 | + if (20 > $params['character_count']) { |
|
| 1000 | + $params['character_count'] = 20; |
|
| 1001 | + } |
|
| 1009 | 1002 | |
| 1010 | - return $output; |
|
| 1003 | + if ($related_display = geodir_related_posts_display($params)) { |
|
| 1004 | + echo $related_display; |
|
| 1005 | + } |
|
| 1006 | + $output = ob_get_contents(); |
|
| 1007 | + |
|
| 1008 | + ob_end_clean(); |
|
| 1009 | + |
|
| 1010 | + return $output; |
|
| 1011 | 1011 | } |
| 1012 | 1012 | |
| 1013 | 1013 | /** |
@@ -1031,13 +1031,13 @@ discard block |
||
| 1031 | 1031 | * @return string Advanced search widget HTML. |
| 1032 | 1032 | */ |
| 1033 | 1033 | function geodir_sc_advanced_search($atts) { |
| 1034 | - $defaults = array( |
|
| 1034 | + $defaults = array( |
|
| 1035 | 1035 | 'title' => '', |
| 1036 | 1036 | 'before_widget' => '<section id="geodir_advanced_search-1" class="widget geodir-widget geodir_advance_search_widget">', |
| 1037 | - 'after_widget' => '</section>', |
|
| 1038 | - 'before_title' => '<h3 class="widget-title">', |
|
| 1039 | - 'after_title' => '</h3>', |
|
| 1040 | - 'show_adv_search' => 'default', |
|
| 1037 | + 'after_widget' => '</section>', |
|
| 1038 | + 'before_title' => '<h3 class="widget-title">', |
|
| 1039 | + 'after_title' => '</h3>', |
|
| 1040 | + 'show_adv_search' => 'default', |
|
| 1041 | 1041 | 'post_type' => '' |
| 1042 | 1042 | ); |
| 1043 | 1043 | |
@@ -1061,9 +1061,9 @@ discard block |
||
| 1061 | 1061 | the_widget('geodir_advance_search_widget', $params, $params ); |
| 1062 | 1062 | |
| 1063 | 1063 | $output = ob_get_contents(); |
| 1064 | - ob_end_clean(); |
|
| 1064 | + ob_end_clean(); |
|
| 1065 | 1065 | |
| 1066 | - return $output; |
|
| 1066 | + return $output; |
|
| 1067 | 1067 | } |
| 1068 | 1068 | add_shortcode('gd_advanced_search', 'geodir_sc_advanced_search'); |
| 1069 | 1069 | |
@@ -1109,48 +1109,48 @@ discard block |
||
| 1109 | 1109 | 'add_location_filter' => '1', |
| 1110 | 1110 | 'tab_layout' => 'bestof-tabs-on-top', |
| 1111 | 1111 | 'before_widget' => '<section id="bestof_widget-1" class="widget geodir-widget geodir_bestof_widget geodir_sc_bestof_widget">', |
| 1112 | - 'after_widget' => '</section>', |
|
| 1113 | - 'before_title' => '<h3 class="widget-title">', |
|
| 1114 | - 'after_title' => '</h3>', |
|
| 1112 | + 'after_widget' => '</section>', |
|
| 1113 | + 'before_title' => '<h3 class="widget-title">', |
|
| 1114 | + 'after_title' => '</h3>', |
|
| 1115 | 1115 | ); |
| 1116 | 1116 | $params = shortcode_atts($defaults, $atts); |
| 1117 | 1117 | |
| 1118 | - /** |
|
| 1119 | - * Validate our incoming params |
|
| 1120 | - */ |
|
| 1118 | + /** |
|
| 1119 | + * Validate our incoming params |
|
| 1120 | + */ |
|
| 1121 | 1121 | |
| 1122 | - // Validate the selected post type, default to gd_place on fail |
|
| 1123 | - if (!(gdsc_is_post_type_valid($params['post_type']))) { |
|
| 1124 | - $params['post_type'] = 'gd_place'; |
|
| 1125 | - } |
|
| 1122 | + // Validate the selected post type, default to gd_place on fail |
|
| 1123 | + if (!(gdsc_is_post_type_valid($params['post_type']))) { |
|
| 1124 | + $params['post_type'] = 'gd_place'; |
|
| 1125 | + } |
|
| 1126 | 1126 | |
| 1127 | 1127 | // Post limit needs to be a positive integer |
| 1128 | - $params['post_limit'] = absint($params['post_limit']); |
|
| 1129 | - if (0 == $params['post_limit']) { |
|
| 1130 | - $params['post_limit'] = 5; |
|
| 1131 | - } |
|
| 1128 | + $params['post_limit'] = absint($params['post_limit']); |
|
| 1129 | + if (0 == $params['post_limit']) { |
|
| 1130 | + $params['post_limit'] = 5; |
|
| 1131 | + } |
|
| 1132 | 1132 | |
| 1133 | 1133 | // Category limit needs to be a positive integer |
| 1134 | - $params['categ_limit'] = absint($params['categ_limit']); |
|
| 1135 | - if (0 == $params['categ_limit']) { |
|
| 1136 | - $params['categ_limit'] = 3; |
|
| 1137 | - } |
|
| 1134 | + $params['categ_limit'] = absint($params['categ_limit']); |
|
| 1135 | + if (0 == $params['categ_limit']) { |
|
| 1136 | + $params['categ_limit'] = 3; |
|
| 1137 | + } |
|
| 1138 | 1138 | |
| 1139 | 1139 | // Tab layout validation |
| 1140 | - $params['tab_layout'] = $params['tab_layout']; |
|
| 1141 | - if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) { |
|
| 1142 | - $params['tab_layout'] = 'bestof-tabs-on-top'; |
|
| 1143 | - } |
|
| 1140 | + $params['tab_layout'] = $params['tab_layout']; |
|
| 1141 | + if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) { |
|
| 1142 | + $params['tab_layout'] = 'bestof-tabs-on-top'; |
|
| 1143 | + } |
|
| 1144 | 1144 | |
| 1145 | 1145 | // Validate character_count |
| 1146 | - $params['character_count'] = $params['character_count']; |
|
| 1146 | + $params['character_count'] = $params['character_count']; |
|
| 1147 | 1147 | |
| 1148 | 1148 | ob_start(); |
| 1149 | 1149 | the_widget('geodir_bestof_widget', $params, $params); |
| 1150 | - $output = ob_get_contents(); |
|
| 1151 | - ob_end_clean(); |
|
| 1150 | + $output = ob_get_contents(); |
|
| 1151 | + ob_end_clean(); |
|
| 1152 | 1152 | |
| 1153 | - return $output; |
|
| 1153 | + return $output; |
|
| 1154 | 1154 | } |
| 1155 | 1155 | add_shortcode('gd_bestof_widget', 'geodir_sc_bestof_widget'); |
| 1156 | 1156 | |
@@ -1198,127 +1198,127 @@ discard block |
||
| 1198 | 1198 | * @return string HTML content to display geodirectory listings. |
| 1199 | 1199 | */ |
| 1200 | 1200 | function geodir_sc_gd_listings($atts, $content = '') { |
| 1201 | - global $post; |
|
| 1202 | - $defaults = array( |
|
| 1203 | - 'title' => '', |
|
| 1204 | - 'post_type' => 'gd_place', |
|
| 1205 | - 'category' => 0, |
|
| 1206 | - 'list_sort' => 'latest', |
|
| 1207 | - 'event_type' => '', |
|
| 1208 | - 'post_number' => 10, |
|
| 1209 | - 'post_author' => '', |
|
| 1210 | - 'layout' => 'gridview_onehalf', |
|
| 1211 | - 'listing_width' => '', |
|
| 1212 | - 'character_count' => 20, |
|
| 1213 | - 'add_location_filter' => 1, |
|
| 1214 | - 'show_featured_only' => '', |
|
| 1215 | - 'show_special_only' => '', |
|
| 1216 | - 'with_pics_only' => '', |
|
| 1217 | - 'with_videos_only' => '', |
|
| 1218 | - 'with_pagination' => '1', |
|
| 1219 | - 'top_pagination' => '0', |
|
| 1220 | - 'bottom_pagination' => '1', |
|
| 1221 | - 'without_no_results' => 0, |
|
| 1222 | - 'tags' => '' |
|
| 1223 | - ); |
|
| 1224 | - $params = shortcode_atts($defaults, $atts); |
|
| 1225 | - |
|
| 1226 | - $params['title'] = wp_strip_all_tags($params['title']); |
|
| 1227 | - $params['post_type'] = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place'; |
|
| 1228 | - |
|
| 1229 | - // Validate the selected category/ies - Grab the current list based on post_type |
|
| 1230 | - $category_taxonomy = geodir_get_taxonomies($params['post_type']); |
|
| 1231 | - $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids')); |
|
| 1232 | - |
|
| 1233 | - // Make sure we have an array |
|
| 1234 | - if (!(is_array($params['category']))) { |
|
| 1235 | - $params['category'] = explode(',', $params['category']); |
|
| 1236 | - } |
|
| 1237 | - |
|
| 1238 | - // Array_intersect returns only the items in $params['category'] that are also in our category list |
|
| 1239 | - // Otherwise it becomes empty and later on that will mean "All" |
|
| 1240 | - $params['category'] = array_intersect($params['category'], $categories); |
|
| 1241 | - |
|
| 1242 | - // Post_number needs to be a positive integer |
|
| 1243 | - $params['post_number'] = absint($params['post_number']); |
|
| 1244 | - $params['post_number'] = $params['post_number'] > 0 ? $params['post_number'] : 10; |
|
| 1201 | + global $post; |
|
| 1202 | + $defaults = array( |
|
| 1203 | + 'title' => '', |
|
| 1204 | + 'post_type' => 'gd_place', |
|
| 1205 | + 'category' => 0, |
|
| 1206 | + 'list_sort' => 'latest', |
|
| 1207 | + 'event_type' => '', |
|
| 1208 | + 'post_number' => 10, |
|
| 1209 | + 'post_author' => '', |
|
| 1210 | + 'layout' => 'gridview_onehalf', |
|
| 1211 | + 'listing_width' => '', |
|
| 1212 | + 'character_count' => 20, |
|
| 1213 | + 'add_location_filter' => 1, |
|
| 1214 | + 'show_featured_only' => '', |
|
| 1215 | + 'show_special_only' => '', |
|
| 1216 | + 'with_pics_only' => '', |
|
| 1217 | + 'with_videos_only' => '', |
|
| 1218 | + 'with_pagination' => '1', |
|
| 1219 | + 'top_pagination' => '0', |
|
| 1220 | + 'bottom_pagination' => '1', |
|
| 1221 | + 'without_no_results' => 0, |
|
| 1222 | + 'tags' => '' |
|
| 1223 | + ); |
|
| 1224 | + $params = shortcode_atts($defaults, $atts); |
|
| 1225 | + |
|
| 1226 | + $params['title'] = wp_strip_all_tags($params['title']); |
|
| 1227 | + $params['post_type'] = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place'; |
|
| 1228 | + |
|
| 1229 | + // Validate the selected category/ies - Grab the current list based on post_type |
|
| 1230 | + $category_taxonomy = geodir_get_taxonomies($params['post_type']); |
|
| 1231 | + $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids')); |
|
| 1232 | + |
|
| 1233 | + // Make sure we have an array |
|
| 1234 | + if (!(is_array($params['category']))) { |
|
| 1235 | + $params['category'] = explode(',', $params['category']); |
|
| 1236 | + } |
|
| 1237 | + |
|
| 1238 | + // Array_intersect returns only the items in $params['category'] that are also in our category list |
|
| 1239 | + // Otherwise it becomes empty and later on that will mean "All" |
|
| 1240 | + $params['category'] = array_intersect($params['category'], $categories); |
|
| 1241 | + |
|
| 1242 | + // Post_number needs to be a positive integer |
|
| 1243 | + $params['post_number'] = absint($params['post_number']); |
|
| 1244 | + $params['post_number'] = $params['post_number'] > 0 ? $params['post_number'] : 10; |
|
| 1245 | 1245 | |
| 1246 | - // Post_number needs to be a positive integer |
|
| 1247 | - if (!empty($atts['post_author'])) { |
|
| 1248 | - if ($atts['post_author'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') { |
|
| 1249 | - $params['post_author'] = $post->post_author; |
|
| 1250 | - } else if ($atts['post_author'] != 'current' && absint($atts['post_author']) > 0) { |
|
| 1251 | - $params['post_author'] = absint($atts['post_author']); |
|
| 1252 | - } else { |
|
| 1253 | - unset($params['post_author']); |
|
| 1254 | - } |
|
| 1255 | - } else { |
|
| 1256 | - unset($params['post_author']); |
|
| 1257 | - } |
|
| 1258 | - |
|
| 1259 | - // Validate character_count |
|
| 1260 | - //todo: is this necessary? |
|
| 1261 | - $params['character_count'] = $params['character_count']; |
|
| 1262 | - |
|
| 1263 | - // Validate our layout choice |
|
| 1264 | - // Outside of the norm, I added some more simple terms to match the existing |
|
| 1265 | - // So now I just run the switch to set it properly. |
|
| 1266 | - $params['layout'] = gdsc_validate_layout_choice($params['layout']); |
|
| 1267 | - |
|
| 1268 | - // Validate our sorting choice |
|
| 1269 | - $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']); |
|
| 1270 | - |
|
| 1271 | - // Validate Listing width, used in the template widget-listing-listview.php |
|
| 1272 | - // The context is in width=$listing_width% - So we need a positive number between 0 & 100 |
|
| 1273 | - $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']); |
|
| 1274 | - |
|
| 1275 | - // Validate the checkboxes used on the widget |
|
| 1276 | - $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']); |
|
| 1277 | - $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']); |
|
| 1278 | - $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']); |
|
| 1279 | - $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']); |
|
| 1280 | - $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']); |
|
| 1281 | - $params['with_pagination'] = gdsc_to_bool_val($params['with_pagination']); |
|
| 1282 | - $params['top_pagination'] = gdsc_to_bool_val($params['top_pagination']); |
|
| 1283 | - $params['bottom_pagination'] = gdsc_to_bool_val($params['bottom_pagination']); |
|
| 1284 | - |
|
| 1285 | - // Clean tags |
|
| 1286 | - if (!empty($params['tags'])) { |
|
| 1287 | - if (!is_array($params['tags'])) { |
|
| 1288 | - $comma = _x(',', 'tag delimiter'); |
|
| 1289 | - if ( ',' !== $comma ) { |
|
| 1290 | - $params['tags'] = str_replace($comma, ',', $params['tags']); |
|
| 1291 | - } |
|
| 1292 | - $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,")); |
|
| 1293 | - $params['tags'] = array_map('trim', $params['tags']); |
|
| 1294 | - } |
|
| 1295 | - } else { |
|
| 1296 | - $params['tags'] = array(); |
|
| 1297 | - } |
|
| 1298 | - |
|
| 1299 | - /** |
|
| 1300 | - * End of validation |
|
| 1301 | - */ |
|
| 1302 | - if (isset($atts['geodir_ajax'])) { |
|
| 1303 | - $params['geodir_ajax'] = $atts['geodir_ajax']; |
|
| 1304 | - unset($atts['geodir_ajax']); |
|
| 1305 | - } |
|
| 1306 | - if (isset($atts['pageno'])) { |
|
| 1307 | - $params['pageno'] = $atts['pageno']; |
|
| 1308 | - unset($atts['pageno']); |
|
| 1309 | - } |
|
| 1310 | - |
|
| 1311 | - if ( !empty($atts['shortcode_content']) ) { |
|
| 1312 | - $content = $atts['shortcode_content']; |
|
| 1313 | - } |
|
| 1314 | - $params['shortcode_content'] = trim($content); |
|
| 1315 | - $atts['shortcode_content'] = trim($content); |
|
| 1246 | + // Post_number needs to be a positive integer |
|
| 1247 | + if (!empty($atts['post_author'])) { |
|
| 1248 | + if ($atts['post_author'] == 'current' && !empty($post) && isset($post->post_author) && $post->post_type != 'page') { |
|
| 1249 | + $params['post_author'] = $post->post_author; |
|
| 1250 | + } else if ($atts['post_author'] != 'current' && absint($atts['post_author']) > 0) { |
|
| 1251 | + $params['post_author'] = absint($atts['post_author']); |
|
| 1252 | + } else { |
|
| 1253 | + unset($params['post_author']); |
|
| 1254 | + } |
|
| 1255 | + } else { |
|
| 1256 | + unset($params['post_author']); |
|
| 1257 | + } |
|
| 1258 | + |
|
| 1259 | + // Validate character_count |
|
| 1260 | + //todo: is this necessary? |
|
| 1261 | + $params['character_count'] = $params['character_count']; |
|
| 1262 | + |
|
| 1263 | + // Validate our layout choice |
|
| 1264 | + // Outside of the norm, I added some more simple terms to match the existing |
|
| 1265 | + // So now I just run the switch to set it properly. |
|
| 1266 | + $params['layout'] = gdsc_validate_layout_choice($params['layout']); |
|
| 1267 | + |
|
| 1268 | + // Validate our sorting choice |
|
| 1269 | + $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']); |
|
| 1270 | + |
|
| 1271 | + // Validate Listing width, used in the template widget-listing-listview.php |
|
| 1272 | + // The context is in width=$listing_width% - So we need a positive number between 0 & 100 |
|
| 1273 | + $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']); |
|
| 1274 | + |
|
| 1275 | + // Validate the checkboxes used on the widget |
|
| 1276 | + $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']); |
|
| 1277 | + $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']); |
|
| 1278 | + $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']); |
|
| 1279 | + $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']); |
|
| 1280 | + $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']); |
|
| 1281 | + $params['with_pagination'] = gdsc_to_bool_val($params['with_pagination']); |
|
| 1282 | + $params['top_pagination'] = gdsc_to_bool_val($params['top_pagination']); |
|
| 1283 | + $params['bottom_pagination'] = gdsc_to_bool_val($params['bottom_pagination']); |
|
| 1284 | + |
|
| 1285 | + // Clean tags |
|
| 1286 | + if (!empty($params['tags'])) { |
|
| 1287 | + if (!is_array($params['tags'])) { |
|
| 1288 | + $comma = _x(',', 'tag delimiter'); |
|
| 1289 | + if ( ',' !== $comma ) { |
|
| 1290 | + $params['tags'] = str_replace($comma, ',', $params['tags']); |
|
| 1291 | + } |
|
| 1292 | + $params['tags'] = explode(',', trim($params['tags'], " \n\t\r\0\x0B,")); |
|
| 1293 | + $params['tags'] = array_map('trim', $params['tags']); |
|
| 1294 | + } |
|
| 1295 | + } else { |
|
| 1296 | + $params['tags'] = array(); |
|
| 1297 | + } |
|
| 1298 | + |
|
| 1299 | + /** |
|
| 1300 | + * End of validation |
|
| 1301 | + */ |
|
| 1302 | + if (isset($atts['geodir_ajax'])) { |
|
| 1303 | + $params['geodir_ajax'] = $atts['geodir_ajax']; |
|
| 1304 | + unset($atts['geodir_ajax']); |
|
| 1305 | + } |
|
| 1306 | + if (isset($atts['pageno'])) { |
|
| 1307 | + $params['pageno'] = $atts['pageno']; |
|
| 1308 | + unset($atts['pageno']); |
|
| 1309 | + } |
|
| 1310 | + |
|
| 1311 | + if ( !empty($atts['shortcode_content']) ) { |
|
| 1312 | + $content = $atts['shortcode_content']; |
|
| 1313 | + } |
|
| 1314 | + $params['shortcode_content'] = trim($content); |
|
| 1315 | + $atts['shortcode_content'] = trim($content); |
|
| 1316 | 1316 | |
| 1317 | - $params['shortcode_atts'] = $atts; |
|
| 1317 | + $params['shortcode_atts'] = $atts; |
|
| 1318 | 1318 | |
| 1319 | - $output = geodir_sc_gd_listings_output($params); |
|
| 1319 | + $output = geodir_sc_gd_listings_output($params); |
|
| 1320 | 1320 | |
| 1321 | - return $output; |
|
| 1321 | + return $output; |
|
| 1322 | 1322 | } |
| 1323 | 1323 | add_shortcode('gd_listings', 'geodir_sc_gd_listings'); |
| 1324 | 1324 | |
@@ -1358,56 +1358,56 @@ discard block |
||
| 1358 | 1358 | * @return string HTML content to display CPT categories. |
| 1359 | 1359 | */ |
| 1360 | 1360 | function geodir_sc_cpt_categories_widget($atts, $content = '') { |
| 1361 | - $defaults = array( |
|
| 1362 | - 'title' => '', |
|
| 1363 | - 'post_type' => '', // NULL for all |
|
| 1364 | - 'hide_empty' => '', |
|
| 1365 | - 'show_count' => '', |
|
| 1366 | - 'hide_icon' => '', |
|
| 1367 | - 'cpt_left' => '', |
|
| 1368 | - 'sort_by' => 'count', |
|
| 1369 | - 'max_count' => 'all', |
|
| 1370 | - 'max_level' => '1', |
|
| 1371 | - 'no_cpt_filter' => '', |
|
| 1372 | - 'no_cat_filter' => '', |
|
| 1373 | - 'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">', |
|
| 1374 | - 'after_widget' => '</section>', |
|
| 1375 | - 'before_title' => '<h3 class="widget-title">', |
|
| 1376 | - 'after_title' => '</h3>', |
|
| 1377 | - ); |
|
| 1378 | - $params = shortcode_atts($defaults, $atts); |
|
| 1379 | - |
|
| 1380 | - /** |
|
| 1381 | - * Validate our incoming params |
|
| 1382 | - */ |
|
| 1383 | - // Make sure we have an array |
|
| 1384 | - $params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array(); |
|
| 1385 | - |
|
| 1386 | - // Validate the checkboxes used on the widget |
|
| 1387 | - $params['hide_empty'] = gdsc_to_bool_val($params['hide_empty']); |
|
| 1388 | - $params['show_count'] = gdsc_to_bool_val($params['show_count']); |
|
| 1389 | - $params['hide_icon'] = gdsc_to_bool_val($params['hide_icon']); |
|
| 1390 | - $params['cpt_left'] = gdsc_to_bool_val($params['cpt_left']); |
|
| 1361 | + $defaults = array( |
|
| 1362 | + 'title' => '', |
|
| 1363 | + 'post_type' => '', // NULL for all |
|
| 1364 | + 'hide_empty' => '', |
|
| 1365 | + 'show_count' => '', |
|
| 1366 | + 'hide_icon' => '', |
|
| 1367 | + 'cpt_left' => '', |
|
| 1368 | + 'sort_by' => 'count', |
|
| 1369 | + 'max_count' => 'all', |
|
| 1370 | + 'max_level' => '1', |
|
| 1371 | + 'no_cpt_filter' => '', |
|
| 1372 | + 'no_cat_filter' => '', |
|
| 1373 | + 'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">', |
|
| 1374 | + 'after_widget' => '</section>', |
|
| 1375 | + 'before_title' => '<h3 class="widget-title">', |
|
| 1376 | + 'after_title' => '</h3>', |
|
| 1377 | + ); |
|
| 1378 | + $params = shortcode_atts($defaults, $atts); |
|
| 1391 | 1379 | |
| 1392 | - if ($params['max_count'] != 'all') { |
|
| 1393 | - $params['max_count'] = absint($params['max_count']); |
|
| 1394 | - } |
|
| 1380 | + /** |
|
| 1381 | + * Validate our incoming params |
|
| 1382 | + */ |
|
| 1383 | + // Make sure we have an array |
|
| 1384 | + $params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array(); |
|
| 1385 | + |
|
| 1386 | + // Validate the checkboxes used on the widget |
|
| 1387 | + $params['hide_empty'] = gdsc_to_bool_val($params['hide_empty']); |
|
| 1388 | + $params['show_count'] = gdsc_to_bool_val($params['show_count']); |
|
| 1389 | + $params['hide_icon'] = gdsc_to_bool_val($params['hide_icon']); |
|
| 1390 | + $params['cpt_left'] = gdsc_to_bool_val($params['cpt_left']); |
|
| 1391 | + |
|
| 1392 | + if ($params['max_count'] != 'all') { |
|
| 1393 | + $params['max_count'] = absint($params['max_count']); |
|
| 1394 | + } |
|
| 1395 | 1395 | |
| 1396 | - if ($params['max_level'] != 'all') { |
|
| 1397 | - $params['max_level'] = absint($params['max_level']); |
|
| 1398 | - } |
|
| 1396 | + if ($params['max_level'] != 'all') { |
|
| 1397 | + $params['max_level'] = absint($params['max_level']); |
|
| 1398 | + } |
|
| 1399 | 1399 | |
| 1400 | - $params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']); |
|
| 1401 | - $params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']); |
|
| 1400 | + $params['no_cpt_filter'] = gdsc_to_bool_val($params['no_cpt_filter']); |
|
| 1401 | + $params['no_cat_filter'] = gdsc_to_bool_val($params['no_cat_filter']); |
|
| 1402 | 1402 | |
| 1403 | - $params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count'; |
|
| 1403 | + $params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count'; |
|
| 1404 | 1404 | |
| 1405 | - ob_start(); |
|
| 1406 | - the_widget('geodir_cpt_categories_widget', $params, $params); |
|
| 1407 | - $output = ob_get_contents(); |
|
| 1408 | - ob_end_clean(); |
|
| 1405 | + ob_start(); |
|
| 1406 | + the_widget('geodir_cpt_categories_widget', $params, $params); |
|
| 1407 | + $output = ob_get_contents(); |
|
| 1408 | + ob_end_clean(); |
|
| 1409 | 1409 | |
| 1410 | - return $output; |
|
| 1410 | + return $output; |
|
| 1411 | 1411 | } |
| 1412 | 1412 | add_shortcode('gd_cpt_categories', 'geodir_sc_cpt_categories_widget'); |
| 1413 | 1413 | |
@@ -1422,6 +1422,6 @@ discard block |
||
| 1422 | 1422 | * @return string HTML code. |
| 1423 | 1423 | */ |
| 1424 | 1424 | function geodir_sc_responsive_videos($atts, $content) { |
| 1425 | - return '<div class="geodir-video-wrapper">'.$content.'</div>'; |
|
| 1425 | + return '<div class="geodir-video-wrapper">'.$content.'</div>'; |
|
| 1426 | 1426 | } |
| 1427 | 1427 | add_shortcode('gd_video', 'geodir_sc_responsive_videos'); |
| 1428 | 1428 | \ No newline at end of file |
